rubygems-update 3.5.23 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 298dd7e433f12db32821aa839bedc93ef8b6fcce23dd3fd478657224173c98db
-  data.tar.gz: 4121f91098e2a14d645492fbc139ddbb1ddc8a8999445b577be746acc49e83c3
+  metadata.gz: 15a753eb9565973c8c26c2ec2c51f01d59d3dcc6c052ec3d1e6e1d0652048c5e
+  data.tar.gz: e12b9ee68d9eff9c9f1924dcaf707754f01ee77e488af13b8a97b80111d97c55
 SHA512:
-  metadata.gz: e26b5111da52570e42a44f51ba3ef6a8abb679ff42f87cadd6019b90b9572136111a08cbb027877ed02f1592a84080cfaf3ff30700e7816e1d3403e44545b1e0
-  data.tar.gz: 152c98c1710f87df1034f727c8fea857c6a8e3d16c7d27c20763818d39879615f9004484b842874ded31aaa29771c1bc7635fe0dc07ecc4d554aa550f8e9bdee
+  metadata.gz: 1d53ef84edb5ea754ece9390c544b81446fe69153310dbaa489bc4334ebe26a2867384bee7cb366b8bdee302f6087901ed796eeff99644da31138b5e6a4e97d7
+  data.tar.gz: 9013c49f596fb5f6dea1e8a5ed0b330f6b84c0b8136ba034522b70df974a73ba9c2492e5e51c1f92edde0c2027394ef54dba5771ac698ae8618b06f110af1f54

data/CHANGELOG.md

