Merge branch 'master' into freefloatftp_user

Author: dougsko

.gitignore

@@ -1,3 +1,4 @@
+.bundle
 # Rubymine project directory
 .idea
 # RVM control file

.mailmap

@@ -6,6 +6,7 @@ jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 jlee-r7 <jlee-r7@github>           James Lee <[email protected]> # aka egypt
+jlee-r7 <jlee-r7@github>           egypt <[email protected]> # aka egypt
 jlee-r7 <jlee-r7@github>           James Lee <[email protected]>
 dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]> # aka TheLightCosine
 dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
@@ -49,6 +50,8 @@ mubix <mubix@github>                   Rob Fuller <[email protected]>
 nmonkee <nmonkee@github>               nmonkee <[email protected]> 
 rsmudge <rsmudge@github>               Raphael Mudge <[email protected]> # Aka `butane
 m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
+m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
+m-1-k-3 <m-1-k-3@github>               m-1-k-3 <[email protected]>
 kost <kost@github>                     Vlatko Kosturjak <[email protected]>
 ohdae <ohdae@github>                   ohdae <[email protected]>
 schierlm <schierlm@github>             Michael Schierl <[email protected]> # Aka mihi

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,45 +24,43 @@ 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
 
 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.