bundler 1.7.15 → 1.8.0.pre

data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/lib/bundler/templates/newgem/LICENSE.txt.tt

@@ -1,22 +1,21 @@
-Copyright (c) <%=Time.now.year%> <%=config[:author]%>
+The MIT License (MIT)
 
-MIT License
+Copyright (c) <%=Time.now.year%> <%=config[:author]%>
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/bundler/templates/newgem/README.md.tt

@@ -1,6 +1,8 @@
 # <%=config[:constant_name]%>
 
-TODO: Write a gem description
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/<%=config[:namespaced_path]%>`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -22,6 +24,12 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment. <% if config[:bin] %>Run `bundle exec <%= config[:name] %>` to use the code located 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` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/<%=config[:name]%>/fork )

data/lib/bundler/templates/newgem/Rakefile.tt

@@ -18,6 +18,8 @@ task :default => :spec
 <% if config[:ext] -%>
 require "rake/extensiontask"
 
+task :build => :compile
+
 Rake::ExtensionTask.new("<%=config[:underscored_name]%>") do |ext|
   ext.lib_dir = "lib/<%=config[:namespaced_path]%>"
 end

data/lib/bundler/templates/newgem/bin/console.tt

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "<%= config[:namespaced_path] %>"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/lib/bundler/templates/newgem/bin/setup.tt

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/bundler/templates/newgem/exe/newgem.tt

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require "<%= config[:namespaced_path] %>"

data/lib/bundler/templates/newgem/gitignore.tt

@@ -7,8 +7,10 @@
 /pkg/
 /spec/reports/
 /tmp/
+<%- if config[:ext] -%>
 *.bundle
 *.so
 *.o
 *.a
 mkmf.log
+<%- end -%>

data/lib/bundler/templates/newgem/lib/newgem/version.rb.tt

@@ -1,7 +1,7 @@
 <%- config[:constant_array].each_with_index do |c,i| -%>
 <%= '  '*i %>module <%= c %>
 <%- end -%>
-<%= '  '*config[:constant_array].size %>VERSION = "0.0.1"
+<%= '  '*config[:constant_array].size %>VERSION = "0.1.0"
 <%- (config[:constant_array].size-1).downto(0) do |i| -%>
 <%= '  '*i %>end
 <%- end -%>

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -8,25 +8,29 @@ Gem::Specification.new do |spec|
   spec.version       = <%=config[:constant_name]%>::VERSION
   spec.authors       = [<%=config[:author].inspect%>]
   spec.email         = [<%=config[:email].inspect%>]
-<% if config[:ext] -%>
-  spec.extensions    = ["ext/<%=config[:underscored_name]%>/extconf.rb"]
-<% end -%>
-  spec.summary       = %q{TODO: Write a short summary. Required.}
-  spec.description   = %q{TODO: Write a longer description. Optional.}
-  spec.homepage      = ""
+
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
+  end
+
+  spec.summary       = %q{TODO: Write a short summary, because Rubygems requires one.}
+  spec.description   = %q{TODO: Write a longer description or delete this line.}
+  spec.homepage      = "TODO: Put your gem's website or public repo URL here."
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+<%- if config[:ext] -%>
+  spec.extensions    = ["ext/<%=config[:underscored_name]%>/extconf.rb"]
+<%- end -%>
 
   spec.add_development_dependency "bundler", "~> <%= Bundler::VERSION.split(".")[0..1].join(".") %>"
   spec.add_development_dependency "rake", "~> 10.0"
-<% if config[:ext] -%>
+<%- if config[:ext] -%>
   spec.add_development_dependency "rake-compiler"
-<% end -%>
-<% if config[:test] -%>
+<%- end -%>
+<%- if config[:test] && config[:test] != "false" -%>
   spec.add_development_dependency "<%=config[:test]%>"
-<% end -%>
+<%- end -%>
 end

data/lib/bundler/templates/newgem/test/test_newgem.rb.tt

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-class Test<%= config[:constant_name] %> < MiniTest::Unit::TestCase
+class Test<%= config[:constant_name] %> < Minitest::Test
   def test_that_it_has_a_version_number
     refute_nil ::<%= config[:constant_name] %>::VERSION
   end

data/lib/bundler/ui/shell.rb

@@ -57,7 +57,7 @@ module Bundler
 
       def trace(e, newline = nil)
         return unless debug?
-        msg = ["#{e.class}: #{e.message}", *e.backtrace].join("\n")
+        msg = "#{e.class}: #{e.message}\n#{e.backtrace.join("\n  ")}"
         tell_me(msg, nil, newline)
       end
 

