Prevent remove command from deleting gemfile lines that are comments

bundler/lib/bundler/injector.rb

@@ -183,7 +183,7 @@ def remove_gems_from_gemfile(gems, gemfile_path)
       new_gemfile = []
       multiline_removal = false
       IO.readlines(gemfile_path).each do |line|
-        if line.match(patterns)
+        if line.match(patterns) && is_not_a_line_comment?(line)
           multiline_removal = line.rstrip.end_with?(",")
           # skip lines which match the regex
           next
@@ -207,6 +207,11 @@ def remove_gems_from_gemfile(gems, gemfile_path)
       new_gemfile.join.chomp
     end
 
+    # @param [String] line         Individual line of gemfile content.
+    def is_not_a_line_comment?(line)
+      line.match(/^(?=#).*/).nil?
+    end
+
     # @param [Array] gemfile       Array of gemfile contents.
     # @param [String] block_name   Name of block name to look for.
     def remove_nested_blocks(gemfile, block_name)

bundler/spec/commands/remove_spec.rb

@@ -83,7 +83,7 @@
     end
   end
 
-  describe "remove mutiple gems from gemfile" do
+  describe "remove multiple gems from gemfile" do
     context "when all gems are present in gemfile" do
       it "shows success fir all removed gems" do
         gemfile <<-G
@@ -210,7 +210,7 @@
       end
     end
 
-    context "when the gem belongs to mutiple groups" do
+    context "when the gem belongs to multiple groups" do
       it "removes the groups" do
         gemfile <<-G
           source "#{file_uri_for(gem_repo1)}"
@@ -616,4 +616,43 @@
       expect(out).to include("foo could not be removed.")
     end
   end
+
+  describe "with comments that mention gems" do
+    context "when comment is a separate line comment" do
+      it "does not remove the line comment" do
+        gemfile <<-G
+          source "#{file_uri_for(gem_repo1)}"
+
+          # gem "rack" might be used in the future
+          gem "rack"
+        G
+
+        bundle "remove rack"
+
+        expect(out).to include("rack was removed.")
+        gemfile_should_be <<-G
+          source "#{file_uri_for(gem_repo1)}"
+
+          # gem "rack" might be used in the future
+        G
+      end
+    end
+
+    context "when gem specified for removal has an inline comment" do
+      it "removes the inline comment" do
+        gemfile <<-G
+          source "#{file_uri_for(gem_repo1)}"
+
+          gem "rack" # gem "rack" can be removed
+        G
+
+        bundle "remove rack"
+
+        expect(out).to include("rack was removed.")
+        gemfile_should_be <<-G
+          source "#{file_uri_for(gem_repo1)}"
+        G
+      end
+    end
+  end
 end