diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-12-23 09:08:54 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-12-23 09:34:26 +0900 |
commit | 7d7a84e99fca816ec352c95965687db240fb56d3 (patch) | |
tree | 3c734dbd75631559194ffda83695f17657320682 /lib | |
parent | fa5de8f68d51e4fbc91190061e3ce3817bd68964 (diff) |
Merge RubyGems-3.5.3 and Bundler-2.5.3
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/dependency.rb | 4 | ||||
-rw-r--r-- | lib/bundler/dsl.rb | 19 | ||||
-rw-r--r-- | lib/bundler/version.rb | 2 | ||||
-rw-r--r-- | lib/rubygems.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/safe_marshal/elements.rb | 8 | ||||
-rw-r--r-- | lib/rubygems/safe_marshal/reader.rb | 4 | ||||
-rw-r--r-- | lib/rubygems/safe_marshal/visitors/to_ruby.rb | 30 |
7 files changed, 59 insertions, 10 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index efc39a12f3..77d7a00362 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -68,6 +68,10 @@ module Bundler @should_include && current_env? && current_platform? end + def gemspec_dev_dep? + type == :development + end + def current_env? return true unless @env if @env.is_a?(Hash) diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index a67f7ed8a1..1eca749617 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -103,16 +103,21 @@ module Bundler # if there's already a dependency with this name we try to prefer one if current = @dependencies.find {|d| d.name == dep.name } # Always prefer the dependency from the Gemfile - deleted_dep = @dependencies.delete(current) if current.type == :development + @dependencies.delete(current) if current.gemspec_dev_dep? if current.requirement != dep.requirement current_requirement_open = current.requirements_list.include?(">= 0") - if current.type == :development - unless current_requirement_open || dep.type == :development - Bundler.ui.warn "A gemspec development dependency (#{dep.name}, #{current.requirement}) is being overridden by a Gemfile dependency (#{dep.name}, #{dep.requirement}).\n" \ - "This behaviour may change in the future. Please remove either of them, or make sure they both have the same requirement\n" \ + gemspec_dep = [dep, current].find(&:gemspec_dev_dep?) + if gemspec_dep + gemfile_dep = [dep, current].find(&:runtime?) + + unless current_requirement_open + Bundler.ui.warn "A gemspec development dependency (#{gemspec_dep.name}, #{gemspec_dep.requirement}) is being overridden by a Gemfile dependency (#{gemfile_dep.name}, #{gemfile_dep.requirement}).\n" \ + "This behaviour may change in the future. Please remove either of them, or make sure they both have the same requirement\n" end + + return if dep.gemspec_dev_dep? else update_prompt = "" @@ -130,8 +135,8 @@ module Bundler "You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})" \ "#{update_prompt}" end - elsif current.type == :development || dep.type == :development - return if deleted_dep.nil? + elsif current.gemspec_dev_dep? || dep.gemspec_dev_dep? + return if dep.gemspec_dev_dep? elsif current.source != dep.source raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \ "You specified that #{dep.name} (#{dep.requirement}) should come from " \ diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index a98d7fab30..a0ef931d07 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.5.2".freeze + VERSION = "2.5.3".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i diff --git a/lib/rubygems.rb b/lib/rubygems.rb index fd5683f1be..fa3da5cc1a 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -9,7 +9,7 @@ require "rbconfig" module Gem - VERSION = "3.5.2" + VERSION = "3.5.3" end # Must be first since it unloads the prelude from 1.9.2 diff --git a/lib/rubygems/safe_marshal/elements.rb b/lib/rubygems/safe_marshal/elements.rb index 067ab59d19..f8874b1b2f 100644 --- a/lib/rubygems/safe_marshal/elements.rb +++ b/lib/rubygems/safe_marshal/elements.rb @@ -133,6 +133,14 @@ module Gem end attr_reader :sign, :data end + + class UserClass < Element + def initialize(name, wrapped_object) + @name = name + @wrapped_object = wrapped_object + end + attr_reader :name, :wrapped_object + end end end end diff --git a/lib/rubygems/safe_marshal/reader.rb b/lib/rubygems/safe_marshal/reader.rb index 7c3a703475..740be113e5 100644 --- a/lib/rubygems/safe_marshal/reader.rb +++ b/lib/rubygems/safe_marshal/reader.rb @@ -299,7 +299,9 @@ module Gem end def read_user_class - raise NotImplementedError, "Reading Marshal objects of type user_class is not implemented" + name = read_element + wrapped_object = read_element + Elements::UserClass.new(name, wrapped_object) end end end diff --git a/lib/rubygems/safe_marshal/visitors/to_ruby.rb b/lib/rubygems/safe_marshal/visitors/to_ruby.rb index 58c44fa8bf..a9f1d048d4 100644 --- a/lib/rubygems/safe_marshal/visitors/to_ruby.rb +++ b/lib/rubygems/safe_marshal/visitors/to_ruby.rb @@ -247,6 +247,30 @@ module Gem::SafeMarshal end end + def visit_Gem_SafeMarshal_Elements_UserClass(r) + if resolve_class(r.name) == ::Hash && r.wrapped_object.is_a?(Elements::Hash) + + hash = register_object({}.compare_by_identity) + + o = r.wrapped_object + o.pairs.each_with_index do |(k, v), i| + push_stack i + k = visit(k) + push_stack k + hash[k] = visit(v) + end + + if o.is_a?(Elements::HashWithDefaultValue) + push_stack :default + hash.default = visit(o.default) + end + + hash + else + raise UnsupportedError.new("Unsupported user class #{resolve_class(r.name)} in marshal stream", stack: formatted_stack) + end + end + def resolve_class(n) @class_cache[n] ||= begin to_s = resolve_symbol_name(n) @@ -375,6 +399,12 @@ module Gem::SafeMarshal end end + class UnsupportedError < Error + def initialize(message, stack:) + super "#{message} @ #{stack.join "."}" + end + end + class FormatError < Error end |