bundler 2.5.23 → 2.6.0

data/lib/bundler/installer.rb

@@ -77,12 +77,9 @@ module Bundler
           return
         end
 
-        if resolve_if_needed(options)
+        if @definition.setup_domain!(options)
           ensure_specs_are_compatible!
-          load_plugins
-          options.delete(:jobs)
-        else
-          options[:jobs] = 1 # to avoid the overhead of Bundler::Worker
+          Bundler.load_plugins(@definition)
         end
         install(options)
 
@@ -197,18 +194,14 @@ module Bundler
       standalone = options[:standalone]
       force = options[:force]
       local = options[:local]
-      jobs = installation_parallelization(options)
+      jobs = installation_parallelization
       spec_installations = ParallelInstaller.call(self, @definition.specs, jobs, standalone, force, local: local)
       spec_installations.each do |installation|
         post_install_messages[installation.name] = installation.post_install_message if installation.has_post_install_message?
       end
     end
 
-    def installation_parallelization(options)
-      if jobs = options.delete(:jobs)
-        return jobs
-      end
-
+    def installation_parallelization
       if jobs = Bundler.settings[:jobs]
         return jobs
       end
@@ -216,20 +209,6 @@ module Bundler
       Bundler.settings.processor_count
     end
 
-    def load_plugins
-      Gem.load_plugins
-
-      requested_path_gems = @definition.requested_specs.select {|s| s.source.is_a?(Source::Path) }
-      path_plugin_files = requested_path_gems.map do |spec|
-        spec.matches_for_glob("rubygems_plugin#{Bundler.rubygems.suffix_pattern}")
-      rescue TypeError
-        error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
-        raise Gem::InvalidSpecificationException, error_message
-      end.flatten
-      Gem.load_plugin_files(path_plugin_files)
-      Gem.load_env_plugins
-    end
-
     def ensure_specs_are_compatible!
       @definition.specs.each do |spec|
         unless spec.matches_current_ruby?
@@ -243,19 +222,6 @@ module Bundler
       end
     end
 
-    # returns whether or not a re-resolve was needed
-    def resolve_if_needed(options)
-      @definition.prefer_local! if options[:"prefer-local"]
-
-      if options[:local] || (@definition.no_resolve_needed? && !@definition.missing_specs?)
-        @definition.resolve_with_cache!
-        false
-      else
-        @definition.resolve_remotely!
-        true
-      end
-    end
-
     def lock
       @definition.lock
     end

data/lib/bundler/lazy_specification.rb

@@ -8,14 +8,26 @@ module Bundler
     include MatchPlatform
     include ForcePlatform
 
-    attr_reader :name, :version, :platform
+    attr_reader :name, :version, :platform, :materialization
     attr_accessor :source, :remote, :force_ruby_platform, :dependencies, :required_ruby_version, :required_rubygems_version
 
+    #
+    # For backwards compatibility with existing lockfiles, if the most specific
+    # locked platform is not a specific platform like x86_64-linux or
+    # universal-java-11, then we keep the previous behaviour of resolving the
+    # best platform variant at materiliazation time. For previous bundler
+    # versions (before 2.2.0) this was always the case (except when the lockfile
+    # only included non-ruby platforms), but we're also keeping this behaviour
+    # on newer bundlers unless users generate the lockfile from scratch or
+    # explicitly add a more specific platform.
+    #
+    attr_accessor :most_specific_locked_platform
+
     alias_method :runtime_dependencies, :dependencies
 
     def self.from_spec(s)
       lazy_spec = new(s.name, s.version, s.platform, s.source)
-      lazy_spec.dependencies = s.dependencies
+      lazy_spec.dependencies = s.runtime_dependencies
       lazy_spec.required_ruby_version = s.required_ruby_version
       lazy_spec.required_rubygems_version = s.required_rubygems_version
       lazy_spec
@@ -33,6 +45,16 @@ module Bundler
       @source = source
 
       @force_ruby_platform = default_force_ruby_platform
+      @most_specific_locked_platform = nil
+      @materialization = nil
+    end
+
+    def missing?
+      @materialization == self
+    end
+
+    def incomplete?
+      @materialization.nil?
     end
 
     def source_changed?
@@ -99,16 +121,31 @@ module Bundler
       out
     end
 
-    def materialize_for_installation
+    def materialize_strictly
       source.local!
 
