runner.rb in railties-4.0.0.beta1

- old
+ new

@@ -1,18 +1,17 @@
 require 'optparse'
 require 'rbconfig'
 
-options = { :environment => (ENV['RAILS_ENV'] || "development").dup }
+options = { environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup }
 code_or_file = nil
 
 if ARGV.first.nil?
   ARGV.push "-h"
 end
 
 ARGV.clone.options do |opts|
-  script_name = File.basename($0)
-  opts.banner = "Usage: runner [options] ('Some.ruby(code)' or a filename)"
+  opts.banner = "Usage: rails runner [options] ('Some.ruby(code)' or a filename)"
 
   opts.separator ""
 
   opts.on("-e", "--environment=name", String,
           "Specifies the environment for the runner to operate under (test/development/production).",
@@ -23,11 +22,11 @@
   opts.on("-h", "--help",
           "Show this help message.") { $stdout.puts opts; exit }
 
   if RbConfig::CONFIG['host_os'] !~ /mswin|mingw/
     opts.separator ""
-    opts.separator "You can also use runner as a shebang line for your scripts like this:"
+    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 "Product.all.each { |p| p.price *= 2 ; p.save! }"
     opts.separator "-------------------------------------------------------------"
@@ -40,10 +39,10 @@
 
 ENV["RAILS_ENV"] = options[:environment]
 
 require APP_PATH
 Rails.application.require_environment!
- Rails.application.load_runner
+Rails.application.load_runner
 
 if code_or_file.nil?
   $stderr.puts "Run '#{$0} -h' for help."
   exit 1
 elsif File.exist?(code_or_file)