Revert "Various merge resolutions from master <- staging"

This reverts commit 149c3ec.

Conflicts:
	lib/metasploit/framework/command/base.rb
	lib/metasploit/framework/common_engine.rb
	lib/metasploit/framework/require.rb
	lib/msf/core/modules/namespace.rb
	modules/auxiliary/analyze/jtr_postgres_fast.rb
	modules/auxiliary/scanner/smb/smb_login.rb
	msfconsole

.gitignore

@@ -48,9 +48,6 @@ tags
 *.opensdf
 *.user
 
-# Rails log directory
-/log
-
 # ignore release/debug folders for exploits
 external/source/exploits/**/Debug
 external/source/exploits/**/Release

.rubocop.yml

@@ -53,4 +53,4 @@ Style/StringLiterals:
 
 Style/WordArray:
   Enabled: false
-  Description: 'Metasploit prefers consistent use of []'
+  Description: 'Metasploit prefers consistent use of []'

.yardopts

@@ -3,8 +3,6 @@
 --exclude \.ut\.rb/
 --exclude \.ts\.rb/
 --files CONTRIBUTING.md,COPYING,HACKING,LICENSE
-app/**/*.rb
 lib/msf/**/*.rb
-lib/metasploit/**/*.rb
 lib/rex/**/*.rb
 plugins/**/*.rb

Gemfile

@@ -1,53 +1,66 @@
 source 'https://rubygems.org'
-# Add default group gems to `metasploit-framework.gemspec`:
-#   spec.add_runtime_dependency '<name>', [<version requirements>]
-gemspec
+
+# Need 3+ for ActiveSupport::Concern
+gem 'activesupport', '>= 3.0.0', '< 4.0.0'
+# Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
+gem 'bcrypt'
+# Needed for some admin modules (scrutinizer_add_user.rb)
+gem 'json'
+# Needed for Meterpreter on Windows, soon others.
+gem 'meterpreter_bins', '0.0.6'
+# Needed by msfgui and other rpc components
+gem 'msgpack'
+# Needed by anemone crawler
+gem 'nokogiri'
+# Needed by db.rb and Msf::Exploit::Capture
+gem 'packetfu', '1.1.9'
+# Needed by JSObfu
+gem 'rkelly-remix', '0.0.6'
+# Needed by anemone crawler
+gem 'robots'
+# Needed for some post modules
+gem 'sqlite3'
 
 group :db do
   # Needed for Msf::DbManager
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'
-  # Metasploit::Credential database models
-  gem 'metasploit-credential', '>= 0.8.6', '< 0.9'
   # Database models shared between framework and Pro.
-  gem 'metasploit_data_models', '~> 0.19'
+  gem 'metasploit_data_models', '0.17.0'
   # Needed for module caching in Mdm::ModuleDetails
   gem 'pg', '>= 0.11'
 end
 
+group :pcap do
+  gem 'network_interface', '~> 0.0.1'
+  # For sniffer and raw socket modules
+  gem 'pcaprub'
+end
+
 group :development do
   # Markdown formatting for yard
   gem 'redcarpet'
   # generating documentation
   gem 'yard'
-  # for development and testing purposes
-  gem 'pry'
 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'
   # Make rspec output shorter and more useful
   gem 'fivemat', '1.2.1'
   # running documentation generation tasks and rspec tasks
   gem 'rake', '>= 10.0.0'
-  # testing framework
-  gem 'rspec', '>= 2.12', '< 3.0.0'
-  # 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' , '>= 2.12', '< 3.0.0'
-end
-
-group :pcap do
-  gem 'network_interface', '~> 0.0.1'
-  # For sniffer and raw socket modules
-  gem 'pcaprub'
 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'
   gem 'shoulda-matchers'
   # code coverage for tests
   # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.

Gemfile.local.example

@@ -27,6 +27,8 @@ end
 
 # Create a custom group
 group :local do
+  # Use pry to help view and interact with objects in the framework
+  gem 'pry', '~> 0.9'
   # Use pry-debugger to step through code during development
   gem 'pry-debugger', '~> 0.2'
   # Add the lab gem so that the 'lab' plugin will work again

Gemfile.lock