-      matching_specs = source.specs.search(use_exact_resolved_specifications? ? self : [name, version])
+      matching_specs = source.specs.search(self)
       return self if matching_specs.empty?
 
-      candidates = if use_exact_resolved_specifications?
-        matching_specs
+      __materialize__(matching_specs)
+    end
+
+    def materialized_for_installation
+      @materialization = materialize_for_installation
+
+      self unless incomplete?
+    end
+
+    def materialize_for_installation
+      source.local!
+
+      if use_exact_resolved_specifications?
+        materialize_strictly
       else
-        target_platform = ruby_platform_materializes_to_ruby_platform? ? platform : local_platform
+        matching_specs = source.specs.search([name, version])
+        return self if matching_specs.empty?
+
+        target_platform = source.is_a?(Source::Path) ? platform : local_platform
 
         installable_candidates = GemHelpers.select_best_platform_match(matching_specs, target_platform)
 
@@ -119,10 +156,8 @@ module Bundler
           installable_candidates = GemHelpers.select_best_platform_match(matching_specs, platform)
         end
 
-        installable_candidates
+        __materialize__(installable_candidates)
       end
-
-      __materialize__(candidates)
     end
 
     # If in frozen mode, we fallback to a non-installable candidate because by
@@ -136,12 +171,28 @@ module Bundler
       end
       if search.nil? && fallback_to_non_installable
         search = candidates.last
-      else
-        search.dependencies = dependencies if search && search.full_name == full_name && (search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification))
+      elsif search && search.full_name == full_name
+        # We don't validate locally installed dependencies but accept what's in
+        # the lockfile instead for performance, since loading locally installed
+        # dependencies would mean evaluating all gemspecs, which would affect
+        # `bundler/setup` performance
+        if search.is_a?(StubSpecification)
+          search.dependencies = dependencies
+        else
+          if !source.is_a?(Source::Path) && search.runtime_dependencies.sort != dependencies.sort
+            raise IncorrectLockfileDependencies.new(self)
+          end
+
+          search.locked_platform = platform if search.instance_of?(RemoteSpecification) || search.instance_of?(EndpointSpecification)
+        end
       end
       search
     end
 
+    def inspect
+      "#<#{self.class} @name=\"#{name}\" (#{full_name.delete_prefix("#{name}-")})>"
+    end
+
     def to_s
       lock_name
     end
@@ -158,23 +209,13 @@ module Bundler
     private
 
     def use_exact_resolved_specifications?
-      @use_exact_resolved_specifications ||= !source.is_a?(Source::Path) && ruby_platform_materializes_to_ruby_platform?
+      !source.is_a?(Source::Path) && ruby_platform_materializes_to_ruby_platform?
     end
 
-    #
-    # For backwards compatibility with existing lockfiles, if the most specific
-    # locked platform is not a specific platform like x86_64-linux or
-    # universal-java-11, then we keep the previous behaviour of resolving the
-    # best platform variant at materiliazation time. For previous bundler
-    # versions (before 2.2.0) this was always the case (except when the lockfile
-    # only included non-ruby platforms), but we're also keeping this behaviour
-    # on newer bundlers unless users generate the lockfile from scratch or
-    # explicitly add a more specific platform.
-    #
     def ruby_platform_materializes_to_ruby_platform?
       generic_platform = generic_local_platform == Gem::Platform::JAVA ? Gem::Platform::JAVA : Gem::Platform::RUBY
 
-      !Bundler.most_specific_locked_platform?(generic_platform) || force_ruby_platform || Bundler.settings[:force_ruby_platform]
+      (most_specific_locked_platform != generic_platform) || force_ruby_platform || Bundler.settings[:force_ruby_platform]
     end
   end
 end

data/lib/bundler/lockfile_parser.rb

@@ -2,6 +2,8 @@
 
 module Bundler
   class LockfileParser
+    include GemHelpers
+
     class Position
       attr_reader :line, :column
       def initialize(line, column)
@@ -29,6 +31,7 @@ module Bundler
       :dependencies,
       :specs,
       :platforms,
+      :most_specific_locked_platform,
       :bundler_version,
       :ruby_version,
       :checksums,
@@ -136,7 +139,12 @@ module Bundler
         end
         @pos.advance!(line)
       end
