Merge limhoff's import shuffle and YARD fixes

Cuts an importer out of db.rb, includes a ton of specs to ensure that
nothing is broke along the way.

[Closes rapid7#1693]

Author: todb

Gemfile

@@ -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

@@ -26,7 +26,10 @@ GEM
     arel (3.0.2)
     builder (3.0.4)
     coderay (1.0.9)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
     i18n (0.6.1)
     json (1.7.7)
     method_source (0.8.1)
@@ -64,6 +67,8 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   activesupport (>= 3.0.0)
+  database_cleaner
+  factory_girl (>= 4.1.0)
   json
   metasploit_data_models!
   msgpack

lib/metasploit/framework/database.rb

@@ -0,0 +1,15 @@
+require 'metasploit/framework'
+
+module Metasploit
+	module Framework
+		module Database
+			def self.configurations
+				YAML.load_file(configurations_pathname)
+			end
+
+			def self.configurations_pathname
+				Metasploit::Framework.root.join('config', 'database.yml')
+			end
+		end
+	end
+end

lib/msf/base.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-###
 #
 # framework-base
 # --------------
@@ -13,8 +12,6 @@
 # Beyond providing the default sessions, framework-base also provides
 # a wrapper interface to framework-core that makes some of the tasks,
 # such as exploitation, into easier to manage functions.
-#
-###
 
 # framework-base depends on framework-core
 require 'msf/core'

lib/msf/base/sessions/meterpreter.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
-##
 # $Id$
-##
 
 require 'msf/base'
 require 'msf/base/sessions/scriptable'

lib/msf/base/sessions/meterpreter_java.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
-##
 # $Id$
-##
 
 require 'msf/base/sessions/meterpreter'
 

lib/msf/base/sessions/meterpreter_options.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
-##
 # $Id$
-##
 
 require 'shellwords'
 

lib/msf/base/sessions/meterpreter_php.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
-##
 # $Id$
-##
 
 require 'msf/base/sessions/meterpreter'
 

lib/msf/base/sessions/meterpreter_x64_win.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: meterpreter_options.rb 10595 2010-10-08 04:11:47Z hdm $
-##
 
 require 'msf/base/sessions/meterpreter'
 require 'msf/windows_error'

lib/msf/base/sessions/meterpreter_x86_bsd.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
-##
 # $Id$
-##
 
 require 'msf/base/sessions/meterpreter'