Merge branch 'pr/3593' into staging/electro-release

Author: darkbushido

lib/metasploit/framework/command/base.rb

@@ -49,8 +49,11 @@ def self.require_environment!
     parsed_options.environment!
     ARGV.replace(parsed_options.positional)
 
-    # @see https://github.com/rails/rails/blob/v3.2.17/railties/lib/rails/commands.rb#L39-L40
-    require Pathname.new(__FILE__).parent.parent.parent.parent.parent.join('config', 'application')
+    # allow other Rails::Applications to use this command
+    if !defined?(Rails) || Rails.application.nil?
+      # @see https://github.com/rails/rails/blob/v3.2.17/railties/lib/rails/commands.rb#L39-L40
+      require Pathname.new(__FILE__).parent.parent.parent.parent.parent.join('config', 'application')
+    end
 
     # have to configure before requiring environment because
     # config/environment.rb calls initialize! and the initializers will use

lib/metasploit/framework/parsed_options/base.rb

@@ -57,7 +57,7 @@ def configure(application)
   #
   # @return [void]
   def environment!
-    if defined?(Rails) && Rails.instance_variable_defined?(:@_env)
+    if defined?(Rails) && Rails.instance_variable_defined?(:@_env) && Rails.env != options.environment
       raise "#{self.class}##{__method__} called too late to set RAILS_ENV: Rails.env already memoized"
     end
 
@@ -85,14 +85,16 @@ def options
       options.database.disable = false
       options.database.migrations_paths = []
 
+      # If RAILS_ENV is set, then it will be used, but if RAILS_ENV is set and the --environment option is given, then
+      # --environment value will be used to reset ENV[RAILS_ENV].
+      options.environment = ENV['RAILS_ENV'] || DEFAULT_ENVIRONMENT
+
       options.framework = ActiveSupport::OrderedOptions.new
       options.framework.config = nil
 
       options.modules = ActiveSupport::OrderedOptions.new
       options.modules.path = nil
 
-      options.environment = DEFAULT_ENVIRONMENT
-
       @options = options
     end