bundler 2.7.2 → 4.0.0.beta1

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

@@ -3,28 +3,18 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
 
 ## SYNOPSIS
 
-`bundle install` [--binstubs[=DIRECTORY]]
-                 [--clean]
-                 [--deployment]
-                 [--force]
-                 [--frozen]
+`bundle install` [--force]
                  [--full-index]
                  [--gemfile=GEMFILE]
                  [--jobs=NUMBER]
                  [--local]
                  [--no-cache]
-                 [--no-prune]
-                 [--path PATH]
                  [--prefer-local]
                  [--quiet]
                  [--retry=NUMBER]
-                 [--shebang=SHEBANG]
                  [--standalone[=GROUP[ GROUP...]]]
-                 [--system]
                  [--trust-policy=TRUST-POLICY]
                  [--target-rbconfig=TARGET-RBCONFIG]
-                 [--with=GROUP[ GROUP...]]
-                 [--without=GROUP[ GROUP...]]
 
 ## DESCRIPTION
 
@@ -45,50 +35,9 @@ update process below under [CONSERVATIVE UPDATING][].
 
 ## OPTIONS
 
-The `--clean`, `--deployment`, `--frozen`, `--no-prune`, `--path`, `--shebang`,
-`--system`, `--without` and `--with` options are deprecated because they only
-make sense if they are applied to every subsequent `bundle install` run
-automatically and that requires `bundler` to silently remember them. Since
-`bundler` will no longer remember CLI flags in future versions, `bundle config`
-(see bundle-config(1)) should be used to apply them permanently.
-
-* `--binstubs[=BINSTUBS]`:
-  Binstubs are scripts that wrap around executables. Bundler creates a small Ruby
-  file (a binstub) that loads Bundler, runs the command, and puts it in `bin/`.
-  This lets you link the binstub inside of an application to the exact gem
-  version the application needs.
-
-  Creates a directory (defaults to `~/bin` when the option is used without a
-  value, or to the given `<BINSTUBS>` directory otherwise) and places any
-  executables from the gem there. These executables run in Bundler's context. If
-  used, you might add this directory to your environment's `PATH` variable. For
-  instance, if the `rails` gem comes with a `rails` executable, this flag will
-  create a `bin/rails` executable that ensures that all referred dependencies
-  will be resolved using the bundled gems.
-
-* `--clean`:
-  On finishing the installation Bundler is going to remove any gems not present
-  in the current Gemfile(5). Don't worry, gems currently in use will not be
-  removed.
-
-  This option is deprecated in favor of the `clean` setting.
-
-* `--deployment`:
-  In [deployment mode][DEPLOYMENT MODE], Bundler will 'roll-out' the bundle for
-  production or CI use. Please check carefully if you want to have this option
-  enabled in your development environment.
-
-  This option is deprecated in favor of the `deployment` setting.
-
 * `--force`, `--redownload`:
   Force reinstalling every gem, even if already installed.
 
-* `--frozen`:
-  Do not allow the Gemfile.lock to be updated after this install. Exits
-  non-zero if there are going to be changes to the Gemfile.lock.
-
-  This option is deprecated in favor of the `frozen` setting.
-
 * `--full-index`:
   Bundler will not call Rubygems' API endpoint (default) but download and cache
   a (currently big) index file of all gems. Performance can be improved for
@@ -122,47 +71,18 @@ automatically and that requires `bundler` to silently remember them. Since
   does not remove any gems in the cache but keeps the newly bundled gems from
   being cached during the install.
 
-* `--no-prune`:
-  Don't remove stale gems from the cache when the installation finishes.
-
-  This option is deprecated in favor of the `no_prune` setting.
-
-* `--path=PATH`:
-  The location to install the specified gems to. This defaults to Rubygems'
-  setting. Bundler shares this location with Rubygems, `gem install ...` will
-  have gem installed there, too. Therefore, gems installed without a
-  `--path ...` setting will show up by calling `gem list`. Accordingly, gems
-  installed to other locations will not get listed.
-
-  This option is deprecated in favor of the `path` setting.
-
 * `--quiet`:
   Do not print progress information to the standard output.
 
 * `--retry=[<number>]`:
   Retry failed network or git requests for <number> times.
 
