Merge pull request #25 from rapid7/master

asasa

Author: Pedro Ribeiro

.gitignore

@@ -84,3 +84,4 @@ data/meterpreter/ext_server_pivot.*.dll
 # Avoid checking in metakitty, the source for
 # https://rapid7.github.io/metasploit-framework. It's an orphan branch.
 /metakitty
+.vagrant

.mailmap

@@ -37,7 +37,7 @@ wchen-r7 <wchen-r7@github>           <[email protected]> # aka sinn3r
 wchen-r7 <wchen-r7@github>           <[email protected]>
 wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
 wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
-wvu-r7 <wvu-r7@github>               William Vu <[email protected]>
+wvu-r7 <wvu-r7@github>               William Vu <wvu@cs.nmt.edu>
 wvu-r7 <wvu-r7@github>               wvu-r7 <[email protected]>
 wwebb-r7 <wwebb-r7@github>           William Webb <[email protected]>
 

.ruby-version

@@ -1 +1 @@
-2.1.9
+2.3.1

.travis.yml

@@ -10,7 +10,7 @@ addons:
       - graphviz
 language: ruby
 rvm:
-  - '2.1.8'
+  - '2.3.1'
 
 env:
   - RAKE_TASKS="cucumber cucumber:boot" CREATE_BINSTUBS=true

CONTRIBUTING.md

@@ -45,6 +45,7 @@ and Metasploit's [Common Coding Mistakes].
 * **Do** specify a descriptive title to make searching for your pull request easier.
 * **Do** include [console output], especially for witnessable effects in `msfconsole`.
 * **Do** list [verification steps] so your code is testable.
+* **Do** [reference associated issues] in your pull request description
 * **Don't** leave your pull request description blank.
 * **Don't** abandon your pull request. Being responsive helps us land your code faster.
 
@@ -56,6 +57,10 @@ Pull requests [PR#2940] and [PR#3043] are a couple good examples to follow.
   - It would be even better to set up `msftidy.rb` as a [pre-commit hook].
 * **Do** use the many module mixin [API]s. Wheel improvements are welcome; wheel reinventions, not so much.
 * **Don't** include more than one module per pull request.
+* **Do** include instructions on how to setup the vulnerable environment or software
+* **Do** include [Module Documentation](https://github.com/rapid7/metasploit-framework/wiki/Generating-Module-Documentation) showing sample run-throughs
+
+
 
 #### Scripts
 
@@ -102,6 +107,7 @@ already way ahead of the curve, so keep it up!
 [topic branch]:http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches
 [console output]:https://help.github.com/articles/github-flavored-markdown#fenced-code-blocks
 [verification steps]:https://help.github.com/articles/writing-on-github#task-lists
+[reference associated issues]:https://github.com/blog/1506-closing-issues-via-pull-requests
 [PR#2940]:https://github.com/rapid7/metasploit-framework/pull/2940
 [PR#3043]:https://github.com/rapid7/metasploit-framework/pull/3043
 [pre-commit hook]:https://github.com/rapid7/metasploit-framework/blob/master/tools/dev/pre-commit-hook.rb

Gemfile

@@ -25,14 +25,14 @@ end
 
 group :development, :test do
   # automatically include factories from spec/factories
-  gem 'factory_girl_rails', '~> 4.5.0'
+  gem 'factory_girl_rails'
   # Make rspec output shorter and more useful
-  gem 'fivemat', '~> 1.3.1'
+  gem 'fivemat'
   # running documentation generation tasks and rspec tasks
-  gem 'rake', '>= 10.0.0'
+  gem 'rake'
   # Define `rake spec`.  Must be in development AND test so that its available by default as a rake test when the
   # environment is development
-  gem 'rspec-rails' , '~> 3.3'
+  gem 'rspec-rails'
 end
 
 group :test do