bundler 1.10.6 → 1.11.2

data/lib/bundler/lockfile_parser.rb

@@ -34,8 +34,8 @@ module Bundler
       @rubygems_aggregate = Source::Rubygems.new
 
       if lockfile.match(/<<<<<<<|=======|>>>>>>>|\|\|\|\|\|\|\|/)
-        raise LockfileError, "Your Gemfile.lock contains merge conflicts.\n" \
-          "Run `git checkout HEAD -- Gemfile.lock` first to get a clean lock."
+        raise LockfileError, "Your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} contains merge conflicts.\n" \
+          "Run `git checkout HEAD -- #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` first to get a clean lock."
       end
 
       lockfile.split(/(?:\r?\n)+/).each do |line|
@@ -59,7 +59,7 @@ module Bundler
       warn_for_outdated_bundler_version
     rescue ArgumentError => e
       Bundler.ui.debug(e)
-      raise LockfileError, "Your lockfile is unreadable. Run `rm Gemfile.lock` " \
+      raise LockfileError, "Your lockfile is unreadable. Run `rm #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` " \
         "and then `bundle install` to generate a new lockfile."
     end
 
@@ -92,7 +92,8 @@ module Bundler
       case line
       when GIT, GEM, PATH
         @current_source = nil
-        @opts, @type = {}, line
+        @opts = {}
+        @type = line
       when SPECS
         case @type
         when PATH
@@ -102,7 +103,7 @@ module Bundler
           @current_source = TYPES[@type].from_lock(@opts)
           # Strip out duplicate GIT sections
           if @sources.include?(@current_source)
-            @current_source = @sources.find { |s| s == @current_source }
+            @current_source = @sources.find {|s| s == @current_source }
           else
             @sources << @current_source
           end
@@ -131,19 +132,21 @@ module Bundler
     end
 
     NAME_VERSION = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'