-* `--shebang=SHEBANG`:
-  Uses the specified ruby executable (usually `ruby`) to execute the scripts
-  created with `--binstubs`. In addition, if you use `--binstubs` together with
-  `--shebang jruby` these executables will be changed to execute `jruby`
-  instead.
-
-  This option is deprecated in favor of the `shebang` setting.
-
 * `--standalone[=<list>]`:
   Makes a bundle that can work without depending on Rubygems or Bundler at
   runtime. A space separated list of groups to install can be specified.
   Bundler creates a directory named `bundle` and installs the bundle there. It
   also generates a `bundle/bundler/setup.rb` file to replace Bundler's own setup
-  in the manner required. Using this option implicitly sets `path`, which is a
-  [remembered option][REMEMBERED OPTIONS].
-
-* `--system`:
-  Installs the gems specified in the bundle to the system's Rubygems location.
-  This overrides any previous configuration of `--path`.
-
-  This option is deprecated in favor of the `system` setting.
+  in the manner required.
 
 * `--trust-policy=TRUST-POLICY`:
   Apply the Rubygems security policy <policy>, where policy is one of
@@ -173,26 +93,11 @@ automatically and that requires `bundler` to silently remember them. Since
 * `--target-rbconfig=TARGET-RBCONFIG`:
   Path to rbconfig.rb for the deployment target platform.
 
-* `--with=<list>`:
-  A space-separated list of groups referencing gems to install. If an
-  optional group is given it is installed. If a group is given that is
-  in the remembered list of groups given to --without, it is removed
-  from that list.
-
-  This option is deprecated in favor of the `with` setting.
-
-* `--without=<list>`:
-  A space-separated list of groups referencing gems to skip during installation.
-  If a group is given that is in the remembered list of groups given
-  to --with, it is removed from that list.
-
-  This option is deprecated in favor of the `without` setting.
-
 ## DEPLOYMENT MODE
 
 Bundler's defaults are optimized for development. To switch to
-defaults optimized for deployment and for CI, use the `--deployment`
-flag. Do not activate deployment mode on development machines, as it
+defaults optimized for deployment and for CI, use the `deployment`
+setting. Do not activate deployment mode on development machines, as it
 will cause an error when the Gemfile(5) is modified.
 
 1. A `Gemfile.lock` is required.
@@ -224,9 +129,9 @@ will cause an error when the Gemfile(5) is modified.
    gems to the system, or the web server may not have permission to
    read them.
 
-   As a result, `bundle install --deployment` installs gems to
-   the `vendor/bundle` directory in the application. This may be
-   overridden using the `--path` option.
+   As a result, when `deployment` is configured, `bundle install` installs gems
+   to the `vendor/bundle` directory in the application. This may be
+   overridden using the `path` setting.
 
 ## INSTALLING GROUPS
 
@@ -234,12 +139,12 @@ By default, `bundle install` will install all gems in all groups
 in your Gemfile(5), except those declared for a different platform.
 
 However, you can explicitly tell Bundler to skip installing
-certain groups with the `--without` option. This option takes
+certain groups with the `without` setting. This setting takes
 a space-separated list of groups.
 
-While the `--without` option will skip _installing_ the gems in the
-specified groups, it will still _download_ those gems and use them to
-resolve the dependencies of every gem in your Gemfile(5).
+While the `without` setting will skip _installing_ the gems in the
+specified groups, `bundle install` will still _download_ those gems and use them
+to resolve the dependencies of every gem in your Gemfile(5).
 
 This is so that installing a different set of groups on another
  machine (such as a production server) will not change the
@@ -265,7 +170,7 @@ For a simple illustration, consider the following Gemfile(5):
 In this case, `sinatra` depends on any version of Rack (`>= 1.0`), while
 `rack-perftools-profiler` depends on 1.x (`~> 1.0`).
 