-      @specs = @specs.values.sort_by!(&:full_name)
+      @most_specific_locked_platform = @platforms.min_by do |bundle_platform|
+        platform_specificity_match(bundle_platform, local_platform)
+      end
+      @specs = @specs.values.sort_by!(&:full_name).each do |spec|
+        spec.most_specific_locked_platform = @most_specific_locked_platform
+      end
     rescue ArgumentError => e
       Bundler.ui.debug(e)
       raise LockfileError, "Your lockfile is unreadable. Run `rm #{@lockfile_path}` " \

data/lib/bundler/man/bundle-add.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-ADD" "1" "October 2024" ""
+.TH "BUNDLE\-ADD" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
 .SH "SYNOPSIS"
@@ -9,33 +9,36 @@
 Adds the named gem to the [\fBGemfile(5)\fR][Gemfile(5)] and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-install\fR\.
 .SH "OPTIONS"
 .TP
-\fB\-\-version\fR, \fB\-v\fR
+\fB\-\-version=VERSION\fR, \fB\-v=VERSION\fR
 Specify version requirements(s) for the added gem\.
 .TP
-\fB\-\-group\fR, \fB\-g\fR
+\fB\-\-group=GROUP\fR, \fB\-g=GROUP\fR
 Specify the group(s) for the added gem\. Multiple groups should be separated by commas\.
 .TP
-\fB\-\-source\fR, \fB\-s\fR
+\fB\-\-source=SOURCE\fR, \fB\-s=SOURCE\fR
 Specify the source for the added gem\.
 .TP
-\fB\-\-require\fR, \fB\-r\fR
+\fB\-\-require=REQUIRE\fR, \fB\-r=REQUIRE\fR
 Adds require path to gem\. Provide false, or a path as a string\.
 .TP
-\fB\-\-path\fR
+\fB\-\-path=PATH\fR
 Specify the file system path for the added gem\.
 .TP
-\fB\-\-git\fR
+\fB\-\-git=GIT\fR
 Specify the git source for the added gem\.
 .TP
-\fB\-\-github\fR
+\fB\-\-github=GITHUB\fR
 Specify the github source for the added gem\.
 .TP
-\fB\-\-branch\fR
+\fB\-\-branch=BRANCH\fR
 Specify the git branch for the added gem\.
 .TP
-\fB\-\-ref\fR
+\fB\-\-ref=REF\fR
 Specify the git ref for the added gem\.
 .TP
+\fB\-\-glob=GLOB\fR
+Specify the location of a dependency's \.gemspec, expanded within Ruby (single quotes recommended)\.
+.TP
 \fB\-\-quiet\fR
 Do not print progress information to the standard output\.
 .TP

data/lib/bundler/man/bundle-add.1.ronn

@@ -14,33 +14,36 @@ Adds the named gem to the [`Gemfile(5)`][Gemfile(5)] and run `bundle install`.
 
 ## OPTIONS
 
-* `--version`, `-v`:
+* `--version=VERSION`, `-v=VERSION`:
   Specify version requirements(s) for the added gem.
 
-* `--group`, `-g`:
+* `--group=GROUP`, `-g=GROUP`:
   Specify the group(s) for the added gem. Multiple groups should be separated by commas.
 
-* `--source`, `-s`:
+* `--source=SOURCE`, `-s=SOURCE`:
   Specify the source for the added gem.
 
-* `--require`, `-r`:
+* `--require=REQUIRE`, `-r=REQUIRE`:
   Adds require path to gem. Provide false, or a path as a string.
 
-* `--path`:
+* `--path=PATH`:
   Specify the file system path for the added gem.
 
-* `--git`:
+* `--git=GIT`:
   Specify the git source for the added gem.
 
-* `--github`:
+* `--github=GITHUB`:
   Specify the github source for the added gem.
 
-* `--branch`:
+* `--branch=BRANCH`:
   Specify the git branch for the added gem.
 
-* `--ref`:
+* `--ref=REF`:
   Specify the git ref for the added gem.
 
+* `--glob=GLOB`:
+  Specify the location of a dependency's .gemspec, expanded within Ruby (single quotes recommended).
+
 * `--quiet`:
   Do not print progress information to the standard output.
 

data/lib/bundler/man/bundle-binstubs.1

@@ -1,10 +1,10 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-BINSTUBS" "1" "October 2024" ""
+.TH "BUNDLE\-BINSTUBS" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
 .SH "SYNOPSIS"
