Merge branch 'master' into land-5358-notes

Author: Brent Cook

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

Gemfile.lock

@@ -2,14 +2,14 @@ PATH
   remote: .
   specs:
     metasploit-framework (4.11.0.pre.dev)
-      actionpack (>= 3.2.21, < 4.0.0)
-      activesupport (>= 3.2.21, < 4.0.0)
+      actionpack (>= 4.0.9, < 4.1.0)
+      activesupport (>= 4.0.9, < 4.1.0)
       bcrypt
       jsobfu (~> 0.2.0)
       json
-      metasploit-concern (= 0.4.0)
-      metasploit-model (~> 0.29.0)
-      metasploit-payloads (= 0.0.3)
+      metasploit-concern (~> 1.0)
+      metasploit-model (~> 1.0)
+      metasploit-payloads (= 0.0.7)
       msgpack
       nokogiri
       packetfu (= 1.1.9)
@@ -21,10 +21,10 @@ PATH
       sqlite3
       tzinfo
     metasploit-framework-db (4.11.0.pre.dev)
-      activerecord (>= 3.2.21, < 4.0.0)
-      metasploit-credential (= 0.14.5)
+      activerecord (>= 4.0.9, < 4.1.0)
+      metasploit-credential (~> 1.0)
       metasploit-framework (= 4.11.0.pre.dev)
-      metasploit_data_models (= 0.24.0)
+      metasploit_data_models (~> 1.0)
       pg (>= 0.11)
     metasploit-framework-pcap (4.11.0.pre.dev)
       metasploit-framework (= 4.11.0.pre.dev)
@@ -34,148 +34,147 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.21)
-      actionpack (= 3.2.21)
-      mail (~> 2.5.4)
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.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.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
     arel-helpers (2.1.0)
       activerecord (>= 3.1.0, < 5)
-    aruba (0.6.1)
+    aruba (0.6.2)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     bcrypt (3.1.10)
-    builder (3.0.4)
-    capybara (2.4.1)
+    builder (3.1.4)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.3)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    cucumber (1.2.1)
+    cucumber (1.3.19)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    cucumber-rails (1.4.0)
-      capybara (>= 1.1.2)
-      cucumber (>= 1.2.0)
-      nokogiri (>= 1.5.0)
-      rails (>= 3.0.0)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-rails (1.4.2)
+      capybara (>= 1.1.2, < 3)
+      cucumber (>= 1.3.8, < 2)
+      mime-types (>= 1.16, < 3)
+      nokogiri (~> 1.5)
+      rails (>= 3, < 5)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     erubis (2.7.0)
-    factory_girl (4.4.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffi (1.9.3)
+    ffi (1.9.8)
     fivemat (1.2.1)
-    gherkin (2.11.6)
-      json (>= 1.7.6)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
     hike (1.2.3)
     i18n (0.7.0)
-    journey (1.0.4)
     jsobfu (0.2.1)
       rkelly-remix (= 0.0.6)
     json (1.8.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metasploit-concern (0.4.0)
-      activesupport (~> 3.0, >= 3.0.0)
-      railties (< 4.0.0)
-    metasploit-credential (0.14.5)
-      metasploit-concern (= 0.4.0)
-      metasploit-model (~> 0.29.0)
-      metasploit_data_models (= 0.24.0)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    metasploit-concern (1.0.0)
+      activerecord (>= 4.0.9, < 4.1.0)
+      activesupport (>= 4.0.9, < 4.1.0)
+      railties (>= 4.0.9, < 4.1.0)
+    metasploit-credential (1.0.0)
+      metasploit-concern (~> 1.0)
+      metasploit-model (~> 1.0)
+      metasploit_data_models (~> 1.0)
       pg
-      railties (< 4.0.0)
+      railties
       rubyntlm
       rubyzip (~> 1.1)
-    metasploit-model (0.29.2)
-      activesupport
-      railties (< 4.0.0)
-    metasploit-payloads (0.0.3)
-    metasploit_data_models (0.24.0)
-      activerecord (>= 3.2.13, < 4.0.0)
-      activesupport
+    metasploit-model (1.0.0)
+      activemodel (>= 4.0.9, < 4.1.0)
+      activesupport (>= 4.0.9, < 4.1.0)
+      railties (>= 4.0.9, < 4.1.0)
+    metasploit-payloads (0.0.7)
+    metasploit_data_models (1.0.1)
+      activerecord (>= 4.0.9, < 4.1.0)
+      activesupport (>= 4.0.9, < 4.1.0)
       arel-helpers
-      metasploit-concern (= 0.4.0)
-      metasploit-model (~> 0.29.0)
+      metasploit-concern (~> 1.0)
+      metasploit-model (~> 1.0)
       pg
-      railties (< 4.0.0)
+      postgres_ext
+      railties (>= 4.0.9, < 4.1.0)
       recog (~> 1.0)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     mini_portile (0.6.2)
+    minitest (4.7.5)
     msgpack (0.5.11)
-    multi_json (1.0.4)
+    multi_json (1.11.0)
+    multi_test (0.1.2)
     network_interface (0.0.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     packetfu (1.1.9)
-    pcaprub (0.11.3)
+    pcaprub (0.12.0)
     pg (0.18.1)
-    polyglot (0.3.5)
-    pry (0.10.0)
+    pg_array_parser (0.0.9)
+    postgres_ext (2.4.1)
+      activerecord (>= 4.0.0)
+      arel (>= 4.0.1)
+      pg_array_parser (~> 0.0.9)
+    pry (0.10.1)
       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 (1.5.2)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.21)
-      actionmailer (= 3.2.21)
-      actionpack (= 3.2.21)
-      activerecord (= 3.2.21)
-      activeresource (= 3.2.21)
-      activesupport (= 3.2.21)
-      bundler (~> 1.0)
-      railties (= 3.2.21)
-    railties (3.2.21)
-      actionpack (= 3.2.21)
-      activesupport (= 3.2.21)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     rb-readline-r7 (0.5.2.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    recog (1.0.27)
+    recog (1.0.29)
       nokogiri
     redcarpet (3.2.3)
     rkelly-remix (0.0.6)
@@ -184,12 +183,12 @@ GEM
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    rspec-collection_matchers (1.0.0)
+    rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.1)
+    rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
+    rspec-mocks (2.99.3)
     rspec-rails (2.99.0)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
@@ -201,37 +200,40 @@ GEM
       rspec-mocks (~> 2.99.0)
     rubyntlm (0.5.0)
     rubyzip (1.1.7)
-    shoulda-matchers (2.6.2)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     slop (3.6.0)
-    sprockets (2.2.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
     thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    timecop (0.7.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
+    timecop (0.7.3)
     tzinfo (0.3.43)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.7.4)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aruba
   cucumber-rails
-  factory_girl (>= 4.1.0)
-  factory_girl_rails
+  factory_girl_rails (~> 4.5.0)
   fivemat (= 1.2.1)
   metasploit-framework!
   metasploit-framework-db!
@@ -242,6 +244,6 @@ DEPENDENCIES
   rspec (>= 2.12, < 3.0.0)
   rspec-rails (>= 2.12, < 3.0.0)
   shoulda-matchers
-  simplecov (= 0.5.4)
+  simplecov
   timecop
   yard