bundler 1.13.7 → 1.14.0.pre.1

data/man/bundle.ronn

@@ -27,20 +27,20 @@ We divide `bundle` subcommands into primary commands and utilities.
 
 ## PRIMARY COMMANDS
 
-* [bundle install(1)][bundle-install]:
+* [`bundle install(1)`][bundle-install]:
   Install the gems specified by the `Gemfile` or `Gemfile.lock`
 
-* [bundle update(1)][bundle-update]:
+* [`bundle update(1)`][bundle-update]:
   Update dependencies to their latest versions
 
-* [bundle package(1)][bundle-package]:
+* [`bundle package(1)`][bundle-package]:
   Package the .gem files required by your application into the
   `vendor/cache` directory
 
-* [bundle exec(1)][bundle-exec]:
+* [`bundle exec(1)`][bundle-exec]:
   Execute a script in the context of the current bundle
 
-* [bundle config(1)][bundle-config]:
+* [`bundle config(1)`][bundle-config]:
   Specify and read configuration options for bundler
 
 * `bundle help(1)`:
@@ -55,7 +55,7 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle show(1)`:
   Show the source location of a particular gem in the bundle
 
-* `bundle outdated(1)`:
+* [`bundle outdated(1)`][bundle-outdated]:
   Show all of the outdated gems in the current bundle
 
 * `bundle console(1)`:
@@ -64,7 +64,7 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle open(1)`:
   Open an installed gem in the editor
 
-* `bundle lock(1)`:
+* [`bundle lock(1)`][bundle-lock]:
   Generate a lockfile for your dependencies
 
 * `bundle viz(1)`:
