bundler 2.3.25 → 2.3.26

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: 508e348983627527bf00fb429d395c7fc71bd41692b03f55901b3999a77cd5d6
4
- data.tar.gz: 9ad200e02400a40f90d17ddabc20673366b9b16f8c8e451eafb41d9f2ecd6e8a
3
+ metadata.gz: 1ecbb775b34e7c64a72d01af5cce8bacbd1a470404845444fda36a2f0e37a1aa
4
+ data.tar.gz: 40fbd944cb4094b105e01672961a790730055bd8563632dbbe4ae3738b9d531f
5
5
  SHA512:
6
- metadata.gz: 6750ee21d6226fbde651fb33831c07aa7b16901a40ec7c960d7ac8bda21f22fbacf78041c5a8dff14739bd25df45dc78c6605e2ff650fe65d14202df3fc18d87
7
- data.tar.gz: 5581c3544c07ba90854e1534793ca9457ca7212ca5453ab38d6f7567efe4e8570d0f67ff83be826ebd7ed3eb9ad1548a07a878cac73faca27fe6b8b66dcbd68e
6
+ metadata.gz: 1a2e39b4aa05271b042c17f35ac0376306d509221d91c13480eb40da97fda0fbe811fd59951a550a455232428b41856f04a63ea474b4dc88553eb6ae3b5e149e
7
+ data.tar.gz: 3ccf4c9906a118084bdcd4e8a124dab5f96310ac8ac09bea0ed7de8be6019c1fae3fc58e2b421406e0d2d9de19518869e0beaf1faeae7f8148388724521d3a65
data/CHANGELOG.md CHANGED
@@ -1,3 +1,13 @@
1
+ # 2.3.26 (November 16, 2022)
2
+
3
+ ## Enhancements:
4
+
5
+ - Map 'universal' to the real arch in Bundler for prebuilt gem selection [#5978](https://github.com/rubygems/rubygems/pull/5978)
6
+
7
+ ## Documentation:
8
+
9
+ - Fix '--force' option documentation of 'bundle clean' [#6050](https://github.com/rubygems/rubygems/pull/6050)
10
+
1
11
  # 2.3.25 (November 2, 2022)
2
12
 
3
13
  ## Bug fixes:
@@ -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 = "2022-11-02".freeze
8
- @git_commit_sha = "6b0b87b1ed".freeze
7
+ @built_at = "2022-11-17".freeze
8
+ @git_commit_sha = "23ec5b8501".freeze
9
9
  @release = true
10
10
  # end ivars
11
11
 
data/lib/bundler/cli.rb CHANGED
@@ -620,7 +620,7 @@ module Bundler
620
620
  method_option "dry-run", :type => :boolean, :default => false, :banner =>
621
621
  "Only print out changes, do not clean gems"
622
622
  method_option "force", :type => :boolean, :default => false, :banner =>
623
- "Forces clean even if --path is not set"
623
+ "Forces cleaning up unused gems even if Bundler is configured to use globally installed gems. As a consequence, removes all system gems except for the ones in the current application."
624
624
  def clean
625
625
  require_relative "cli/clean"
626
626
  Clean.new(options.dup).run
@@ -20,5 +20,5 @@ Print the changes, but do not clean the unused gems\.
20
20
  .
21
21
  .TP
22
22
  \fB\-\-force\fR
23
- Force a clean even if \fB\-\-path\fR is not set\.
23
+ Forces cleaning up unused gems even if Bundler is configured to use globally installed gems\. As a consequence, removes all system gems except for the ones in the current application\.
24
24
 
@@ -15,4 +15,4 @@ useful when you have made many changes to your gem dependencies.
15
15
  * `--dry-run`:
16
16
  Print the changes, but do not clean the unused gems.
17
17
  * `--force`:
18
- Force a clean even if `--path` is not set.
18
+ Forces cleaning up unused gems even if Bundler is configured to use globally installed gems. As a consequence, removes all system gems except for the ones in the current application.
@@ -308,6 +308,28 @@ module Gem
308
308
  end
309
309
  end
310
310
 
311
+ # On universal Rubies, resolve the "universal" arch to the real CPU arch, without changing the extension directory.
312
+ class Specification
313
+ if /^universal\.(?<arch>.*?)-/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
314
+ local_platform = Platform.local
315
+ if local_platform.cpu == "universal"
316
+ ORIGINAL_LOCAL_PLATFORM = local_platform.to_s.freeze
317
+
318
+ local_platform.cpu = if arch == "arm64e" # arm64e is only permitted for Apple system binaries
319
+ "arm64"
320
+ else
321
+ arch
322
+ end
323
+
324
+ def extensions_dir
325
+ Gem.default_ext_dir_for(base_dir) ||
326
+ File.join(base_dir, "extensions", ORIGINAL_LOCAL_PLATFORM,
327
+ Gem.extension_api_version)
328
+ end
329
+ end
330
+ end
331
+ end
332
+
311
333
  require "rubygems/util"
312
334
 
313
335
  Util.singleton_class.module_eval do
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: false
2
2
 
3
3
  module Bundler
4
- VERSION = "2.3.25".freeze
4
+ VERSION = "2.3.26".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.3.25
4
+ version: 2.3.26
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: 2022-11-02 00:00:00.000000000 Z
25
+ date: 2022-11-17 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
@@ -379,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
379
379
  - !ruby/object:Gem::Version
380
380
  version: 2.5.2
381
381
  requirements: []
382
- rubygems_version: 3.3.25
382
+ rubygems_version: 3.3.26
383
383
  signing_key:
384
384
  specification_version: 4
385
385
  summary: The best way to manage your application's dependencies