Upgrade MDM, removing pry as a runtime dependency

This has been put off for a long while.

.gitignore

@@ -1,3 +1,4 @@
+.bundle
 # Rubymine project directory
 .idea
 # RVM control file
@@ -6,6 +7,8 @@
 .yardoc
 # Mac OS X files
 .DS_Store
+# database config for testing
+config/database.yml
 # simplecov coverage data
 coverage
 data/meterpreter/ext_server_pivot.dll

.mailmap

@@ -0,0 +1,66 @@
+wchen-r7 <wchen-r7@github>         sinn3r <msfsinn3r@gmail.com> # aka sinn3r
+wchen-r7 <wchen-r7@github>         Wei Chen <Wei_Chen@rapid7.com>
+wchen-r7 <wchen-r7@github>         sinn3r <wei_chen@rapid7.com>
+todb-r7 <todb-r7@github>           Tod Beardsley <todb@metasploit.com>
+jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <juan.vazquez@metasploit.com>
+hmoore-r7 <hmoore-r7@github>       HD Moore <hd_moore@rapid7.com>
+hmoore-r7 <hmoore-r7@github>       HD Moore <hdm@digitaloffense.net>
+jlee-r7 <jlee-r7@github>           James Lee <egypt@metasploit.com> # aka egypt
+jlee-r7 <jlee-r7@github>           James Lee <James_Lee@rapid7.com>
+dmaloney-r7 <dmaloney-r7@github>   David Maloney <DMaloney@rapid7.com> # aka TheLightCosine
+dmaloney-r7 <dmaloney-r7@github>   David Maloney <David_Maloney@rapid7.com>
+joev-r7 <joev-r7@github>           Joe Vennix <Joe_Vennix@rapid7.com>
+bturner-r7 <bturner-r7@github>     Brandon Turner <brandon_turner@rapid7.com>
+ecarey-r7 <ecarey-r7@github>       Erran Carey <e@ipwnstuff.com>
+limhoff-r7 <limhoff-r7@github>     Luke Imhoff <luke_imhoff@rapid7.com>
+todb-r7 <todb-r7@github>           Tod Beardsley <tod_beardsley@rapid7.com>
+tasos-r7 <tasos-r7@github>         Tasos Laskos <Tasos_Laskos@rapid7.com>
+shuckins-r7 <shuckins-r7@github>   Samuel Huckins <samuel_huckins@rapid7.com>
+bperry-r7 <bperry-r7@github>       Brandon Perry <bperry@bperry-rapid7.(none)>
+bperry-r7 <bperry-r7@github>       Brandon Perry <bperry.volatile@gmail.com>
+
+# Above this line are current Rapid7 employees Below this paragraph are
+# volunteers, former employees, and potential Rapid7 employees who, at
+# one time or another, had some largeish number of commits landed on
+# rapid7/metasploit-framework master branch.  This should be refreshed
+# periodically. If you're on this list and would like to not be, just
+# let todb@metasploit.com know.
+
+Meatballs1 <Meatballs1@github>         Meatballs <eat_meatballs@hotmail.co.uk>
+Meatballs1 <Meatballs1@github>         Meatballs1 <eat_meatballs@hotmail.co.uk> 
+Meatballs1 <Meatballs1@github>         Ben Campbell <eat_meatballs@hotmail.co.uk>
+jduck <jduck@github>                   Joshua Drake <github.jdrake@qoop.org>
+jcran <jcran@github>                   Jonathan Cran <jcran@rapid7.com>
+jcran <jcran@github>                   Jonathan Cran <jcran@0x0e.org>
+bannedit <bannedit@github>             David Rude <bannedit0@gmail.com>
+darkoperator <darkoperator@github>     Carlos Perez <carlos_perez@darkoperator.com>
+scriptjunkie <scriptjunkie@github>     Matt Weeks <scriptjunkie@scriptjunkie.us>
+skape <skape@???>                      Matt Miller <mmiller@hick.org>
+ceballosm <ceballosm@github>           Mario Ceballos <mc@metasploit.com>
+swtornio <swtornio@github>             Steve Tornio <swtornio@gmail.com>
+kris <kris@???>                        kris <>
+spoonm <spoonm@github>                 Spoon M <spoonm@gmail.com>
+fab <fab@???>                          fab <> # fab at revhosts.net (Fabrice MOURRON)
+efraintorres <efraintorres@github>     efraintorres <etlownoise@gmail.com>
+efraintorres <efraintorres@github>     et <>
+r3dy <r3dy@github>                     Royce Davis <r3dy@Royces-MacBook-Pro.local>
+r3dy <r3dy@github>                     Royce Davis <royce.e.davis@gmail.com>
+mubix <mubix@github>                   Rob Fuller <jd.mubix@gmail.com>
+nmonkee <nmonkee@github>               nmonkee <dave@northern-monkee.co.uk> 
+rsmudge <rsmudge@github>               Raphael Mudge <rsmudge@gmail.com> # Aka `butane
+m-1-k-3 <m-1-k-3@github>               m-1-k-3 <michael.messner@integralis.com>
+kost <kost@github>                     Vlatko Kosturjak <kost@linux.hr>
+ohdae <ohdae@github>                   ohdae <bindshell@live.com>
+schierlm <schierlm@github>             Michael Schierl <schierlm@gmx.de> # Aka mihi
+corelanc0d3er <corelanc0d3er@github>   Peter Van Eeckhoutte (corelanc0d3r) <peter.ve@corelan.be>
+corelanc0d3er <corelanc0d3er@github>   corelanc0d3r <peter.ve@corelan.be>
+kernelsmith <kernelsmith@github>       Joshua Smith <kernelsmith@kernelsmith.com>
+kernelsmith <kernelsmith@github>       kernelsmith <kernelsmith@kernelsmith>
+h0ng10 <h0ng10@github>                 h0ng10 <hansmartin.muench@googlemail.com>
+h0ng10 <h0ng10@github>                 Hans-Martin Münch <hansmartin.muench@googlemail.com>
+nullbind <nullbind@github>             nullbind <scott.sutherland@nullbind.com>
+nevdull77 <nevdull77@github>           Patrik Karlsson <patrik@cqure.net>
+jgor <jgor@github>                     jgor <jgor@indiecom.org>
+ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <chris.riley@c22.cc>
+ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <reg@c22.cc>
+FireFart <FireFart@github>             Christian Mehlmauer <firefart@gmail.com>

