diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-09-22 10:29:23 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-09-22 10:42:28 +0900 |
| commit | daa592293b5a10f487cc9000863e052d2a28884f (patch) | |
| tree | 0940c213cf952cd826c1d028afd298deade37975 | |
| parent | 6c199967fc5c32155684b95628751eb1b5098e13 (diff) | |
| download | rails-daa592293b5a10f487cc9000863e052d2a28884f.tar.gz rails-daa592293b5a10f487cc9000863e052d2a28884f.tar.bz2 rails-daa592293b5a10f487cc9000863e052d2a28884f.zip | |
Use `TOPLEVEL_BINDING` in rails runner command
Binding to capture the local scope. This means that if a constant with same
name as constant specified by the user exists in local scope, constant
defined in local will use. This is different from what the user expects.
Therefore, fixed to use top-level binding instead of local scope.
Fixes #30644
| -rw-r--r-- | railties/lib/rails/commands/runner/runner_command.rb | 4 | ||||
| -rw-r--r-- | railties/test/application/runner_test.rb | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/runner/runner_command.rb b/railties/lib/rails/commands/runner/runner_command.rb index cd9462e08f..30fbf04982 100644 --- a/railties/lib/rails/commands/runner/runner_command.rb +++ b/railties/lib/rails/commands/runner/runner_command.rb @@ -32,13 +32,13 @@ module Rails ARGV.replace(command_argv) if code_or_file == "-" - eval($stdin.read, binding, "stdin") + eval($stdin.read, TOPLEVEL_BINDING, "stdin") elsif File.exist?(code_or_file) $0 = code_or_file Kernel.load code_or_file else begin - eval(code_or_file, binding, __FILE__, __LINE__) + eval(code_or_file, TOPLEVEL_BINDING, __FILE__, __LINE__) rescue SyntaxError, NameError => error $stderr.puts "Please specify a valid ruby command or the path of a script to run." $stderr.puts "Run '#{self.class.executable} -h' for help." diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb index 64c46c4b45..aa5d495c97 100644 --- a/railties/test/application/runner_test.rb +++ b/railties/test/application/runner_test.rb @@ -128,5 +128,17 @@ module ApplicationTests assert_match "production", rails("runner", "puts Rails.env") end end + + def test_can_call_same_name_class_as_defined_in_thor + app_file "app/models/task.rb", <<-MODEL + class Task + def self.count + 42 + end + end + MODEL + + assert_match "42", rails("runner", "puts Task.count") + end end end |