-\fBbundle binstubs\fR \fIGEM_NAME\fR [\-\-force] [\-\-path PATH] [\-\-standalone]
+\fBbundle binstubs\fR \fIGEM_NAME\fR [\-\-force] [\-\-path PATH] [\-\-standalone] [\-\-all\-platforms]
 .SH "DESCRIPTION"
 Binstubs are scripts that wrap around executables\. Bundler creates a small Ruby file (a binstub) that loads Bundler, runs the command, and puts it into \fBbin/\fR\. Binstubs are a shortcut\-or alternative\- to always using \fBbundle exec\fR\. This gives you a file that can be run directly, and one that will always run the correct gem version used by the application\.
 .P
@@ -16,15 +16,18 @@ This command generates binstubs for executables in \fBGEM_NAME\fR\. Binstubs are
 \fB\-\-force\fR
 Overwrite existing binstubs if they exist\.
 .TP
-\fB\-\-path\fR
+\fB\-\-path[=PATH]\fR
 The location to install the specified binstubs to\. This defaults to \fBbin\fR\.
 .TP
 \fB\-\-standalone\fR
 Makes binstubs that can work without depending on Rubygems or Bundler at runtime\.
 .TP
-\fB\-\-shebang\fR
+\fB\-\-shebang=SHEBANG\fR
 Specify a different shebang executable name than the default (default 'ruby')
 .TP
 \fB\-\-all\fR
 Create binstubs for all gems in the bundle\.
+.TP
+\fB\-\-all\-platforms\fR
+Install binstubs for all platforms\.
 

data/lib/bundler/man/bundle-binstubs.1.ronn

@@ -3,7 +3,7 @@ bundle-binstubs(1) -- Install the binstubs of the listed gems
 
 ## SYNOPSIS
 
-`bundle binstubs` <GEM_NAME> [--force] [--path PATH] [--standalone]
+`bundle binstubs` <GEM_NAME> [--force] [--path PATH] [--standalone] [--all-platforms]
 
 ## DESCRIPTION
 
@@ -27,15 +27,18 @@ Calling binstubs with [GEM [GEM]] will create binstubs for all given gems.
 * `--force`:
   Overwrite existing binstubs if they exist.
 
-* `--path`:
+* `--path[=PATH]`:
   The location to install the specified binstubs to. This defaults to `bin`.
 
 * `--standalone`:
   Makes binstubs that can work without depending on Rubygems or Bundler at
   runtime.
 
-* `--shebang`:
+* `--shebang=SHEBANG`:
   Specify a different shebang executable name than the default (default 'ruby')
 
 * `--all`:
   Create binstubs for all gems in the bundle.
+
+* `--all-platforms`:
+  Install binstubs for all platforms.

data/lib/bundler/man/bundle-cache.1

@@ -1,14 +1,42 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CACHE" "1" "October 2024" ""
+.TH "BUNDLE\-CACHE" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application
 .SH "SYNOPSIS"
-\fBbundle cache\fR
+\fBbundle cache\fR [\fIOPTIONS\fR]
 .P
 alias: \fBpackage\fR, \fBpack\fR
 .SH "DESCRIPTION"
 Copy all of the \fB\.gem\fR files needed to run the application into the \fBvendor/cache\fR directory\. In the future, when running \fBbundle install(1)\fR \fIbundle\-install\.1\.html\fR, use the gems in the cache in preference to the ones on \fBrubygems\.org\fR\.
+.SH "OPTIONS"
+.TP
+\fB\-\-all\fR
+Include all sources (including path and git)\.
+.TP
+\fB\-\-all\-platforms\fR
+Include gems for all platforms present in the lockfile, not only the current one\.
+.TP
+\fB\-\-cache\-path=CACHE\-PATH\fR
+Specify a different cache path than the default (vendor/cache)\.
+.TP
+\fB\-\-gemfile=GEMFILE\fR
+Use the specified gemfile instead of Gemfile\.
+.TP
+\fB\-\-no\-install\fR
+Don't install the gems, only update the cache\.
+.TP
+\fB\-\-no\-prune\fR
+Don't remove stale gems from the cache\.
+.TP
+\fB\-\-path=PATH\fR
+Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME)\.
+.TP
+\fB\-\-quiet\fR
+Only output warnings and errors\.
+.TP
+\fB\-\-frozen\fR
+Do not allow the Gemfile\.lock to be updated after this bundle cache operation's install\.
 .SH "GIT AND PATH GEMS"
 The \fBbundle cache\fR command can also package \fB:git\fR and \fB:path\fR dependencies besides \.gem files\. This needs to be explicitly enabled via the \fB\-\-all\fR option\. Once used, the \fB\-\-all\fR option will be remembered\.
 .SH "SUPPORT FOR MULTIPLE PLATFORMS"

