Skip to content
Merged
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
3 changes: 1 addition & 2 deletions bundler/lib/bundler/injector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,10 @@ def remove(gemfile_path, lockfile_path)
def conservative_version(spec)
version = spec.version
return ">= 0" if version.nil?
segments = version.segments
seg_end_index = version >= Gem::Version.new("1.0") ? 1 : 2

prerelease_suffix = version.to_s.delete_prefix(version.release.to_s) if version.prerelease?
"#{version_prefix}#{segments[0..seg_end_index].join(".")}#{prerelease_suffix}"
"#{version_prefix}#{version.segments[0..seg_end_index].join(".")}#{prerelease_suffix}"
end

def version_prefix
Expand Down
4 changes: 0 additions & 4 deletions spec/commands/add_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,12 @@
end

it "version requirement becomes ~> major.minor.patch.pre when resolved version is < 1.0" do
# Ruby 3.3 on Windows has a native crash (SEGV in rb_ary_cmp during Array#join) related to Object Shape optimization.
skip "Ruby 3.3 on Windows crashes with SEGV in Array#join" if Gem.win_platform? && RUBY_VERSION.start_with?("3.3.")
bundle "add 'cat'"
expect(bundled_app_gemfile.read).to match(/gem "cat", "~> 0.12.3.pre"/)
expect(the_bundle).to include_gems "cat 0.12.3.pre"
end

it "version requirement becomes ~> major.minor.pre when resolved version is > 1.0.pre" do
# Ruby 3.3 on Windows has a native crash (SEGV in rb_ary_cmp during Array#join) related to Object Shape optimization.
skip "Ruby 3.3 on Windows crashes with SEGV in Array#join" if Gem.win_platform? && RUBY_VERSION.start_with?("3.3.")
bundle "add 'dog'"
expect(bundled_app_gemfile.read).to match(/gem "dog", "~> 1.1.pre"/)
expect(the_bundle).to include_gems "dog 1.1.3.pre"
Expand Down
Loading