-When you run `bundle install --without production` in development, we
+When you configure `bundle config without production` in development, we
 look at the dependencies of `rack-perftools-profiler` as well. That way,
 you do not spend all your time developing against Rack 2.0, using new
 APIs unavailable in Rack 1.x, only to have Bundler switch to Rack 1.2

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-ISSUE" "1" "August 2025" ""
+.TH "BUNDLE\-ISSUE" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-issue\fR \- Get help reporting Bundler issues
 .SH "SYNOPSIS"

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-LICENSES" "1" "August 2025" ""
+.TH "BUNDLE\-LICENSES" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-licenses\fR \- Print the license of all gems in the bundle
 .SH "SYNOPSIS"

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-LIST" "1" "August 2025" ""
+.TH "BUNDLE\-LIST" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-list\fR \- List all the gems in the bundle
 .SH "SYNOPSIS"
@@ -19,6 +19,8 @@ bundle list \-\-without\-group test
 bundle list \-\-only\-group dev
 .P
 bundle list \-\-only\-group dev test \-\-paths
+.P
+bundle list \-\-format json
 .SH "OPTIONS"
 .TP
 \fB\-\-name\-only\fR
@@ -32,4 +34,7 @@ A space\-separated list of groups of gems to skip during printing\.
 .TP
 \fB\-\-only\-group=<list>\fR
 A space\-separated list of groups of gems to print\.
+.TP
+\fB\-\-format=FORMAT\fR
+Format output ('json' is the only supported format)
 

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

@@ -21,6 +21,8 @@ bundle list --only-group dev
 
 bundle list --only-group dev test --paths
 
+bundle list --format json
+
 ## OPTIONS
 
 * `--name-only`:
@@ -34,3 +36,6 @@ bundle list --only-group dev test --paths
 
 * `--only-group=<list>`:
   A space-separated list of groups of gems to print.
+
+* `--format=FORMAT`:
+  Format output ('json' is the only supported format)

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-LOCK" "1" "August 2025" ""
+.TH "BUNDLE\-LOCK" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing
 .SH "SYNOPSIS"

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-OPEN" "1" "August 2025" ""
+.TH "BUNDLE\-OPEN" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-open\fR \- Opens the source directory for a gem in your bundle
 .SH "SYNOPSIS"

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-OUTDATED" "1" "August 2025" ""
+.TH "BUNDLE\-OUTDATED" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-outdated\fR \- List installed gems with newer versions available
 .SH "SYNOPSIS"

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-PLATFORM" "1" "August 2025" ""
+.TH "BUNDLE\-PLATFORM" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-platform\fR \- Displays platform compatibility information
 .SH "SYNOPSIS"

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

@@ -1,10 +1,10 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-PLUGIN" "1" "August 2025" ""
+.TH "BUNDLE\-PLUGIN" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-plugin\fR \- Manage Bundler plugins
 .SH "SYNOPSIS"
-\fBbundle plugin\fR install PLUGINS [\-\-source=SOURCE] [\-\-version=VERSION] [\-\-git=GIT] [\-\-branch=BRANCH|\-\-ref=REF] [\-\-local\-git=LOCAL_GIT] [\-\-path=PATH]
+\fBbundle plugin\fR install PLUGINS [\-\-source=SOURCE] [\-\-version=VERSION] [\-\-git=GIT] [\-\-branch=BRANCH|\-\-ref=REF] [\-\-path=PATH]
 .br
 \fBbundle plugin\fR uninstall PLUGINS [\-\-all]
 .br
@@ -54,13 +54,6 @@ When you specify \fB\-\-git\fR, you can use \fB\-\-ref\fR to specify any tag, or
 Install the plugin gem from a local path\.
 .IP
 Example: \fBbundle plugin install bundler\-graph \-\-path \.\./bundler\-graph\fR
-.TP
-\fB\-\-local\-git=LOCAL_GIT\fR
-Install the plugin gem from a local Git repository\.
-.IP
-Example: \fBbundle plugin install bundler\-graph \-\-local\-git \.\./bundler\-graph\fR\.
-.IP
-This option is deprecated in favor of \fB\-\-git\fR\.
 .SS "uninstall"
 Uninstall the plugin(s) specified in PLUGINS\.
 .P

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

