Skip to content

Commit

Permalink
Regenerate bin/bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
ledermann committed Jan 21, 2025
1 parent 6cc3f5f commit ded64f4
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions bin/bundle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ m =
update_index = nil
ARGV.each_with_index do |a, i|
if update_index && update_index.succ == i &&
a =~ Gem::Version::ANCHORED_VERSION_PATTERN
a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
bundler_version = a
end
unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
Expand All @@ -45,14 +45,14 @@ m =
gemfile = ENV['BUNDLE_GEMFILE']
return gemfile if gemfile && !gemfile.empty?

File.expand_path('../../Gemfile', __FILE__)
File.expand_path('../Gemfile', __dir__)
end

def lockfile
lockfile =
case File.basename(gemfile)
when 'gems.rb'
gemfile.sub(/\.rb$/, gemfile)
gemfile.sub(/\.rb$/, '.locked')
else
"#{gemfile}.lock"
end
Expand Down Expand Up @@ -80,15 +80,7 @@ m =

bundler_gem_version = Gem::Version.new(version)

requirement = bundler_gem_version.approximate_recommendation

unless Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.7.0')
return requirement
end

requirement += '.a' if bundler_gem_version.prerelease?

requirement
bundler_gem_version.approximate_recommendation
end

def load_bundler!
Expand Down

0 comments on commit ded64f4

Please sign in to comment.