rubygems-update 3.5.12 → 3.5.14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c35be5895f916b09303ca0a72f0cc908f52df658c8860de916b73d4e0637fb1d
4
- data.tar.gz: 5ca038be72e7dd475544a0fe4baa5998dc4ec4fc40169c86bbceaf3004a28993
3
+ metadata.gz: 101bb4d3835465ae355294d968d11286a9f40d1ffcd1ac3a99a54a93d40af5d8
4
+ data.tar.gz: 2f93681d561672e3b4096fdd0fada43eee91318fc8a851e0afc6afb6cdf2dd06
5
5
  SHA512:
6
- metadata.gz: '018263fd318b8ff0f135774f71daac0b005472254e524cf93fc9616650ddba36f397a0c0f94ed2c278e276ab8ec6cc5a6323af2375d0a1a220e066d863904142'
7
- data.tar.gz: f9713050e6ab501c1777a44c1409c5aa45cb17bdf5795f61113d27bbad2abf502a604a1d6d4930ff59c548349920a61ea7d4bae1a99eeef8e41842b6a9a3af1a
6
+ metadata.gz: 501d248170dd4bf953705741e93816b1a9a706b0ce6e586383678bc575645420c42c8196e0c42fdaae75d4b53e621ba1c56308d02deb47b843e734a416922851
7
+ data.tar.gz: 7bba23888fa59d7d73c7db9c667845235672b000bb29fd0b652d202e6cc1f4279d3d3beb9b26e62eeadb21a1d64bbda58fcc2e9fc08a7dcdeb5b821b74cb6a0d
data/CHANGELOG.md CHANGED
@@ -1,3 +1,26 @@
1
+ # 3.5.14 / 2024-06-21
2
+
3
+ ## Enhancements:
4
+
5
+ * Installs bundler 2.5.14 as a default gem.
6
+
7
+ ## Bug fixes:
8
+
9
+ * Make "bundler? update --bundler" behave identically. Pull request
10
+ [#7778](https://github.com/rubygems/rubygems/pull/7778) by x-yuri
11
+
12
+ # 3.5.13 / 2024-06-14
13
+
14
+ ## Enhancements:
15
+
16
+ * Installs bundler 2.5.13 as a default gem.
17
+
18
+ ## Bug fixes:
19
+
20
+ * Never remove executables that may belong to a default gem. Pull request
21
+ [#7747](https://github.com/rubygems/rubygems/pull/7747) by
22
+ deivid-rodriguez
23
+
1
24
  # 3.5.12 / 2024-06-13
2
25
 
3
26
  ## Enhancements:
data/bundler/CHANGELOG.md CHANGED
@@ -1,3 +1,19 @@
1
+ # 2.5.14 (June 21, 2024)
2
+
3
+ ## Bug fixes:
4
+
5
+ - Fix credentials being re-added when re-resolving without a full unlock [#7767](https://github.com/rubygems/rubygems/pull/7767)
6
+ - Fix `bundle update <gem_name>` edge case [#7770](https://github.com/rubygems/rubygems/pull/7770)
7
+ - Fix `bundle fund` when the gemfile contains optional groups [#7758](https://github.com/rubygems/rubygems/pull/7758)
8
+
9
+ # 2.5.13 (June 14, 2024)
10
+
11
+ ## Bug fixes:
12
+
13
+ - Fix funding metadata not being printed in some situations [#7746](https://github.com/rubygems/rubygems/pull/7746)
14
+ - Make sure to not re-resolve when a not fully specific local platform is locked [#7751](https://github.com/rubygems/rubygems/pull/7751)
15
+ - Don't print bug report template when bin dir is not writable [#7748](https://github.com/rubygems/rubygems/pull/7748)
16
+
1
17
  # 2.5.12 (June 13, 2024)
2
18
 
3
19
  ## Enhancements:
@@ -4,8 +4,8 @@ module Bundler
4
4
  # Represents metadata from when the Bundler gem was built.
5
5
  module BuildMetadata
6
6
  # begin ivars
7
- @built_at = "2024-06-13".freeze
8
- @git_commit_sha = "05dc7d98e5".freeze
7
+ @built_at = "2024-06-21".freeze
8
+ @git_commit_sha = "72920bc230".freeze
9
9
  @release = true
10
10
  # end ivars
11
11
 
@@ -16,7 +16,7 @@ module Bundler
16
16
  deps = if groups.any?
17
17
  Bundler.definition.dependencies_for(groups)
18
18
  else
19
- Bundler.definition.current_dependencies
19
+ Bundler.definition.requested_dependencies
20
20
  end
21
21
 
22
22
  fund_info = deps.each_with_object([]) do |dep, arr|
@@ -621,11 +621,13 @@ module Bundler
621
621
  end
622
622
 
623
623
  def start_resolution
624
+ @platforms |= [local_platform]
625
+
624
626
  result = SpecSet.new(resolver.start)
625
627
 
626
628
  @resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version
627
629
 
628
- if @current_ruby_locked_platform && @current_ruby_locked_platform != local_platform
630
+ if most_specific_ruby_locked_platform_is_not_local_platform?
629
631
  @platforms.delete(result.incomplete_for_platform?(dependencies, @current_ruby_locked_platform) ? @current_ruby_locked_platform : local_platform)
630
632
  end
631
633
 
@@ -667,10 +669,15 @@ module Bundler
667
669
 
668
670
  def add_current_platform
669
671
  @current_ruby_locked_platform = most_specific_locked_platform if current_ruby_platform_locked?
672
+ return if most_specific_ruby_locked_platform_is_not_local_platform?
670
673
 
671
674
  add_platform(local_platform)
672
675
  end
673
676
 
677
+ def most_specific_ruby_locked_platform_is_not_local_platform?
678
+ @current_ruby_locked_platform && @current_ruby_locked_platform != local_platform
679
+ end
680
+
674
681
  def change_reason
675
682
  if unlocking?
676
683
  unlock_targets = if @gems_to_unlock.any?
@@ -1051,6 +1058,7 @@ module Bundler
1051
1058
  (@new_platform && platforms.last == platform) ||
1052
1059
  @path_changes ||
1053
1060
  @dependency_changes ||
1061
+ @locked_spec_with_invalid_deps ||
1054
1062
  !@originally_locked_specs.incomplete_for_platform?(dependencies, platform)
1055
1063
 
1056
1064
  remove_platform(platform)
@@ -92,6 +92,17 @@ module Bundler
92
92
  end
93
93
  end
94
94
 
95
+ # needed for `bundle fund`
96
+ def metadata
97
+ if @remote_specification
98
+ @remote_specification.metadata
99
+ elsif _local_specification
100
+ _local_specification.metadata
101
+ else
102
+ super
103
+ end
104
+ end
105
+
95
106
  def _local_specification
96
107
  return unless @loaded_from && File.exist?(local_specification_path)
97
108
  eval(File.read(local_specification_path), nil, local_specification_path).tap do |spec|
@@ -29,7 +29,10 @@ module Bundler
29
29
  write_build_info_file
30
30
  run_post_build_hooks
31
31
 
32
- generate_bin
32
+ SharedHelpers.filesystem_access(bin_dir, :write) do
33
+ generate_bin
34
+ end
35
+
33
36
  generate_plugins
34
37
 
35
38
  write_spec
@@ -10,7 +10,7 @@ module Bundler
10
10
  # Ask for X gems per API request
11
11
  API_REQUEST_SIZE = 50
12
12
 
13
- attr_reader :remotes
13
+ attr_accessor :remotes
14
14
 
15
15
  def initialize(options = {})
16
16
  @options = options
@@ -20,9 +20,10 @@ module Bundler
20
20
  @allow_cached = false
21
21
  @allow_local = options["allow_local"] || false
22
22
  @checksum_store = Checksum::Store.new
23
- @original_remotes = nil
24
23
 
25
24
  Array(options["remotes"]).reverse_each {|r| add_remote(r) }
25
+
26
+ @lockfile_remotes = @remotes if options["from_lockfile"]
26
27
  end
27
28
 
28
29
  def caches
@@ -92,12 +93,7 @@ module Bundler
92
93
 
93
94
  def self.from_lock(options)
94
95
  options["remotes"] = Array(options.delete("remote")).reverse
95
- new(options)
96
- end
97
-
98
- def remotes=(new_remotes)
99
- @original_remotes = @remotes
100
- @remotes = new_remotes
96
+ new(options.merge("from_lockfile" => true))
101
97
  end
102
98
 
103
99
  def to_lock
@@ -470,7 +466,7 @@ module Bundler
470
466
  private
471
467
 
472
468
  def lockfile_remotes
473
- @original_remotes || credless_remotes
469
+ @lockfile_remotes || credless_remotes
474
470
  end
475
471
 
476
472
  # Checks if the requested spec exists in the global cache. If it does,
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: false
2
2
 
3
3
  module Bundler
4
- VERSION = "2.5.12".freeze
4
+ VERSION = "2.5.14".freeze
5
5
 
6
6
  def self.bundler_major_version
7
7
  @bundler_major_version ||= VERSION.split(".").first.to_i
@@ -21,7 +21,7 @@ module Gem::BundlerVersionFinder
21
21
  end
22
22
 
23
23
  def self.bundle_update_bundler_version
24
- return unless File.basename($0) == "bundle"
24
+ return unless ["bundle", "bundler"].include? File.basename($0)
25
25
  return unless "update".start_with?(ARGV.first || " ")
26
26
  bundler_version = nil
27
27
  update_index = nil
@@ -13,8 +13,8 @@ class Gem::Requirement
13
13
  OPS = { # :nodoc:
14
14
  "=" => lambda {|v, r| v == r },
15
15
  "!=" => lambda {|v, r| v != r },
16
- ">" => lambda {|v, r| v > r },
17
- "<" => lambda {|v, r| v < r },
16
+ ">" => lambda {|v, r| v > r },
17
+ "<" => lambda {|v, r| v < r },
18
18
  ">=" => lambda {|v, r| v >= r },
19
19
  "<=" => lambda {|v, r| v <= r },
20
20
  "~>" => lambda {|v, r| v >= r && v.release < r.bump },
@@ -178,7 +178,7 @@ class Gem::Uninstaller
178
178
  # Removes installed executables and batch files (windows only) for +spec+.
179
179
 
180
180
  def remove_executables(spec)
181
- return if spec.executables.empty?
181
+ return if spec.executables.empty? || default_spec_matches?(spec)
182
182
 
183
183
  executables = spec.executables.clone
184
184
 
data/lib/rubygems.rb CHANGED
@@ -9,7 +9,7 @@
9
9
  require "rbconfig"
10
10
 
11
11
  module Gem
12
- VERSION = "3.5.12"
12
+ VERSION = "3.5.14"
13
13
  end
14
14
 
15
15
  # Must be first since it unloads the prelude from 1.9.2
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "rubygems-update"
5
- s.version = "3.5.12"
5
+ s.version = "3.5.14"
6
6
  s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
7
7
  s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
8
8
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubygems-update
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.12
4
+ version: 3.5.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jim Weirich
@@ -16,7 +16,7 @@ authors:
16
16
  autorequire:
17
17
  bindir: exe
18
18
  cert_chain: []
19
- date: 2024-06-13 00:00:00.000000000 Z
19
+ date: 2024-06-21 00:00:00.000000000 Z
20
20
  dependencies: []
21
21
  description: |-
22
22
  A package (also known as a library) contains a set of functionality
@@ -727,7 +727,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
727
727
  - !ruby/object:Gem::Version
728
728
  version: '0'
729
729
  requirements: []
730
- rubygems_version: 3.5.12
730
+ rubygems_version: 3.5.14
731
731
  signing_key:
732
732
  specification_version: 4
733
733
  summary: RubyGems is a package management framework for Ruby. This gem is downloaded