Merge branch 'master' into feature/MSP-11130/metasploit-framework-spec-constants

MSP-11130

Conflicts:
	Rakefile

Author: limhoff-r7

.ruby-version

@@ -1 +1 @@
-1.9.3-p547
+1.9.3-p550

.travis.yml

@@ -1,7 +1,8 @@
 env:
   - RAKE_TASK=cucumber
   - RAKE_TASK=cucumber:boot
-  - RAKE_TASK=spec
+  - RAKE_TASK=spec SPEC_OPTS="--tag content"
+  - RAKE_TASK=spec SPEC_OPTS="--tag ~content"
 
 language: ruby
 before_install:
@@ -22,8 +23,9 @@ before_script:
 script: "bundle exec rake $RAKE_TASK"
 
 rvm:
-  #- '1.8.7'
   - '1.9.3'
+  - '2.0'
+  - '2.1'
 
 notifications:
   irc: "irc.freenode.org#msfnotify"

COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2006-2013, Rapid7, Inc.
+Copyright (C) 2006-2014, Rapid7, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 #   spec.add_runtime_dependency '<name>', [<version requirements>]
 gemspec
 
+gem 'rb-readline', require: false
+
 group :db do
   # Needed for Msf::DbManager
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'

Gemfile.lock

@@ -14,6 +14,7 @@ PATH
       nokogiri
       packetfu (= 1.1.9)
       railties
+      rb-readline
       recog (~> 1.0)
       robots
       rubyzip (~> 1.1)
@@ -57,7 +58,7 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt (3.1.7)
+    bcrypt (3.1.9)
     builder (3.0.4)
     capybara (2.4.1)
       mime-types (>= 1.16)
@@ -161,6 +162,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.3.2)
+    rb-readline (0.5.1)
     rdoc (3.12.2)
       json (~> 1.4)
     recog (1.0.0)
@@ -230,6 +232,7 @@ DEPENDENCIES
   pg (>= 0.11)
   pry
   rake (>= 10.0.0)
+  rb-readline
   redcarpet
   rspec (>= 2.12, < 3.0.0)
   rspec-rails (>= 2.12, < 3.0.0)

Rakefile

@@ -1,6 +1,7 @@
 #!/usr/bin/env rake
 require File.expand_path('../config/application', __FILE__)
 require 'metasploit/framework/require'
+require 'metasploit/framework/spec/untested_payloads'
 
 # @note must be before `Metasploit::Framework::Application.load_tasks`
 #
@@ -10,3 +11,4 @@ Metasploit::Framework::Require.optionally_active_record_railtie
 
 Metasploit::Framework::Application.load_tasks
 Metasploit::Framework::Spec::Constants.define_task
+Metasploit::Framework::Spec::UntestedPayloads.define_task