data/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.7.15" unless defined?(::Bundler::VERSION)
+  VERSION = "1.8.0.pre" unless defined?(::Bundler::VERSION)
 end

data/lib/bundler/worker.rb

@@ -0,0 +1,73 @@
+require 'thread'
+
+module Bundler
+  class Worker
+    POISON = Object.new
+
+    class WrappedException < StandardError
+      attr_reader :exception
+      def initialize(exn)
+        @exception = exn
+      end
+    end
+
+    # Creates a worker pool of specified size
+    #
+    # @param size [Integer] Size of pool
+    # @param func [Proc] job to run in inside the worker pool
+    def initialize(size, func)
+      @request_queue = Queue.new
+      @response_queue = Queue.new
+      @func = func
+      @threads = size.times.map { |i| Thread.start { process_queue(i) } }
+      trap("INT") { abort_threads }
+    end
+
+    # Enqueue a request to be executed in the worker pool
+    #
+    # @param obj [String] mostly it is name of spec that should be downloaded
+    def enq(obj)
+      @request_queue.enq obj
+    end
+
+    # Retrieves results of job function being executed in worker pool
+    def deq
+      result = @response_queue.deq
+      raise result.exception if result.is_a?(WrappedException)
+      result
+    end
+
+    def stop
+      stop_threads
+    end
+
+  private
+
+    def process_queue(i)
+      loop do
+        obj = @request_queue.deq
+        break if obj.equal? POISON
+        @response_queue.enq apply_func(obj, i)
+      end
+    end
+
+    def apply_func(obj, i)
+      @func.call(obj, i)
+    rescue Exception => e
+      WrappedException.new(e)
+    end
+
+    # Stop the worker threads by sending a poison object down the request queue
+    # so as worker threads after retrieving it, shut themselves down
+    def stop_threads
+      @threads.each { @request_queue.enq POISON }
+      @threads.each { |thread| thread.join }
+    end
+
+    def abort_threads
+      @threads.each {|i| i.exit }
+      exit 1
+    end
+
+  end
+end

data/man/bundle-config.ronn

@@ -70,6 +70,10 @@ The canonical form of this configuration is `"without"`. To convert the canonica
 form to the environment variable form, capitalize it, and prepend `BUNDLE_`. The
 environment variable form of `"without"` is `BUNDLE_WITHOUT`.
 
+Any periods in the configuration keys must be replaced with two underscores when
+setting it via environment variables. The configuration key `local.rack` becomes
+the environment variable `BUNDLE_LOCAL__RACK`.
+
 ## LIST OF AVAILABLE KEYS
 
 The following is a list of all configuration keys and their purpose. You can
@@ -77,7 +81,7 @@ learn more about their operation in [bundle install(1)][bundle-install].
 
 * `path` (`BUNDLE_PATH`):
   The location on disk to install gems. Defaults to `$GEM_HOME` in development
-  and `vendor/bundler` when `--deployment` is used
+  and `vendor/bundle` when `--deployment` is used
 * `frozen` (`BUNDLE_FROZEN`):
   Disallow changes to the `Gemfile`. Defaults to `true` when `--deployment`
   is used.
@@ -86,6 +90,12 @@ learn more about their operation in [bundle install(1)][bundle-install].
 * `bin` (`BUNDLE_BIN`):
   Install executables from gems in the bundle to the specified directory.
   Defaults to `false`.
+* `gemfile` (`BUNDLE_GEMFILE`):
+  The name of the file that bundler should use as the `Gemfile`. This location
+  of this file also sets the root of the project, which is used to resolve
+  relative paths in the `Gemfile`, among other things. By default, bundler
+  will search up from the current working directory until it finds a
+  `Gemfile`.
 * `ssl_ca_cert` (`BUNDLE_SSL_CA_CERT`):
   Path to a designated CA certificate file or folder containing multiple
   certificates for trusted CAs in PEM format.
@@ -100,18 +110,6 @@ You can set them globally either via environment variables or `bundle config`,
 whichever is preferable for your setup. If you use both, environment variables
 will take preference over global settings.
 
-An additional setting is available only as an environment variable:
-
-* `BUNDLE_GEMFILE`:
-  The name of the file that bundler should use as the `Gemfile`. This location
-  of this file also sets the root of the project, which is used to resolve
-  relative paths in the `Gemfile`, among other things. By default, bundler
-  will search up from the current working directory until it finds a
-  `Gemfile`.
-
-Bundler will ignore any `BUNDLE_GEMFILE` entries in local or global
-configuration files.
-
 ## LOCAL GIT REPOS
 
 Bundler also allows you to work against a git repository locally
