bundler 1.12.6 → 1.13.0.pre.1

data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb

@@ -36,12 +36,14 @@ module Bundler::Molinillo
       PossibilityState.new(
         name,
         requirements.dup,
-        activated.dup,
+        activated,
         requirement,
         [possibilities.pop],
         depth + 1,
         conflicts.dup
-      )
+      ).tap do |state|
+        state.activated.tag(state)
+      end
     end
   end
 

data/lib/bundler/vendor/postit/lib/postit.rb

@@ -0,0 +1,15 @@
+require 'postit/environment'
+require 'postit/installer'
+require 'postit/parser'
+require 'postit/version'
+require 'rubygems'
+
+module BundlerVendoredPostIt
+  def self.setup
+    load File.expand_path('../postit/setup.rb', __FILE__)
+  end
+
+  def self.bundler_version
+    defined?(Bundler::VERSION) && Bundler::VERSION
+  end
+end

data/lib/bundler/vendor/postit/lib/postit/environment.rb

@@ -0,0 +1,44 @@
+require 'postit/parser'
+
+module BundlerVendoredPostIt
+  class Environment
+    def initialize(argv)
+      @argv = argv
+    end
+
+    def env_var_version
+      ENV['BUNDLER_VERSION']
+    end
+
+    def cli_arg_version
+      return unless str = @argv.first
+      str = str.dup.force_encoding('BINARY') if str.respond_to?(:force_encoding)
+      if Gem::Version.correct?(str)
+        @argv.shift
+        str
+      end
+    end
+
+    def gemfile
+      ENV['BUNDLE_GEMFILE'] || 'Gemfile'
+    end
+
+    def lockfile
+      File.expand_path case File.basename(gemfile)
+                       when 'gems.rb' then gemfile.sub(/\.rb$/, gemfile)
+                       else "#{gemfile}.lock"
+                       end
+    end
+
+    def lockfile_version
+      BundlerVendoredPostIt::Parser.new(lockfile).parse
+    end
+
+    def bundler_version
+      @bundler_version ||= begin
+        env_var_version || cli_arg_version ||
+          lockfile_version || "#{Gem::Requirement.default}.a"
+      end
+    end
+  end
+end

data/lib/bundler/vendor/postit/lib/postit/installer.rb

@@ -0,0 +1,28 @@
+module BundlerVendoredPostIt
+  class Installer
+    def initialize(bundler_version)
+      @bundler_version = bundler_version
+    end
+
+    def installed?
+      if Gem::Specification.respond_to?(:find_by_name)
+        !Gem::Specification.find_by_name('bundler', @bundler_version).nil?
+      else
+        requirement = Gem::Requirement.new(@bundler_version)
+        Gem.source_index.gems.values.any? do |s|
+          s.name == 'bundler' && requirement.satisfied_by?(s.version)
+        end
+      end
+    rescue LoadError
+      false
+    end
+
+    def install!
+      return if installed?
+      require 'rubygems/dependency_installer'
+      installer = Gem::DependencyInstaller.new
+      installer.install('bundler', @bundler_version)
+      installer.installed_gems
+    end
+  end
+end

data/lib/bundler/vendor/postit/lib/postit/parser.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+
+module BundlerVendoredPostIt
+  class Parser
+    def initialize(file)
+      @file = file
+    end
+
+    BUNDLED_WITH =
+      /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+
+    def parse
+      return unless lockfile = File.file?(@file) && File.read(@file)
+      if lockfile =~ BUNDLED_WITH
+        Regexp.last_match(1)
+      else
+        '< 1.10'
+      end
+    end
+  end
+end

data/lib/bundler/vendor/postit/lib/postit/setup.rb

@@ -0,0 +1,12 @@
+require 'postit/environment'
+require 'postit/installer'
+
+environment = BundlerVendoredPostIt::Environment.new(ARGV)
+version = environment.bundler_version
+
+installer = BundlerVendoredPostIt::Installer.new(version)
+installer.install!
+
+gem 'bundler', version
+
+require 'bundler/version'

data/lib/bundler/vendor/postit/lib/postit/version.rb

@@ -0,0 +1,3 @@
+module BundlerVendoredPostIt
+  VERSION = '0.1.2'.freeze
+end

data/lib/bundler/version.rb

@@ -7,5 +7,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.12.6" unless defined?(::Bundler::VERSION)
+  VERSION = "1.13.0.pre.1" unless defined?(::Bundler::VERSION)
 end

data/lib/bundler/vlad.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # Vlad task for Bundler.
 #