@@ -1,177 +1,90 @@
-PATH
-  remote: .
-  specs:
-    metasploit-framework (4.10.1.pre.dev)
-      actionpack (< 4.0.0)
-      activesupport (>= 3.0.0, < 4.0.0)
-      bcrypt
-      json
-      metasploit-model (~> 0.26.1)
-      meterpreter_bins (= 0.0.6)
-      msgpack
-      nokogiri
-      packetfu (= 1.1.9)
-      railties
-      rkelly-remix (= 0.0.6)
-      robots
-      rubyzip (~> 1.1)
-      sqlite3
-      tzinfo
-
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.19)
+    activesupport (3.2.14)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (3.0.3)
-    arel-helpers (2.0.1)
-      activerecord (>= 3.1.0, < 5)
+    arel (3.0.2)
     bcrypt (3.1.7)
     builder (3.0.4)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    factory_girl (4.4.0)
+    database_cleaner (1.1.1)
+    diff-lcs (1.2.4)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
-      railties (>= 3.0.0)
     fivemat (1.2.1)
-    hike (1.2.3)
-    i18n (0.6.11)
-    journey (1.0.4)
-    json (1.8.1)
-    metasploit-concern (0.1.1)
-      activesupport (~> 3.0, >= 3.0.0)
-    metasploit-credential (0.8.6)
-      metasploit-concern (~> 0.1.0)
-      metasploit-model (~> 0.26.1)
-      metasploit_data_models (~> 0.19.4)
-      pg
-      rubyntlm
-      rubyzip (~> 1.1)
-    metasploit-model (0.26.1)
+    i18n (0.6.5)
+    json (1.8.0)
+    metasploit_data_models (0.17.0)
+      activerecord (>= 3.2.13)
       activesupport
-    metasploit_data_models (0.19.4)
-      activerecord (>= 3.2.13, < 4.0.0)
-      activesupport
-      arel-helpers
-      metasploit-concern (~> 0.1.0)
-      metasploit-model (~> 0.26.1)
       pg
     meterpreter_bins (0.0.6)
-    method_source (0.8.2)
-    mini_portile (0.6.0)
-    msgpack (0.5.8)
+    mini_portile (0.5.1)
+    msgpack (0.5.5)
     multi_json (1.0.4)
     network_interface (0.0.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     packetfu (1.1.9)
     pcaprub (0.11.3)
-    pg (0.17.1)
-    pry (0.10.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redcarpet (3.1.2)
+    pg (0.16.0)
+    rake (10.1.0)
+    redcarpet (3.0.0)
     rkelly-remix (0.0.6)
     robots (0.10.1)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-collection_matchers (1.0.0)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    rspec-rails (2.99.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rubyntlm (0.4.0)
-    rubyzip (1.1.6)
-    shoulda-matchers (2.6.2)
+    rspec-mocks (2.14.3)
+    shoulda-matchers (2.3.0)
+      activesupport (>= 3.0.0)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (3.6.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.9)
-    thor (0.19.1)
-    tilt (1.4.1)
-    timecop (0.7.1)
-    tzinfo (0.3.40)
-    yard (0.8.7.4)
+    timecop (0.6.3)
+    tzinfo (0.3.37)
+    yard (0.8.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (>= 3.0.0, < 4.0.0)
+  activesupport (>= 3.0.0, < 4.0.0)
+  bcrypt
+  database_cleaner
   factory_girl (>= 4.1.0)
-  factory_girl_rails
   fivemat (= 1.2.1)
-  metasploit-credential (>= 0.8.6, < 0.9)
-  metasploit-framework!
-  metasploit_data_models (~> 0.19)
+  json
+  metasploit_data_models (= 0.17.0)
+  meterpreter_bins (= 0.0.6)
+  msgpack
   network_interface (~> 0.0.1)
+  nokogiri
+  packetfu (= 1.1.9)
   pcaprub
   pg (>= 0.11)
-  pry
   rake (>= 10.0.0)
   redcarpet
-  rspec (>= 2.12, < 3.0.0)
-  rspec-rails (>= 2.12, < 3.0.0)
+  rkelly-remix (= 0.0.6)
+  robots
+  rspec (>= 2.12)
   shoulda-matchers
   simplecov (= 0.5.4)
+  sqlite3
   timecop
   yard