@@ -162,9 +160,13 @@ For example, to use a mirror of rubygems.org hosted at
 Bundler allows you to configure credentials for any gem source, which allows
 you to avoid putting secrets into your Gemfile.
 
-    bundle config SOURCE_URL USERNAME:PASSWORD
+    bundle config SOURCE_HOSTNAME USERNAME:PASSWORD
 
 For example, to save the credentials of user `claudette` for the gem source at
 `gems.longerous.com`, you would run:
 
-    bundle config https://gems.longerous.com/ claudette:s00pers3krit
+    bundle config gems.longerous.com claudette:s00pers3krit
+
+Or you can set the credentials as an environment variable like this:
+
+    export BUNDLE_GEMS__LONGEROUS__COM="claudette:s00pers3krit"

data/man/bundle-install.ronn

@@ -3,128 +3,137 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
 
 ## SYNOPSIS
 
-`bundle install` [--gemfile=GEMFILE]
-                 [--path PATH] [--system]
-                 [--without=GROUP1[ GROUP2...]]
-                 [--local] [--deployment]
-                 [--binstubs[=DIRECTORY]]
-                 [--standalone[=GROUP1[ GROUP2...]]]
-                 [--trust-policy=POLICY]
-                 [--jobs=SIZE]
-                 [--retry=TRIES]
-                 [--no-cache]
-                 [--quiet]
+`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...]]
 
 ## 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),
-bundler will fetch all remote sources, resolve dependencies and
+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
+Bundler will fetch all remote sources, but use the dependencies
 specified in the `Gemfile.lock` instead of resolving dependencies.
 
 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
+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 update. You can find more information about this
 update process below under [CONSERVATIVE UPDATING][].
 
 ## OPTIONS
 
-* `--gemfile=<gemfile>`:
-  The location of the Gemfile(5) that bundler should use. This defaults
-  to a gemfile in the current working directory. In general, bundler
-  will assume that the location of the Gemfile(5) is also the project
-  root, and will look for the `Gemfile.lock` and `vendor/cache` relative
-  to it.
+* `--binstubs[=<directory>]`:
+  Creates a directory (defaults to `~/bin`) and place 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.
 
-* `--path=<path>`:
-  The location to install the gems in the bundle to. This defaults to
-  Rubygems' gem home, which is also the default location where `gem
-  install` installs gems. This means that, by default, gems installed
-  without a `--path` setting will show up in `gem list`. This setting is
-  a [remembered option][REMEMBERED OPTIONS].
+* `--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.
 
-* `--system`:
-  Installs the gems in the bundle to the system location. This
-  overrides any previous [remembered][REMEMBERED OPTIONS] use of
-  `--path`.
+* `--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
+  large bundles that seldomly change by enabling this option.
 
-* `--without=<list>`:
-  A space-separated list of groups to skip installing. This is a
-  [remembered option][REMEMBERED OPTIONS].
+* `--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
+  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.
 
 * `--local`:
-  Do not attempt to connect to `rubygems.org`, instead using just
-  the gems already present in Rubygems' cache or in `vendor/cache`.
-  Note that if a more appropriate platform-specific gem exists on
-  `rubygems.org`, it will not be found.
+  Do not attempt to connect to `rubygems.org`. Instead, Bundler will use the
+  gems already present in Rubygems' cache or in `vendor/cache`. Note that if a
+  appropriate platform-specific gem exists on `rubygems.org` it will not be
+  found.
 
 * `--deployment`:
-  Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].
-  Do not use this flag on development machines.
+  In [deployment mode][DEPLOYMENT MODE], Bundler will 'roll-out' the bundle for
+  `production` use. Please check carefully if you want to have this option
+  enabled in `development` or `test` environments.
 
-* `--binstubs[=<directory>]`:
-  Create a directory (defaults to `bin`) containing an executable
-  that runs in the context of the bundle. For instance, if the
-  `rails` gem comes with a `rails` executable, this flag will create
-  a `bin/rails` executable that ensures that all dependencies used
-  come from the bundled gems.
+* `--system`:
+  Installs the gems specified in the bundle to the system's Rubygems location.
+  This overrides any previous [remembered][REMEMBERED OPTIONS] use of `--path`.
 
