3 files changed, 38 insertions, 12 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 3e4cc787c4..f6d8aec30d 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -81,14 +81,11 @@ module Rails
 
     def config
       @config ||= begin
-        cfg = begin
-          YAML.load(ERB.new(IO.read("config/database.yml")).result)
-        rescue SyntaxError, StandardError
-          require APP_PATH
-          Rails.application.config.database_configuration
+        if configurations[environment].blank?
+          raise ActiveRecord::AdapterNotSpecified, "'#{environment}' database is not configured. Available configuration: #{configurations.inspect}"
+        else
+          configurations[environment]
         end
-
-        cfg[environment] || abort("No database is configured for the environment '#{environment}'")
       end
     end
 
@@ -102,6 +99,12 @@ module Rails
 
     protected
 
+    def configurations
+      require APP_PATH
+      ActiveRecord::Base.configurations = Rails.application.config.database_configuration
+      ActiveRecord::Base.configurations
+    end
+
     def parse_arguments(arguments)
       options = {}
 
diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index 837fe0ec10..f7a0b99005 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -2,6 +2,20 @@ if ARGV.first != "new"
   ARGV[0] = "--help"
 else
   ARGV.shift
+  unless ARGV.delete("--no-rc")
+    customrc = ARGV.index{ |x| x.include?("--rc=") }
+    railsrc = if customrc
+                File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ""))
+              else
+                File.join(File.expand_path("~"), '.railsrc')
+              end
+    if File.exist?(railsrc)
+      extra_args_string = File.read(railsrc)
+      extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
+      puts "Using #{extra_args.join(" ")} from #{railsrc}"
+      ARGV.insert(1, *extra_args)
+    end
+  end
 end
 
 require 'rails/generators'
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index dd2ee5639e..3a71f8d3f8 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -9,7 +9,7 @@ if ARGV.first.nil?
 end
 
 ARGV.clone.options do |opts|
-  opts.banner = "Usage: rails runner [options] ('Some.ruby(code)' or a filename)"
+  opts.banner = "Usage: rails runner [options] [<'Some.ruby(code)'> | <filename.rb>]"
 
   opts.separator ""
 
@@ -22,14 +22,23 @@ ARGV.clone.options do |opts|
   opts.on("-h", "--help",
           "Show this help message.") { $stdout.puts opts; exit }
 
+    opts.separator ""
+    opts.separator "Examples: "
+
+    opts.separator "    rails runner 'puts Rails.env'"
+    opts.separator "        This runs the code `puts Rails.env` after loading the app"
+    opts.separator ""
+    opts.separator "    rails runner path/to/filename.rb"
+    opts.separator "        This runs the Ruby file located at `path/to/filename.rb` after loading the app"
+
   if RbConfig::CONFIG['host_os'] !~ /mswin|mingw/
     opts.separator ""
     opts.separator "You can also use runner as a shebang line for your executables:"
-    opts.separator "-------------------------------------------------------------"
-    opts.separator "#!/usr/bin/env #{File.expand_path($0)} runner"
+    opts.separator "    -------------------------------------------------------------"
+    opts.separator "    #!/usr/bin/env #{File.expand_path($0)} runner"
     opts.separator ""
-    opts.separator "Product.all.each { |p| p.price *= 2 ; p.save! }"
-    opts.separator "-------------------------------------------------------------"
+    opts.separator "    Product.all.each { |p| p.price *= 2 ; p.save! }"
+    opts.separator "    -------------------------------------------------------------"
   end
 
   opts.order! { |o| code_or_file ||= o } rescue retry