data/lib/bundler/man/bundle-cache.1.ronn

@@ -1,9 +1,9 @@
 bundle-cache(1) -- Package your needed `.gem` files into your application
-===========================================================================
+=========================================================================
 
 ## SYNOPSIS
 
-`bundle cache`
+`bundle cache` [*OPTIONS*]
 
 alias: `package`, `pack`
 
@@ -13,6 +13,35 @@ Copy all of the `.gem` files needed to run the application into the
 `vendor/cache` directory. In the future, when running [`bundle install(1)`](bundle-install.1.html),
 use the gems in the cache in preference to the ones on `rubygems.org`.
 
+## OPTIONS
+
+* `--all`:
+  Include all sources (including path and git).
+
+* `--all-platforms`:
+  Include gems for all platforms present in the lockfile, not only the current one.
+
+* `--cache-path=CACHE-PATH`:
+  Specify a different cache path than the default (vendor/cache).
+
+* `--gemfile=GEMFILE`:
+  Use the specified gemfile instead of Gemfile.
+
+* `--no-install`:
+  Don't install the gems, only update the cache.
+
+* `--no-prune`:
+  Don't remove stale gems from the cache.
+
+* `--path=PATH`:
+  Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).
+
+* `--quiet`:
+  Only output warnings and errors.
+
+* `--frozen`:
+  Do not allow the Gemfile.lock to be updated after this bundle cache operation's install.
+
 ## GIT AND PATH GEMS
 
 The `bundle cache` command can also package `:git` and `:path` dependencies

data/lib/bundler/man/bundle-check.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CHECK" "1" "October 2024" ""
+.TH "BUNDLE\-CHECK" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
 .SH "SYNOPSIS"
@@ -16,9 +16,9 @@ If the lockfile needs to be updated then it will be resolved using the gems inst
 \fB\-\-dry\-run\fR
 Locks the [\fBGemfile(5)\fR][Gemfile(5)] before running the command\.
 .TP
-\fB\-\-gemfile\fR
+\fB\-\-gemfile=GEMFILE\fR
 Use the specified gemfile instead of the [\fBGemfile(5)\fR][Gemfile(5)]\.
 .TP
-\fB\-\-path\fR
+\fB\-\-path=PATH\fR
 Specify a different path than the system default (\fB$BUNDLE_PATH\fR or \fB$GEM_HOME\fR)\. Bundler will remember this value for future installs on this machine\.
 

data/lib/bundler/man/bundle-check.1.ronn

@@ -22,8 +22,10 @@ installed on the local machine, if they satisfy the requirements.
 
 * `--dry-run`:
   Locks the [`Gemfile(5)`][Gemfile(5)] before running the command.
-* `--gemfile`:
+
+* `--gemfile=GEMFILE`:
   Use the specified gemfile instead of the [`Gemfile(5)`][Gemfile(5)].
-* `--path`:
+
+* `--path=PATH`:
   Specify a different path than the system default (`$BUNDLE_PATH` or `$GEM_HOME`).
   Bundler will remember this value for future installs on this machine.

data/lib/bundler/man/bundle-clean.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CLEAN" "1" "October 2024" ""
+.TH "BUNDLE\-CLEAN" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory
 .SH "SYNOPSIS"

data/lib/bundler/man/bundle-config.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CONFIG" "1" "October 2024" ""
+.TH "BUNDLE\-CONFIG" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options
 .SH "SYNOPSIS"
@@ -149,6 +149,8 @@ The following is a list of all configuration keys and their purpose\. You can le
 .IP "\(bu" 4
 \fBjobs\fR (\fBBUNDLE_JOBS\fR): The number of gems Bundler can install in parallel\. Defaults to the number of available processors\.
 .IP "\(bu" 4
+\fBlockfile_checksums\fR (\fBBUNDLE_LOCKFILE_CHECKSUMS\fR): Whether Bundler should include a checksums section in new lockfiles, to protect from compromised gem sources\.
+.IP "\(bu" 4
 \fBno_install\fR (\fBBUNDLE_NO_INSTALL\fR): Whether \fBbundle package\fR should skip installing gems\.
 .IP "\(bu" 4
 \fBno_prune\fR (\fBBUNDLE_NO_PRUNE\fR): Whether Bundler should leave outdated gems unpruned when caching\.

