Merge branch 'master' into clear_all_environments_log_by_default

14 files changed, 26 insertions, 26 deletions

diff --git a/railties/lib/rails/commands/application/application_command.rb b/railties/lib/rails/commands/application/application_command.rb
index 7e3a2b011d..7675d3b3d1 100644
--- a/railties/lib/rails/commands/application/application_command.rb
+++ b/railties/lib/rails/commands/application/application_command.rb
@@ -13,7 +13,7 @@ module Rails
   end
 
   module Command
-    class ApplicationCommand < Base
+    class ApplicationCommand < Base # :nodoc:
       hide_command!
 
       def help
diff --git a/railties/lib/rails/commands/console/console_command.rb b/railties/lib/rails/commands/console/console_command.rb
index 617066f575..62e3aa19df 100644
--- a/railties/lib/rails/commands/console/console_command.rb
+++ b/railties/lib/rails/commands/console/console_command.rb
@@ -64,7 +64,7 @@ module Rails
   end
 
   module Command
-    class ConsoleCommand < Base
+    class ConsoleCommand < Base # :nodoc:
       include EnvironmentArgument
 
       class_option :sandbox, aliases: "-s", type: :boolean, default: false,
diff --git a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
index d3c80da89b..588fb06b15 100644
--- a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
+++ b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
@@ -1,6 +1,3 @@
-require "erb"
-require "yaml"
-
 require "rails/command/environment_argument"
 
 module Rails
@@ -102,14 +99,14 @@ module Rails
       Rails.respond_to?(:env) ? Rails.env : Rails::Command.environment
     end
 
-    protected
-      def configurations
+    private
+      def configurations # :doc:
         require APP_PATH
         ActiveRecord::Base.configurations = Rails.application.config.database_configuration
         ActiveRecord::Base.configurations
       end
 
-      def find_cmd_and_exec(commands, *args)
+      def find_cmd_and_exec(commands, *args) # :doc:
         commands = Array(commands)
 
         dirs_on_path = ENV["PATH"].to_s.split(File::PATH_SEPARATOR)
@@ -134,7 +131,7 @@ module Rails
   end
 
   module Command
-    class DbconsoleCommand < Base
+    class DbconsoleCommand < Base # :nodoc:
       include EnvironmentArgument
 
       class_option :include_password, aliases: "-p", type: :boolean,
diff --git a/railties/lib/rails/commands/destroy/destroy_command.rb b/railties/lib/rails/commands/destroy/destroy_command.rb
index 5e6b7f9371..5b552b2070 100644
--- a/railties/lib/rails/commands/destroy/destroy_command.rb
+++ b/railties/lib/rails/commands/destroy/destroy_command.rb
@@ -2,8 +2,8 @@ require "rails/generators"
 
 module Rails
   module Command
-    class DestroyCommand < Base
-      def help # :nodoc:
+    class DestroyCommand < Base # :nodoc:
+      def help
         Rails::Generators.help self.class.command_name
       end
 
diff --git a/railties/lib/rails/commands/generate/generate_command.rb b/railties/lib/rails/commands/generate/generate_command.rb
index b381ca85b9..aa8dab71b0 100644
--- a/railties/lib/rails/commands/generate/generate_command.rb
+++ b/railties/lib/rails/commands/generate/generate_command.rb
@@ -2,8 +2,8 @@ require "rails/generators"
 
 module Rails
   module Command
-    class GenerateCommand < Base
-      def help # :nodoc:
+    class GenerateCommand < Base # :nodoc:
+      def help
         Rails::Generators.help self.class.command_name
       end
 
@@ -14,6 +14,8 @@ module Rails
         require_application_and_environment!
         load_generators
 
+        ARGV.shift
+
         Rails::Generators.invoke generator, args, behavior: :invoke, destination_root: Rails::Command.root
       end
     end
diff --git a/railties/lib/rails/commands/help/help_command.rb b/railties/lib/rails/commands/help/help_command.rb
index 5bcc4c8eee..90d37217fc 100644
--- a/railties/lib/rails/commands/help/help_command.rb
+++ b/railties/lib/rails/commands/help/help_command.rb
@@ -1,6 +1,6 @@
 module Rails
   module Command
-    class HelpCommand < Base
+    class HelpCommand < Base # :nodoc:
       hide_command!
 
       def help(*)
diff --git a/railties/lib/rails/commands/new/new_command.rb b/railties/lib/rails/commands/new/new_command.rb
index 13eedfc479..74d1fa5021 100644
--- a/railties/lib/rails/commands/new/new_command.rb
+++ b/railties/lib/rails/commands/new/new_command.rb
@@ -1,6 +1,6 @@
 module Rails
   module Command
-    class NewCommand < Base
+    class NewCommand < Base # :nodoc:
       def help
         Rails::Command.invoke :application, [ "--help" ]
       end
