Merge branch 'master' into unlock-minitest

9 files changed, 22 insertions, 17 deletions

diff --git a/railties/lib/rails/commands/application/application_command.rb b/railties/lib/rails/commands/application/application_command.rb
index 7675d3b3d1..e92daf9be6 100644
--- a/railties/lib/rails/commands/application/application_command.rb
+++ b/railties/lib/rails/commands/application/application_command.rb
@@ -1,5 +1,5 @@
-require "rails/generators"
-require "rails/generators/rails/app/app_generator"
+require_relative "../../generators"
+require_relative "../../generators/rails/app/app_generator"
 
 module Rails
   module Generators
diff --git a/railties/lib/rails/commands/console/console_command.rb b/railties/lib/rails/commands/console/console_command.rb
index ec58540923..1da1e331f1 100644
--- a/railties/lib/rails/commands/console/console_command.rb
+++ b/railties/lib/rails/commands/console/console_command.rb
@@ -1,7 +1,7 @@
 require "irb"
 require "irb/completion"
 
-require "rails/command/environment_argument"
+require_relative "../../command/environment_argument"
 
 module Rails
   class Console
diff --git a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
index 5bfbe58d97..b3df5191c6 100644
--- a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
+++ b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
@@ -1,4 +1,4 @@
-require "rails/command/environment_argument"
+require_relative "../../command/environment_argument"
 
 module Rails
   class DBConsole
@@ -148,6 +148,7 @@ module Rails
       def perform
         extract_environment_option_from_argument
 
+        require_application_and_environment!
         Rails::DBConsole.start(options)
       end
     end
diff --git a/railties/lib/rails/commands/destroy/destroy_command.rb b/railties/lib/rails/commands/destroy/destroy_command.rb
index 281732a936..8a6fe67f77 100644
--- a/railties/lib/rails/commands/destroy/destroy_command.rb
+++ b/railties/lib/rails/commands/destroy/destroy_command.rb
@@ -1,4 +1,4 @@
-require "rails/generators"
+require_relative "../../generators"
 
 module Rails
   module Command
diff --git a/railties/lib/rails/commands/generate/generate_command.rb b/railties/lib/rails/commands/generate/generate_command.rb
index 9dd7ad1012..c2089dbcb7 100644
--- a/railties/lib/rails/commands/generate/generate_command.rb
+++ b/railties/lib/rails/commands/generate/generate_command.rb
@@ -1,4 +1,4 @@
-require "rails/generators"
+require_relative "../../generators"
 
 module Rails
   module Command
diff --git a/railties/lib/rails/commands/plugin/plugin_command.rb b/railties/lib/rails/commands/plugin/plugin_command.rb
index b40ab006af..e915a24e5b 100644
--- a/railties/lib/rails/commands/plugin/plugin_command.rb
+++ b/railties/lib/rails/commands/plugin/plugin_command.rb
@@ -34,8 +34,8 @@ module Rails
 
       private
         def run_plugin_generator(plugin_args)
-          require "rails/generators"
-          require "rails/generators/rails/plugin/plugin_generator"
+          require_relative "../../generators"
+          require_relative "../../generators/rails/plugin/plugin_generator"
           Rails::Generators::PluginGenerator.start plugin_args
         end
     end
diff --git a/railties/lib/rails/commands/secrets/secrets_command.rb b/railties/lib/rails/commands/secrets/secrets_command.rb
index 651411d444..45e02fa730 100644
--- a/railties/lib/rails/commands/secrets/secrets_command.rb
+++ b/railties/lib/rails/commands/secrets/secrets_command.rb
@@ -1,5 +1,5 @@
 require "active_support"
-require "rails/secrets"
+require_relative "../../secrets"
 
 module Rails
   module Command
@@ -31,7 +31,7 @@ module Rails
         require_application_and_environment!
 
         Rails::Secrets.read_for_editing do |tmp_path|
-          system("\$EDITOR #{tmp_path}")
+          system("#{ENV["EDITOR"]} #{tmp_path}")
         end
 
         say "New secrets encrypted and saved."
@@ -43,15 +43,19 @@ module Rails
         raise unless error.message =~ /secrets\.yml\.enc/
 
         Rails::Secrets.read_template_for_editing do |tmp_path|
-          system("\$EDITOR #{tmp_path}")
+          system("#{ENV["EDITOR"]} #{tmp_path}")
           generator.skip_secrets_file { setup }
         end
       end
 
+      def show
+        say Rails::Secrets.read
+      end
+
       private
         def generator
-          require "rails/generators"
-          require "rails/generators/rails/encrypted_secrets/encrypted_secrets_generator"
+          require_relative "../../generators"
+          require_relative "../../generators/rails/encrypted_secrets/encrypted_secrets_generator"
 
           Rails::Generators::EncryptedSecretsGenerator
         end
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index ebb4ae795a..b607a63176 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -2,7 +2,7 @@ require "fileutils"
 require "optparse"
 require "action_dispatch"
 require "rails"
-require "rails/dev_caching"
+require_relative "../../dev_caching"
 
 module Rails
   class Server < ::Rack::Server
diff --git a/railties/lib/rails/commands/test/test_command.rb b/railties/lib/rails/commands/test/test_command.rb
index 65e16900ba..ca0b6c00fe 100644
--- a/railties/lib/rails/commands/test/test_command.rb
+++ b/railties/lib/rails/commands/test/test_command.rb
@@ -1,5 +1,5 @@
-require "rails/command"
-require "rails/test_unit/minitest_plugin"
+require_relative "../../command"
+require_relative "../../test_unit/minitest_plugin"
 
 module Rails
   module Command
@@ -11,7 +11,7 @@ module Rails
       end
 
       def perform(*)
-        $LOAD_PATH << Rails::Command.root.join("test")
+        $LOAD_PATH << Rails::Command.root.join("test").to_s
 
         Minitest.run_via = :rails