3 files changed, 18 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 86bce9b2fe..babb197ba1 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -58,5 +58,11 @@ elsif File.exist?(code_or_file)
   $0 = code_or_file
   Kernel.load code_or_file
 else
-  eval(code_or_file, binding, __FILE__, __LINE__)
+  begin
+    eval(code_or_file, binding, __FILE__, __LINE__) 
+  rescue SyntaxError,NameError => err
+    $stderr.puts "Please specify a valid ruby command or the path of a script to run."
+    $stderr.puts "Run '#{$0} -h' for help."
+    exit 1
+  end
 end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb
index a0b00fc5c5..a5eebcb19f 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb
@@ -1,7 +1,7 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb",  __FILE__)
+require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb", __FILE__)
 <% unless options[:skip_active_record] -%>
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../<%= options[:dummy_path] -%>/db/migrate", __FILE__)]
 <% if options[:mountable] -%>
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 0c180339b4..9f15ce5e85 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -74,6 +74,16 @@ module ApplicationTests
       assert_match "development", Dir.chdir(app_path) { `bin/rails runner "puts Rails.env"` }
     end
 
+    def test_runner_detects_syntax_errors
+      Dir.chdir(app_path) { `bin/rails runner "puts 'hello world" 2>&1` }
+      refute $?.success? 
+    end
+
+    def test_runner_detects_bad_script_name
+      Dir.chdir(app_path) { `bin/rails runner "iuiqwiourowe" 2>&1` }
+      refute $?.success? 
+    end
+
     def test_environment_with_rails_env
       with_rails_env "production" do
         assert_match "production", Dir.chdir(app_path) { `bin/rails runner "puts Rails.env"` }