.travis.yml

@@ -2,6 +2,10 @@ language: ruby
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libpcap-dev
+before_script:
+  - cp config/database.yml.travis config/database.yml
+  - rake db:create
+  - rake db:migrate
 
 rvm:
   #- '1.8.7'

Gemfile

@@ -7,7 +7,7 @@ gem 'activerecord'
 # Needed for some admin modules (scrutinizer_add_user.rb)
 gem 'json'
 # Database models shared between framework and Pro.
-gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.6.3'
+gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.6.4'
 # Needed by msfgui and other rpc components
 gem 'msgpack'
 # Needed by anemone crawler
@@ -27,11 +27,19 @@ 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'
   # running documentation generation tasks and rspec tasks
   gem 'rake'
 end
 
 group :test do
+	# Removes records from database created during tests.  Can't use rspec-rails'
+	# transactional fixtures because multiple connections are in use so
+	# transactions won't work.
+	gem 'database_cleaner'
   # testing framework
   gem 'rspec', '>= 2.12'
   # code coverage for tests

Gemfile.lock

@@ -1,13 +1,12 @@
 GIT
   remote: git://github.com/rapid7/metasploit_data_models.git
-  revision: bf26ddf71e7ba2f66d3ba528fc67029f5c6a6135
-  tag: 0.6.3
+  revision: d6af3cf0413c1ad317c16c143791097bd0a5afff
+  tag: 0.6.4
   specs:
-    metasploit_data_models (0.6.3)
+    metasploit_data_models (0.6.4)
       activerecord (>= 3.2.13)
       activesupport
       pg
-      pry
 
 GEM
   remote: http://rubygems.org/
@@ -25,38 +24,34 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
-    coderay (1.0.9)
-    diff-lcs (1.1.3)
+    database_cleaner (0.9.1)
+    diff-lcs (1.2.2)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
     i18n (0.6.1)
     json (1.7.7)