diff --git a/railties/lib/rails/commands/plugin/plugin_command.rb b/railties/lib/rails/commands/plugin/plugin_command.rb
index d6d9fe4400..b40ab006af 100644
--- a/railties/lib/rails/commands/plugin/plugin_command.rb
+++ b/railties/lib/rails/commands/plugin/plugin_command.rb
@@ -1,6 +1,6 @@
 module Rails
   module Command
-    class PluginCommand < Base
+    class PluginCommand < Base # :nodoc:
       hide_command!
 
       def help
@@ -11,7 +11,7 @@ module Rails
         "#{executable} new [options]"
       end
 
-      class_option :rc, type: :boolean, default: File.join("~", ".railsrc"),
+      class_option :rc, type: :string, default: File.join("~", ".railsrc"),
         desc: "Initialize the plugin command with previous defaults. Uses .railsrc in your home directory by default."
 
       class_option :no_rc, desc: "Skip evaluating .railsrc."
diff --git a/railties/lib/rails/commands/rake/rake_command.rb b/railties/lib/rails/commands/rake/rake_command.rb
index a43c884170..f03dc81117 100644
--- a/railties/lib/rails/commands/rake/rake_command.rb
+++ b/railties/lib/rails/commands/rake/rake_command.rb
@@ -1,6 +1,6 @@
 module Rails
   module Command
-    class RakeCommand < Base
+    class RakeCommand < Base # :nodoc:
       extend Rails::Command::Actions
 
       namespace "rake"
diff --git a/railties/lib/rails/commands/runner/USAGE b/railties/lib/rails/commands/runner/USAGE
index dc47a35ff3..b2a6e8493d 100644
--- a/railties/lib/rails/commands/runner/USAGE
+++ b/railties/lib/rails/commands/runner/USAGE
@@ -8,7 +8,7 @@ Run the Ruby file located at `path/to/filename.rb` after loading the app:
 
   <%= executable %> path/to/filename.rb
 
-<% if RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ %>
+<% unless Gem.win_platform? %>
 You can also use the runner command as a shebang line for your executables:
 
   #!/usr/bin/env <%= File.expand_path(executable) %>
diff --git a/railties/lib/rails/commands/runner/runner_command.rb b/railties/lib/rails/commands/runner/runner_command.rb
index 8db6da8759..4989a7837d 100644
--- a/railties/lib/rails/commands/runner/runner_command.rb
+++ b/railties/lib/rails/commands/runner/runner_command.rb
@@ -1,6 +1,6 @@
 module Rails
   module Command
-    class RunnerCommand < Base
+    class RunnerCommand < Base # :nodoc:
       class_option :environment, aliases: "-e", type: :string,
         default: Rails::Command.environment.dup,
         desc: "The environment for the runner to operate under (test/development/production)"
@@ -14,7 +14,7 @@ module Rails
         "#{super} [<'Some.ruby(code)'> | <filename.rb>]"
       end
 
-      def perform(code_or_file = nil)
+      def perform(code_or_file = nil, *file_argv)
         unless code_or_file
           help
           exit 1
@@ -27,6 +27,7 @@ module Rails
 
         if File.exist?(code_or_file)
           $0 = code_or_file
+          ARGV.replace(file_argv)
           Kernel.load code_or_file
         else
           begin
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index 14cf72f483..e9538b804c 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -139,8 +139,8 @@ module Rails
   end
 
   module Command
-    class ServerCommand < Base
-      def help # :nodoc:
+    class ServerCommand < Base # :nodoc:
+      def help
         puts Rails::Server::Options.new.option_parser(Hash.new)
       end
 
diff --git a/railties/lib/rails/commands/test/test_command.rb b/railties/lib/rails/commands/test/test_command.rb
index 1b2e3af9cc..7bf8f61137 100644
--- a/railties/lib/rails/commands/test/test_command.rb
+++ b/railties/lib/rails/commands/test/test_command.rb
@@ -3,8 +3,8 @@ require "rails/test_unit/minitest_plugin"
 
 module Rails
   module Command
-    class TestCommand < Base
-      def help # :nodoc:
+    class TestCommand < Base # :nodoc:
+      def help
         perform # Hand over help printing to minitest.
       end
 
diff --git a/railties/lib/rails/commands/version/version_command.rb b/railties/lib/rails/commands/version/version_command.rb
index 4f3fbfca1b..ac745594ee 100644
--- a/railties/lib/rails/commands/version/version_command.rb
+++ b/railties/lib/rails/commands/version/version_command.rb
@@ -1,6 +1,6 @@
 module Rails
   module Command
-    class VersionCommand < Base
+    class VersionCommand < Base # :nodoc:
       def perform
         Rails::Command.invoke :application, [ "--version" ]
       end