Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rubygem-bundler for openSUSE:Factory
checked in at 2022-10-30 18:28:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-bundler (Old)
and /work/SRC/openSUSE:Factory/.rubygem-bundler.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-bundler"
Sun Oct 30 18:28:43 2022 rev:63 rq:1032134 version:2.3.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-bundler/rubygem-bundler.changes
2022-10-12 18:26:49.641971957 +0200
+++
/work/SRC/openSUSE:Factory/.rubygem-bundler.new.2275/rubygem-bundler.changes
2022-10-30 18:28:51.330390716 +0100
@@ -1,0 +2,18 @@
+Fri Oct 28 04:53:11 UTC 2022 - Stephan Kulow <co...@suse.com>
+
+updated to version 2.3.24
+ see installed CHANGELOG.md
+
+ # 2.3.24 (October 17, 2022)
+
+ ## Enhancements:
+
+ - Only add extra resolver spec group for Ruby platform when needed
[#5698](https://github.com/rubygems/rubygems/pull/5698)
+ - Fix little UI issue when bundler shows duplicated gems in a list
[#5965](https://github.com/rubygems/rubygems/pull/5965)
+
+ ## Bug fixes:
+
+ - Fix incorrect materialization on Windows
[#5975](https://github.com/rubygems/rubygems/pull/5975)
+
+
+-------------------------------------------------------------------
Old:
----
bundler-2.3.23.gem
New:
----
bundler-2.3.24.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-bundler.spec ++++++
--- /var/tmp/diff_new_pack.oN3iyZ/_old 2022-10-30 18:28:51.814393332 +0100
+++ /var/tmp/diff_new_pack.oN3iyZ/_new 2022-10-30 18:28:51.818393353 +0100
@@ -24,7 +24,7 @@
#
Name: rubygem-bundler
-Version: 2.3.23
+Version: 2.3.24
Release: 0
%define mod_name bundler
%define mod_full_name %{mod_name}-%{version}
++++++ bundler-2.3.23.gem -> bundler-2.3.24.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2022-10-05 18:26:20.000000000 +0200
+++ new/CHANGELOG.md 2022-10-17 14:48:22.000000000 +0200
@@ -1,3 +1,14 @@
+# 2.3.24 (October 17, 2022)
+
+## Enhancements:
+
+ - Only add extra resolver spec group for Ruby platform when needed
[#5698](https://github.com/rubygems/rubygems/pull/5698)
+ - Fix little UI issue when bundler shows duplicated gems in a list
[#5965](https://github.com/rubygems/rubygems/pull/5965)
+
+## Bug fixes:
+
+ - Fix incorrect materialization on Windows
[#5975](https://github.com/rubygems/rubygems/pull/5975)
+
# 2.3.23 (October 5, 2022)
## Enhancements:
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/build_metadata.rb
new/lib/bundler/build_metadata.rb
--- old/lib/bundler/build_metadata.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/build_metadata.rb 2022-10-17 14:48:22.000000000 +0200
@@ -4,8 +4,8 @@
# Represents metadata from when the Bundler gem was built.
module BuildMetadata
# begin ivars
- @built_at = "2022-10-05".freeze
- @git_commit_sha = "250d9d485d".freeze
+ @built_at = "2022-10-17".freeze
+ @git_commit_sha = "b835c7ea15".freeze
@release = true
# end ivars
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/definition.rb
new/lib/bundler/definition.rb
--- old/lib/bundler/definition.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/definition.rb 2022-10-17 14:48:22.000000000 +0200
@@ -139,8 +139,8 @@
if @unlock[:conservative]
@unlock[:gems] ||= @dependencies.map(&:name)
else
- eager_unlock = expand_dependencies(@unlock[:gems] || [], true)
- @unlock[:gems] = @locked_specs.for(eager_unlock, false,
platforms).map(&:name)
+ eager_unlock = (@unlock[:gems] || []).map {|name| Dependency.new(name,
">= 0") }
+ @unlock[:gems] = @locked_specs.for(eager_unlock, false,
platforms).map(&:name).uniq
end
@dependency_changes = converge_dependencies
@@ -224,7 +224,7 @@
def current_dependencies
dependencies.select do |d|
- d.should_include? && !d.gem_platforms(@platforms).empty?
+ d.should_include? && !d.gem_platforms([generic_local_platform]).empty?
end
end
@@ -248,10 +248,9 @@
def dependencies_for(groups)
groups.map!(&:to_sym)
- deps = current_dependencies.reject do |d|
+ current_dependencies.reject do |d|
(d.groups & groups).empty?
end
- expand_dependencies(deps)
end
# Resolve all the dependencies specified in Gemfile. It ensures that
@@ -474,17 +473,17 @@
def resolver
@resolver ||= begin
last_resolve = converge_locked_specs
- remove_ruby_from_platforms_if_necessary!(dependencies)
+ remove_ruby_from_platforms_if_necessary!(current_dependencies)
Resolver.new(source_requirements, last_resolve, gem_version_promoter,
additional_base_requirements_for_resolve(last_resolve), platforms)
end
end
def expanded_dependencies
- @expanded_dependencies ||= expand_dependencies(dependencies +
metadata_dependencies, true)
+ @expanded_dependencies ||= dependencies + metadata_dependencies
end
def filter_specs(specs, deps)
- SpecSet.new(specs).for(expand_dependencies(deps, true), false, platforms)
+ SpecSet.new(specs).for(deps, false, platforms)
end
def materialize(dependencies)
@@ -578,8 +577,8 @@
].select(&:first).map(&:last).join(", ")
end
- def pretty_dep(dep, source = false)
- SharedHelpers.pretty_dependency(dep, source)
+ def pretty_dep(dep)
+ SharedHelpers.pretty_dependency(dep)
end
# Check if the specs of the given source changed
@@ -792,23 +791,6 @@
]
end
- def expand_dependencies(dependencies, remote = false)
- deps = []
- dependencies.each do |dep|
- dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name)
- next unless remote || dep.current_platform?
- target_platforms = dep.gem_platforms(remote ? @platforms :
[generic_local_platform])
- deps += expand_dependency_with_platforms(dep, target_platforms)
- end
- deps
- end
-
- def expand_dependency_with_platforms(dep, platforms)
- platforms.map do |p|
- DepProxy.get_proxy(dep, p)
- end
- end
-
def source_requirements
# Record the specs available in each gem's source, so that those
# specs will be available later when the resolver knows where to
@@ -880,7 +862,7 @@
Bundler.local_platform == Gem::Platform::RUBY ||
!platforms.include?(Gem::Platform::RUBY) ||
(@new_platform && platforms.last == Gem::Platform::RUBY) ||
-
!@originally_locked_specs.incomplete_ruby_specs?(expand_dependencies(dependencies))
+ !@originally_locked_specs.incomplete_ruby_specs?(dependencies)
remove_platform(Gem::Platform::RUBY)
add_current_platform
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/dep_proxy.rb new/lib/bundler/dep_proxy.rb
--- old/lib/bundler/dep_proxy.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/dep_proxy.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
- class DepProxy
- attr_reader :__platform, :dep
-
- @proxies = {}
-
- def self.get_proxy(dep, platform)
- @proxies[[dep, platform]] ||= new(dep, platform).freeze
- end
-
- def initialize(dep, platform)
- @dep = dep
- @__platform = platform
- end
-
- private_class_method :new
-
- alias_method :eql?, :==
-
- def type
- @dep.type
- end
-
- def name
- @dep.name
- end
-
- def requirement
- @dep.requirement
- end
-
- def to_s
- s = name.dup
- s << " (#{requirement})" unless requirement == Gem::Requirement.default
- s << " #{__platform}" unless __platform == Gem::Platform::RUBY
- s
- end
-
- def dup
- raise NoMethodError.new("DepProxy cannot be duplicated")
- end
-
- def clone
- raise NoMethodError.new("DepProxy cannot be cloned")
- end
-
- private
-
- def method_missing(*args, &blk)
- @dep.send(*args, &blk)
- end
- end
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/endpoint_specification.rb
new/lib/bundler/endpoint_specification.rb
--- old/lib/bundler/endpoint_specification.rb 2022-10-05 18:26:20.000000000
+0200
+++ new/lib/bundler/endpoint_specification.rb 2022-10-17 14:48:22.000000000
+0200
@@ -26,6 +26,10 @@
@platform
end
+ def identifier
+ @__identifier ||= [name, version, platform.to_s]
+ end
+
# needed for standalone, load required_paths from local gemspec
# after the gem is installed
def require_paths
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/gem_helpers.rb
new/lib/bundler/gem_helpers.rb
--- old/lib/bundler/gem_helpers.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/gem_helpers.rb 2022-10-17 14:48:22.000000000 +0200
@@ -5,7 +5,6 @@
GENERIC_CACHE = { Gem::Platform::RUBY => Gem::Platform::RUBY } #
rubocop:disable Style/MutableConstant
GENERICS = [
[Gem::Platform.new("java"), Gem::Platform.new("java")],
- [Gem::Platform.new("universal-java"), Gem::Platform.new("java")],
[Gem::Platform.new("mswin32"), Gem::Platform.new("mswin32")],
[Gem::Platform.new("mswin64"), Gem::Platform.new("mswin64")],
[Gem::Platform.new("universal-mingw32"),
Gem::Platform.new("universal-mingw32")],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/index.rb new/lib/bundler/index.rb
--- old/lib/bundler/index.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/index.rb 2022-10-17 14:48:22.000000000 +0200
@@ -71,7 +71,6 @@
when Gem::Specification, RemoteSpecification, LazySpecification,
EndpointSpecification then search_by_spec(query)
when String then specs_by_name(query)
when Gem::Dependency then search_by_dependency(query)
- when DepProxy then search_by_dependency(query.dep)
else
raise "You can't search for a #{query.inspect}."
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/injector.rb new/lib/bundler/injector.rb
--- old/lib/bundler/injector.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/injector.rb 2022-10-17 14:48:22.000000000 +0200
@@ -70,7 +70,7 @@
show_warning("No gems were removed from the gemfile.") if deps.empty?
- deps.each {|dep| Bundler.ui.confirm
"#{SharedHelpers.pretty_dependency(dep, false)} was removed." }
+ deps.each {|dep| Bundler.ui.confirm
"#{SharedHelpers.pretty_dependency(dep)} was removed." }
end
# Invalidate the cached Bundler.definition.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/lazy_specification.rb
new/lib/bundler/lazy_specification.rb
--- old/lib/bundler/lazy_specification.rb 2022-10-05 18:26:20.000000000
+0200
+++ new/lib/bundler/lazy_specification.rb 2022-10-17 14:48:22.000000000
+0200
@@ -77,7 +77,7 @@
source.local!
candidates = if source.is_a?(Source::Path) ||
!ruby_platform_materializes_to_ruby_platform?
- target_platform = ruby_platform_materializes_to_ruby_platform? ?
platform : Bundler.local_platform
+ target_platform = ruby_platform_materializes_to_ruby_platform? ?
platform : local_platform
source.specs.search(Dependency.new(name, version)).select do |spec|
MatchPlatform.platforms_match?(spec.platform, target_platform)
@@ -120,7 +120,7 @@
end
def identifier
- @__identifier ||= [name, version, platform_string]
+ @__identifier ||= [name, version, platform.to_s]
end
def git_version
@@ -128,13 +128,6 @@
" #{source.revision[0..6]}"
end
- protected
-
- def platform_string
- platform_string = platform.to_s
- platform_string == Index::RUBY ? Index::NULL : platform_string
- end
-
private
def to_ary
@@ -151,7 +144,8 @@
#
# For backwards compatibility with existing lockfiles, if the most specific
- # locked platform is RUBY, we keep the previous behaviour of resolving the
+ # locked platform is not a specific platform like x86_64-linux or
+ # universal-java-11, then we keep the previous behaviour of resolving the
# best platform variant at materiliazation time. For previous bundler
# versions (before 2.2.0) this was always the case (except when the
lockfile
# only included non-ruby platforms), but we're also keeping this behaviour
@@ -159,7 +153,9 @@
# explicitly add a more specific platform.
#
def ruby_platform_materializes_to_ruby_platform?
- !Bundler.most_specific_locked_platform?(generic_local_platform) ||
force_ruby_platform || Bundler.settings[:force_ruby_platform]
+ generic_platform = generic_local_platform == Gem::Platform::JAVA ?
Gem::Platform::JAVA : Gem::Platform::RUBY
+
+ !Bundler.most_specific_locked_platform?(generic_platform) ||
force_ruby_platform || Bundler.settings[:force_ruby_platform]
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/remote_specification.rb
new/lib/bundler/remote_specification.rb
--- old/lib/bundler/remote_specification.rb 2022-10-05 18:26:20.000000000
+0200
+++ new/lib/bundler/remote_specification.rb 2022-10-17 14:48:22.000000000
+0200
@@ -29,11 +29,15 @@
@platform = _remote_specification.platform
end
+ def identifier
+ @__identifier ||= [name, version, @platform.to_s]
+ end
+
def full_name
- if @original_platform == Gem::Platform::RUBY
+ if @platform == Gem::Platform::RUBY
"#{@name}-#{@version}"
else
- "#{@name}-#{@version}-#{@original_platform}"
+ "#{@name}-#{@version}-#{@platform}"
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/resolver/base.rb
new/lib/bundler/resolver/base.rb
--- old/lib/bundler/resolver/base.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/resolver/base.rb 2022-10-17 14:48:22.000000000 +0200
@@ -40,7 +40,7 @@
base_requirements = {}
@base.each do |ls|
dep = Dependency.new(ls.name, ls.version)
- base_requirements[ls.name] = DepProxy.get_proxy(dep, ls.platform)
+ base_requirements[ls.name] = dep
end
@additional_base_requirements.each {|d| base_requirements[d.name] = d }
base_requirements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/resolver/spec_group.rb
new/lib/bundler/resolver/spec_group.rb
--- old/lib/bundler/resolver/spec_group.rb 2022-10-05 18:26:20.000000000
+0200
+++ new/lib/bundler/resolver/spec_group.rb 2022-10-17 14:48:22.000000000
+0200
@@ -6,40 +6,23 @@
attr_accessor :name, :version, :source
attr_accessor :activated_platforms, :force_ruby_platform
- def self.create_for(specs, all_platforms, specific_platform)
- specific_platform_specs = specs[specific_platform]
- return unless specific_platform_specs.any?
-
- platforms = all_platforms.select {|p| specs[p].any? }
-
- new(specific_platform_specs.first, specs, platforms)
- end
-
- def initialize(exemplary_spec, specs, relevant_platforms)
- @exemplary_spec = exemplary_spec
- @name = exemplary_spec.name
- @version = exemplary_spec.version
- @source = exemplary_spec.source
+ def initialize(specs, relevant_platforms)
+ @exemplary_spec = specs.first
+ @name = @exemplary_spec.name
+ @version = @exemplary_spec.version
+ @source = @exemplary_spec.source
@activated_platforms = relevant_platforms
- @dependencies = Hash.new do |dependencies, platforms|
- dependencies[platforms] = dependencies_for(platforms)
- end
@specs = specs
end
def to_specs
- activated_platforms.map do |p|
- specs = @specs[p]
- next unless specs.any?
-
- specs.map do |s|
- lazy_spec = LazySpecification.new(name, version, s.platform,
source)
- lazy_spec.force_ruby_platform = force_ruby_platform
- lazy_spec.dependencies.replace s.dependencies
- lazy_spec
- end
- end.flatten.compact.uniq
+ @specs.map do |s|
+ lazy_spec = LazySpecification.new(name, version, s.platform, source)
+ lazy_spec.force_ruby_platform = force_ruby_platform
+ lazy_spec.dependencies.replace s.dependencies
+ lazy_spec
+ end
end
def to_s
@@ -48,7 +31,9 @@
end
def dependencies_for_activated_platforms
- @dependencies[activated_platforms]
+ @dependencies_for_activated_platforms ||= @specs.map do |spec|
+ __dependencies(spec) + metadata_dependencies(spec)
+ end.flatten.uniq
end
def ==(other)
@@ -79,35 +64,28 @@
private
- def dependencies_for(platforms)
- platforms.map do |platform|
- __dependencies(platform) + metadata_dependencies(platform)
- end.flatten
- end
-
- def __dependencies(platform)
+ def __dependencies(spec)
dependencies = []
- @specs[platform].first.dependencies.each do |dep|
+ spec.dependencies.each do |dep|
next if dep.type == :development
- dependencies << DepProxy.get_proxy(Dependency.new(dep.name,
dep.requirement), platform)
+ dependencies << Dependency.new(dep.name, dep.requirement)
end
dependencies
end
- def metadata_dependencies(platform)
- spec = @specs[platform].first
+ def metadata_dependencies(spec)
return [] if spec.is_a?(LazySpecification)
[
- metadata_dependency("Ruby", spec.required_ruby_version, platform),
- metadata_dependency("RubyGems", spec.required_rubygems_version,
platform),
+ metadata_dependency("Ruby", spec.required_ruby_version),
+ metadata_dependency("RubyGems", spec.required_rubygems_version),
].compact
end
- def metadata_dependency(name, requirement, platform)
+ def metadata_dependency(name, requirement)
return if requirement.nil? || requirement.none?
- DepProxy.get_proxy(Dependency.new("#{name}\0", requirement), platform)
+ Dependency.new("#{name}\0", requirement)
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/resolver.rb new/lib/bundler/resolver.rb
--- old/lib/bundler/resolver.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/resolver.rb 2022-10-17 14:48:22.000000000 +0200
@@ -8,22 +8,6 @@
include GemHelpers
- # Figures out the best possible configuration of gems that satisfies
- # the list of passed dependencies and any child dependencies without
- # causing any gem activation errors.
- #
- # ==== Parameters
- # *dependencies<Gem::Dependency>:: The list of dependencies to resolve
- #
- # ==== Returns
- # <GemBundle>,nil:: If the list of dependencies can be resolved, a
- # collection of gemspecs is returned. Otherwise, nil is returned.
- def self.resolve(requirements, source_requirements = {}, base = [],
gem_version_promoter = GemVersionPromoter.new, additional_base_requirements =
[], platforms = nil)
- base = SpecSet.new(base) unless base.is_a?(SpecSet)
- resolver = new(source_requirements, base, gem_version_promoter,
additional_base_requirements, platforms)
- resolver.start(requirements)
- end
-
def initialize(source_requirements, base, gem_version_promoter,
additional_base_requirements, platforms)
@source_requirements = source_requirements
@base = Resolver::Base.new(base, additional_base_requirements)
@@ -116,41 +100,35 @@
specification.dependencies_for_activated_platforms
end
- def search_for(dependency_proxy)
- platform = dependency_proxy.__platform
- dependency = dependency_proxy.dep
- name = dependency.name
- @search_for[dependency_proxy] ||= begin
+ def search_for(dependency)
+ @search_for[dependency] ||= begin
+ name = dependency.name
locked_results = @base[name].select {|spec|
requirement_satisfied_by?(dependency, nil, spec) }
locked_requirement = base_requirements[name]
results = results_for(dependency) + locked_results
results = results.select {|spec|
requirement_satisfied_by?(locked_requirement, nil, spec) } if locked_requirement
+ dep_platforms = dependency.gem_platforms(@platforms)
- if results.any?
- results = @gem_version_promoter.sort_versions(dependency, results)
-
- results.group_by(&:version).reduce([]) do |groups, (_, specs)|
- next groups unless specs.any? {|spec|
spec.match_platform(platform) }
-
- specs_by_platform = Hash.new do |current_specs, current_platform|
- current_specs[current_platform] =
select_best_platform_match(specs, current_platform)
- end
+ @gem_version_promoter.sort_versions(dependency,
results).group_by(&:version).reduce([]) do |groups, (_, specs)|
+ relevant_platforms = dep_platforms.select {|platform| specs.any?
{|spec| spec.match_platform(platform) } }
+ next groups unless relevant_platforms.any?
+
+ ruby_specs = select_best_platform_match(specs, Gem::Platform::RUBY)
+ if ruby_specs.any?
+ spec_group_ruby = SpecGroup.new(ruby_specs, [Gem::Platform::RUBY])
+ spec_group_ruby.force_ruby_platform =
dependency.force_ruby_platform
+ groups << spec_group_ruby
+ end
- spec_group_ruby = SpecGroup.create_for(specs_by_platform,
[Gem::Platform::RUBY], Gem::Platform::RUBY)
- if spec_group_ruby
- spec_group_ruby.force_ruby_platform =
dependency.force_ruby_platform
- groups << spec_group_ruby
- end
+ next groups if @resolving_only_for_ruby ||
dependency.force_ruby_platform
- next groups if @resolving_only_for_ruby ||
dependency.force_ruby_platform
+ platform_specs = relevant_platforms.flat_map {|platform|
select_best_platform_match(specs, platform) }
+ next groups if platform_specs == ruby_specs
- spec_group = SpecGroup.create_for(specs_by_platform, @platforms,
platform)
- groups << spec_group
+ spec_group = SpecGroup.new(platform_specs, relevant_platforms)
+ groups << spec_group
- groups
- end
- else
- []
+ groups
end
end
end
@@ -181,10 +159,6 @@
requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
end
- def dependencies_equal?(dependencies, other_dependencies)
- dependencies.map(&:dep) == other_dependencies.map(&:dep)
- end
-
def sort_dependencies(dependencies, activated, conflicts)
dependencies.sort_by do |dependency|
name = name_for(dependency)
@@ -196,17 +170,10 @@
amount_constrained(dependency),
conflicts[name] ? 0 : 1,
vertex.payload ? 0 : search_for(dependency).count,
- self.class.platform_sort_key(dependency.__platform),
]
end
end
- def self.platform_sort_key(platform)
- # Prefer specific platform to not specific platform
- return ["99-LAST", "", "", ""] if Gem::Platform::RUBY == platform
- ["00", *platform.to_a.map {|part| part || "" }]
- end
-
private
def base_requirements
@@ -261,21 +228,11 @@
requirements.map! do |requirement|
name = requirement.name
next requirement if name == "bundler"
+ next if requirement.gem_platforms(@platforms).empty?
next requirement unless search_for(requirement).empty?
next unless requirement.current_platform?
- if (base = @base[name]) && !base.empty?
- version = base.first.version
- message = "You have requested:\n" \
- " #{name} #{requirement.requirement}\n\n" \
- "The bundle currently has #{name} locked at #{version}.\n" \
- "Try running `bundle update #{name}`\n\n" \
- "If you are updating multiple gems in your Gemfile at once,\n" \
- "try passing them all to `bundle update`"
- else
- message = gem_not_found_message(name, requirement, source_for(name))
- end
- raise GemNotFound, message
+ raise GemNotFound, gem_not_found_message(name, requirement,
source_for(name))
end.compact!
end
@@ -293,7 +250,9 @@
if specs_matching_requirement.any?
specs = specs_matching_requirement
matching_part = requirement_label
- requirement_label = "#{requirement_label}' with platform
'#{requirement.__platform}"
+ platforms = requirement.gem_platforms(@platforms)
+ platform_label = platforms.size == 1 ? "platform '#{platforms.first}"
: "platforms '#{platforms.join("', '")}"
+ requirement_label = "#{requirement_label}' with #{platform_label}"
end
message = String.new("Could not find gem
'#{requirement_label}'#{extra_message} in #{source}#{cache_message}.\n")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/shared_helpers.rb
new/lib/bundler/shared_helpers.rb
--- old/lib/bundler/shared_helpers.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/shared_helpers.rb 2022-10-17 14:48:22.000000000 +0200
@@ -163,7 +163,7 @@
"\nEither installing with `--full-index` or running `bundle update
#{spec.name}` should fix the problem."
end
- def pretty_dependency(dep, print_source = false)
+ def pretty_dependency(dep)
msg = String.new(dep.name)
msg << " (#{dep.requirement})" unless dep.requirement ==
Gem::Requirement.default
@@ -172,7 +172,6 @@
msg << " " << platform_string if !platform_string.empty? &&
platform_string != Gem::Platform::RUBY
end
- msg << " from the `#{dep.source}` source" if print_source && dep.source
msg
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler/version.rb new/lib/bundler/version.rb
--- old/lib/bundler/version.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler/version.rb 2022-10-17 14:48:22.000000000 +0200
@@ -1,7 +1,7 @@
# frozen_string_literal: false
module Bundler
- VERSION = "2.3.23".freeze
+ VERSION = "2.3.24".freeze
def self.bundler_major_version
@bundler_major_version ||= VERSION.split(".").first.to_i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/bundler.rb new/lib/bundler.rb
--- old/lib/bundler.rb 2022-10-05 18:26:20.000000000 +0200
+++ new/lib/bundler.rb 2022-10-17 14:48:22.000000000 +0200
@@ -41,7 +41,6 @@
autoload :Definition, File.expand_path("bundler/definition",
__dir__)
autoload :Dependency, File.expand_path("bundler/dependency",
__dir__)
- autoload :DepProxy, File.expand_path("bundler/dep_proxy",
__dir__)
autoload :Deprecate, File.expand_path("bundler/deprecate",
__dir__)
autoload :Digest, File.expand_path("bundler/digest", __dir__)
autoload :Dsl, File.expand_path("bundler/dsl", __dir__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2022-10-05 18:26:20.000000000 +0200
+++ new/metadata 2022-10-17 14:48:22.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: bundler
version: !ruby/object:Gem::Version
- version: 2.3.23
+ version: 2.3.24
platform: ruby
authors:
- Andr?? Arko
@@ -22,7 +22,7 @@
autorequire:
bindir: exe
cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
dependencies: []
description: Bundler manages an application's dependencies through its entire
life,
across many machines, systematically and repeatably
@@ -80,7 +80,6 @@
- lib/bundler/constants.rb
- lib/bundler/current_ruby.rb
- lib/bundler/definition.rb
-- lib/bundler/dep_proxy.rb
- lib/bundler/dependency.rb
- lib/bundler/deployment.rb
- lib/bundler/deprecate.rb
@@ -380,7 +379,7 @@
- !ruby/object:Gem::Version
version: 2.5.2
requirements: []
-rubygems_version: 3.3.23
+rubygems_version: 3.3.24
signing_key:
specification_version: 4
summary: The best way to manage your application's dependencies