@@ -5,7 +5,6 @@ bundle-plugin(1) -- Manage Bundler plugins
 
 `bundle plugin` install PLUGINS [--source=SOURCE] [--version=VERSION]
                               [--git=GIT] [--branch=BRANCH|--ref=REF]
-                              [--local-git=LOCAL_GIT]
                               [--path=PATH]<br>
 `bundle plugin` uninstall PLUGINS [--all]<br>
 `bundle plugin` list<br>
@@ -59,13 +58,6 @@ global source specified in Gemfile is ignored.
 
   Example: `bundle plugin install bundler-graph --path ../bundler-graph`
 
-* `--local-git=LOCAL_GIT`:
-  Install the plugin gem from a local Git repository.
-
-  Example: `bundle plugin install bundler-graph --local-git ../bundler-graph`.
-
-  This option is deprecated in favor of `--git`.
-
 ### uninstall
 
 Uninstall the plugin(s) specified in PLUGINS.

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-PRISTINE" "1" "August 2025" ""
+.TH "BUNDLE\-PRISTINE" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-pristine\fR \- Restores installed gems to their pristine condition
 .SH "SYNOPSIS"

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

@@ -1,21 +1,15 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-REMOVE" "1" "August 2025" ""
+.TH "BUNDLE\-REMOVE" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-remove\fR \- Removes gems from the Gemfile
 .SH "SYNOPSIS"
-\fBbundle remove [GEM [GEM \|\.\|\.\|\.]] [\-\-install]\fR
+`bundle remove [GEM [GEM \|\.\|\.\|\.]]
 .SH "DESCRIPTION"
 Removes the given gems from the Gemfile while ensuring that the resulting Gemfile is still valid\. If a gem cannot be removed, a warning is printed\. If a gem is already absent from the Gemfile, and error is raised\.
-.SH "OPTIONS"
-.TP
-\fB\-\-install\fR
-Runs \fBbundle install\fR after the given gems have been removed from the Gemfile, which ensures that both the lockfile and the installed gems on disk are also updated to remove the given gem(s)\.
 .P
 Example:
 .P
 bundle remove rails
 .P
 bundle remove rails rack
-.P
-bundle remove rails rack \-\-install

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

@@ -3,21 +3,14 @@ bundle-remove(1) -- Removes gems from the Gemfile
 
 ## SYNOPSIS
 
-`bundle remove [GEM [GEM ...]] [--install]`
+`bundle remove [GEM [GEM ...]]
 
 ## DESCRIPTION
 
 Removes the given gems from the Gemfile while ensuring that the resulting Gemfile is still valid. If a gem cannot be removed, a warning is printed. If a gem is already absent from the Gemfile, and error is raised.
 
-## OPTIONS
-
-* `--install`:
-  Runs `bundle install` after the given gems have been removed from the Gemfile, which ensures that both the lockfile and the installed gems on disk are also updated to remove the given gem(s).
-
 Example:
 
 bundle remove rails
 
 bundle remove rails rack
-
-bundle remove rails rack --install

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

@@ -1,10 +1,10 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-SHOW" "1" "August 2025" ""
+.TH "BUNDLE\-SHOW" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem
 .SH "SYNOPSIS"
-\fBbundle show\fR [GEM] [\-\-paths] [\-\-outdated]
+\fBbundle show\fR [GEM] [\-\-paths]
 .SH "DESCRIPTION"
 Without the [GEM] option, \fBshow\fR will print a list of the names and versions of all gems that are required by your [\fBGemfile(5)\fR][Gemfile(5)], sorted by name\.
 .P
@@ -13,7 +13,4 @@ Calling show with [GEM] will list the exact location of that gem on your machine
 .TP
 \fB\-\-paths\fR
 List the paths of all gems that are required by your [\fBGemfile(5)\fR][Gemfile(5)], sorted by gem name\.
-.TP
-\fB\-\-outdated\fR
-Show verbose output including whether gems are outdated\.
 

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

@@ -5,7 +5,6 @@ bundle-show(1) -- Shows all the gems in your bundle, or the path to a gem
 
 `bundle show` [GEM]
               [--paths]
-              [--outdated]
 
 ## DESCRIPTION
 
