Fix Pro generator Gemfile swap duplicate and indentation

cursoragent · cursoragent · commit 41d1ea4a52e4 · 2026-03-24T04:05:04.000Z
diff --git a/react_on_rails/lib/generators/react_on_rails/pro_generator.rb b/react_on_rails/lib/generators/react_on_rails/pro_generator.rb
@@ -82,9 +82,16 @@ def swap_base_gem_for_pro_in_gemfile
         return unless File.exist?(gemfile_path)
 
         gemfile_content = File.read(gemfile_path)
+        pro_gem_line_pattern = /^\s*gem\s+["']react_on_rails_pro["'][^\n]*$/
+        pro_gem_already_present = gemfile_content.match?(pro_gem_line_pattern)
         updated_content = gemfile_content.gsub(
-          /^\s*gem\s+["']react_on_rails["'][^\n]*$/,
-          "gem 'react_on_rails_pro', '#{recommended_pro_gem_version}'"
+          /^(\s*)gem\s+["']react_on_rails["'][^\n]*$/
+        ) do
+          if pro_gem_already_present
+            ""
+          else
+            "#{Regexp.last_match(1)}gem 'react_on_rails_pro', '#{recommended_pro_gem_version}'"
+          end
         )
         return if updated_content == gemfile_content
 
diff --git a/react_on_rails/spec/react_on_rails/generators/pro_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/pro_generator_spec.rb
@@ -58,6 +58,7 @@
   describe "#swap_base_gem_for_pro_in_gemfile" do
     let(:generator) { described_class.new }
     let(:gemfile_path) { File.join(destination_root, "Gemfile") }
+    let(:expected_version) { Gem::Version.new(ReactOnRails::VERSION).release.to_s }
 
     before do
       prepare_destination
@@ -74,12 +75,44 @@
       generator.send(:swap_base_gem_for_pro_in_gemfile)
 
       gemfile_content = File.read(gemfile_path)
-      expected_version = Gem::Version.new(ReactOnRails::VERSION).release.to_s
       expect(gemfile_content).to include("gem 'react_on_rails_pro', '#{expected_version}'")
       expect(gemfile_content).not_to match(/gem\s+["']react_on_rails["']/)
       expect(generator).to have_received(:bundle_install_after_gem_swap)
     end
 
+    it "removes react_on_rails when react_on_rails_pro is already present" do
+      simulate_existing_file("Gemfile", <<~RUBY)
+        source "https://rubygems.org"
+        gem "react_on_rails", "~> 16.0"
+        gem "react_on_rails_pro", "~> 16.0"
+      RUBY
+      allow(generator).to receive(:bundle_install_after_gem_swap)
+
+      generator.send(:swap_base_gem_for_pro_in_gemfile)
+
+      gemfile_content = File.read(gemfile_path)
+      pro_gem_lines = gemfile_content.scan(/^\s*gem\s+["']react_on_rails_pro["'][^\n]*$/)
+      expect(pro_gem_lines.length).to eq(1)
+      expect(gemfile_content).not_to match(/gem\s+["']react_on_rails["']/)
+      expect(generator).to have_received(:bundle_install_after_gem_swap)
+    end
+
+    it "preserves leading whitespace when replacing indented react_on_rails entry" do
+      simulate_existing_file("Gemfile", <<~RUBY)
+        source "https://rubygems.org"
+
+        group :production do
+          gem "react_on_rails", "~> 16.0"
+        end
+      RUBY
+      allow(generator).to receive(:bundle_install_after_gem_swap)
+
+      generator.send(:swap_base_gem_for_pro_in_gemfile)
+
+      gemfile_content = File.read(gemfile_path)
+      expect(gemfile_content).to include("  gem 'react_on_rails_pro', '#{expected_version}'")
+    end
+
     it "does nothing when Gemfile has no react_on_rails entry" do
       simulate_existing_file("Gemfile", <<~RUBY)
         source "https://rubygems.org"