data/lib/bundler/man/bundle-config.1.ronn

@@ -217,6 +217,8 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
 * `jobs` (`BUNDLE_JOBS`):
    The number of gems Bundler can install in parallel. Defaults to the number of
    available processors.
+* `lockfile_checksums` (`BUNDLE_LOCKFILE_CHECKSUMS`):
+   Whether Bundler should include a checksums section in new lockfiles, to protect from compromised gem sources.
 * `no_install` (`BUNDLE_NO_INSTALL`):
    Whether `bundle package` should skip installing gems.
 * `no_prune` (`BUNDLE_NO_PRUNE`):

data/lib/bundler/man/bundle-console.1

@@ -1,8 +1,8 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CONSOLE" "1" "October 2024" ""
+.TH "BUNDLE\-CONSOLE" "1" "December 2024" ""
 .SH "NAME"
-\fBbundle\-console\fR \- Deprecated way to open an IRB session with the bundle pre\-loaded
+\fBbundle\-console\fR \- Open an IRB session with the bundle pre\-loaded
 .SH "SYNOPSIS"
 \fBbundle console\fR [GROUP]
 .SH "DESCRIPTION"
@@ -29,7 +29,5 @@ $ bundle console
 Resolving dependencies\|\.\|\.\|\.
 [1] pry(main)>
 .fi
-.SH "NOTES"
-This command was deprecated in Bundler 2\.1 and will be removed in 3\.0\. Use \fBbin/console\fR script, which can be generated by \fBbundle gem <NAME>\fR\.
 .SH "SEE ALSO"
 Gemfile(5) \fIhttps://bundler\.io/man/gemfile\.5\.html\fR

data/lib/bundler/man/bundle-console.1.ronn

@@ -1,5 +1,5 @@
-bundle-console(1) -- Deprecated way to open an IRB session with the bundle pre-loaded
-=====================================================================================
+bundle-console(1) -- Open an IRB session with the bundle pre-loaded
+===================================================================
 
 ## SYNOPSIS
 
@@ -34,11 +34,6 @@ the shell from the following:
     Resolving dependencies...
     [1] pry(main)>
 
-## NOTES
-
-This command was deprecated in Bundler 2.1 and will be removed in 3.0.
-Use `bin/console` script, which can be generated by `bundle gem <NAME>`.
-
 ## SEE ALSO
 
 [Gemfile(5)](https://bundler.io/man/gemfile.5.html)

data/lib/bundler/man/bundle-doctor.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-DOCTOR" "1" "October 2024" ""
+.TH "BUNDLE\-DOCTOR" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-doctor\fR \- Checks the bundle for common problems
 .SH "SYNOPSIS"
@@ -25,6 +25,6 @@ Missing dependencies
 \fB\-\-quiet\fR
 Only output warnings and errors\.
 .TP
-\fB\-\-gemfile=<gemfile>\fR
+\fB\-\-gemfile=GEMFILE\fR
 The location of the Gemfile(5) which Bundler should use\. This defaults to a Gemfile(5) in the current working directory\. In general, Bundler will assume that the location of the Gemfile(5) is also the project's root and will try to find \fBGemfile\.lock\fR and \fBvendor/cache\fR relative to this location\.
 

data/lib/bundler/man/bundle-doctor.1.ronn

@@ -25,7 +25,7 @@ Examples of common problems caught by bundle-doctor include:
 * `--quiet`:
   Only output warnings and errors.
 
-* `--gemfile=<gemfile>`:
+* `--gemfile=GEMFILE`:
   The location of the Gemfile(5) which Bundler should use. This defaults
   to a Gemfile(5) in the current working directory. In general, Bundler
   will assume that the location of the Gemfile(5) is also the project's

data/lib/bundler/man/bundle-env.1

@@ -0,0 +1,9 @@
+.\" generated with nRonn/v0.11.1
+.\" https://github.com/n-ronn/nronn/tree/0.11.1
+.TH "BUNDLE\-ENV" "1" "December 2024" ""
+.SH "NAME"
+\fBbundle\-env\fR \- Print information about the environment Bundler is running under
+.SH "SYNOPSIS"
+\fBbundle env\fR
+.SH "DESCRIPTION"
+Prints information about the environment Bundler is running under\.