Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions bundler/lib/bundler/resolver/package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,19 @@ class Package
def initialize(name, platforms, locked_specs:, unlock:, prerelease: false, dependency: nil)
@name = name
@platforms = platforms
@locked_version = locked_specs[name].first&.version
@unlock = unlock
@dependency = dependency || Dependency.new(name, @locked_version)
@top_level = !dependency.nil?

locked_spec = locked_specs[name].first

if @top_level
@locked_version = locked_spec.version if locked_spec && dependency.matches_spec?(locked_spec)
@dependency = dependency
else
@locked_version = locked_spec&.version
@dependency = Dependency.new(name, @locked_version)
end

@prerelease = @dependency.prerelease? || @locked_version&.prerelease? || prerelease ? :consider_first : :ignore
end

Expand Down
36 changes: 36 additions & 0 deletions bundler/spec/commands/lock_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,42 @@
expect(read_lockfile).to eq(@lockfile)
end

it "writes a lockfile when there is an outdated lockfile and --patch is used with a specific dependency" do
build_repo4 do
build_gem "playbook_ui", "13.14.0"
build_gem "playbook_ui", "13.15.0"
end

gemfile <<-G
source "#{file_uri_for(gem_repo4)}"
gem "playbook_ui", "13.15.0"
G

original_lockfile = <<~L
GEM
remote: #{file_uri_for(gem_repo4)}/
specs:
playbook_ui (13.14.0)

PLATFORMS
arm64-darwin-23

DEPENDENCIES
playbook_ui (= 13.14.0)

BUNDLED WITH
#{Bundler::VERSION}
L

lockfile original_lockfile

simulate_platform "arm64-darwin-23" do
bundle "lock --update playbook_ui --patch --strict"
end

expect(read_lockfile).to eq(original_lockfile.gsub("13.14.0", "13.15.0"))
end

it "does not fetch remote specs when using the --local option" do
bundle "lock --update --local", raise_on_error: false

Expand Down