@@ -1,3 +1,77 @@
+# 3.6.1 / 2024-12-17
+
+## Enhancements:
+
+* Installs bundler 2.6.1 as a default gem.
+
+## Bug fixes:
+
+* Fix `gem info` tagging some non default gems as default. Pull request
+  [#8321](https://github.com/rubygems/rubygems/pull/8321) by
+  deivid-rodriguez
+
+## Documentation:
+
+* Fix broken links. Pull request
+  [#8327](https://github.com/rubygems/rubygems/pull/8327) by st0012
+
+# 3.6.0 / 2024-12-16
+
+## Security:
+
+* Stop storing executable names in ivars. Pull request
+  [#8307](https://github.com/rubygems/rubygems/pull/8307) by segiddins
+
+## Breaking changes:
+
+* Drop ruby 3.0 support. Pull request
+  [#8091](https://github.com/rubygems/rubygems/pull/8091) by segiddins
+
+## Features:
+
+* Add --attestation option to gem push. Pull request
+  [#8239](https://github.com/rubygems/rubygems/pull/8239) by segiddins
+
+## Enhancements:
+
+* Skip unresolved deps warning on `Gem::Specification.reset` on benign
+  cases. Pull request
+  [#8309](https://github.com/rubygems/rubygems/pull/8309) by
+  deivid-rodriguez
+* Let `gem install <name>` suggest `<name>-ruby` and `ruby-<name>` when
+  providing "did you mean" suggestions. Pull request
+  [#8197](https://github.com/rubygems/rubygems/pull/8197) by duckinator
+* Update SPDX license list as of 2024-08-19. Pull request
+  [#8233](https://github.com/rubygems/rubygems/pull/8233) by
+  github-actions[bot]
+* Add `--target-rbconfig` option to `gem install` and `gem update`
+  commands. Pull request
+  [#7628](https://github.com/rubygems/rubygems/pull/7628) by kateinoigakukun
+* Skip nil-value keys to make metadata reproducible. Pull request
+  [#7129](https://github.com/rubygems/rubygems/pull/7129) by nobu
+* Allow disabling installation of compiled extensions into lib through
+  `Gem.configuration.install_extension_in_lib`. Pull request
+  [#6463](https://github.com/rubygems/rubygems/pull/6463) by hsbt
+* Installs bundler 2.6.0 as a default gem.
+
+## Bug fixes:
+
+* Set $0 to exe when running `gem exec` to fix name in CLI output. Pull
+  request [#8267](https://github.com/rubygems/rubygems/pull/8267) by adam12
+* Fix manifest in gem package using incorrect platform sometimes. Pull
+  request [#8202](https://github.com/rubygems/rubygems/pull/8202) by
+  deivid-rodriguez
+
+## Documentation:
+
+* Fix missing single quote in git source example. Pull request
+  [#8303](https://github.com/rubygems/rubygems/pull/8303) by nobu
+* Update the `gem install` demo in REAME to use a gem that just works on
+  Windows. Pull request
+  [#8262](https://github.com/rubygems/rubygems/pull/8262) by soda92
+* Unify rubygems and bundler docs directory. Pull request
+  [#8159](https://github.com/rubygems/rubygems/pull/8159) by hsbt
+
 # 3.5.23 / 2024-11-05
 
 ## Enhancements:

data/Manifest.txt

@@ -1,17 +1,12 @@
 CHANGELOG.md
 CODE_OF_CONDUCT.md
-CONTRIBUTING.md
 LICENSE.txt
-MAINTAINERS.txt
 MIT.txt
 Manifest.txt
-POLICIES.md
 README.md
-UPGRADING.md
 bundler/CHANGELOG.md
 bundler/LICENSE.md
 bundler/README.md
-bundler/UPGRADING.md
 bundler/bundler.gemspec
 bundler/exe/bundle
 bundler/exe/bundler
@@ -110,8 +105,12 @@ bundler/lib/bundler/man/bundle-console.1
 bundler/lib/bundler/man/bundle-console.1.ronn
 bundler/lib/bundler/man/bundle-doctor.1
 bundler/lib/bundler/man/bundle-doctor.1.ronn
+bundler/lib/bundler/man/bundle-env.1
+bundler/lib/bundler/man/bundle-env.1.ronn
 bundler/lib/bundler/man/bundle-exec.1
 bundler/lib/bundler/man/bundle-exec.1.ronn
+bundler/lib/bundler/man/bundle-fund.1
+bundler/lib/bundler/man/bundle-fund.1.ronn
 bundler/lib/bundler/man/bundle-gem.1
 bundler/lib/bundler/man/bundle-gem.1.ronn
 bundler/lib/bundler/man/bundle-help.1
@@ -124,6 +123,10 @@ bundler/lib/bundler/man/bundle-inject.1
 bundler/lib/bundler/man/bundle-inject.1.ronn
 bundler/lib/bundler/man/bundle-install.1
 bundler/lib/bundler/man/bundle-install.1.ronn
+bundler/lib/bundler/man/bundle-issue.1
+bundler/lib/bundler/man/bundle-issue.1.ronn
+bundler/lib/bundler/man/bundle-licenses.1
+bundler/lib/bundler/man/bundle-licenses.1.ronn
 bundler/lib/bundler/man/bundle-list.1
 bundler/lib/bundler/man/bundle-list.1.ronn
 bundler/lib/bundler/man/bundle-lock.1
@@ -156,6 +159,7 @@ bundler/lib/bundler/man/index.txt
 bundler/lib/bundler/match_metadata.rb
 bundler/lib/bundler/match_platform.rb
 bundler/lib/bundler/match_remote_metadata.rb
+bundler/lib/bundler/materialization.rb
 bundler/lib/bundler/mirror.rb
 bundler/lib/bundler/plugin.rb
 bundler/lib/bundler/plugin/api.rb
@@ -257,7 +261,7 @@ bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb
 bundler/lib/bundler/vendor/fileutils/.document
-bundler/lib/bundler/vendor/fileutils/LICENSE.txt
+bundler/lib/bundler/vendor/fileutils/COPYING
 bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
 bundler/lib/bundler/vendor/net-http-persistent/.document
 bundler/lib/bundler/vendor/net-http-persistent/README.rdoc
@@ -284,8 +288,7 @@ bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
 bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
 bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb
 bundler/lib/bundler/vendor/securerandom/.document
-bundler/lib/bundler/vendor/securerandom/LICENSE.txt
-bundler/lib/bundler/vendor/securerandom/lib/random/formatter.rb
+bundler/lib/bundler/vendor/securerandom/COPYING
 bundler/lib/bundler/vendor/securerandom/lib/securerandom.rb
 bundler/lib/bundler/vendor/thor/.document
 bundler/lib/bundler/vendor/thor/LICENSE.md
@@ -328,7 +331,7 @@ bundler/lib/bundler/vendor/tsort/.document
 bundler/lib/bundler/vendor/tsort/LICENSE.txt
 bundler/lib/bundler/vendor/tsort/lib/tsort.rb
 bundler/lib/bundler/vendor/uri/.document
-bundler/lib/bundler/vendor/uri/LICENSE.txt
+bundler/lib/bundler/vendor/uri/COPYING
 bundler/lib/bundler/vendor/uri/lib/uri.rb
 bundler/lib/bundler/vendor/uri/lib/uri/common.rb
 bundler/lib/bundler/vendor/uri/lib/uri/file.rb
@@ -357,6 +360,11 @@ bundler/lib/bundler/version.rb
 bundler/lib/bundler/vlad.rb
 bundler/lib/bundler/worker.rb
 bundler/lib/bundler/yaml_serializer.rb
+doc/MAINTAINERS.txt
+doc/bundler/UPGRADING.md
+doc/rubygems/CONTRIBUTING.md
+doc/rubygems/POLICIES.md
+doc/rubygems/UPGRADING.md
 exe/gem
 exe/update_rubygems
 hide_lib_for_update/note.txt
@@ -526,6 +534,7 @@ lib/rubygems/ssl_certs/.document
 lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
 lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 lib/rubygems/stub_specification.rb
+lib/rubygems/target_rbconfig.rb
 lib/rubygems/text.rb
 lib/rubygems/uninstaller.rb
 lib/rubygems/unknown_command_spell_checker.rb
@@ -560,9 +569,8 @@ lib/rubygems/vendor/molinillo/lib/molinillo/resolution.rb
 lib/rubygems/vendor/molinillo/lib/molinillo/resolver.rb
 lib/rubygems/vendor/molinillo/lib/molinillo/state.rb
 lib/rubygems/vendor/net-http/.document
-lib/rubygems/vendor/net-http/LICENSE.txt
+lib/rubygems/vendor/net-http/COPYING
 lib/rubygems/vendor/net-http/lib/net/http.rb
-lib/rubygems/vendor/net-http/lib/net/http/backward.rb
 lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
 lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
 lib/rubygems/vendor/net-http/lib/net/http/header.rb
@@ -588,20 +596,19 @@ lib/rubygems/vendor/optparse/lib/optparse/time.rb
 lib/rubygems/vendor/optparse/lib/optparse/uri.rb
 lib/rubygems/vendor/optparse/lib/optparse/version.rb
 lib/rubygems/vendor/resolv/.document
-lib/rubygems/vendor/resolv/LICENSE.txt
+lib/rubygems/vendor/resolv/COPYING
 lib/rubygems/vendor/resolv/lib/resolv.rb
 lib/rubygems/vendor/securerandom/.document
-lib/rubygems/vendor/securerandom/LICENSE.txt
-lib/rubygems/vendor/securerandom/lib/random/formatter.rb
+lib/rubygems/vendor/securerandom/COPYING
 lib/rubygems/vendor/securerandom/lib/securerandom.rb
 lib/rubygems/vendor/timeout/.document
-lib/rubygems/vendor/timeout/LICENSE.txt
+lib/rubygems/vendor/timeout/COPYING
 lib/rubygems/vendor/timeout/lib/timeout.rb
 lib/rubygems/vendor/tsort/.document
 lib/rubygems/vendor/tsort/LICENSE.txt
 lib/rubygems/vendor/tsort/lib/tsort.rb
 lib/rubygems/vendor/uri/.document
-lib/rubygems/vendor/uri/LICENSE.txt
+lib/rubygems/vendor/uri/COPYING
 lib/rubygems/vendor/uri/lib/uri.rb
 lib/rubygems/vendor/uri/lib/uri/common.rb
 lib/rubygems/vendor/uri/lib/uri/file.rb

data/README.md

@@ -10,18 +10,23 @@ that can be shared and used by other developers. See our guide on publishing a G
 
 ## Getting Started
 
-Installing and managing a Gem is done through the `gem` command. To install a Gem such as [Nokogiri](https://github.com/sparklemotion/nokogiri) which lets
-you read and parse XML in Ruby:
+Installing and managing a Gem is done through the `gem` command. To install a Gem such as [Faraday][faraday]:
 
-    $ gem install nokogiri
+```bash
+gem install faraday
+```
 
-RubyGems will download the Nokogiri Gem from RubyGems.org and install it into your Ruby environment.
+[faraday]: https://github.com/lostisland/faraday?tab=readme-ov-file
 
-Finally, inside your Ruby program, load the Nokogiri gem and start parsing your XML:
+RubyGems will download the Faraday Gem from RubyGems.org and install it into your Ruby environment.
 
-    require 'nokogiri'
+Finally, inside your Ruby program, load the Faraday gem and start hacking:
 
-    Nokogiri.XML('<h1>Hello World</h1>')
+```ruby
+require 'faraday'
+response = Faraday.get('https://rubygems.org')
+# do something with `response`...
+```
 
 For more information about how to use RubyGems, see our RubyGems basics guide at [guides.rubygems.org](https://guides.rubygems.org/rubygems-basics/)
 
@@ -60,7 +65,7 @@ To upgrade to the latest RubyGems, run:
 
     $ gem update --system
 
-See [UPGRADING](UPGRADING.md) for more details and alternative instructions.
+See [UPGRADING](doc/bundler/UPGRADING.md) for more details and alternative instructions.
 
 ## Release policy
 
@@ -81,7 +86,7 @@ The release policy is somewhat similar to the release policy of Ruby itself:
 ## Documentation
 
 RubyGems uses [rdoc](https://github.com/rdoc/rdoc) for documentation. A compiled set of the docs
-can be viewed online at [rubydoc](https://www.rubydoc.info/github/rubygems/rubygems).
+can be viewed online at [docs.ruby-lang.org](https://docs.ruby-lang.org/en/master/Gem.html).
 
 RubyGems also provides a comprehensive set of guides which covers numerous topics such as
 creating a new gem, security practices and other resources at https://guides.rubygems.org
@@ -105,7 +110,7 @@ RubyGems is managed by [Ruby Central](https://rubycentral.org), a non-profit org
 
 ### Contributing
 
-If you'd like to contribute to RubyGems, that's awesome, and we <3 you. Check out our [guide to contributing](CONTRIBUTING.md) for more information.
+If you'd like to contribute to RubyGems, that's awesome, and we <3 you. Check out our [guide to contributing](doc/rubygems/CONTRIBUTING.md) for more information.
 
 ### Code of Conduct
 

data/bundler/CHANGELOG.md

@@ -1,3 +1,69 @@
+# 2.6.1 (December 17, 2024)
+
+## Bug fixes:
+
+  - Fix missing `Gem::Uri.redact` on some Ruby 3.1 versions [#8337](https://github.com/rubygems/rubygems/pull/8337)
+  - Fix `bundle lock --add-checksums` when gems are already installed [#8326](https://github.com/rubygems/rubygems/pull/8326)
+
+# 2.6.0 (December 16, 2024)
+
+## Security:
+
+  - Fix gemfury credentials written to logs in verbose mode [#8283](https://github.com/rubygems/rubygems/pull/8283)
+  - Fix private registry credentials being written to logs [#8222](https://github.com/rubygems/rubygems/pull/8222)
+
+## Breaking changes:
+
+  - Drop ruby 3.0 support [#8091](https://github.com/rubygems/rubygems/pull/8091)
+  - Remove client-side MD5 ETag transition from compact index client [#7677](https://github.com/rubygems/rubygems/pull/7677)
+
+## Deprecations:
+
+  - Cancel `bundle console` deprecation [#8218](https://github.com/rubygems/rubygems/pull/8218)
+  - Warn when platform of installed gem differs from platform in the lockfile [#8029](https://github.com/rubygems/rubygems/pull/8029)
+  - Cancel deprecation of Gemfiles without a global source [#8213](https://github.com/rubygems/rubygems/pull/8213)
+
+## Features:
+
+  - Add a `lockfile_checksums` configuration to include checksums in fresh lockfiles [#8219](https://github.com/rubygems/rubygems/pull/8219)
+  - Add `bundle lock --add-checksums` to add checksums to an existing lockfile [#8214](https://github.com/rubygems/rubygems/pull/8214)
+
+## Performance:
+
+  - Enable a couple of performance cops [#8261](https://github.com/rubygems/rubygems/pull/8261)
+  - Remove override of worker jobs for `bundle install --local` [#8248](https://github.com/rubygems/rubygems/pull/8248)
+
+## Enhancements:
+
+  - Support `bundle exec <relative-path-to-script>` when `Kernel.exec` is used under the hood [#8294](https://github.com/rubygems/rubygems/pull/8294)
+  - Improve working with different rubies using the same lockfile [#8251](https://github.com/rubygems/rubygems/pull/8251)
+  - Define a few `inspect` methods to help debugging [#8266](https://github.com/rubygems/rubygems/pull/8266)
+  - Include original error when openssl fails to load [#8232](https://github.com/rubygems/rubygems/pull/8232)
+  - Automatically fix lockfile when it's missing dependencies [#8103](https://github.com/rubygems/rubygems/pull/8103)
+  - Fix some JRuby warnings when using `bundler/setup` with Ruby's -w flag [#8205](https://github.com/rubygems/rubygems/pull/8205)
+  - Add a `--normalize-platforms` flag to `bundle lock` [#7896](https://github.com/rubygems/rubygems/pull/7896)
+  - Add plugin hooks for Bundler.require [#3439](https://github.com/rubygems/rubygems/pull/3439)
+
+## Bug fixes:
+
+  - Fix restarting with locked version when `$PROGRAM_NAME` has been changed [#8320](https://github.com/rubygems/rubygems/pull/8320)
+  - Restore the previous cache format for git sources [#8296](https://github.com/rubygems/rubygems/pull/8296)
+  - Fix installs of subdependencies of unlocked dependencies to be conservative [#8281](https://github.com/rubygems/rubygems/pull/8281)
+  - Fix test task name on generated readme when using test-unit [#8291](https://github.com/rubygems/rubygems/pull/8291)
+  - Fix `bundle exec` executable detection on windows [#8276](https://github.com/rubygems/rubygems/pull/8276)
+  - Fix `bundle remove` sometimes not removing gems [#8278](https://github.com/rubygems/rubygems/pull/8278)
+  - Fix issue with git gems locking incorrect specs sometimes [#8269](https://github.com/rubygems/rubygems/pull/8269)
+
+## Documentation:
+
+  - Normalize command flag documentation and make sure all flags are documented [#8313](https://github.com/rubygems/rubygems/pull/8313)
+  - Add missing man pages for `bundle env` and `bundle licenses` [#8315](https://github.com/rubygems/rubygems/pull/8315)
+  - Add man page for 'bundle issue' command [#8271](https://github.com/rubygems/rubygems/pull/8271)
+  - Add man page for 'bundle fund' command [#8258](https://github.com/rubygems/rubygems/pull/8258)
+  - Move pry-related contents to `debugging.md` [#8263](https://github.com/rubygems/rubygems/pull/8263)
+  - Add debugging instruction on Windows [#8236](https://github.com/rubygems/rubygems/pull/8236)
+  - Unify rubygems and bundler docs directory [#8159](https://github.com/rubygems/rubygems/pull/8159)
+
 # 2.5.23 (November 5, 2024)
 
 ## Enhancements:

data/bundler/bundler.gemspec

@@ -29,10 +29,10 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/rubygems/rubygems/tree/master/bundler",
   }
 
-  s.required_ruby_version     = ">= 3.0.0"
+  s.required_ruby_version     = ">= 3.1.0"
 
   # It should match the RubyGems version shipped with `required_ruby_version` above
-  s.required_rubygems_version = ">= 3.2.3"
+  s.required_rubygems_version = ">= 3.3.3"
 
   s.files = Dir.glob("lib/bundler{.rb,/**/*}", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
 

data/bundler/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2024-11-05".freeze
-    @git_commit_sha = "35f4611265e".freeze
+    @built_at = "2024-12-17".freeze
+    @git_commit_sha = "00a344e02c8".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/cli/console.rb

@@ -9,10 +9,6 @@ module Bundler
     end
 
     def run
-      message = "bundle console will be replaced by `bin/console` generated by `bundle gem <name>`"
-      removed_message = "bundle console has been replaced by `bin/console` generated by `bundle gem <name>`"
-      Bundler::SharedHelpers.major_deprecation 2, message, removed_message: removed_message
-
       group ? Bundler.require(:default, *group.split(" ").map!(&:to_sym)) : Bundler.require
       ARGV.clear
 

data/bundler/lib/bundler/cli/doctor.rb

@@ -32,11 +32,11 @@ module Bundler
 
     def dylibs_ldd(path)
       output = `/usr/bin/ldd #{path.shellescape}`.chomp
-      output.split("\n").map do |l|
+      output.split("\n").filter_map do |l|
         match = l.match(LDD_REGEX)
         next if match.nil?
         match.captures[0]
-      end.compact
+      end
     end
 
     def dylibs(path)
@@ -89,11 +89,11 @@ module Bundler
 
       if broken_links.any?
         message = "The following gems are missing OS dependencies:"
-        broken_links.map do |spec, paths|
+        broken_links.flat_map do |spec, paths|
           paths.uniq.map do |path|
             "\n * #{spec.name}: #{path}"
           end
-        end.flatten.sort.each {|m| message += m }
+        end.sort.each {|m| message += m }
         raise ProductionError, message
       elsif !permissions_valid
         Bundler.ui.info "No issues found with the installed bundle"

data/bundler/lib/bundler/cli/exec.rb

@@ -22,6 +22,7 @@ module Bundler
         if !Bundler.settings[:disable_exec_load] && ruby_shebang?(bin_path)
           return kernel_load(bin_path, *args)
         end
+        bin_path = "./" + bin_path unless File.absolute_path?(bin_path)
         kernel_exec(bin_path, *args)
       else
         # exec using the given command

data/bundler/lib/bundler/cli/gem.rb

@@ -446,7 +446,7 @@ module Bundler
     end
 
     def required_ruby_version
-      "3.0.0"
+      "3.1.0"
     end
 
     def rubocop_version

data/bundler/lib/bundler/cli/info.rb

@@ -73,11 +73,11 @@ module Bundler
     end
 
     def gem_dependencies
-      @gem_dependencies ||= Bundler.definition.specs.map do |spec|
+      @gem_dependencies ||= Bundler.definition.specs.filter_map do |spec|
         dependency = spec.dependencies.find {|dep| dep.name == gem_name }
         next unless dependency
         "#{spec.name} (#{spec.version}) depends on #{gem_name} (#{dependency.requirements_list.join(", ")})"
-      end.compact.sort
+      end.sort
     end
   end
 end

data/bundler/lib/bundler/cli/inject.rb

@@ -48,7 +48,7 @@ module Bundler
 
     def last_version_number
       definition = Bundler.definition(true)
-      definition.resolve_remotely!
+      definition.remotely!
       specs = definition.index[name].sort_by(&:version)
       unless options[:pre]
         specs.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }

data/bundler/lib/bundler/cli/install.rb

@@ -23,6 +23,10 @@ module Bundler
       # Disable color in deployment mode
       Bundler.ui.shell = Thor::Shell::Basic.new if options[:deployment]
 
+      if target_rbconfig_path = options[:"target-rbconfig"]
+        Bundler.rubygems.set_target_rbconfig(target_rbconfig_path)
+      end
+
       check_for_options_conflicts
 
       check_trust_policy

data/bundler/lib/bundler/cli/lock.rb

@@ -14,6 +14,8 @@ module Bundler
         exit 1
       end
 
+      check_for_conflicting_options
+
       print = options[:print]
       previous_output_stream = Bundler.ui.output_stream
       Bundler.ui.output_stream = :stderr if print
@@ -38,6 +40,7 @@ module Bundler
 
       Bundler.settings.temporary(frozen: false) do
         definition = Bundler.definition(update, file)
+        definition.add_checksums if options["add-checksums"]
 
         Bundler::CLI::Common.configure_gem_version_promoter(definition, options) if options[:update]
 
@@ -58,7 +61,11 @@ module Bundler
           raise InvalidOption, "Removing all platforms from the bundle is not allowed"
         end
 
-        definition.resolve_remotely! unless options[:local]
+        definition.remotely! unless options[:local]
+
+        if options["normalize-platforms"]
+          definition.normalize_platforms
+        end
 
         if print
           puts definition.to_lock
@@ -70,5 +77,17 @@ module Bundler
 
       Bundler.ui.output_stream = previous_output_stream
     end
+
+    private
+
+    def check_for_conflicting_options
+      if options["normalize-platforms"] && options["add-platform"].any?
+        raise InvalidOption, "--normalize-platforms can't be used with --add-platform"
+      end
+
+      if options["normalize-platforms"] && options["remove-platform"].any?
+        raise InvalidOption, "--normalize-platforms can't be used with --remove-platform"
+      end
+    end
   end
 end

data/bundler/lib/bundler/cli/pristine.rb

@@ -49,7 +49,7 @@ module Bundler
           true
         end.map(&:name)
 
-        jobs = installer.send(:installation_parallelization, {})
+        jobs = installer.send(:installation_parallelization)
         pristine_count = definition.specs.count - installed_specs.count
         # allow a pristining a single gem to skip the parallel worker
         jobs = [jobs, pristine_count].min

data/bundler/lib/bundler/cli/show.rb

@@ -59,9 +59,9 @@ module Bundler
       definition = Bundler.definition(true)
       if options[:outdated]
         Bundler.ui.info "Fetching remote specs for outdated check...\n\n"
-        Bundler.ui.silence { definition.resolve_remotely! }
+        Bundler.ui.silence { definition.remotely! }
       else
-        definition.resolve_with_cache!
+        definition.with_cache!
       end
       Bundler.reset!
       definition.specs