Merge remote-tracking branch 'origin/master' into unlock-minitest

6 files changed, 55 insertions, 17 deletions

diff --git a/railties/lib/rails/commands/console/console_command.rb b/railties/lib/rails/commands/console/console_command.rb
index 1da1e331f1..6f9a1f022b 100644
--- a/railties/lib/rails/commands/console/console_command.rb
+++ b/railties/lib/rails/commands/console/console_command.rb
@@ -70,9 +70,6 @@ module Rails
       class_option :sandbox, aliases: "-s", type: :boolean, default: false,
         desc: "Rollback database modifications on exit."
 
-      class_option :environment, aliases: "-e", type: :string,
-        desc: "Specifies the environment to run this console under (test/development/production)."
-
       def initialize(args = [], local_options = {}, config = {})
         console_options = []
 
diff --git a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
index b3df5191c6..71b3455473 100644
--- a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
+++ b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
@@ -11,7 +11,7 @@ module Rails
     end
 
     def start
-      ENV["RAILS_ENV"] = @options[:environment] || environment
+      ENV["RAILS_ENV"] ||= @options[:environment] || environment
 
       case config["adapter"]
       when /^(jdbc)?mysql/
@@ -87,10 +87,15 @@ module Rails
 
     def config
       @config ||= begin
-        if configurations[environment].blank?
+        # We need to check whether the user passed the connection the
+        # first time around to show a consistent error message to people
+        # relying on 2-level database configuration.
+        if @options["connection"] && configurations[connection].blank?
+          raise ActiveRecord::AdapterNotSpecified, "'#{connection}' connection is not configured. Available configuration: #{configurations.inspect}"
+        elsif configurations[environment].blank? && configurations[connection].blank?
           raise ActiveRecord::AdapterNotSpecified, "'#{environment}' database is not configured. Available configuration: #{configurations.inspect}"
         else
-          configurations[environment]
+          configurations[environment].presence || configurations[connection]
         end
       end
     end
@@ -99,6 +104,10 @@ module Rails
       Rails.respond_to?(:env) ? Rails.env : Rails::Command.environment
     end
 
+    def connection
+      @options.fetch(:connection, "primary")
+    end
+
     private
       def configurations # :doc:
         require APP_PATH
@@ -142,12 +151,15 @@ module Rails
 
       class_option :header, type: :boolean
 
-      class_option :environment, aliases: "-e", type: :string,
-        desc: "Specifies the environment to run this console under (test/development/production)."
+      class_option :connection, aliases: "-c", type: :string,
+        desc: "Specifies the connection to use."
 
       def perform
         extract_environment_option_from_argument
 
+        # RAILS_ENV needs to be set before config/application is required.
+        ENV["RAILS_ENV"] = options[:environment]
+
         require_application_and_environment!
         Rails::DBConsole.start(options)
       end
diff --git a/railties/lib/rails/commands/runner/USAGE b/railties/lib/rails/commands/runner/USAGE
index b2a6e8493d..24b60037f0 100644
--- a/railties/lib/rails/commands/runner/USAGE
+++ b/railties/lib/rails/commands/runner/USAGE
@@ -8,6 +8,9 @@ Run the Ruby file located at `path/to/filename.rb` after loading the app:
 
   <%= executable %> path/to/filename.rb
 
+Run the Ruby script read from stdin after loading the app:
+  <%= executable %> -
+
 <% unless Gem.win_platform? %>
 You can also use the runner command as a shebang line for your executables:
 
diff --git a/railties/lib/rails/commands/runner/runner_command.rb b/railties/lib/rails/commands/runner/runner_command.rb
index 6864a9726b..c931fc2152 100644
--- a/railties/lib/rails/commands/runner/runner_command.rb
+++ b/railties/lib/rails/commands/runner/runner_command.rb
@@ -13,7 +13,7 @@ module Rails
       end
 
       def self.banner(*)
-        "#{super} [<'Some.ruby(code)'> | <filename.rb>]"
+        "#{super} [<'Some.ruby(code)'> | <filename.rb> | -]"
       end
 
       def perform(code_or_file = nil, *command_argv)
@@ -29,7 +29,9 @@ module Rails
 
         ARGV.replace(command_argv)
 
-        if File.exist?(code_or_file)
+        if code_or_file == "-"
+          eval($stdin.read, binding, "stdin")
+        elsif File.exist?(code_or_file)
           $0 = code_or_file
           Kernel.load code_or_file
         else
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index b607a63176..ce258341f6 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -64,9 +64,9 @@ module Rails
       end
 
       def print_boot_information
-        url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
+        url = "on #{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}" unless use_puma?
         puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
-        puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
+        puts "=> Rails #{Rails.version} application starting in #{Rails.env} #{url}"
         puts "=> Run `rails server -h` for more startup options"
       end
 
@@ -91,6 +91,10 @@ module Rails
       def restart_command
         "bin/rails server #{ARGV.join(' ')}"
       end
+
+      def use_puma?
+        server.to_s == "Rack::Handler::Puma"
+      end
   end
 
   module Command
diff --git a/railties/lib/rails/commands/test/test_command.rb b/railties/lib/rails/commands/test/test_command.rb
index ca0b6c00fe..5852f51a62 100644
--- a/railties/lib/rails/commands/test/test_command.rb
+++ b/railties/lib/rails/commands/test/test_command.rb
@@ -1,21 +1,41 @@
 require_relative "../../command"
-require_relative "../../test_unit/minitest_plugin"
+require_relative "../../test_unit/runner"
 
 module Rails
   module Command
     class TestCommand < Base # :nodoc:
       no_commands do
         def help
-          perform # Hand over help printing to minitest.
+          require "optparse"
+          require "minitest/rails_plugin"
+
+          opts = OptionParser.new
+          opts.banner = "Usage: #{Rails::TestUnitReporter.executable} [options] [files or directories]"
+          opts.separator ""
+          opts.separator "You can run a single test by appending a line number to a filename:"
+          opts.separator ""
+          opts.separator "    #{Rails::TestUnitReporter.executable} test/models/user_test.rb:27"
+          opts.separator ""
+          opts.separator "You can run multiple files and directories at the same time:"
+          opts.separator ""
+          opts.separator "    #{Rails::TestUnitReporter.executable} test/controllers test/integration/login_test.rb"
+          opts.separator ""
+          opts.separator "By default test failures and errors are reported inline during a run."
+          opts.separator ""
+
+          opts.separator "Rails options:"
+          Rails::TestUnit::Runner.options(opts)
+          Minitest.plugin_rails_options(opts, {})
+
+          say opts
         end
       end
 
       def perform(*)
         $LOAD_PATH << Rails::Command.root.join("test").to_s
 
-        Minitest.run_via = :rails
-
-        require "active_support/testing/autorun"
+        Rails::TestUnit::Runner.parse_options(ARGV)
+        Rails::TestUnit::Runner.run(ARGV)
       end
     end
   end