-    NAME_VERSION_2 = %r{^ {2}#{NAME_VERSION}(!)?$}
-    NAME_VERSION_4 = %r{^ {4}#{NAME_VERSION}$}
-    NAME_VERSION_6 = %r{^ {6}#{NAME_VERSION}$}
+    NAME_VERSION_2 = /^ {2}#{NAME_VERSION}(!)?$/
+    NAME_VERSION_4 = /^ {4}#{NAME_VERSION}$/
+    NAME_VERSION_6 = /^ {6}#{NAME_VERSION}$/
 
     def parse_dependency(line)
       if line =~ NAME_VERSION_2
-        name, version, pinned = $1, $2, $4
-        version = version.split(",").map { |d| d.strip } if version
+        name = $1
+        version = $2
+        pinned = $4
+        version = version.split(",").map(&:strip) if version
 
         dep = Bundler::Dependency.new(name, version)
 
-        if pinned && dep.name != 'bundler'
-          spec = @specs.find {|k, v| v.name == dep.name }
+        if pinned && dep.name != "bundler"
+          spec = @specs.find {|_, v| v.name == dep.name }
           dep.source = spec.last.source if spec
 
           # Path sources need to know what the default name / version
@@ -162,7 +165,8 @@ module Bundler
 
     def parse_spec(line)
       if line =~ NAME_VERSION_4
-        name, version = $1, Gem::Version.new($2)
+        name = $1
+        version = Gem::Version.new($2)
         platform = $3 ? Gem::Platform.new($3) : Gem::Platform::RUBY
         @current_spec = LazySpecification.new(name, version, platform)
         @current_spec.source = @current_source
@@ -171,17 +175,16 @@ module Bundler
         # duplicate GIT sections)
         @specs[@current_spec.identifier] ||= @current_spec
       elsif line =~ NAME_VERSION_6
-        name, version = $1, $2
-        version = version.split(',').map { |d| d.strip } if version
+        name = $1
+        version = $2
+        version = version.split(",").map(&:strip) if version
         dep = Gem::Dependency.new(name, version)
         @current_spec.dependencies << dep
       end
     end
 
     def parse_platform(line)
-      if line =~ /^  (.*)$/
-        @platforms << Gem::Platform.new($1)
-      end
+      @platforms << Gem::Platform.new($1) if line =~ /^  (.*)$/
     end
 
     def parse_bundled_with(line)
@@ -190,6 +193,5 @@ module Bundler
         @bundler_version = Gem::Version.create(line)
       end
     end
-
   end
 end

data/lib/bundler/man/bundle

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE" "1" "June 2015" "" ""
+.TH "BUNDLE" "1" "October 2015" "" ""
 .
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management
@@ -93,7 +93,7 @@ Generate a visual representation of your dependencies
 Generate a simple \fBGemfile\fR, placed in the current directory
 .
 .TP
-\fBbundle gem(1)\fR
+bundle gem(1) \fIbundle\-gem\.1\.html\fR
 Create a simple gem, suitable for development with bundler
 .
 .TP

data/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" "July 2015" "" ""
+.TH "BUNDLE\-CONFIG" "1" "October 2015" "" ""
 .
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options
@@ -84,7 +84,7 @@ Any periods in the configuration keys must be replaced with two underscores when
 The following is a list of all configuration keys and their purpose\. You can learn more about their operation in bundle install(1) \fIbundle\-install\.1\.html\fR\.
 .
 .IP "\(bu" 4
-\fBpath\fR (\fBBUNDLE_PATH\fR): The location on disk to install gems\. Defaults to \fB$GEM_HOME\fR in development and \fBvendor/bundle\fR when \fB\-\-deployment\fR is used
+\fBpath\fR (\fBBUNDLE_PATH\fR): The location on disk where all gems in your bundle will be located regardless of \fB$GEM_HOME\fR or \fB$GEM_PATH\fR values\. Bundle gems not found in this location will be installed by \fBbundle install\fR\. Defaults to \fBGem\.dir\fR\. When \-\-deployment is used, defaults to vendor/bundle\.
 .
 .IP "\(bu" 4
 \fBfrozen\fR (\fBBUNDLE_FROZEN\fR): Disallow changes to the \fBGemfile\fR\. Defaults to \fBtrue\fR when \fB\-\-deployment\fR is used\.

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

@@ -97,9 +97,11 @@ LIST OF AVAILABLE KEYS
        You  can  learn	more  about  their operation in bundle install(1) bun-
        dle-install.1.html.
 
-       o   path (BUNDLE_PATH): The location on disk to install gems.  Defaults
-	   to  $GEM_HOME in development and vendor/bundle when --deployment is
-	   used
+       o   path (BUNDLE_PATH): The location on disk where  all	gems  in  your
+	   bundle will be located regardless of $GEM_HOME or $GEM_PATH values.
+	   Bundle gems not found in this location will be installed by	bundle
+	   install.  Defaults  to Gem.dir. When --deployment is used, defaults
+	   to vendor/bundle.
 
        o   frozen (BUNDLE_FROZEN): Disallow changes to the  Gemfile.  Defaults
 	   to true when --deployment is used.
@@ -235,4 +237,4 @@ CREDENTIALS FOR GEM SOURCES
 
 
 
-				   July 2015		      BUNDLE-CONFIG(1)
+				 October 2015		      BUNDLE-CONFIG(1)

data/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" "July 2015" "" ""
+.TH "BUNDLE\-EXEC" "1" "September 2015" "" ""
 .
 .SH "NAME"
 \fBbundle\-exec\fR \- Execute a command in the context of the bundle

data/lib/bundler/man/bundle-exec.txt

@@ -160,4 +160,4 @@ RUBYGEMS PLUGINS
 
 
 
-				   July 2015			BUNDLE-EXEC(1)
+				September 2015			BUNDLE-EXEC(1)

data/lib/bundler/man/bundle-gem

@@ -0,0 +1,80 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-GEM" "1" "October 2015" "" ""
+.
+.SH "NAME"
+\fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem
+.
+.SH "SYNOPSIS"
+\fBbundle gem\fR \fIGEM_NAME\fR \fIOPTIONS\fR
+.
+.SH "DESCRIPTION"
+Generates a directory named \fBGEM_NAME\fR with a \fBRakefile\fR, \fBGEM_NAME\.gemspec\fR, and other supporting files and directories that can be used to develop a rubygem with that name\.
+.
+.P
+Run \fBrake \-T\fR in the resulting project for a list of Rake tasks that can used to test and publish the gem to rubygems\.org\.
+.
+.P
+The generated project skeleton can be customized with OPTIONS, as explained below\. Note that these options can also be specified via Bundler\'s global configuration file using the following names:
+.
+.IP "\(bu" 4
+\fBgem\.coc\fR
+.
+.IP "\(bu" 4
+\fBgem\.mit\fR
+.
+.IP "\(bu" 4
+\fBgem\.test\fR
+.
+.IP "" 0
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-b\fR or \fB\-\-bin\fR
+Specify that Bundler should create a binary (as \fBexe/GEM_NAME\fR) in the generated rubygem project\. This binary will also be added to the \fBGEM_NAME\.gemspec\fR manifest\. This behavior is disabled by default\.
+.
+.TP
+\fB\-\-no\-bin\fR
+Do not create a binary (overrides \fB\-\-bin\fR specified in the global config)\.
+.
+.TP
+\fB\-\-coc\fR
+Add a \fBCODE_OF_CONDUCT\.md\fR file to the root of the generated project\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
+.
+.TP
+\fB\-\-no\-coc\fR
+Do not create a \fBCODE_OF_CONDUCT\.md\fR (overrides \fB\-\-coc\fR specified in the global config)\.
+.
+.TP
+\fB\-\-ext\fR
+Add boilerplate for C extension code to the generated project\. This behavior is disabled by default\.
+.
+.TP
+\fB\-\-no\-ext\fR
+Do not add C extension code (overrides \fB\-\-ext\fR specified in the global config)\.
+.
+.TP
+\fB\-\-mit\fR
+Add an MIT license to a \fBLICENSE\.txt\fR file in the root of the generated project\. Your name from the global git config is used for the copyright statement\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
+.
+.TP
+\fB\-\-no\-mit\fR
+Do not create a \fBLICENSE\.txt\fR (overrides \fB\-\-mit\fR specified in the global config)\.
+.
+.TP
+\fB\-t\fR, \fB\-\-test=minitest\fR, \fB\-\-test=rspec\fR
+Specify the test framework that Bundler should use when generating the project\. Acceptable values are \fBminitest\fR and \fBrspec\fR\. The \fBGEM_NAME\.gemspec\fR will be configured and a skeleton test/spec directory will be created based on this option\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
+.
+.TP
+\fB\-e\fR, \fB\-\-edit[=EDITOR]\fR
+Open the resulting GEM_NAME\.gemspec in EDITOR, or the default editor if not specified\. The default is \fB$BUNDLER_EDITOR\fR, \fB$VISUAL\fR, or \fB$EDITOR\fR\.
+.
+.SH "SEE ALSO"
+.
+.IP "\(bu" 4
+bundle\-config(1)
+.
+.IP "" 0
+

data/lib/bundler/man/bundle-gem.txt

@@ -0,0 +1,90 @@
+BUNDLE-GEM(1)							 BUNDLE-GEM(1)
+
+
+
+NAME
+       bundle-gem - Generate a project skeleton for creating a rubygem
+
+SYNOPSIS
+       bundle gem GEM_NAME OPTIONS
+
+DESCRIPTION
+       Generates a directory named GEM_NAME with a Rakefile, GEM_NAME.gemspec,
+       and other supporting files and directories that can be used to  develop
+       a rubygem with that name.
+
+       Run  rake -T in the resulting project for a list of Rake tasks that can
+       used to test and publish the gem to rubygems.org.
+
+       The generated project skeleton  can  be	customized  with  OPTIONS,  as
+       explained  below.  Note	that  these  options can also be specified via
+       Bundler's global configuration file using the following names:
+
+       o   gem.coc
+
+       o   gem.mit
+
+       o   gem.test
+
+
+
+OPTIONS
+       -b or --bin
+	      Specify that Bundler should create a binary (as exe/GEM_NAME) in
+	      the generated rubygem project. This binary will also be added to
+	      the GEM_NAME.gemspec manifest.  This  behavior  is  disabled  by
+	      default.
+
+       --no-bin
+	      Do  not create a binary (overrides --bin specified in the global
+	      config).
+
+       --coc  Add a CODE_OF_CONDUCT.md file  to  the  root  of	the  generated
+	      project.	If  this  option is unspecified, an interactive prompt
+	      will be displayed and the answer	will  be  saved  in  Bundler's
+	      global config for future bundle gem use.
+
+       --no-coc
+	      Do not create a CODE_OF_CONDUCT.md (overrides --coc specified in
+	      the global config).
+
+       --ext  Add boilerplate for C extension code to the  generated  project.
+	      This behavior is disabled by default.
+
+       --no-ext
+	      Do  not  add  C extension code (overrides --ext specified in the
+	      global config).
+
+       --mit  Add an MIT license to a LICENSE.txt file in the root of the gen-
+	      erated project. Your name from the global git config is used for
+	      the copyright statement.	If  this  option  is  unspecified,  an
+	      interactive  prompt  will  be  displayed	and the answer will be
+	      saved in Bundler's global config for future bundle gem use.
+
+       --no-mit
+	      Do not create a LICENSE.txt (overrides --mit  specified  in  the
+	      global config).
+
+       -t, --test=minitest, --test=rspec
+	      Specify the test framework that Bundler should use when generat-
+	      ing the project. Acceptable values are minitest and  rspec.  The
+	      GEM_NAME.gemspec	will  be  configured  and a skeleton test/spec
+	      directory will be created based on this option. If  this	option
+	      is  unspecified, an interactive prompt will be displayed and the
+	      answer will be saved in Bundler's global config for future  bun-
+	      dle gem use.
+
+       -e, --edit[=EDITOR]
+	      Open  the  resulting  GEM_NAME.gemspec in EDITOR, or the default
+	      editor  if  not  specified.  The	default  is   $BUNDLER_EDITOR,
+	      $VISUAL, or $EDITOR.
+
+SEE ALSO
+       o   bundle-config(1)
+
+
+
+
+
+
+				 October 2015			 BUNDLE-GEM(1)

data/lib/bundler/man/bundle-install

@@ -1,13 +1,40 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INSTALL" "1" "July 2015" "" ""
+.TH "BUNDLE\-INSTALL" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
 .
 .SH "SYNOPSIS"
-\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\.\.\.]]
+\fBbundle install\fR [\-\-binstubs[=DIRECTORY]]
+.
+.IP "" 4
+.
+.nf
+
+             [\-\-clean]
+             [\-\-full\-index]
+             [\-\-gemfile=GEMFILE]
+             [\-\-jobs=NUMBER]
+             [\-\-local]
+             [\-\-deployment]
+             [\-\-force]
+             [\-\-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
 .
 .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\.
@@ -38,7 +65,7 @@ The location of the Gemfile(5) which Bundler should use\. This defaults to a Gem
 .
 .TP
 \fB\-\-jobs=[<number>]\fR
-Install gems by starting \fInumber\fR of workers parallely\.
+The maximum number of parallel download and install jobs\. The default is \fB1\fR\.
 .
 .TP
 \fB\-\-local\fR
@@ -46,7 +73,11 @@ Do not attempt to connect to \fBrubygems\.org\fR\. Instead, Bundler will use the
 .
 .TP
 \fB\-\-deployment\fR
-In \fIdeployment mode\fR, Bundler will \'roll\-out\' the bundle for \fBproduction\fR use\. Please check carefully if you want to have this option enabled in \fBdevelopment\fR or \fBtest\fR environments\.
+In \fIdeployment mode\fR, 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\.
+.
+.TP
+\fB\-\-force\fR
+Force download every gem, even if the required versions are already available locally\.
 .
 .TP
 \fB\-\-system\fR
@@ -78,7 +109,7 @@ Uses the specified ruby executable (usually \fBruby\fR) to execute the scripts c
 .
 .TP
 \fB\-\-standalone[=<list>]\fR
-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 \fBbundle\fR and installs the bundle there\. It also generates a \fBbundle/bundler/setup\.rb\fR file to replace Bundler\'s own setup in the manner required\.
+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 \fBbundle\fR and installs the bundle there\. It also generates a \fBbundle/bundler/setup\.rb\fR file to replace Bundler\'s own setup in the manner required\. Using this option implicitly sets \fBpath\fR, which is a \fIremembered option\fR\.
 .
 .TP
 \fB\-\-trust\-policy=[<policy>]\fR
@@ -93,7 +124,7 @@ A space\-separated list of groups referencing gems to skip during installation\.
 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 is a \fIremembered option\fR\.
 .
 .SH "DEPLOYMENT MODE"
-Bundler\'s defaults are optimized for development\. To switch to defaults optimized for deployment, use the \fB\-\-deployment\fR flag\. Do not activate deployment mode on development machines, as it will cause an error when the Gemfile(5) is modified\.
+Bundler\'s defaults are optimized for development\. To switch to defaults optimized for deployment and for CI, use the \fB\-\-deployment\fR flag\. Do not activate deployment mode on development machines, as it will cause an error when the Gemfile(5) is modified\.
 .
 .IP "1." 4
 A \fBGemfile\.lock\fR is required\.

data/lib/bundler/man/bundle-install.txt

@@ -6,59 +6,78 @@ 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]
+			[--force]
+			[--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.
 
        --jobs=[<number>]
-	      Install gems by starting number of workers parallely.
+	      The  maximum  number  of parallel download and install jobs. The
+	      default is 1.
 
        --local
 	      Do not attempt to connect to rubygems.org. Instead, Bundler will
@@ -68,33 +87,37 @@ OPTIONS
 
        --deployment
 	      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.
+	      duction or CI use. Please check carefully if you	want  to  have
+	      this option enabled in your development environment.
+
+       --force
+	      Force  download  every  gem,  even  if the required versions are
+	      already available locally.
 
        --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>]
@@ -102,17 +125,18 @@ 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
-	      manner required.
+	      dle/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.
 
        --trust-policy=[<policy>]
 	      Apply the Rubygems security policy policy, where policy  is  one
@@ -134,9 +158,9 @@ OPTIONS
 
 DEPLOYMENT MODE
        Bundler's defaults are optimized for development. To switch to defaults
-       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.
+       optimized for deployment and for CI, 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.
 
@@ -402,4 +426,4 @@ SEE ALSO
 
 
 
-				   July 2015		     BUNDLE-INSTALL(1)
+				 December 2015		     BUNDLE-INSTALL(1)