-# Just add "require 'bundler/vlad'" in your Vlad deploy.rb, and
+# Add "require 'bundler/vlad'" in your Vlad deploy.rb, and
 # include the vlad:bundle:install task in your vlad:deploy task.
 require "bundler/deployment"
 

data/lib/bundler/yaml_serializer.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Bundler
+  # A stub yaml serializer that can handle only hashes and strings (as of now).
+  module YAMLSerializer
+  module_function
+
+    def dump(hash)
+      yaml = String.new("---")
+      yaml << dump_hash(hash)
+    end
+
+    def dump_hash(hash)
+      yaml = String.new("\n")
+      hash.each do |k, v|
+        yaml << k << ":"
+        if v.is_a?(Hash)
+          yaml << dump_hash(v).gsub(/^(?!$)/, "  ") # indent all non-empty lines
+        else
+          yaml << " " << v.to_s.gsub(/\s+/, " ").inspect << "\n"
+        end
+      end
+      yaml
+    end
+
+    SCAN_REGEX = /
+      ^
+      ([ ]*) # indentations
+      (.*) # key
+      (?::(?=\s)) # :  (without the lookahead the #key includes this when : is present in value)
+      [ ]?
+      (?: !\s)? # optional exclamation mark found with ruby 1.9.3
+      (['"]?) # optional opening quote
+      (.*) # value
+      \3 # matching closing quote
+      $
+    /xo
+
+    def load(str)
+      res = {}
+      stack = [res]
+      str.scan(SCAN_REGEX).each do |(indent, key, _, val)|
+        key = convert_to_backward_compatible_key(key)
+        depth = indent.scan(/  /).length
+        if val.empty?
+          new_hash = {}
+          stack[depth][key] = new_hash
+          stack[depth + 1] = new_hash
+        else
+          stack[depth][key] = val
+        end
+      end
+      res
+    end
+
+    # for settings' keys
+    def convert_to_backward_compatible_key(key)
+      key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z}
+      key = key.gsub(".", "__") if key.include?(".")
+      key
+    end
+
+    class << self
+      private :dump_hash, :convert_to_backward_compatible_key
+    end
+  end
+end

data/man/bundle-install.ronn

@@ -11,6 +11,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--local]
                  [--deployment]
                  [--force]
+                 [--frozen]
                  [--no-cache]
                  [--no-prune]
                  [--path PATH]
@@ -86,6 +87,10 @@ update process below under [CONSERVATIVE UPDATING][].
   Force download every gem, even if the required versions are already available
   locally.
 
+* `--frozen`:
+  Do not allow the Gemfile.lock to be updated after this install. Exits
+  non-zero if there are going to be changes to the Gemfile.lock.
+
 * `--system`:
   Installs the gems specified in the bundle to the system's Rubygems location.
   This overrides any previous [remembered][REMEMBERED OPTIONS] use of `--path`.
@@ -174,7 +179,7 @@ will cause an error when the Gemfile(5) is modified.
 3. Gems are installed to `vendor/bundle` not your default system location
 
    In development, it's convenient to share the gems used in your
-   application with other applications and other scripts run on
+   application with other applications and other scripts that run on
    the system.
 
    In deployment, isolation is a more important default. In addition,
@@ -195,7 +200,7 @@ 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.
 
-From your perspective, this is identical to installing them gems
+From your perspective, this is identical to installing the gems
 directly into the system.
 
 You should never use `sudo bundle install`. This is because several
@@ -207,7 +212,7 @@ other steps in `bundle install` must be performed as the current user:
 
 Of these three, the first two could theoretically be performed by
 `chown`ing the resulting files to `$SUDO_USER`. The third, however,
-can only be performed by actually invoking the `git` command as
+can only be performed by invoking the `git` command as
 the current user. Therefore, git gems are downloaded and installed
 into `~/.bundle` rather than $GEM_HOME or $BUNDLE_PATH.
 
@@ -266,7 +271,7 @@ 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
+affects more than the gems you list in your Gemfile(5), and can
 (surprisingly) radically change the gems you are using.
 
 ## REMEMBERED OPTIONS
