Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bundler: retain != conditions when upgrading #3345

Closed
wants to merge 3 commits into from
Closed

bundler: retain != conditions when upgrading #3345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bf9d60
codify binding !=, and that development is inverted
thepwagner Mar 24, 2021
a6a608b
failing test case for discussion
thepwagner Mar 24, 2021
c434b25
extract EQUALITY_OPERATOR const
thepwagner Mar 25, 2021
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
6 changes: 4 additions & 2 deletions bundler/lib/dependabot/bundler/file_updater/requirement_replacer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ def space_after_specifier?(requirement_nodes)
req_string.include?(" ")
end

EQUALITY_OPERATOR = /(?<![<>!])=/.freeze

def use_equality_operator?(requirement_nodes)
return true if requirement_nodes.none?

Expand All @@ -178,7 +180,7 @@ def use_equality_operator?(requirement_nodes)
requirement_nodes.first.children.first.loc.expression.source
end

req_string.match?(/(?<![<>!])=/)
req_string.match?(EQUALITY_OPERATOR)
end

def new_requirement_string(quote_characters:,
Expand All @@ -203,7 +205,7 @@ def serialized_req(req, use_equality_operator)
# Gem::Requirement serializes exact matches as a string starting
# with `=`. We may need to remove that equality operator if it
# wasn't used originally.
tmp_req = tmp_req.gsub(/(?<![<>!])=/, "") unless use_equality_operator
tmp_req = tmp_req.gsub(EQUALITY_OPERATOR, "") unless use_equality_operator

tmp_req.strip
end
Expand Down
28 changes: 25 additions & 3 deletions bundler/spec/dependabot/bundler/update_checker/requirements_updater_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,17 +324,25 @@

context "and one is a != requirement" do
context "that is binding" do
let(:gemspec_requirement_string) { "~> 1.4, != 1.8.0" }
let(:gemspec_requirement_string) { "~> 1.4, != #{latest_version}" }
its([:requirement]) { is_expected.to eq("~> 1.4") }
end

context "that is not binding" do
let(:gemspec_requirement_string) { "~> 1.4.0, != 1.5.0" }
let(:gemspec_requirement_string) { "~> 1.4, != #{latest_resolvable_version}" }
its([:requirement]) do
is_expected.to eq(">= 1.4, != 1.5.0, < 1.9")
is_expected.to eq("~> 1.4, != #{latest_resolvable_version}")
end
end
end

context "when latest version is denied" do
let(:latest_version) { "2.0.4" }
let(:latest_resolvable_version) { "2.0.3" }
let(:gemspec_requirement_string) { ">= 2.0.0, != 2.0.4" }

its([:requirement]) { is_expected.to eq(">= 2.0.0, != 2.0.4") }
end
end

context "when a beta version was used in the old requirement" do
Expand Down Expand Up @@ -400,6 +408,20 @@
context "when there are multiple requirements" do
let(:gemspec_requirement_string) { "> 1.0.0, <= 1.4.0" }
its([:requirement]) { is_expected.to eq("> 1.0.0, <= 1.9.0") }

context "and one is a != requirement" do
context "that is binding" do
let(:gemspec_requirement_string) { "~> 1.4, != #{latest_resolvable_version}" }
its([:requirement]) { is_expected.to eq("~> 1.4") }
end

context "that is not binding" do
let(:gemspec_requirement_string) { "~> 1.4, != #{latest_version}" }
its([:requirement]) do
is_expected.to eq("~> 1.4, != #{latest_version}")
end
end
end
end

context "when a beta version was used in the old requirement" do
Expand Down