Merge branch 'staging/electro-release' into bug/MSP-11050/rails_root

Author: David Maloney

.rubocop.yml

@@ -15,8 +15,6 @@ group :db do
 end
 
 group :development do
-  # Style/sanity checking Ruby code
-  gem 'rubocop'
   # Markdown formatting for yard
   gem 'redcarpet'
   # generating documentation

Gemfile

@@ -45,7 +45,6 @@ GEM
     arel (3.0.3)
     arel-helpers (2.0.1)
       activerecord (>= 3.1.0, < 5)
-    ast (2.0.0)
     bcrypt (3.1.7)
     builder (3.0.4)
     coderay (1.1.0)
@@ -88,12 +87,8 @@ GEM
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     packetfu (1.1.9)
-    parser (2.1.9)
-      ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
     pcaprub (0.11.3)
     pg (0.17.1)
-    powerpack (0.0.9)
     pry (0.10.0)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -112,7 +107,6 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rainbow (2.0.0)
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -138,14 +132,6 @@ GEM
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    rubocop (0.23.0)
-      json (>= 1.7.7, < 2)
-      parser (~> 2.1.9)
-      powerpack (~> 0.0.6)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.5.1)
-      activesupport (>= 3.0.0)
     rubyntlm (0.4.0)
     rubyzip (1.1.6)
     shoulda-matchers (2.6.2)
@@ -185,7 +171,6 @@ DEPENDENCIES
   redcarpet
   rspec (>= 2.12, < 3.0.0)
   rspec-rails (>= 2.12, < 3.0.0)
-  rubocop
   shoulda-matchers
   simplecov (= 0.5.4)
   timecop

Gemfile.lock

@@ -47,7 +47,7 @@ def driver_options
       driver_options['ModulePath'] = options.modules.path
       driver_options['Plugins'] = options.console.plugins
       driver_options['RealReadline'] = options.console.real_readline
-      driver_options['Resource'] = options.console.resource
+      driver_options['Resource'] = options.console.resources
       driver_options['XCommands'] = options.console.commands
 
       @driver_options = driver_options

lib/metasploit/framework/command/console.rb

@@ -335,15 +335,6 @@ def check_extname
     end
   end
 
-  # Explicitly skip this check if we're suppressing info messages
-  # anyway, since it takes a fair amount of time per module to perform.
-  def check_rubocop
-    return true if SUPPRESS_INFO_MESSAGES
-    out = %x{rubocop -n #{@full_filepath}}
-    ret = $?
-    info("Fails to pass Rubocop Ruby style guidelines (run 'rubocop #{@full_filepath}' to see violations)") unless ret.exitstatus == 0
-  end
-
   def check_old_rubies
     return true unless CHECK_OLD_RUBIES
     return true unless Object.const_defined? :RVM
@@ -611,7 +602,6 @@ def run_checks(full_filepath)
   tidy.check_vuln_codes
   tidy.check_vars_get
   tidy.check_newline_eof
-  tidy.check_rubocop
   tidy.check_sock_get
   tidy.check_udp_sock_get
   return tidy