Merge pull request rails#50223 from bensheldon/runner_conditional_executor

Add runner script option to disable Executor wrap

Author: byroot

railties/CHANGELOG.md

@@ -1,3 +1,8 @@
+*   Use `bin/rails runner --skip-executor` option to not wrap the runner script
+    with an Executor.
+
+    *Ben Sheldon*
+
 *   Fix isolated engines to take `ActiveRecord::Base.table_name_prefix` into consideration.
     This will allow for engine defined models, such as inside Active Storage, to respect
     Active Record table name prefix configuration.

railties/lib/rails/commands/runner/runner_command.rb

@@ -7,6 +7,8 @@ module Command
     class RunnerCommand < Base # :nodoc:
       include EnvironmentArgument
 
+      class_option :skip_executor, type: :boolean, aliases: "-w", desc: "Don't wrap with Rails Executor", default: false
+
       no_commands do
         def help(command_name = nil, *)
           super
@@ -30,19 +32,20 @@ def perform(code_or_file = nil, *command_argv)
 
         ARGV.replace(command_argv)
 
+        wrap_with_executor = !options[:skip_executor]
         if code_or_file == "-"
-          Rails.application.executor.wrap(source: "application.runner.railties") do
+          conditional_executor(wrap_with_executor, source: "application.runner.railties") do
             eval($stdin.read, TOPLEVEL_BINDING, "stdin")
           end
         elsif File.exist?(code_or_file)
           expanded_file_path = File.expand_path code_or_file
           $0 = expanded_file_path
-          Rails.application.executor.wrap(source: "application.runner.railties") do
+          conditional_executor(wrap_with_executor, source: "application.runner.railties") do
             Kernel.load expanded_file_path
           end
         else
           begin
-            Rails.application.executor.wrap(source: "application.runner.railties") do
+            conditional_executor(wrap_with_executor, source: "application.runner.railties") do
               eval(code_or_file, TOPLEVEL_BINDING, __FILE__, __LINE__)
             end
           rescue SyntaxError, NameError => e
@@ -62,6 +65,14 @@ def perform(code_or_file = nil, *command_argv)
       end
 
       private
+        def conditional_executor(enabled, **args, &block)
+          if enabled
+            Rails.application.executor.wrap(**args, &block)
+          else
+            yield
+          end
+        end
+
         def looks_like_a_file_path?(code_or_file)
           code_or_file.ends_with?(".rb")
         end

railties/test/commands/runner_test.rb

@@ -44,6 +44,16 @@ def test_rails_runner_with_ruby_code
     OUTPUT
   end
 
+  def test_rails_runner_with_conditional_executor
+    assert_equal <<~OUTPUT, run_runner_command("puts Rails.application.executor.active?", allow_failure: true)
+      true
+    OUTPUT
+
+    assert_equal <<~OUTPUT, run_runner_command("--skip-executor", "puts Rails.application.executor.active?", allow_failure: true)
+      false
+    OUTPUT
+  end
+
   def test_rails_runner_with_syntax_error_in_ruby_code
     command_output = run_runner_command("This is not ruby code", allow_failure: true)
 
@@ -61,7 +71,7 @@ def test_rails_runner_with_name_error_in_ruby_code
   end
 
   private
-    def run_runner_command(argument, allow_failure: false)
-      rails "runner", argument, allow_failure: allow_failure
+    def run_runner_command(*arguments, allow_failure: false)
+      rails "runner", *arguments, allow_failure: allow_failure
     end
 end