-* `--shebang ruby-install-name`:
-  Uses the ruby executable (usually `ruby`) provided to execute the scripts created
-  with --binstubs. For instance, if you use --binstubs with `--shebang jruby`,
-  all executables will be created to use jruby instead.
+* `--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 newly bundled gems from
+  being cached during the install.
 
-* `--standalone[=<list>]`:
-  Make a bundle that can work without Ruby Gems or Bundler at runtime.
-  It takes a space separated list of groups to install. It creates a
-  `bundle` directory and installs the bundle there. It also generates
-  a `bundle/bundler/setup.rb` file to replace Bundler's own setup.
+* `--no-prune`:
+  Don't remove stale gems from the cache when the installation finishes.
 
-* `--trust-policy=[<policy>]`:
-  Apply the Rubygems security policy named <policy>, where policy is one of
-  HighSecurity, MediumSecurity, LowSecurity, AlmostNoSecurity, or NoSecurity.
-  For more detail, see the Rubygems signing documentation, linked below in
-  [SEE ALSO][].
+* `--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 will not get listed. This setting is a
+  [remembered option][REMEMBERED OPTIONS].
 
-* `--jobs=[<size>]`:
-  Install gems parallely by starting <size> number of parallel workers.
+* `--quiet`:
+  Do not print progress information to the standard output. Instead, Bundler
+  will exit using a status code (`$?`).
 
-* `--retry[<tries]`:
-  Retries failed network or git requests <tries> times.
+* `--retry=[<number>]`:
+  Retry failed network or git requests for <number> times.
 
-* `--no-cache`:
-  Do not update the cache in `vendor/cache` with the newly bundled gems. This
-  does not remove any existing cached gems, only stops the newly bundled gems
-  from being cached during the install.
+* `--shebang=<ruby-executable>`:
+  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.
 
-* `--quiet`:
-  Do not print progress information to stdout. Instead, communicate the
-  success of the install operation via exit status code.
+* `--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` and installs the bundle there. It
+  also generates a `bundle/bundler/setup.rb` file to replace Bundler's own setup
+  in the manner required.
 
-* `--clean`:
-  Run bundle clean automatically after install.
+* `--trust-policy=[<policy>]`:
+  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][].
 
-* `--full-index`:
-  Use the rubygems modern index instead of the API endpoint.
+* `--without=<list>`:
+  A space-separated list of groups referencing gems to skip during installation.
+  This is a [remembered option][REMEMBERED OPTIONS].
 
-* `--no-prune`:
-  Don't remove stale gems from the cache.
 
 ## 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 in an error when the Gemfile is modified.
+will cause an error when the Gemfile(5) is modified.
 
 1. A `Gemfile.lock` is required.
 
@@ -161,10 +170,10 @@ will cause in an error when the Gemfile is modified.
 
 ## 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
-that case, bundler will stage everything in a temporary directory,
+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 system location.
 
@@ -185,7 +194,7 @@ 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 bundler will ask for your password if it is needed to put the
+and Bundler will ask for your password if it is needed to put the
 gems into their final location.
 
 ## INSTALLING GROUPS
@@ -193,7 +202,7 @@ gems into their final location.
 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
+However, you can explicitly tell Bundler to skip installing
 certain groups with the `--without` option. This option takes
 a space-separated list of groups.
 
@@ -214,21 +223,21 @@ third-party code being used in different environments.`
 
 For a simple illustration, consider the following Gemfile(5):
 
-    source "https://rubygems.org"
+    source 'https://rubygems.org'
 
-    gem "sinatra"
+    gem 'sinatra'
 
     group :production do
-      gem "rack-perftools-profiler"
+      gem 'rack-perftools-profiler'
     end
 
-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
+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
@@ -310,10 +319,10 @@ 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):
 
-    source "https://rubygems.org"
+    source 'https://rubygems.org'
 
-    gem "actionpack", "2.3.8"
-    gem "activemerchant"
+    gem 'actionpack', '2.3.8'
+    gem 'activemerchant'
 
 In this case, both `actionpack` and `activemerchant` depend on
 `activesupport`. The `actionpack` gem depends on `activesupport 2.3.8`
@@ -326,10 +335,10 @@ gems in your Gemfile(5).
 
 Next, you modify your Gemfile(5) to:
 
-    source "https://rubygems.org"
+    source 'https://rubygems.org'
 
-    gem "actionpack", "3.0.0.rc"
-    gem "activemerchant"
+    gem 'actionpack', '3.0.0.rc'
+    gem 'activemerchant'
 
 The `actionpack 3.0.0.rc` gem has a number of new dependencies,
 and updates the `activesupport` dependency to `= 3.0.0.rc` and
@@ -351,7 +360,7 @@ you would not expect it to suddenly stop working after updating
 dependency of actionpack requires updating one of its dependencies.
 
 Even though `activemerchant` declares a very loose dependency
-that theoretically matches `activesupport 3.0.0.rc`, bundler treats
+that theoretically 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`,