@@ -390,7 +395,7 @@ which other gems in the Gemfile(5) still depend on, run
 
 `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
+other gem in the Gemfile(5) is impacted by the change. If that
 does not work, run [bundle update(1)][bundle-update].
 
 ## SEE ALSO

data/man/bundle-package.ronn

@@ -20,9 +20,10 @@ via the `--all` option. Once used, the `--all` option will be remembered.
 ## SUPPORT FOR MULTIPLE PLATFORMS
 
 When using gems that have different packages for different platforms, Bundler
-1.8 and newer support caching of gems for other platforms in `vendor/cache`.
-This needs to be enabled via the `--all-platforms` option. This setting will be
-remembered in your local bundler configuration.
+1.8 and newer support caching of gems for other platforms where the Gemfile
+has been resolved (i.e. present in the lockfile) in `vendor/cache`.  This needs
+to be enabled via the `--all-platforms` option. This setting will be remembered
+in your local bundler configuration.
 
 ## REMOTE FETCHING
 
@@ -43,12 +44,12 @@ to JRuby and run `bundle install`, bundler is forced to check to
 see whether a `"java"` platformed `nokogiri` exists.
 
 Even though the `nokogiri` gem for the Ruby platform is
-_technically_ acceptable on JRuby, it actually has a C extension
+_technically_ acceptable on JRuby, it has a C extension
 that does not run on JRuby. As a result, bundler will, by default,
 still connect to `rubygems.org` to check whether it has a version
 of one of your gems more specific to your platform.
 
-This problem is also not just limited to the `"java"` platform.
+This problem is also not limited to the `"java"` platform.
 A similar (common) problem can happen when developing on Windows
 and deploying to Linux, or even when developing on OSX and
 deploying to Linux.
@@ -56,7 +57,7 @@ deploying to Linux.
 If you know for sure that the gems packaged in `vendor/cache`
 are appropriate for the platform you are on, you can run
 `bundle install --local` to skip checking for more appropriate
-gems, and just use the ones in `vendor/cache`.
+gems, and use the ones in `vendor/cache`.
 
 One way to be sure that you have the right platformed versions
 of all your gems is to run `bundle package` on an identical

data/man/bundle-platform.ronn

@@ -38,5 +38,5 @@ match the running Ruby VM, it will tell you what part does not.
 ## OPTIONS
 
 * `--ruby`:
-  It will just display the ruby directive information, so you don't have to
+  It will display the ruby directive information, so you don't have to
   parse it from the Gemfile(5).

data/man/bundle-update.ronn

@@ -34,6 +34,9 @@ gem.
 * `--ruby`:
   Update the locked version of Ruby to the current version of Ruby.
 
+* `--bundler`:
+  Update the locked version of bundler to the invoked bundler version.
+
 ## UPDATING ALL GEMS
 
 If you run `bundle update` with no parameters, bundler will ignore
@@ -82,8 +85,8 @@ all of the dependencies, all the way down, and install what you need:
     Bundle complete! 2 Gemfile dependencies, 26 gems total.
     Use `bundle show [gemname]` to see where a bundled gem is installed.
 
-As you can see, even though you have just two gems in the Gemfile(5), your application
-actually needs 26 different gems in order to run. Bundler remembers the exact versions
+As you can see, even though you have two gems in the Gemfile(5), your application
+needs 26 different gems in order to run. Bundler remembers the exact versions
 it installed in `Gemfile.lock`. The next time you run [bundle install(1)][bundle-install], bundler skips
 the dependency resolution and installs the same gems as it installed last time.
 

data/man/bundle.ronn

@@ -16,10 +16,10 @@ started, and Gemfile(5) for more information on the `Gemfile` format.
 ## OPTIONS
 
 * `--no-color`:
-  Prints all output without color
+  Print all output without color
 
 * `--verbose`:
-  Prints out additional logging information
+  Print out additional logging information
 
 ## BUNDLE COMMANDS
 
@@ -44,7 +44,7 @@ We divide `bundle` subcommands into primary commands and utilities.
   Specify and read configuration options for bundler
 
 * `bundle help(1)`:
-  Displays detailed help for each subcommand
+  Display detailed help for each subcommand
 
 ## UTILITIES
 
@@ -80,10 +80,10 @@ We divide `bundle` subcommands into primary commands and utilities.
   Create a simple gem, suitable for development with bundler
 
 * [bundle platform(1)][bundle-platform]:
-  Displays platform compatibility information
+  Display platform compatibility information
 
 * `bundle clean(1)`:
-  Cleans up unused gems in your bundler directory
+  Clean up unused gems in your bundler directory
 
 ## PLUGINS
 

data/man/gemfile.5.ronn

@@ -15,7 +15,7 @@ directory as the `Rakefile`.
 A `Gemfile` is evaluated as Ruby code, in a context which makes available
 a number of methods used to describe the gem requirements.
 
-## GLOBAL SOURCES (#source)
+## GLOBAL SOURCES
 
 At the top of the `Gemfile`, add a line for the `Rubygems` source that contains
 the gems listed in the `Gemfile`.
@@ -33,11 +33,11 @@ be selected for gems that need to use a non-standard repository, suppressing
 this warning, by using the [`:source` option](#SOURCE-source-) or a
 [`source` block](#BLOCK-FORM-OF-SOURCE-GIT-PATH-GROUP-and-PLATFORMS).
 
-### CREDENTIALS (#credentials)
+### CREDENTIALS
 
-Some gem sources require a username and password. Use `bundle config` to set
-the username and password for any sources that need it. The command must be run
-once on each computer that will install the Gemfile, but this keeps the
+Some gem sources require a username and password. Use [bundle config(1)][bundle-config] to set
+the username and password for any of the sources that need it. The command must
+be run once on each computer that will install the Gemfile, but this keeps the
 credentials from being stored in plain text in version control.
 
     bundle config gems.example.com user:password
@@ -50,7 +50,7 @@ include the credentials in the Gemfile as part of the source URL.
 Credentials in the source URL will take precedence over credentials set using
 `config`.
 
-## RUBY (#ruby)
+## RUBY
 
 If your application requires a specific Ruby version or engine, specify your
 requirements using the `ruby` method, with the following arguments.
@@ -64,12 +64,12 @@ the Ruby version that the engine is compatible with.
 
     ruby "1.9.3"
 
-### ENGINE (:engine)
+### ENGINE
 
 Each application _may_ specify a Ruby engine. If an engine is specified, an
 engine version _must_ also be specified.
 
-### ENGINE VERSION (:engine_version)
+### ENGINE VERSION
 
 Each application _may_ specify a Ruby engine version. If an engine version is
 specified, an engine _must_ also be specified. If the engine is "ruby" the
@@ -77,13 +77,13 @@ engine version specified _must_ match the Ruby version.
 
     ruby "1.8.7", :engine => "jruby", :engine_version => "1.6.7"
 
-### PATCHLEVEL (:patchlevel)
+### PATCHLEVEL
 
 Each application _may_ specify a Ruby patchlevel.
 
     ruby "2.0.0", :patchlevel => "247"
 
-## GEMS (#gem)
+## GEMS
 
 Specify gem requirements using the `gem` method, with the following arguments.
 All parameters are `OPTIONAL` unless otherwise specified.
@@ -101,7 +101,7 @@ Each _gem_ `MAY` have one or more version specifiers.
     gem "nokogiri", ">= 1.4.2"
     gem "RedCloth", ">= 4.1.0", "< 4.2.0"
 
-### REQUIRE AS (:require)
+### REQUIRE AS
 
 Each _gem_ `MAY` specify files that should be used when autorequiring via
 `Bundler.require`. You may pass an array with multiple files or `true` if file
@@ -118,7 +118,7 @@ The argument defaults to the name of the gem. For example, these are identical:
     gem "nokogiri", :require => "nokogiri"
     gem "nokogiri", :require => true
 
-### GROUPS (:group or :groups)
+### GROUPS
 
 Each _gem_ `MAY` specify membership in one or more groups. Any _gem_ that does
 not specify membership in any group is placed in the `default` group.
@@ -137,10 +137,10 @@ The Bundler runtime allows its two main methods, `Bundler.setup` and
     Bundler.setup(:default, :test)   # set up the _default_ and _test_ groups, but no others
 
     # require requires all of the gems in the specified groups
-    Bundler.require                  # defaults to just the _default_ group
+    Bundler.require                  # defaults to the _default_ group
     Bundler.require(:default)        # identical
     Bundler.require(:default, :test) # requires the _default_ and _test_ groups
-    Bundler.require(:test)           # requires just the _test_ group
+    Bundler.require(:test)           # requires the _test_ group
 
 The Bundler CLI allows you to specify a list of groups whose gems `bundle install` should
 not install with the `--without` option. To specify multiple groups to ignore, specify a
@@ -155,14 +155,14 @@ without any `--without option`, bundler will recall it.
 
 Also, calling `Bundler.setup` with no parameters, or calling `require "bundler/setup"`
 will setup all groups except for the ones you excluded via `--without` (since they
-are obviously not available).
+are not available).
 
 Note that on `bundle install`, bundler downloads and evaluates all gems, in order to
 create a single canonical list of all of the required gems and their dependencies.
 This means that you cannot list different versions of the same gems in different
 groups. For more details, see [Understanding Bundler](http://bundler.io/rationale.html).
 
-### PLATFORMS (:platforms)
+### PLATFORMS
 
 If a gem should only be used in a particular platform or set of platforms, you can
 specify them. Platforms are essentially identical to groups, except that you do not
@@ -240,7 +240,7 @@ All operations involving groups (`bundle install`, `Bundler.setup`,
 `Bundler.require`) behave exactly the same as if any groups not
 matching the current platform were explicitly excluded.
 
-### SOURCE (:source)
+### SOURCE
 
 You can select an alternate Rubygems repository for a gem using the ':source'
 option.
@@ -259,7 +259,7 @@ Selecting a specific source repository this way also suppresses the ambiguous
 gem warning described above in
 [GLOBAL SOURCES (#source)](#GLOBAL-SOURCES-source-).
 
-### GIT (:git)
+### GIT
 
 If necessary, you can specify that a gem is located at a particular
 git repository using the `:git` parameter. The repository can be accessed via
@@ -333,7 +333,7 @@ and then installs the resulting gem. The `gem build` command,
 which comes standard with Rubygems, evaluates the `.gemspec` in
 the context of the directory in which it is located.
 
-### GIT SOURCE (:git_source)
+### GIT SOURCE
 
 A custom git source can be defined via the `git_source` method. Provide the source's name
 as an argument, and a block which receives a single argument and interpolates it into a
@@ -346,14 +346,14 @@ In addition, if you wish to choose a specific branch:
 
     gem "rails", :stash => "forks/rails", :branch => "branch_name"
 
-### GITHUB (:github)
+### GITHUB
 
 `NOTE`: This shorthand should be avoided until Bundler 2.0, since it
 currently expands to an insecure `git://` URL. This allows a
 man-in-the-middle attacker to compromise your system.
 
 If the git repository you want to use is hosted on GitHub and is public, you can use the
