Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.

removing multiline gem specifications correctly #7454

Closed
jethroo wants to merge 1 commit into from
Closed

removing multiline gem specifications correctly #7454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions lib/bundler/injector.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,21 @@ def remove_gems_from_dependencies(builder, gems, gemfile_path)
def remove_gems_from_gemfile(gems, gemfile_path)
patterns = /gem\s+(['"])#{Regexp.union(gems)}\1|gem\s*\((['"])#{Regexp.union(gems)}\2\)/

# remove lines which match the regex
new_gemfile = IO.readlines(gemfile_path).reject {|line| line.match(patterns) }
new_gemfile = []
multiline_removal = false
IO.readlines(gemfile_path).each do |line|
if line.match(patterns)
multiline_removal = line.rstrip.end_with?(",")
# skip lines which match the regex
next
end

# skip followup lines until line does not end with ','
new_gemfile << line unless multiline_removal
multiline_removal = line.rstrip.end_with?(",") if multiline_removal
end

# remove lone \n and append them with other strings
# remove line \n and append them with other strings
new_gemfile.each_with_index do |_line, index|
if new_gemfile[index + 1] == "\n"
new_gemfile[index] += new_gemfile[index + 1]
Expand Down
24 changes: 24 additions & 0 deletions spec/commands/remove_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,30 @@
source "#{file_uri_for(gem_repo1)}"
G
end

context "when gem is specified in multiple lines" do
it "shows success for removed gem" do
gemfile <<-G
source '#{file_uri_for(gem_repo1)}'

gem 'git'
gem 'rack',
Copy link
Copy Markdown
Member

@hsbt hsbt Dec 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the extra gems that are the original report?

Like this:

gem 'git'
gem 'some-gem',
    git: 'ssh://gitlab-server.com/project/repo.git',
    branch: 'master'
gem 'nokogiri'

And add expectation for git and nokogiri.

Copy link
Copy Markdown
Author

@jethroo jethroo Dec 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the feedback, sure would give more test context, will do soonish ;)

git: 'https://github.com/rack/rack',
branch: 'master'
gem 'nokogiri'
G

bundle! "remove rack"

expect(out).to include("rack was removed.")
gemfile_should_be <<-G
source '#{file_uri_for(gem_repo1)}'

gem 'git'
gem 'nokogiri'
G
end
end
end

context "when gem is not present in gemfile" do
Expand Down