[DRE-commits] [bundler] 07/09: Imported Upstream version 1.10.6
zeha at debian.org
zeha at debian.org
Tue Aug 18 17:09:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
zeha pushed a commit to annotated tag debian/1.10.6-1
in repository bundler.
commit 03453fc4fccacf686c85a4b6a8e24de9919fce8c
Author: Christian Hofstaedtler <zeha at debian.org>
Date: Tue Aug 18 16:43:45 2015 +0000
Imported Upstream version 1.10.6
---
.travis.yml | 1 -
CHANGELOG.md | 12 ++
lib/bundler.rb | 3 +-
lib/bundler/cli.rb | 4 +-
lib/bundler/dsl.rb | 2 +-
lib/bundler/installer/parallel_installer.rb | 7 +-
lib/bundler/man/bundle-config | 2 +-
lib/bundler/man/bundle-config.txt | 2 +-
lib/bundler/man/bundle-exec | 2 +-
lib/bundler/man/bundle-exec.txt | 2 +-
lib/bundler/man/bundle-install | 30 +--
lib/bundler/man/bundle-install.txt | 275 +++++++++++++---------------
lib/bundler/man/bundle-package | 2 +-
lib/bundler/man/bundle-package.txt | 2 +-
lib/bundler/man/bundle-platform | 2 +-
lib/bundler/man/bundle-platform.txt | 2 +-
lib/bundler/man/bundle-update | 2 +-
lib/bundler/man/bundle-update.txt | 2 +-
lib/bundler/man/gemfile.5 | 2 +-
lib/bundler/man/gemfile.5.txt | 2 +-
lib/bundler/remote_specification.rb | 4 +-
lib/bundler/source/git/git_proxy.rb | 2 +-
lib/bundler/templates/newgem/README.md.tt | 2 +-
lib/bundler/version.rb | 2 +-
metadata.yml | 7 +-
25 files changed, 172 insertions(+), 203 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 575e3e9..7498589 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,6 @@ env:
- RGV=v2.4.8
matrix:
- fast_finish: true
include:
# Ruby 2.2, Rubygems 2.4.5 and up (RG 2.4 is included by the matrix above)
# Ruby 2.1, Rubygems 2.2.2 and up
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa83fcc..cc8ed1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.10.6 (2015-07-22)
+
+Workarounds:
+
+ - only warn on invalid gemspecs (@indirect)
+
+Bugfixes:
+
+ - fix installing dependencies in the correct order (#3799, @pducks32)
+ - fix sorting of mixed DependencyLists (#3762, @tony-spataro-rs)
+ - fix `install_if` conditionals when using the block form (@danieltdt)
+
## 1.10.5 (2015-06-24)
Workarounds:
diff --git a/lib/bundler.rb b/lib/bundler.rb
index 5970e2c..7059830 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -371,8 +371,9 @@ module Bundler
spec
end
rescue Gem::InvalidSpecificationException => e
- raise InvalidOption, "The gemspec at #{file} is not valid. " \
+ Bundler.ui.warn "The gemspec at #{file} is not valid. " \
"The validation error was '#{e.message}'"
+ nil
end
def clear_gemspec_cache
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index cda22aa..cedfd2b 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -345,13 +345,13 @@ module Bundler
end
desc "gem GEM [OPTIONS]", "Creates a skeleton for creating a rubygem"
- method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :desc => "Generate a binary for your library. Set a default with `bundle config gem.mit true`."
+ method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :desc => "Generate a binary for your library."
method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config gem.coc true`."
method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
:lazy_default => [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? },
:desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code"
- method_option :mit, :type => :boolean, :desc => "Generate an MIT license file"
+ method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config gem.mit true`."
method_option :test, :type => :string, :lazy_default => 'rspec', :aliases => '-t', :banner => "rspec",
:desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
def gem(name)
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 9924faa..e5432fa 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -186,7 +186,7 @@ module Bundler
@install_conditionals.concat args
blk.call
ensure
- args.each { @groups.pop }
+ args.each { @install_conditionals.pop }
end
def platforms(*platforms)
diff --git a/lib/bundler/installer/parallel_installer.rb b/lib/bundler/installer/parallel_installer.rb
index 9c08c83..6e05f73 100644
--- a/lib/bundler/installer/parallel_installer.rb
+++ b/lib/bundler/installer/parallel_installer.rb
@@ -35,10 +35,9 @@ class ParallelInstaller
# Checks installed dependencies against spec's dependencies to make
# sure needed dependencies have been installed.
- def dependencies_installed?(remaining_specs)
- installed_specs = remaining_specs.reject(&:installed?).map(&:name)
- already_installed = lambda {|dep| installed_specs.include? dep.name }
- dependencies.all? {|d| already_installed[d] }
+ def dependencies_installed?(all_specs)
+ installed_specs = all_specs.select(&:installed?).map(&:name)
+ dependencies.all? {|d| installed_specs.include? d.name }
end
# Represents only the non-development dependencies and the ones that
diff --git a/lib/bundler/man/bundle-config b/lib/bundler/man/bundle-config
index b4a3fd6..1401be6 100644
--- a/lib/bundler/man/bundle-config
+++ b/lib/bundler/man/bundle-config
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-CONFIG" "1" "June 2015" "" ""
+.TH "BUNDLE\-CONFIG" "1" "July 2015" "" ""
.
.SH "NAME"
\fBbundle\-config\fR \- Set bundler configuration options
diff --git a/lib/bundler/man/bundle-config.txt b/lib/bundler/man/bundle-config.txt
index d1831fc..ecabf02 100644
--- a/lib/bundler/man/bundle-config.txt
+++ b/lib/bundler/man/bundle-config.txt
@@ -235,4 +235,4 @@ CREDENTIALS FOR GEM SOURCES
- June 2015 BUNDLE-CONFIG(1)
+ July 2015 BUNDLE-CONFIG(1)
diff --git a/lib/bundler/man/bundle-exec b/lib/bundler/man/bundle-exec
index afa1211..b29975a 100644
--- a/lib/bundler/man/bundle-exec
+++ b/lib/bundler/man/bundle-exec
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-EXEC" "1" "June 2015" "" ""
+.TH "BUNDLE\-EXEC" "1" "July 2015" "" ""
.
.SH "NAME"
\fBbundle\-exec\fR \- Execute a command in the context of the bundle
diff --git a/lib/bundler/man/bundle-exec.txt b/lib/bundler/man/bundle-exec.txt
index e1c4749..7c19755 100644
--- a/lib/bundler/man/bundle-exec.txt
+++ b/lib/bundler/man/bundle-exec.txt
@@ -160,4 +160,4 @@ RUBYGEMS PLUGINS
- June 2015 BUNDLE-EXEC(1)
+ July 2015 BUNDLE-EXEC(1)
diff --git a/lib/bundler/man/bundle-install b/lib/bundler/man/bundle-install
index 410b9a9..43a9f86 100644
--- a/lib/bundler/man/bundle-install
+++ b/lib/bundler/man/bundle-install
@@ -1,39 +1,13 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-INSTALL" "1" "June 2015" "" ""
+.TH "BUNDLE\-INSTALL" "1" "July 2015" "" ""
.
.SH "NAME"
\fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
.
.SH "SYNOPSIS"
-\fBbundle install\fR [\-\-binstubs[=DIRECTORY]]
-.
-.IP "" 4
-.
-.nf
-
- [\-\-clean]
- [\-\-full\-index]
- [\-\-gemfile=GEMFILE]
- [\-\-jobs=NUMBER]
- [\-\-local]
- [\-\-deployment]
- [\-\-no\-cache]
- [\-\-no\-prune]
- [\-\-path PATH]
- [\-\-system]
- [\-\-quiet]
- [\-\-retry=NUMBER]
- [\-\-shebang]
- [\-\-standalone[=GROUP[ GROUP\.\.\.]]]
- [\-\-trust\-policy=POLICY]
- [\-\-without=GROUP[ GROUP\.\.\.]]
- [\-\-with=GROUP[ GROUP\.\.\.]]
-.
-.fi
-.
-.IP "" 0
+\fBbundle install\fR [\-\-binstubs[=DIRECTORY]] [\-\-clean] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-jobs=NUMBER] [\-\-local] [\-\-deployment] [\-\-no\-cache] [\-\-no\-prune] [\-\-path PATH] [\-\-system] [\-\-quiet] [\-\-retry=NUMBER] [\-\-shebang] [\-\-standalone[=GROUP[ GROUP\.\.\.]]] [\-\-trust\-policy=POLICY] [\-\-without=GROUP[ GROUP\.\.\.]] [\-\-with=GROUP[ GROUP\.\.\.]]
.
.SH "DESCRIPTION"
Install the gems specified in your Gemfile(5)\. If this is the first time you run bundle install (and a \fBGemfile\.lock\fR does not exist), Bundler will fetch all remote sources, resolve dependencies and install all needed gems\.
diff --git a/lib/bundler/man/bundle-install.txt b/lib/bundler/man/bundle-install.txt
index 786cc05..9df8c3f 100644
--- a/lib/bundler/man/bundle-install.txt
+++ b/lib/bundler/man/bundle-install.txt
@@ -6,70 +6,53 @@ NAME
bundle-install - Install the dependencies specified in your Gemfile
SYNOPSIS
- bundle install [--binstubs[=DIRECTORY]]
-
-
-
- [--clean]
- [--full-index]
- [--gemfile=GEMFILE]
- [--jobs=NUMBER]
- [--local]
- [--deployment]
- [--no-cache]
- [--no-prune]
- [--path PATH]
- [--system]
- [--quiet]
- [--retry=NUMBER]
- [--shebang]
- [--standalone[=GROUP[ GROUP...]]]
- [--trust-policy=POLICY]
- [--without=GROUP[ GROUP...]]
- [--with=GROUP[ GROUP...]]
-
-
+ bundle install [--binstubs[=DIRECTORY]] [--clean] [--full-index]
+ [--gemfile=GEMFILE] [--jobs=NUMBER] [--local] [--deployment]
+ [--no-cache] [--no-prune] [--path PATH] [--system] [--quiet]
+ [--retry=NUMBER] [--shebang] [--standalone[=GROUP[ GROUP...]]]
+ [--trust-policy=POLICY] [--without=GROUP[ GROUP...]] [--with=GROUP[
+ GROUP...]]
DESCRIPTION
- Install the gems specified in your Gemfile(5). If this is the first
- time you run bundle install (and a Gemfile.lock does not exist),
+ Install the gems specified in your Gemfile(5). If this is the first
+ time you run bundle install (and a Gemfile.lock does not exist),
Bundler will fetch all remote sources, resolve dependencies and install
all needed gems.
If a Gemfile.lock does exist, and you have not updated your Gemfile(5),
- Bundler will fetch all remote sources, but use the dependencies speci-
+ Bundler will fetch all remote sources, but use the dependencies speci-
fied in the Gemfile.lock instead of resolving dependencies.
- If a Gemfile.lock does exist, and you have updated your Gemfile(5),
+ If a Gemfile.lock does exist, and you have updated your Gemfile(5),
Bundler will use the dependencies in the Gemfile.lock for all gems that
- you did not update, but will re-resolve the dependencies of gems that
+ you did not update, but will re-resolve the dependencies of gems that
you did update. You can find more information about this update process
below under CONSERVATIVE UPDATING.
OPTIONS
--binstubs[=<directory>]
- Creates a directory (defaults to ~/bin) and place any executa-
+ Creates a directory (defaults to ~/bin) and place any executa-
bles from the gem there. These executables run in Bundler's con-
- text. If used, you might add this directory to your environ-
- ment's PATH variable. For instance, if the rails gem comes with
+ text. If used, you might add this directory to your environ-
+ ment'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
+ 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
+ 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.
--full-index
Bundler will not call Rubygems' API endpoint (default) but down-
load and cache a (currently big) index file of all gems. Perfor-
- mance can be improved for large bundles that seldomly change by
+ mance can be improved for large bundles that seldomly change by
enabling this option.
--gemfile=<gemfile>
- The location of the Gemfile(5) which Bundler should use. This
- defaults to a Gemfile(5) in the current working directory. In
+ 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 Gemfile.lock and
vendor/cache relative to this location.
@@ -79,39 +62,39 @@ OPTIONS
--local
Do not attempt to connect to rubygems.org. Instead, Bundler will
- use the gems already present in Rubygems' cache or in ven-
- dor/cache. Note that if a appropriate platform-specific gem
+ use the gems already present in Rubygems' cache or in ven-
+ dor/cache. Note that if a appropriate platform-specific gem
exists on rubygems.org it will not be found.
--deployment
- In deployment mode, Bundler will 'roll-out' the bundle for pro-
- duction use. Please check carefully if you want to have this
+ In deployment mode, Bundler will 'roll-out' the bundle for pro-
+ duction use. Please check carefully if you want to have this
option enabled in development or test environments.
--system
- Installs the gems specified in the bundle to the system's
+ Installs the gems specified in the bundle to the system's
Rubygems location. This overrides any previous remembered use of
--path.
--no-cache
- Do not update the cache in vendor/cache with the newly bundled
- gems. This does not remove any gems in the cache but keeps the
+ Do not update the cache in vendor/cache with the newly bundled
+ gems. This 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
+ Don't remove stale gems from the cache when the installation
finishes.
--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. Accodingly, gems installed to other locations
+ 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. Accodingly, gems installed to other locations
will not get listed. This setting is a remembered option.
--quiet
- Do not print progress information to the standard output.
+ Do not print progress information to the standard output.
Instead, Bundler will exit using a status code ($?).
--retry=[<number>]
@@ -119,21 +102,21 @@ OPTIONS
--shebang=<ruby-executable>
Uses the specified ruby executable (usually ruby) to execute the
- scripts created with --binstubs. In addition, if you use --bin-
- stubs together with --shebang jruby these executables will be
+ scripts created with --binstubs. In addition, if you use --bin-
+ stubs together with --shebang jruby these executables will be
changed to execute jruby instead.
--standalone[=<list>]
- Makes a bundle that can work without depending on Rubygems or
- Bundler at runtime. A space separated list of groups to install
- has to be specified. Bundler creates a directory named bundle
+ Makes a bundle that can work without depending on Rubygems or
+ Bundler at runtime. A space separated list of groups to install
+ has to be specified. Bundler creates a directory named bundle
and installs the bundle there. It also generates a bun-
- dle/bundler/setup.rb file to replace Bundler's own setup in the
+ dle/bundler/setup.rb file to replace Bundler's own setup in the
manner required.
--trust-policy=[<policy>]
- Apply the Rubygems security policy policy, where policy is one
- of HighSecurity, MediumSecurity, LowSecurity, AlmostNoSecurity,
+ Apply the Rubygems security policy policy, where policy is one
+ of HighSecurity, MediumSecurity, LowSecurity, AlmostNoSecurity,
or NoSecurity. For more details, please see the Rubygems signing
documentation linked below in SEE ALSO.
@@ -145,60 +128,60 @@ OPTIONS
--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
+ 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 is a remembered option.
DEPLOYMENT MODE
Bundler's defaults are optimized for development. To switch to defaults
- optimized for deployment, use the --deployment flag. Do not activate
+ optimized for deployment, use the --deployment flag. 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.
To ensure that the same versions of the gems you developed with and
- tested with are also used in deployments, a Gemfile.lock is
+ tested with are also used in deployments, a Gemfile.lock is
required.
- This is mainly to ensure that you remember to check your Gem-
+ This is mainly to ensure that you remember to check your Gem-
file.lock into version control.
2. The Gemfile.lock must be up to date
- In development, you can modify your Gemfile(5) and re-run bundle
+ In development, you can modify your Gemfile(5) and re-run bundle
install to conservatively update your Gemfile.lock snapshot.
- In deployment, your Gemfile.lock should be up-to-date with changes
+ In deployment, your Gemfile.lock should be up-to-date with changes
made in your Gemfile(5).
- 3. Gems are installed to vendor/bundle not your default system loca-
+ 3. Gems are installed to vendor/bundle not your default system loca-
tion
- In development, it's convenient to share the gems used in your
- application with other applications and other scripts run on the
+ In development, it's convenient to share the gems used in your
+ application with other applications and other scripts run on the
system.
- In deployment, isolation is a more important default. In addition,
- the user deploying the application may not have permission to
- install gems to the system, or the web server may not have permis-
+ In deployment, isolation is a more important default. In addition,
+ the user deploying the application may not have permission to
+ install gems to the system, or the web server may not have permis-
sion to read them.
- As a result, bundle install --deployment installs gems to the ven-
- dor/bundle directory in the application. This may be overridden
+ As a result, bundle install --deployment installs gems to the ven-
+ dor/bundle directory in the application. This may be overridden
using the --path option.
SUDO USAGE
- By default, Bundler installs gems to the same location as gem install.
+ By default, Bundler installs gems to the same location as gem install.
- In some cases, that location may not be writable by your Unix user. In
+ In some cases, that location may not be writable by your Unix user. In
that case, Bundler will stage everything in a temporary directory, then
- ask you for your sudo password in order to copy the gems into their
+ ask you for your sudo password in order to copy the gems into their
system location.
- From your perspective, this is identical to installing them gems
+ From your perspective, this is identical to installing them gems
directly into the system.
You should never use sudo bundle install. This is because several other
@@ -212,36 +195,36 @@ SUDO USAGE
- Of these three, the first two could theoretically be performed by
- chowning the resulting files to $SUDO_USER. The third, however, can
- only be performed by actually invoking the git command as the current
- user. Therefore, git gems are downloaded and installed into ~/.bundle
+ Of these three, the first two could theoretically be performed by
+ chowning the resulting files to $SUDO_USER. The third, however, can
+ only be performed by actually invoking the git command as the current
+ user. Therefore, git gems are downloaded and installed into ~/.bundle
rather than $GEM_HOME or $BUNDLE_PATH.
- As a result, you should run bundle install as the current user, and
+ As a result, you should run bundle install as the current user, and
Bundler will ask for your password if it is needed to put the gems into
their final location.
INSTALLING GROUPS
- By default, bundle install will install all gems in all groups in your
+ 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 a space-separated
+ However, you can explicitly tell Bundler to skip installing certain
+ groups with the --without option. This option takes a space-separated
list of groups.
- While the --without option will skip installing the gems in the speci-
- fied groups, it will still download those gems and use them to resolve
+ While the --without option will skip installing the gems in the speci-
+ fied groups, it 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 gems and versions
+ (such as a production server) will not change the gems and versions
that you have already developed and tested against.
Bundler offers a rock-solid guarantee that the third-party code you are
running in development and testing is also the third-party code you are
- running in production. You can choose to exclude some of that code in
- different environments, but you will never be caught flat-footed by
+ running in production. You can choose to exclude some of that code in
+ different environments, but you will never be caught flat-footed by
different versions of third-party code being used in different environ-
ments.
@@ -259,86 +242,86 @@ INSTALLING GROUPS
- In this case, sinatra depends on any version of Rack (>= 1.0), while
+ 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
- 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
+ When you run bundle install --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
when the production group is used.
- This should not cause any problems in practice, because we do not
- attempt to install the gems in the excluded groups, and only evaluate
+ This should not cause any problems in practice, because we do not
+ attempt to install the gems in the excluded groups, and only evaluate
as part of the dependency resolution process.
- This also means that you cannot include different versions of the same
- gem in different groups, because doing so would result in different
+ This also means that you cannot include different versions of the same
+ gem in different groups, because doing so would result in different
sets of dependencies used in development and production. Because of the
- vagaries of the dependency resolution process, this usually affects
- more than just the gems you list in your Gemfile(5), and can (surpris-
+ vagaries of the dependency resolution process, this usually affects
+ more than just the gems you list in your Gemfile(5), and can (surpris-
ingly) radically change the gems you are using.
REMEMBERED OPTIONS
- Some options (marked above in the OPTIONS section) are remembered
+ Some options (marked above in the OPTIONS section) are remembered
between calls to bundle install, and by the Bundler runtime.
- For instance, if you run bundle install --without test, a subsequent
- call to bundle install that does not include a --without flag will
+ For instance, if you run bundle install --without test, a subsequent
+ call to bundle install that does not include a --without flag will
remember your previous choice.
- In addition, a call to Bundler.setup will not attempt to make the gems
- in those groups available on the Ruby load path, as they were not
+ In addition, a call to Bundler.setup will not attempt to make the gems
+ in those groups available on the Ruby load path, as they were not
installed.
The settings that are remembered are:
--deployment
- At runtime, this remembered setting will also result in Bundler
+ At runtime, this remembered setting will also result in Bundler
raising an exception if the Gemfile.lock is out of date.
- --path Subsequent calls to bundle install will install gems to the
- directory originally passed to --path. The Bundler runtime will
- look for gems in that location. You can revert this option by
+ --path Subsequent calls to bundle install will install gems to the
+ directory originally passed to --path. The Bundler runtime will
+ look for gems in that location. You can revert this option by
running bundle install --system.
--binstubs
- Bundler will update the executables every subsequent call to
+ Bundler will update the executables every subsequent call to
bundle install.
--without
- As described above, Bundler will skip the gems specified by
- --without in subsequent calls to bundle install. The Bundler
+ As described above, Bundler will skip the gems specified by
+ --without in subsequent calls to bundle install. The Bundler
runtime will also not try to make the gems in the skipped groups
available.
THE GEMFILE.LOCK
- When you run bundle install, Bundler will persist the full names and
- versions of all gems that you used (including dependencies of the gems
+ When you run bundle install, Bundler will persist the full names and
+ versions of all gems that you used (including dependencies of the gems
specified in the Gemfile(5)) into a file called Gemfile.lock.
Bundler uses this file in all subsequent calls to bundle install, which
guarantees that you always use the same exact code, even as your appli-
cation moves across machines.
- Because of the way dependency resolution works, even a seemingly small
+ Because of the way dependency resolution works, even a seemingly small
change (for instance, an update to a point-release of a dependency of a
- gem in your Gemfile(5)) can result in radically different gems being
+ gem in your Gemfile(5)) can result in radically different gems being
needed to satisfy all dependencies.
- As a result, you SHOULD check your Gemfile.lock into version control.
+ As a result, you SHOULD check your Gemfile.lock into version control.
If you do not, every machine that checks out your repository (including
your production server) will resolve all dependencies again, which will
- result in different versions of third-party code being used if any of
- the gems in the Gemfile(5) or any of their dependencies have been
+ result in different versions of third-party code being used if any of
+ the gems in the Gemfile(5) or any of their dependencies have been
updated.
CONSERVATIVE UPDATING
- When you make a change to the Gemfile(5) and then run bundle install,
+ When you make a change to the Gemfile(5) and then run bundle install,
Bundler will update only the gems that you modified.
- In other words, if a gem that you did not modify worked before you
- called bundle install, it will continue to use the exact same versions
+ In other words, if a gem that you did not modify worked before you
+ called bundle install, it will continue to use the exact same versions
of all dependencies as it used before the update.
Let's take a look at an example. Here's your original Gemfile(5):
@@ -352,13 +335,13 @@ CONSERVATIVE UPDATING
- In this case, both actionpack and activemerchant depend on activesup-
- port. The actionpack gem depends on activesupport 2.3.8 and rack ~>
- 1.1.0, while the activemerchant gem depends on activesupport >= 2.3.2,
+ In this case, both actionpack and activemerchant depend on activesup-
+ port. The actionpack gem depends on activesupport 2.3.8 and rack ~>
+ 1.1.0, while the activemerchant gem depends on activesupport >= 2.3.2,
braintree >= 2.0.0, and builder >= 2.0.0.
- When the dependencies are first resolved, Bundler will select
- activesupport 2.3.8, which satisfies the requirements of both gems in
+ When the dependencies are first resolved, Bundler will select
+ activesupport 2.3.8, which satisfies the requirements of both gems in
your Gemfile(5).
Next, you modify your Gemfile(5) to:
@@ -372,40 +355,40 @@ CONSERVATIVE UPDATING
- The actionpack 3.0.0.rc gem has a number of new dependencies, and
- updates the activesupport dependency to = 3.0.0.rc and the rack depen-
+ The actionpack 3.0.0.rc gem has a number of new dependencies, and
+ updates the activesupport dependency to = 3.0.0.rc and the rack depen-
dency to ~> 1.2.1.
- When you run bundle install, Bundler notices that you changed the
- actionpack gem, but not the activemerchant gem. It evaluates the gems
+ When you run bundle install, Bundler notices that you changed the
+ actionpack gem, but not the activemerchant gem. It evaluates the gems
currently being used to satisfy its requirements:
activesupport 2.3.8
- also used to satisfy a dependency in activemerchant, which is
+ also used to satisfy a dependency in activemerchant, which is
not being updated
rack ~> 1.1.0
not currently being used to satisfy another dependency
- Because you did not explicitly ask to update activemerchant, you would
- not expect it to suddenly stop working after updating actionpack. How-
- ever, satisfying the new activesupport 3.0.0.rc dependency of action-
+ Because you did not explicitly ask to update activemerchant, you would
+ not expect it to suddenly stop working after updating actionpack. How-
+ ever, satisfying the new activesupport 3.0.0.rc dependency of action-
pack requires updating one of its dependencies.
- Even though activemerchant declares a very loose dependency that theo-
- retically matches activesupport 3.0.0.rc, Bundler treats gems in your
- Gemfile(5) that have not changed as an atomic unit together with their
+ Even though activemerchant declares a very loose dependency that theo-
+ retically matches activesupport 3.0.0.rc, Bundler treats gems in your
+ Gemfile(5) that have not changed as an atomic unit together with their
dependencies. In this case, the activemerchant dependency is treated as
- activemerchant 1.7.1 + activesupport 2.3.8, so bundle install will
+ activemerchant 1.7.1 + activesupport 2.3.8, so bundle install will
report that it cannot update actionpack.
To explicitly update actionpack, including its dependencies which other
- gems in the Gemfile(5) still depend on, run bundle update actionpack
+ gems in the Gemfile(5) still depend on, run bundle update actionpack
(see bundle update(1)).
- Summary: In general, after making a change to the Gemfile(5) , you
- should first try to run bundle install, which will guarantee that no
- other gems in the Gemfile(5) are impacted by the change. If that does
+ Summary: In general, after making a change to the Gemfile(5) , you
+ should first try to run bundle install, which will guarantee that no
+ other gems in the Gemfile(5) are impacted by the change. If that does
not work, run bundle update(1) bundle-update.1.html.
SEE ALSO
@@ -419,4 +402,4 @@ SEE ALSO
- June 2015 BUNDLE-INSTALL(1)
+ July 2015 BUNDLE-INSTALL(1)
diff --git a/lib/bundler/man/bundle-package b/lib/bundler/man/bundle-package
index 33e89c7..abe55e6 100644
--- a/lib/bundler/man/bundle-package
+++ b/lib/bundler/man/bundle-package
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-PACKAGE" "1" "June 2015" "" ""
+.TH "BUNDLE\-PACKAGE" "1" "May 2015" "" ""
.
.SH "NAME"
\fBbundle\-package\fR \- Package your needed \fB\.gem\fR files into your application
diff --git a/lib/bundler/man/bundle-package.txt b/lib/bundler/man/bundle-package.txt
index 8204e79..8894d5e 100644
--- a/lib/bundler/man/bundle-package.txt
+++ b/lib/bundler/man/bundle-package.txt
@@ -70,4 +70,4 @@ REMOTE FETCHING
- June 2015 BUNDLE-PACKAGE(1)
+ May 2015 BUNDLE-PACKAGE(1)
diff --git a/lib/bundler/man/bundle-platform b/lib/bundler/man/bundle-platform
index 4a4ef32..64438ce 100644
--- a/lib/bundler/man/bundle-platform
+++ b/lib/bundler/man/bundle-platform
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-PLATFORM" "1" "June 2015" "" ""
+.TH "BUNDLE\-PLATFORM" "1" "May 2015" "" ""
.
.SH "NAME"
\fBbundle\-platform\fR \- Displays platform compatibility information
diff --git a/lib/bundler/man/bundle-platform.txt b/lib/bundler/man/bundle-platform.txt
index 1aa250f..b0a5c17 100644
--- a/lib/bundler/man/bundle-platform.txt
+++ b/lib/bundler/man/bundle-platform.txt
@@ -54,4 +54,4 @@ OPTIONS
- June 2015 BUNDLE-PLATFORM(1)
+ May 2015 BUNDLE-PLATFORM(1)
diff --git a/lib/bundler/man/bundle-update b/lib/bundler/man/bundle-update
index 870b0e2..4fabc21 100644
--- a/lib/bundler/man/bundle-update
+++ b/lib/bundler/man/bundle-update
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "BUNDLE\-UPDATE" "1" "June 2015" "" ""
+.TH "BUNDLE\-UPDATE" "1" "May 2015" "" ""
.
.SH "NAME"
\fBbundle\-update\fR \- Update your gems to the latest available versions
diff --git a/lib/bundler/man/bundle-update.txt b/lib/bundler/man/bundle-update.txt
index 96ba4fd..b62cc06 100644
--- a/lib/bundler/man/bundle-update.txt
+++ b/lib/bundler/man/bundle-update.txt
@@ -218,4 +218,4 @@ RECOMMENDED WORKFLOW
- June 2015 BUNDLE-UPDATE(1)
+ May 2015 BUNDLE-UPDATE(1)
diff --git a/lib/bundler/man/gemfile.5 b/lib/bundler/man/gemfile.5
index 061f580..6ade81f 100644
--- a/lib/bundler/man/gemfile.5
+++ b/lib/bundler/man/gemfile.5
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "GEMFILE" "5" "June 2015" "" ""
+.TH "GEMFILE" "5" "July 2015" "" ""
.
.SH "NAME"
\fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
diff --git a/lib/bundler/man/gemfile.5.txt b/lib/bundler/man/gemfile.5.txt
index 1600e16..4fc75a4 100644
--- a/lib/bundler/man/gemfile.5.txt
+++ b/lib/bundler/man/gemfile.5.txt
@@ -618,4 +618,4 @@ SOURCE PRIORITY
- June 2015 GEMFILE(5)
+ July 2015 GEMFILE(5)
diff --git a/lib/bundler/remote_specification.rb b/lib/bundler/remote_specification.rb
index 36f62af..5a32bd2 100644
--- a/lib/bundler/remote_specification.rb
+++ b/lib/bundler/remote_specification.rb
@@ -52,8 +52,6 @@ module Bundler
@_remote_specification = spec
end
- private
-
# Create a delegate used for sorting. This strategy is copied from
# RubyGems 2.23 and ensures that Bundler's specifications can be
# compared and sorted with RubyGems' own specifications.
@@ -67,6 +65,8 @@ module Bundler
[@name, @version, @platform == Gem::Platform::RUBY ? -1 : 1]
end
+ private
+
def _remote_specification
@_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @platform])
end
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb
index 89c784e..5f388e7 100644
--- a/lib/bundler/source/git/git_proxy.rb
+++ b/lib/bundler/source/git/git_proxy.rb
@@ -83,7 +83,7 @@ module Bundler
FileUtils.mkdir_p(destination.dirname)
FileUtils.rm_rf(destination)
git_retry %|clone --no-checkout --quiet "#{path}" "#{destination}"|
- File.chmod((0777 & ~File.umask), destination)
+ File.chmod(((File.stat(destination).mode | 0777) & ~File.umask), destination)
end
SharedHelpers.chdir(destination) do
diff --git a/lib/bundler/templates/newgem/README.md.tt b/lib/bundler/templates/newgem/README.md.tt
index 064381e..8a767d5 100644
--- a/lib/bundler/templates/newgem/README.md.tt
+++ b/lib/bundler/templates/newgem/README.md.tt
@@ -26,7 +26,7 @@ TODO: Write usage instructions here
## Development
-After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
+After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '').sub('rspec', 'spec') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 9873d53..984293e 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -2,5 +2,5 @@ module Bundler
# We're doing this because we might write tests that deal
# with other versions of bundler and we are unsure how to
# handle this better.
- VERSION = "1.10.5" unless defined?(::Bundler::VERSION)
+ VERSION = "1.10.6" unless defined?(::Bundler::VERSION)
end
diff --git a/metadata.yml b/metadata.yml
index 6dc8aa6..6c777b2 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: bundler
version: !ruby/object:Gem::Version
- version: 1.10.5
+ version: 1.10.6
platform: ruby
authors:
- André Arko
@@ -11,7 +11,7 @@ authors:
autorequire:
bindir: bin
cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: mustache
@@ -316,8 +316,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
version: 1.3.6
requirements: []
rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
signing_key:
specification_version: 4
summary: The best way to manage your application's dependencies
test_files: []
+has_rdoc:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/bundler.git
More information about the Pkg-ruby-extras-commits
mailing list