Merge pull request #17 from rapid7/master

bla

Author: Pedro Ribeiro

.gitignore

@@ -66,8 +66,13 @@ external/source/exploits/**/Debug
 external/source/exploits/**/Release
 
 # Avoid checking in Meterpreter binaries. These are supplied upstream by
-# the meterpreter_bins gem.
+# the metasploit-payloads gem.
 data/meterpreter/*.dll
+data/meterpreter/*.bin
+data/meterpreter/*.jar
+data/meterpreter/*.lso
+data/android
+data/java
 
 # Avoid checking in Meterpreter libs that are built from
 # private source. If you're interested in this functionality,

.mailmap

@@ -1,41 +1,45 @@
 bcook-r7 <bcook-r7@github>         Brent Cook <[email protected]>
 bturner-r7 <bturner-r7@github>     Brandon Turner <[email protected]>
+ccatalan-r7 <ccatalan-r7@github>   Christian Catalan <[email protected]>
 cdoughty-r7 <cdoughty-r7@github>   Chris Doughty <[email protected]>
 dheiland-r7 <dheiland-r7@github>   Deral Heiland <[email protected]>
-dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
 dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
+dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
 dmaloney-r7 <dmaloney-r7@github>   dmaloney-r7 <[email protected]>
 ecarey-r7 <ecarey-r7@github>       Erran Carey <[email protected]>
 farias-r7 <farias-r7@github>       Fernando Arias <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 jhart-r7 <jhart-r7@github>         Jon Hart <[email protected]>
-jlee-r7 <jlee-r7@github>           egypt <[email protected]> # aka egypt
-jlee-r7 <jlee-r7@github>           James Lee <[email protected]> # aka egypt
 jlee-r7 <jlee-r7@github>           James Lee <[email protected]>
+jlee-r7 <jlee-r7@github>           James Lee <[email protected]> # aka egypt
+jlee-r7 <jlee-r7@github>           egypt <[email protected]> # aka egypt
 jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
 jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
 kgray-r7 <kgray-r7@github>         Kyle Gray <[email protected]>
 limhoff-r7 <limhoff-r7@github>     Luke Imhoff <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>   darkbushido <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>   darkbushido <[email protected]>
 mbuck-r7 <mbuck-r7@github>         Matt Buck <[email protected]>
 mbuck-r7 <mbuck-r7@github>         Matt Buck <[email protected]>
 mschloesser-r7 <mschloesser-r7@github> Mark Schloesser <[email protected]>
 mschloesser-r7 <mschloesser-r7@github> mschloesser-r7 <[email protected]>
 parzamendi-r7 <parzamendi-r7@github> parzamendi-r7 <[email protected]>
+pdeardorff-r7 <pdeardorff-r7@github> Paul Deardorff <[email protected]>
+pdeardorff-r7 <pdeardorff-r7@github> pdeardorff-r7 <[email protected]>
+sgonzalez-r7 <sgonzalez-r7@github> Sonny Gonzalez <[email protected]>
 shuckins-r7 <shuckins-r7@github>   Samuel Huckins <[email protected]>
 todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
 todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
 todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
-trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
 trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
+trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
+wchen-r7 <wchen-r7@github>         Wei Chen <[email protected]>
 wchen-r7 <wchen-r7@github>         sinn3r <[email protected]> # aka sinn3r
 wchen-r7 <wchen-r7@github>         sinn3r <[email protected]>
-wchen-r7 <wchen-r7@github>         Wei Chen <[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]>

.ruby-version

@@ -1 +1 @@
-2.1.5
+2.1.6

.travis.yml

@@ -22,10 +22,10 @@ before_script:
   - bundle exec rake db:migrate
 script:
   # fail build if db/schema.rb update is not committed
-  - git diff --exit-code && bundle exec rake $RAKE_TASKS
+  - git diff --exit-code db/schema.rb && bundle exec rake $RAKE_TASKS
 sudo: false
 rvm:
-  - '2.1'
+  - '2.1.6'
 
 notifications:
   irc: "irc.freenode.org#msfnotify"
@@ -38,3 +38,6 @@ branches:
   except:
     - gh-pages
     - metakitty
+
+addons:
+  postgresql: '9.3'

Gemfile

@@ -8,7 +8,7 @@ group :coverage do
   # code coverage for tests
   # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
   # see: https://github.com/colszowka/simplecov/issues/127 (hopefully fixed in 0.8.0)
-  gem 'simplecov', '0.5.4', :require => false
+  gem 'simplecov'
 end
 
 group :db do
@@ -25,12 +25,8 @@ group :development do
 end
 
 group :development, :test do
-  # supplies factories for producing model instance for specs
-  # Version 4.1.0 or newer is needed to support generate calls without the
-  # 'FactoryGirl.' in factory definitions syntax.
-  gem 'factory_girl', '>= 4.1.0'
   # automatically include factories from spec/factories
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', '~> 4.5.0'
   # Make rspec output shorter and more useful
   gem 'fivemat', '1.2.1'
   # running documentation generation tasks and rspec tasks