-:github shorthand to specify just the github username and repository name (without the
+:github shorthand to specify the github username and repository name (without the
 trailing ".git"), separated by a slash. If both the username and repository name are the
 same, you can omit one.
 
@@ -366,10 +366,10 @@ Are both equivalent to
 
 Since the `github` method is a specialization of `git_source`, it accepts a `:branch` named argument.
 
-### GIST (:gist)
+### GIST
 
 If the git repository you want to use is hosted as a Github Gist and is public, you can use
-the :gist shorthand to specify just the gist identifier (without the trailing ".git").
+the :gist shorthand to specify the gist identifier (without the trailing ".git").
 
     gem "the_hatch", :gist => "4815162342"
 
@@ -379,10 +379,10 @@ Is equivalent to:
 
 Since the `gist` method is a specialization of `git_source`, it accepts a `:branch` named argument.
 
-### BITBUCKET (:bitbucket)
+### BITBUCKET
 
 If the git repository you want to use is hosted on Bitbucket and is public, you can use the
-:bitbucket shorthand to specify just the bitbucket username and repository name (without the
+:bitbucket shorthand to specify the bitbucket username and repository name (without the
 trailing ".git"), separated by a slash. If both the username and repository name are the
 same, you can omit one.
 
@@ -395,7 +395,7 @@ Are both equivalent to
 
 Since the `bitbucket` method is a specialization of `git_source`, it accepts a `:branch` named argument.
 
-### PATH (:path)
+### PATH
 
 You can specify that a gem is located in a particular location
 on the file system. Relative paths are resolved relative to the
@@ -451,7 +451,7 @@ In the case of the `git` block form, the `:ref`, `:branch`, `:tag`,
 and `:submodules` options may be passed to the `git` method, and
 all gems in the block will inherit those options.
 
-## INSTALL_IF (#install_if)
+## INSTALL_IF
 
 The `install_if` method allows gems to be installed based on a proc or lambda.
 This is especially useful for optional gems that can only be used if certain
@@ -461,7 +461,7 @@ software is installed or some other conditions are met.
       gem "pasteboard"
     end
 
-## GEMSPEC (#gemspec)
+## GEMSPEC
 
 If you wish to use Bundler to help install dependencies for a gem while it is
 being developed, use the `gemspec` method to pull in the dependencies listed in
@@ -480,6 +480,10 @@ options, which control where bundler looks for the `.gemspec`, the glob it uses
 for the gemspec (defaults to: "{,*,*/*}.gemspec"), what named `.gemspec` it uses
 (if more than one is present), and which group development dependencies are included in.
 
+When a `gemspec` dependency encounters version conflicts during resolution, the
+local version under development will always be selected -- even if there are
+remote versions that better match other requirements for the `gemspec` gem.
+
 ## SOURCE PRIORITY
 
 When attempting to locate a gem to satisfy a gem requirement,