-    method_source (0.8.1)
-    msgpack (0.5.2)
+    msgpack (0.5.4)
     multi_json (1.0.4)
-    nokogiri (1.5.6)
+    nokogiri (1.5.9)
     pcaprub (0.11.3)
-    pg (0.14.1)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.0.2)
+    pg (0.15.0)
+    rake (10.0.4)
     redcarpet (2.2.2)
     robots (0.10.1)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (3.4.4)
     tzinfo (0.3.37)
-    yard (0.8.3)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby
@@ -64,6 +59,8 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   activesupport (>= 3.0.0)
+  database_cleaner
+  factory_girl (>= 4.1.0)
   json
   metasploit_data_models!
   msgpack

HACKING

@@ -110,7 +110,15 @@ Non-scanner aux modules use run().
 Submitting Your Code
 ====================
 
-The process for submitting new modules via GitHub is documented here:
+To get started with a Metasploit Framework source clone, simply:
+
+  - Fork rapid7/metasploit-framework to your GitHub account
+  - git clone git://github.com/YourName/metasploit-framework.git
+  - gem install bundler
+  - bundle install
+
+More detailed documentation regarding the process for submitting new
+modules via GitHub is documented here:
 
 https://github.com/rapid7/metasploit-framework/wiki/Metasploit-Development-Environment
 

LICENSE

@@ -12,6 +12,8 @@ License: BSD-3-clause
 #
 # This license does not apply to third-party components detailed below.
 #
+# Last updated: 2013-Mar-25
+#
 
 Files: data/john/*
 Copyright: 1996-2011 Solar Designer.

Rakefile

@@ -2,6 +2,25 @@ require 'bundler/setup'
 
 require 'metasploit_data_models'
 
+pathname = Pathname.new(__FILE__)
+root = pathname.parent
+
+# add metasploit-framework/lib to load paths so rake files can just require
+# files normally without having to use __FILE__ and recalculating root and the
+# path to lib
+lib_pathname = root.join('lib')
+$LOAD_PATH.unshift(lib_pathname.to_s)
+
+#
+# load rake files like a rails engine
+#
+
+rakefile_glob = root.join('lib', 'tasks', '**', '*.rake').to_path
+
+Dir.glob(rakefile_glob) do |rakefile|
+  load rakefile
+end
+
 print_without = false
 
 begin
@@ -12,7 +31,7 @@ rescue LoadError
 
 	print_without = true
 else
-	RSpec::Core::RakeTask.new(:spec)
+	RSpec::Core::RakeTask.new(:spec => 'db:test:prepare')
 
 	task :default => :spec
 end

config/database.yml.example

@@ -1,8 +1,8 @@
 # Please only use postgresql bound to a TCP port.
 development: &pgsql
   adapter: postgresql
-  database: metasploit_data_models_development
-  username: metasploit_data_models_development
+  database: metasploit_framework_development
+  username: metasploit_framework_development
   password: __________________________________
   host: localhost
   port: 5432
@@ -16,7 +16,6 @@ development: &pgsql
 # Note also, sqlite3 is totally unsupported by Metasploit now.
 test:
   <<: *pgsql
-  database: metasploit_data_models_test
-  username: metasploit_data_models_test
+  database: metasploit_framework_test
+  username: metasploit_framework_test
   password: ___________________________
-

config/database.yml.travis

@@ -0,0 +1,27 @@
+# @note This file is only for use in travis-ci.  If you need to make a
+# config/database.yml for running rake, rake spec, or rspec locally, please
+# customize `conifg/database.yml.example`
+#
+# @example Customizing config/database.yml.example
+#   cp config/database.yml.example config/database.yml
+#   # update password fields for each environment's user
+
+# Using the postgres user locally without a host and port is the supported
+# configuration from Travis-CI
+#
+# @see http://about.travis-ci.org/docs/user/database-setup/#PostgreSQL
+development: &pgsql
+  adapter: postgresql
+  database: metasploit_framework_development
+  username: postgres
+  pool: 5
+  timeout: 5
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+#
+# Note also, sqlite3 is totally unsupported by Metasploit now.
+test:
+  <<: *pgsql
+  database: metasploit_framework_test