bundler 2.5.12 → 2.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: 829276824aba6fb47236a5d2a3312f24d34d6331a7e7aa36e506fb93f51d510b
4
- data.tar.gz: f1b897fcea468ad974ca7882c6f67a8c2a9d48852f9746e45a7888fc6c49d66f
3
+ metadata.gz: e72f84d19fe7fbbf434d993f34d7b4cd12272cd72d4c61d6f02e7eb664f5058b
4
+ data.tar.gz: d80704aaae9adfb1132c0902c4acfd0e41e4a082d4d7a5b8c174f0a4a14d28e1
5
5
  SHA512:
6
- metadata.gz: 7a35ad5e1282b37700c6ffac4579f296befbfcf22884d57f88987196c537ed8fc8d5a79d2304b1d1ae589a73210198ba69d6ece57e396ecd7c77cb6b3a20f91a
7
- data.tar.gz: 8e342919b00cbf6ffbc25bb22e9b6c4e798bbc5d29975254df77dbbd7690c66d3493a4e5207ea4c12f7cc15fa1ab7bac7af9f85fbb53c02f12b80b0100373848
6
+ metadata.gz: 5f3e9bea39eb37f092d0372e596a4803ed3ada1f70f00d0406554dc170ffef9f1c451cc98636d608669f673d199efa97c639f72c69be3adab05d417580d43a6e
7
+ data.tar.gz: e1694c53d80fda23087d492e6a6264e230c12cc7a488c479987550afcbb51904284b6476ab62eea7f992ac051675f564f2596d9dce9f7ba9f543a9e382d165df
data/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
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundler
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.12
4
+ version: 2.5.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - André Arko
@@ -22,7 +22,7 @@ authors:
22
22
  autorequire:
23
23
  bindir: exe
24
24
  cert_chain: []
25
- date: 2024-06-13 00:00:00.000000000 Z
25
+ date: 2024-06-21 00:00:00.000000000 Z
26
26
  dependencies: []
27
27
  description: Bundler manages an application's dependencies through its entire life,
28
28
  across many machines, systematically and repeatably
@@ -400,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
400
400
  - !ruby/object:Gem::Version
401
401
  version: 3.2.3
402
402
  requirements: []
403
- rubygems_version: 3.5.12
403
+ rubygems_version: 3.5.14
404
404
  signing_key:
405
405
  specification_version: 4
406
406
  summary: The best way to manage your application's dependencies