@@ -20,6 +19,3 @@ machine.
 * `--paths`:
   List the paths of all gems that are required by your [`Gemfile(5)`][Gemfile(5)],
   sorted by gem name.
-
-* `--outdated`:
-  Show verbose output including whether gems are outdated.

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-UPDATE" "1" "August 2025" ""
+.TH "BUNDLE\-UPDATE" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-update\fR \- Update your gems to the latest available versions
 .SH "SYNOPSIS"

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

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE\-VERSION" "1" "August 2025" ""
+.TH "BUNDLE\-VERSION" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\-version\fR \- Prints Bundler version information
 .SH "SYNOPSIS"

data/lib/bundler/man/bundle.1

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "BUNDLE" "1" "August 2025" ""
+.TH "BUNDLE" "1" "September 2025" ""
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management
 .SH "SYNOPSIS"
@@ -66,9 +66,6 @@ Open an installed gem in the editor
 \fBbundle lock(1)\fR \fIbundle\-lock\.1\.html\fR
 Generate a lockfile for your dependencies
 .TP
-\fBbundle viz(1)\fR \fIbundle\-viz\.1\.html\fR (deprecated)
-Generate a visual representation of your dependencies
-.TP
 \fBbundle init(1)\fR \fIbundle\-init\.1\.html\fR
 Generate a simple \fBGemfile\fR, placed in the current directory
 .TP
@@ -94,9 +91,3 @@ Manage Bundler plugins
 Prints Bundler version information
 .SH "PLUGINS"
 When running a command that isn't listed in PRIMARY COMMANDS or UTILITIES, Bundler will try to find an executable on your path named \fBbundler\-<command>\fR and execute it, passing down any extra arguments to it\.
-.SH "OBSOLETE"
-These commands are obsolete and should no longer be used:
-.IP "\(bu" 4
-\fBbundle inject(1)\fR
-.IP "" 0
-

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

@@ -76,9 +76,6 @@ We divide `bundle` subcommands into primary commands and utilities:
 * [`bundle lock(1)`](bundle-lock.1.html):
   Generate a lockfile for your dependencies
 
-* [`bundle viz(1)`](bundle-viz.1.html) (deprecated):
-  Generate a visual representation of your dependencies
-
 * [`bundle init(1)`](bundle-init.1.html):
   Generate a simple `Gemfile`, placed in the current directory
 
@@ -108,9 +105,3 @@ We divide `bundle` subcommands into primary commands and utilities:
 When running a command that isn't listed in PRIMARY COMMANDS or UTILITIES,
 Bundler will try to find an executable on your path named `bundler-<command>`
 and execute it, passing down any extra arguments to it.
-
-## OBSOLETE
-
-These commands are obsolete and should no longer be used:
-
-* `bundle inject(1)`

data/lib/bundler/man/gemfile.5

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.10.1
-.TH "GEMFILE" "5" "August 2025" ""
+.TH "GEMFILE" "5" "September 2025" ""
 .SH "NAME"
 \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
 .SH "SYNOPSIS"

data/lib/bundler/man/index.txt

@@ -15,7 +15,6 @@ bundle-gem(1)         bundle-gem.1
 bundle-help(1)        bundle-help.1
 bundle-info(1)        bundle-info.1
 bundle-init(1)        bundle-init.1
-bundle-inject(1)      bundle-inject.1
 bundle-install(1)     bundle-install.1
 bundle-issue(1)       bundle-issue.1
 bundle-licenses(1)    bundle-licenses.1
@@ -30,4 +29,3 @@ bundle-remove(1)      bundle-remove.1
 bundle-show(1)        bundle-show.1
 bundle-update(1)      bundle-update.1
 bundle-version(1)     bundle-version.1
-bundle-viz(1)         bundle-viz.1

data/lib/bundler/materialization.rb

@@ -29,7 +29,7 @@ module Bundler
     end
 
     def dependencies
-      specs.first.runtime_dependencies.map {|d| [d, platform] }
+      (materialized_spec || specs.first).runtime_dependencies.map {|d| [d, platform] }
     end
 
     def materialized_spec