@@ -73,10 +73,10 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle init(1)`:
   Generate a simple `Gemfile`, placed in the current directory
 
-* [bundle gem(1)][bundle-gem]:
+* [`bundle gem(1)`][bundle-gem]:
   Create a simple gem, suitable for development with bundler
 
-* [bundle platform(1)][bundle-platform]:
+* [`bundle platform(1)`][bundle-platform]:
   Display platform compatibility information
 
 * `bundle clean(1)`:
@@ -91,6 +91,24 @@ When running a command that isn't listed in PRIMARY COMMANDS or UTILITIES,
 Bundler will try to find an executable on your path named `bundler-<command>`
 and execute it, passing down any extra arguments to it.
 
+## BUNDLER TRAMPOLINING
+
+Bundler includes a feature called trampolining, designed to allow a single
+developer to work on multiple projects, each on different Bundler versions.
+The trampoline will infer the correct version of Bundler to use for each project
+and load that version instead of the version directly invoked (which is almost
+always the newest version installed locally).
+
+Bundler by default will use the Bundler version in the current directory to
+determine the version to trampoline to, reading from the `BUNDLED WITH` section.
+However, if the `BUNDLER_VERSION` environment variable is set, that version will
+override the lockfile inference and can be used in directories without a
+lockfile.
+
+Until the target version is Bundler 2 or later, `BUNDLE_TRAMPOLINE_FORCE` must
+be set for the trampoline to be used. Additionally, `BUNDLE_TRAMPOLINE_DISABLE` can
+be set to completely disable the trampoline.
+
 ## OBSOLETE
 
 These commands are obsolete and should no longer be used

data/man/gemfile.5.ronn

@@ -187,6 +187,8 @@ There are a number of `Gemfile` platforms:
     _ruby_ `AND` version 2.3
   * `ruby_24`:
     _ruby_ `AND` version 2.4
+  * `ruby_25`:
+    _ruby_ `AND` version 2.5
   * `mri`:
     Same as _ruby_, but not Rubinius
   * `mri_18`:
@@ -203,6 +205,8 @@ There are a number of `Gemfile` platforms:
     _mri_ `AND` version 2.3
   * `mri_24`:
     _mri_ `AND` version 2.4
+  * `mri_25`:
+    _mri_ `AND` version 2.5
   * `rbx`:
     Same as _ruby_, but only Rubinius (not MRI)
   * `jruby`:
@@ -225,6 +229,8 @@ There are a number of `Gemfile` platforms:
     _mingw_ `AND` version 2.3
   * `mingw_24`:
     _mingw_ `AND` version 2.4
+  * `mingw_25`:
+    _mingw_ `AND` version 2.5
   * `x64_mingw`:
     Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
   * `x64_mingw_20`:
@@ -237,6 +243,8 @@ There are a number of `Gemfile` platforms:
     _x64_mingw_ `AND` version 2.3
   * `x64_mingw_24`:
     _x64_mingw_ `AND` version 2.4
+  * `x64_mingw_25`:
+    _x64_mingw_ `AND` version 2.5
 
 As with groups, you can specify one or more platforms:
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.13.7
+  version: 1.14.0.pre.1
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -152,6 +152,9 @@ files:
 - lib/bundler/cli/show.rb
 - lib/bundler/cli/update.rb
 - lib/bundler/cli/viz.rb
+- lib/bundler/compact_index_client.rb
+- lib/bundler/compact_index_client/cache.rb
+- lib/bundler/compact_index_client/updater.rb
 - lib/bundler/constants.rb
 - lib/bundler/current_ruby.rb
 - lib/bundler/definition.rb
@@ -164,6 +167,7 @@ files:
 - lib/bundler/env.rb
 - lib/bundler/environment_preserver.rb
 - lib/bundler/errors.rb
+- lib/bundler/feature_flag.rb
 - lib/bundler/fetcher.rb
 - lib/bundler/fetcher/base.rb
 - lib/bundler/fetcher/compact_index.rb
@@ -176,6 +180,7 @@ files:
 - lib/bundler/gem_remote_fetcher.rb
 - lib/bundler/gem_tasks.rb
 - lib/bundler/gem_version_promoter.rb
+- lib/bundler/gemdeps.rb
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
 - lib/bundler/injector.rb
@@ -186,28 +191,6 @@ files:
 - lib/bundler/installer/standalone.rb
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-binstubs
-- lib/bundler/man/bundle-binstubs.txt
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
-- lib/bundler/man/bundle-exec
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/bundle-gem
-- lib/bundler/man/bundle-gem.txt
-- lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
-- lib/bundler/man/bundle-lock
-- lib/bundler/man/bundle-lock.txt
-- lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-platform
-- lib/bundler/man/bundle-platform.txt
-- lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
 - lib/bundler/match_platform.rb
 - lib/bundler/mirror.rb
 - lib/bundler/plugin.rb
@@ -279,10 +262,6 @@ files:
 - lib/bundler/ui/shell.rb
 - lib/bundler/ui/silent.rb
 - lib/bundler/uri_credentials_filter.rb
-- lib/bundler/vendor/compact_index_client/lib/compact_index_client.rb
-- lib/bundler/vendor/compact_index_client/lib/compact_index_client/cache.rb
-- lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb
-- lib/bundler/vendor/compact_index_client/lib/compact_index_client/version.rb
 - lib/bundler/vendor/molinillo/lib/molinillo.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
@@ -290,6 +269,7 @@ files:
 - lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
@@ -302,9 +282,9 @@ files:
 - lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
 - lib/bundler/vendor/molinillo/lib/molinillo/state.rb
-- lib/bundler/vendor/net/http/faster.rb
-- lib/bundler/vendor/net/http/persistent.rb
-- lib/bundler/vendor/net/http/persistent/ssl_reuse.rb
+- lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb
+- lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
+- lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb
 - lib/bundler/vendor/postit/lib/postit.rb
 - lib/bundler/vendor/postit/lib/postit/environment.rb
 - lib/bundler/vendor/postit/lib/postit/installer.rb
@@ -350,17 +330,42 @@ files:
 - lib/bundler/vlad.rb
 - lib/bundler/worker.rb
 - lib/bundler/yaml_serializer.rb
+- man/bundle-binstubs.1
+- man/bundle-binstubs.1.txt
 - man/bundle-binstubs.ronn
+- man/bundle-config.1
+- man/bundle-config.1.txt
 - man/bundle-config.ronn
+- man/bundle-exec.1
+- man/bundle-exec.1.txt
 - man/bundle-exec.ronn
+- man/bundle-gem.1
+- man/bundle-gem.1.txt
 - man/bundle-gem.ronn
+- man/bundle-install.1
+- man/bundle-install.1.txt
 - man/bundle-install.ronn
+- man/bundle-lock.1
+- man/bundle-lock.1.txt
 - man/bundle-lock.ronn
+- man/bundle-outdated.1
+- man/bundle-outdated.1.txt
+- man/bundle-outdated.ronn
+- man/bundle-package.1
+- man/bundle-package.1.txt
 - man/bundle-package.ronn
+- man/bundle-platform.1
+- man/bundle-platform.1.txt
 - man/bundle-platform.ronn
+- man/bundle-update.1
+- man/bundle-update.1.txt
 - man/bundle-update.ronn
+- man/bundle.1
+- man/bundle.1.txt
 - man/bundle.ronn
+- man/gemfile.5
 - man/gemfile.5.ronn
+- man/gemfile.5.txt
 - man/index.txt
 homepage: http://bundler.io
 licenses:
@@ -387,3 +392,4 @@ signing_key:
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
+has_rdoc: 

data/lib/bundler/vendor/compact_index_client/lib/compact_index_client.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-require "pathname"
-require "set"
-
-class Bundler::CompactIndexClient
-  class Error < StandardError; end
-
-  require "bundler/vendor/compact_index_client/lib/compact_index_client/cache"
-  require "bundler/vendor/compact_index_client/lib/compact_index_client/updater"
-  require "bundler/vendor/compact_index_client/lib/compact_index_client/version"
-
-  attr_reader :directory
-
-  # @return [Lambda] A lambda that takes an array of inputs and a block, and
-  #         maps the inputs with the block in parallel.
-  #
-  attr_accessor :in_parallel
-
-  def initialize(directory, fetcher)
-    @directory = Pathname.new(directory)
-    @updater = Updater.new(fetcher)
-    @cache = Cache.new(@directory)
-    @endpoints = Set.new
-    @info_checksums_by_name = {}
-    @parsed_checksums = false
-    @in_parallel = lambda do |inputs, &blk|
-      inputs.map(&blk)
-    end
-  end
-
-  def names
-    update(@cache.names_path, "names")
-    @cache.names
-  end
-
-  def versions
-    update(@cache.versions_path, "versions")
-    versions, @info_checksums_by_name = @cache.versions
-    versions
-  end
-
-  def dependencies(names)
-    in_parallel.call(names) do |name|
-      update_info(name)
-      @cache.dependencies(name).map {|d| d.unshift(name) }
-    end.flatten(1)
-  end
-
-  def spec(name, version, platform = nil)
-    update_info(name)
-    @cache.specific_dependency(name, version, platform)
-  end
-
-  def update_and_parse_checksums!
-    return @info_checksums_by_name if @parsed_checksums
-    update(@cache.versions_path, "versions")
-    @info_checksums_by_name = @cache.checksums
-    @parsed_checksums = true
-  end
-
-private
-
-  def update(local_path, remote_path)
-    return unless @endpoints.add?(remote_path)
-    @updater.update(local_path, url(remote_path))
-  end
-
-  def update_info(name)
-    path = @cache.info_path(name)
-    checksum = @updater.checksum_for_file(path)
-    return unless existing = @info_checksums_by_name[name]
-    return if checksum == existing
-    update(path, "info/#{name}")
-  end
-
-  def url(path)
-    path
-  end
-end

data/lib/bundler/vendor/compact_index_client/lib/compact_index_client/cache.rb

@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-require "digest/md5"
-class Bundler::CompactIndexClient
-  class Cache
-    attr_reader :directory
-
-    def initialize(directory)
-      @directory = Pathname.new(directory).expand_path
-      info_roots.each {|dir| FileUtils.mkdir_p(dir) }
-    end
-
-    def names
-      lines(names_path)
-    end
-
-    def names_path
-      directory.join("names")
-    end
-
-    def versions
-      versions_by_name = Hash.new {|hash, key| hash[key] = [] }
-      info_checksums_by_name = {}
-
-      lines(versions_path).each do |line|
-        name, versions_string, info_checksum = line.split(" ", 3)
-        info_checksums_by_name[name] = info_checksum || ""
-        versions_string.split(",").each do |version|
-          if version.start_with?("-")
-            version = version[1..-1].split("-", 2).unshift(name)
-            versions_by_name[name].delete(version)
-          else
-            version = version.split("-", 2).unshift(name)
-            versions_by_name[name] << version
-          end
-        end
-      end
-
-      [versions_by_name, info_checksums_by_name]
-    end
-
-    def versions_path
-      directory.join("versions")
-    end
-
-    def checksums
-      checksums = {}
-
-      lines(versions_path).each do |line|
-        name, _, checksum = line.split(" ", 3)
-        checksums[name] = checksum
-      end
-
-      checksums
-    end
-
-    def dependencies(name)
-      lines(info_path(name)).map do |line|
-        parse_gem(line)
-      end
-    end
-
-    def info_path(name)
-      name = name.to_s
-      if name =~ /[^a-z0-9_-]/
-        name += "-#{Digest::MD5.hexdigest(name).downcase}"
-        info_roots.last.join(name)
-      else
-        info_roots.first.join(name)
-      end
-    end
-
-    def specific_dependency(name, version, platform)
-      pattern = [version, platform].compact.join("-")
-      return nil if pattern.empty?
-
-      gem_lines = info_path(name).read
-      gem_line = gem_lines[/^#{Regexp.escape(pattern)}\b.*/, 0]
-      gem_line ? parse_gem(gem_line) : nil
-    end
-
-  private
-
-    def lines(path)
-      return [] unless path.file?
-      lines = path.read.split("\n")
-      header = lines.index("---")
-      lines = header ? lines[header + 1..-1] : lines
-    end
-
-    def parse_gem(string)
-      version_and_platform, rest = string.split(" ", 2)
-      version, platform = version_and_platform.split("-", 2)
-      dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
-      dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } : []
-      requirements = requirements ? requirements.map {|r| parse_dependency(r) } : []
-      [version, platform, dependencies, requirements]
-    end
-
-    def parse_dependency(string)
-      dependency = string.split(":")
-      dependency[-1] = dependency[-1].split("&") if dependency.size > 1
-      dependency
-    end
-
-    def info_roots
-      [
-        directory.join("info"),
-        directory.join("info-special-characters"),
-      ]
-    end
-  end
-end