Pass options from app:update command to AppUpdater

etiennebarrie · Apr 30, 2024 · 7f364be · 7f364be
1 parent 1f8721b
commit 7f364be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/railties/lib/rails/app_updater.rb b/railties/lib/rails/app_updater.rb
@@ -6,13 +6,14 @@
 module Rails
   class AppUpdater # :nodoc:
     class << self
-      def invoke_from_app_generator(method)
-        app_generator.send(method)
+      def invoke_from_app_generator(method, options)
+        app_generator(options).send(method)
       end
 
-      def app_generator
+      def app_generator(options)
         @app_generator ||= begin
-          gen = Rails::Generators::AppGenerator.new ["rails"], generator_options, destination_root: Rails.root
+          options = generator_options.merge(options)
+          gen = Rails::Generators::AppGenerator.new(["rails"], options, destination_root: Rails.root)
           gen.send(:valid_const?) unless File.exist?(Rails.root.join("config", "application.rb"))
           gen
         end

diff --git a/railties/lib/rails/commands/app/update_command.rb b/railties/lib/rails/commands/app/update_command.rb
@@ -11,26 +11,26 @@ def perform
           configs
           bin
           active_storage
-          Rails::AppUpdater.invoke_from_app_generator :display_upgrade_guide_info
+          Rails::AppUpdater.invoke_from_app_generator(:display_upgrade_guide_info, options)
         end
 
         desc "configs", "Update configuration files in the application config/ directory", hide: true
         def configs
           require_application!
-          Rails::AppUpdater.invoke_from_app_generator :create_boot_file
-          Rails::AppUpdater.invoke_from_app_generator :update_config_files
+          Rails::AppUpdater.invoke_from_app_generator(:create_boot_file, options)
+          Rails::AppUpdater.invoke_from_app_generator(:update_config_files, options)
         end
 
         desc "bin", "Update executables in the application bin/ directory", hide: true
         def bin
           require_application!
-          Rails::AppUpdater.invoke_from_app_generator :update_bin_files
+          Rails::AppUpdater.invoke_from_app_generator(:update_bin_files, options)
         end
 
         desc "active_storage", "Run the active_storage:update command", hide: true
         def active_storage
           require_application!
-          Rails::AppUpdater.invoke_from_app_generator :update_active_storage
+          Rails::AppUpdater.invoke_from_app_generator(:update_active_storage, options)
         end
       end
     end