data/lib/bundler/plugin/installer.rb

@@ -43,16 +43,6 @@ module Bundler
       private
 
       def check_sources_consistency!(options)
-        if options.key?(:git) && options.key?(:local_git)
-          raise InvalidOption, "Remote and local plugin git sources can't be both specified"
-        end
-
-        # back-compat; local_git is an alias for git
-        if options.key?(:local_git)
-          Bundler::SharedHelpers.major_deprecation(2, "--local_git is deprecated, use --git")
-          options[:git] = options.delete(:local_git)
-        end
-
         if (options.keys & [:source, :git, :path]).length > 1
           raise InvalidOption, "Only one of --source, --git, or --path may be specified"
         end

data/lib/bundler/plugin/source_list.rb

@@ -23,7 +23,7 @@ module Bundler
 
       private
 
-      def rubygems_aggregate_class
+      def source_class
         Plugin::Installer::Rubygems
       end
     end

data/lib/bundler/plugin.rb

@@ -220,7 +220,7 @@ module Bundler
     #
     # @param [String] event
     def hook(event, *args, &arg_blk)
-      return unless Bundler.feature_flag.plugins?
+      return unless Bundler.settings[:plugins]
       unless Events.defined_event?(event)
         raise ArgumentError, "Event '#{event}' not defined in Bundler::Plugin::Events"
       end

data/lib/bundler/resolver.rb

@@ -165,7 +165,7 @@ module Bundler
       PubGrub::VersionConstraint.new(package, range: range)
     end
 
-    def versions_for(package, range=VersionRange.any)
+    def versions_for(package, range = VersionRange.any)
       range.select_versions(@sorted_versions[package])
     end
 

data/lib/bundler/ruby_dsl.rb

@@ -57,6 +57,8 @@ module Bundler
       else
         file_content.strip
       end
+    rescue Errno::ENOENT
+      raise GemfileError, "Could not find version file #{filename}"
     end
   end
 end

data/lib/bundler/ruby_version.rb

@@ -43,7 +43,6 @@ module Bundler
 
     def to_s(versions = self.versions)
       output = String.new("ruby #{versions_string(versions)}")
-      output << "p#{patchlevel}" if patchlevel && patchlevel != "-1"
       output << " (#{engine} #{versions_string(engine_versions)})" unless engine == "ruby"
 
       output
@@ -72,8 +71,7 @@ module Bundler
     def ==(other)
       versions == other.versions &&
         engine == other.engine &&
-        engine_versions == other.engine_versions &&
-        patchlevel == other.patchlevel
+        engine_versions == other.engine_versions
     end
 
     def host

data/lib/bundler/rubygems_ext.rb

@@ -417,7 +417,7 @@ module Gem
     unless Gem::NameTuple.new("a", Gem::Version.new("1"), Gem::Platform.new("x86_64-linux")).platform.is_a?(String)
       alias_method :initialize_with_platform, :initialize
 
-      def initialize(name, version, platform=Gem::Platform::RUBY)
+      def initialize(name, version, platform = Gem::Platform::RUBY)
         if Gem::Platform === platform
           initialize_with_platform(name, version, platform.to_s)
         else

data/lib/bundler/rubygems_gem_installer.rb

@@ -69,7 +69,7 @@ module Bundler
     end
 
     def generate_plugins
-      return unless Gem::Installer.instance_methods(false).include?(:generate_plugins)
+      return unless Gem::Installer.method_defined?(:generate_plugins, false)
 
       latest = Gem::Specification.stubs_for(spec.name).first
       return if latest && latest.version > spec.version

data/lib/bundler/rubygems_integration.rb

@@ -416,11 +416,7 @@ module Bundler
     end
 
     def all_specs
-      SharedHelpers.major_deprecation 2, "Bundler.rubygems.all_specs has been removed in favor of Bundler.rubygems.installed_specs"
-
-      Gem::Specification.stubs.map do |stub|
-        StubSpecification.from_stub(stub)
-      end
+      SharedHelpers.feature_removed! "Bundler.rubygems.all_specs has been removed in favor of Bundler.rubygems.installed_specs"
     end
 
     def installed_specs