bundler 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6aa71f486e6b4b5d1692c18491fcb29101802c4
-  data.tar.gz: b2fab0763dac40223188dd8fdfc4d662693d6be3
+  metadata.gz: 11b70c8e5ed4f9294f1f27b2c8120a0e6bf3dd57
+  data.tar.gz: 726b8467dd3ac471c3077bc81cb37e160cab2da5
 SHA512:
-  metadata.gz: b2aaf805b52b9bfef1c380f9ea835d0b7fefb8aa4962b8b5706f24fe23ff4ebbf3eb2b58a51d1dfc8fa228d3ce0b5a8a260b37028b8a9ca58451b3f4615a9d13
-  data.tar.gz: 36eb16b2c3e86df6010ea8623260c61ac1b82f4333fb69d091839e263aa7e49d1d35bd3fc831c283bb2b732b7405db08fb8668c03fb47ebb9256ae62e1019eaf
+  metadata.gz: 8ea76414ad963d6fc48c3b433c775f3d2936d13d35de47db84aa32249ea7566b62538bd0827d4dca2a73a9414277d9b1d5ba0671410751340fb16adde302c889
+  data.tar.gz: 0c88dd85d2c24e495541d6b3d4bc34b870bd04945e03ef4645235be292cfc0bfb3b9a50f43cdc1ef34f74021ff12173ac0f1b1ceb23b9a405cc91cdda387b2fd

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.15.2 (2017-07-17)
+
+Features:
+
+  - new gemfiles created by bundler will include an explicit `github` git source that uses `https` (@segiddins)
+
+Bugfixes:
+
+  - inline gemfiles work when `BUNDLE_BIN` is set (#5847, @segiddins)
+  - avoid using the old dependency API when there are no changes to the compact index files (#5373, @greysteil)
+  - fail gracefully when the full index serves gemspecs with invalid dependencies (#5797, @segiddins)
+  - support installing gemfiles that use `eval_gemfile`, `:path` gems with relative paths, and `--deployment` simultaneously (@NickLaMuro)
+  - `bundle config` will print settings as the type they are interpreted as (@segiddins)
+  - respect the `no_proxy` environment variable when making network requests (#5781, @jakauppila)
+  - commands invoked with `--verbose` will not have default flags printed (@segiddins)
+  - allow `bundle viz` to work when another gem has a requirable `grapviz` file (#5707, @segiddins)
+  - ensure bundler puts activated gems on the `$LOAD_PATH` in a consistent order (#5696, @segiddins)
+
 ## 1.15.1 (2017-06-02)
 
 Bugfixes:

data/Rakefile

@@ -299,13 +299,6 @@ begin
     lib.vendor_lib = "lib/bundler/vendor/thor"
   end
 
-  Automatiek::RakeTask.new("postit") do |lib|
-    lib.download = { :github => "https://github.com/bundler/postit" }
-    lib.namespace = "PostIt"
-    lib.prefix = "BundlerVendoredPostIt"
-    lib.vendor_lib = "lib/bundler/vendor/postit"
-  end
-
   Automatiek::RakeTask.new("net-http-persistent") do |lib|
     lib.download = { :github => "https://github.com/drbrain/net-http-persistent" }
     lib.namespace = "Net::HTTP::Persistent"
@@ -326,7 +319,6 @@ rescue LoadError
   namespace :vendor do
     task(:molinillo) { abort "Install the automatiek gem to be able to vendor gems." }
     task(:thor) { abort "Install the automatiek gem to be able to vendor gems." }
-    task(:postit) { abort "Install the automatiek gem to be able to vendor gems." }
     task("net-http-persistent") { abort "Install the automatiek gem to be able to vendor gems." }
   end
 end

data/doc/contributing/README.md

@@ -17,22 +17,22 @@ Welcome to Bundler! We are so happy that you're here. We know it can be daunting
 
 You can start learning about Bundler by reading [the documentation](http://bundler.io). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://bundler.io/rationale.html).
 
-##[How you can help: your first contributions!](HOW_YOU_CAN_HELP.md)
+## [How you can help: your first contributions!](HOW_YOU_CAN_HELP.md)
 
 A detailed overview of how to get started contributing to Bundler, including a long list of suggestions for your first project.
 
-##[Bug triage](BUG_TRIAGE.md)
+## [Bug triage](BUG_TRIAGE.md)
 
 Want to take a stab at processing issues? Start here.
 
-##[Getting help](GETTING_HELP.md)
+## [Getting help](GETTING_HELP.md)
 
 How to get in touch with folks who can help when you're stuck. Don't worry! This happens to all of us. We're really nice, we promise.
 
-##[Filing issues](ISSUES.md)
+## [Filing issues](ISSUES.md)
 
 We see a lot of issues in the Bundler repo! Use this guide to file informative, actionable issues.
 
-##[Community](COMMUNITY.md)
+## [Community](COMMUNITY.md)
 
 Learn more about our goals for the Bundler community and the ways you can help us build better together.

data/doc/development/SETUP.md

@@ -20,9 +20,7 @@ Bundler doesn't use a Gemfile to list development dependencies, because when we
 
 4. Set up a shell alias to run Bundler from your clone, e.g. a Bash alias:
 
-      $ alias dbundle='BUNDLE_TRAMPOLINE_DISABLE=1 ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'
-
-   The `BUNDLE_TRAMPOLINE_DISABLE` environment variable ensures that the version of Bundler in `/path/to/bundler/lib` will be used. Without that environment setting, Bundler will automatically download, install, and run the version of Bundler listed in `Gemfile.lock`. With that set up, you can test changes you've made to Bundler by running `dbundle`, without interfering with the regular `bundle` command.
+      `$ alias dbundle='ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'`
 
 ## Debugging with `pry`
 

data/exe/bundle

@@ -7,11 +7,6 @@ Signal.trap("INT") do
   exit 1
 end
 
-update = "update".start_with?(ARGV.first || " ") && ARGV.find {|a| a.start_with?("--bundler") }
-update &&= update =~ /--bundler(?:=(.+))?/ && $1 || "> 0.a"
-ENV["BUNDLER_VERSION"] = update if update
-require "bundler/postit_trampoline"
-
 require "bundler"
 # Check if an older version of bundler is installed
 $LOAD_PATH.each do |path|

data/lib/bundler/cli.rb

@@ -612,12 +612,18 @@ module Bundler
     end
 
     def print_command
-      return unless ENV["BUNDLE_POSTIT_TRAMPOLINING_VERSION"] || Bundler.ui.debug?
+      return unless Bundler.ui.debug?
       _, _, config = @_initializer
-      current_command = config[:current_command].name
-      return if %w(exec version check platform show help).include?(current_command)
-      command = ["bundle", current_command] + args
-      command << Thor::Options.to_switches(options)
+      current_command = config[:current_command]
+      command_name = current_command.name
+      return if %w(exec version check platform show help).include?(command_name)
+      command = ["bundle", command_name] + args
+      options_to_print = options.dup
+      options_to_print.delete_if do |k, v|
+        next unless o = current_command.options[k]
+        o.default == v
+      end
+      command << Thor::Options.to_switches(options_to_print.sort_by(&:first)).strip
       command.reject!(&:empty?)
       Bundler.ui.info "Running `#{command * " "}` with bundler #{Bundler::VERSION}"
     end

data/lib/bundler/cli/install.rb

@@ -13,8 +13,6 @@ module Bundler
 
       warn_if_root
 
-      warn_if_outdated
-
       [:with, :without].each do |option|
         if options[option]
           options[option] = options[option].join(":").tr(" ", ":").split(":")
@@ -116,20 +114,6 @@ module Bundler
         "application for all non-root users on this machine.", :wrap => true
     end
 
-    def warn_if_outdated
-      return if ENV["BUNDLE_POSTIT_TRAMPOLINING_VERSION"].nil?
-      installed_version = Gem::Version.new(ENV["BUNDLE_POSTIT_TRAMPOLINING_VERSION"].dup)
-      running_version = Gem::Version.new(Bundler::VERSION)
-      return if Gem::Requirement.new(installed_version).satisfied_by?(running_version)
-      if Bundler.settings[:warned_version].nil? || running_version > Gem::Version.new(Bundler.settings[:warned_version])
-        Bundler.settings[:warned_version] = running_version
-        Bundler.ui.warn "You're running Bundler #{installed_version} but this " \
-          "project uses #{running_version}. To update, run `bundle update " \
-          "--bundler`. You won't see this message again unless you upgrade " \
-          "to a newer version of Bundler.", :wrap => true
-      end
-    end
-
     def dependencies_count_for(definition)
       count = definition.dependencies.count
       "#{count} Gemfile #{count == 1 ? "dependency" : "dependencies"}"
@@ -145,7 +129,7 @@ module Bundler
         conflicting_groups = options[:without] & options[:with]
         unless conflicting_groups.empty?
           Bundler.ui.error "You can't list a group in both, --with and --without." \
-          "The offending groups are: #{conflicting_groups.join(", ")}."
+          " The offending groups are: #{conflicting_groups.join(", ")}."
           exit 1
         end
       end

data/lib/bundler/cli/viz.rb

@@ -7,6 +7,9 @@ module Bundler
     end
 
     def run
+      # make sure we get the right `graphviz`. There is also a `graphviz`
+      # gem we're not built to support
+      gem "ruby-graphviz"
       require "graphviz"
 
       options[:without] = options[:without].join(":").tr(" ", ":").split(":")

data/lib/bundler/compact_index_client/updater.rb

@@ -34,7 +34,14 @@ module Bundler
           if retrying.nil? && local_path.file?
             FileUtils.cp local_path, local_temp_path
             headers["If-None-Match"] = etag_for(local_temp_path)
-            headers["Range"] = "bytes=#{local_temp_path.size}-"
+            headers["Range"] =
+              if local_temp_path.size.nonzero?
+                # Subtract a byte to ensure the range won't be empty.
+                # Avoids 416 (Range Not Satisfiable) responses.
+                "bytes=#{local_temp_path.size - 1}-"
+              else
+                "bytes=#{local_temp_path.size}-"
+              end
           else
             # Fastly ignores Range when Accept-Encoding: gzip is set
             headers["Accept-Encoding"] = "gzip"
@@ -48,9 +55,12 @@ module Bundler
             content = Zlib::GzipReader.new(StringIO.new(content)).read
           end
 
-          mode = response.is_a?(Net::HTTPPartialContent) ? "a" : "w"
           SharedHelpers.filesystem_access(local_temp_path) do
-            local_temp_path.open(mode) {|f| f << content }
+            if response.is_a?(Net::HTTPPartialContent) && local_temp_path.size.nonzero?
+              local_temp_path.open("a") {|f| f << slice_body(content, 1..-1) }
+            else
+              local_temp_path.open("w") {|f| f << content }
+            end
           end
 
           response_etag = (response["ETag"] || "").gsub(%r{\AW/}, "")
@@ -74,6 +84,14 @@ module Bundler
         sum ? %("#{sum}") : nil
       end
 
+      def slice_body(body, range)
+        if body.respond_to?(:byteslice)
+          body.byteslice(range)
+        else # pre-1.9.3
+          body.unpack("@#{range.first}a#{range.end + 1}").first
+        end
+      end
+
       def checksum_for_file(path)
         return nil unless path.file?
         # This must use IO.read instead of Digest.file().hexdigest

data/lib/bundler/inline.rb

@@ -60,9 +60,11 @@ def gemfile(install = false, options = {}, &gemfile)
 
   Bundler.ui = ui if install
   if install || missing_specs.call
-    installer = Bundler::Installer.install(Bundler.root, definition, :system => true, :inline => true)
-    installer.post_install_messages.each do |name, message|
-      Bundler.ui.info "Post-install message from #{name}:\n#{message}"
+    Bundler.settings.temporary(:inline => true) do
+      installer = Bundler::Installer.install(Bundler.root, definition, :system => true)
+      installer.post_install_messages.each do |name, message|
+        Bundler.ui.info "Post-install message from #{name}:\n#{message}"
+      end
     end
   end
 

data/lib/bundler/installer.rb

@@ -212,7 +212,7 @@ module Bundler
     end
 
     def resolve_if_need(options)
-      if !options["update"] && !options[:inline] && !options["force"] && Bundler.default_lockfile.file?
+      if !options["update"] && !options["force"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file?
         local = Bundler.ui.silence do
           begin
             tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil)

data/lib/bundler/installer/gem_installer.rb

@@ -65,6 +65,7 @@ module Bundler
     end
 
     def generate_executable_stubs
+      return if Bundler.settings[:inline]
       if Bundler.settings[:bin] && standalone
         installer.generate_standalone_bundler_executable_stubs(spec)
       elsif Bundler.settings[:bin]

data/lib/bundler/remote_specification.rb

@@ -73,7 +73,15 @@ module Bundler
     end
 
     def dependencies
-      @dependencies || method_missing(:dependencies)
+      @dependencies ||= begin
+        deps = method_missing(:dependencies)
+
+        # allow us to handle when the specs dependencies are an array of array of string
+        # see https://github.com/bundler/bundler/issues/5797
+        deps = deps.map {|d| d.is_a?(Gem::Dependency) ? d : Gem::Dependency.new(*d) }
+
+        deps
+      end
     end
 
     def git_version

data/lib/bundler/settings.rb

@@ -62,15 +62,7 @@ module Bundler
                 nil
               end end end end end
 
-      if value.nil?
-        nil
-      elsif is_bool(name) || value == "false"
-        to_bool(value)
-      elsif is_num(name)
-        value.to_i
-      else
-        value
-      end
+      converted_value(value, name)
     end
 
     def []=(key, value)
@@ -160,15 +152,15 @@ module Bundler
 
       locations = []
       if @local_config.key?(key)
-        locations << "Set for your local app (#{local_config_file}): #{@local_config[key].inspect}"
+        locations << "Set for your local app (#{local_config_file}): #{converted_value(@local_config[key], exposed_key).inspect}"
       end
 
       if value = ENV[key]
-        locations << "Set via #{key}: #{value.inspect}"
+        locations << "Set via #{key}: #{converted_value(value, exposed_key).inspect}"
       end
 
       if @global_config.key?(key)
-        locations << "Set for the current user (#{global_config_file}): #{@global_config[key].inspect}"
+        locations << "Set for the current user (#{global_config_file}): #{converted_value(@global_config[key], exposed_key).inspect}"
       end
 
       return ["You have not configured a value for `#{exposed_key}`"] if locations.empty?
@@ -281,6 +273,18 @@ module Bundler
       value
     end
 
+    def converted_value(value, key)
+      if value.nil?
+        nil
+      elsif is_bool(key) || value == "false"
+        to_bool(value)
+      elsif is_num(key)
+        value.to_i
+      else
+        value
+      end
+    end
+
     def global_config_file
       if ENV["BUNDLE_CONFIG"] && !ENV["BUNDLE_CONFIG"].empty?
         Pathname.new(ENV["BUNDLE_CONFIG"])

data/lib/bundler/setup.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require "bundler/postit_trampoline"
 require "bundler/shared_helpers"
 
 if Bundler::SharedHelpers.in_bundle?
@@ -20,12 +19,9 @@ if Bundler::SharedHelpers.in_bundle?
     Bundler.setup
   end
 
-  unless ENV["BUNDLE_POSTIT_TRAMPOLINING_VERSION"]
-    # Add bundler to the load path after disabling system gems
-    # This is guaranteed to be done already if we've trampolined
-    bundler_lib = File.expand_path("../..", __FILE__)
-    $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
-  end
+  # Add bundler to the load path after disabling system gems
+  bundler_lib = File.expand_path("../..", __FILE__)
+  $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
 
   Bundler.ui = nil
 end

data/lib/bundler/source/path.rb

@@ -63,7 +63,7 @@ module Bundler
 
       def eql?(other)
         return unless other.class == self.class
-        expand(@original_path) == expand(other.original_path) &&
+        expanded_original_path == other.expanded_original_path &&
           version == other.version
       end
 
@@ -117,6 +117,10 @@ module Bundler
         instance_of?(Path)
       end
 
+      def expanded_original_path
+        @expanded_original_path ||= expand(original_path)
+      end
+
     private
 
       def expanded_path

data/lib/bundler/spec_set.rb

@@ -160,7 +160,8 @@ module Bundler
     end
 
     def tsort_each_node
-      @specs.each {|s| yield s }
+      # MUST sort by name for backwards compatibility
+      @specs.sort_by(&:name).each {|s| yield s }
     end
 
     def spec_for_dependency(dep, match_current_platform)

data/lib/bundler/templates/Gemfile

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
 # gem "rails"

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

@@ -1,4 +1,6 @@
 source "https://rubygems.org"
 
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
 # Specify your gem's dependencies in <%= config[:name] %>.gemspec
 gemspec

data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb

@@ -616,6 +616,8 @@ class Bundler::Persistent::Net::HTTP::Persistent
     if @proxy_uri and not proxy_bypass? uri.host, uri.port then
       connection_id << @proxy_connection_id
       net_http_args.concat @proxy_args
+    else
+      net_http_args.concat [nil, nil, nil, nil]
     end
 
     connection = connections[connection_id]

data/lib/bundler/version.rb

@@ -7,7 +7,7 @@ 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.15.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.15.2" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin

data/man/bundle-gem.ronn

@@ -11,7 +11,7 @@ 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
+Run `rake -T` in the resulting project for a list of Rake tasks that can be used
 to test and publish the gem to rubygems.org.
 
 The generated project skeleton can be customized with OPTIONS, as explained

data/man/bundle.ronn

@@ -97,24 +97,6 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - André Arko
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -228,7 +228,6 @@ files:
 - lib/bundler/plugin/installer/git.rb
 - lib/bundler/plugin/installer/rubygems.rb
 - lib/bundler/plugin/source_list.rb
-- lib/bundler/postit_trampoline.rb
 - lib/bundler/psyched_yaml.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
@@ -311,12 +310,6 @@ files:
 - 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
-- lib/bundler/vendor/postit/lib/postit/parser.rb
-- lib/bundler/vendor/postit/lib/postit/setup.rb
-- lib/bundler/vendor/postit/lib/postit/version.rb
 - lib/bundler/vendor/thor/lib/thor.rb
 - lib/bundler/vendor/thor/lib/thor/actions.rb
 - lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
@@ -454,4 +447,3 @@ signing_key:
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
-has_rdoc: 

data/lib/bundler/postit_trampoline.rb

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-module BundlerVendoredPostIt; end
-require "bundler/vendor/postit/lib/postit"
-require "rubygems"
-
-environment = BundlerVendoredPostIt::PostIt::Environment.new([])
-version = Gem::Requirement.new(environment.bundler_version)
-if version.requirements.size == 1 && version.requirements.first.first == "=" # version.exact?
-  if version.requirements.first.last.segments.first >= 2
-    ENV["BUNDLE_TRAMPOLINE_FORCE"] = "true"
-  end
-end
-
-if ENV["BUNDLE_TRAMPOLINE_FORCE"] && !ENV["BUNDLE_TRAMPOLINE_DISABLE"]
-  installed_version =
-    if defined?(Bundler::VERSION)
-      Bundler::VERSION
-    else
-      File.read(File.expand_path("../version.rb", __FILE__)) =~ /VERSION = "(.+)"/
-      $1
-    end
-  installed_version &&= Gem::Version.new(installed_version)
-
-  if !version.satisfied_by?(installed_version)
-    begin
-      installer = BundlerVendoredPostIt::PostIt::Installer.new(version)
-      unless installer.installed?
-        warn "Installing locked Bundler version #{version.to_s.gsub("= ", "")}..."
-        installer.install!
-      end
-    rescue => e
-      abort <<-EOS.strip
-Installing the inferred bundler version (#{version}) failed.
-If you'd like to update to the current bundler version (#{installed_version}) in this project, run `bundle update --bundler`.
-The error was: #{e}
-    EOS
-    end
-
-    if deleted_spec = Gem.loaded_specs.delete("bundler")
-      deleted_spec.full_require_paths.each {|path| $:.delete(path) }
-    else
-      $:.delete(File.expand_path("../..", __FILE__))
-    end
-    gem "bundler", version
-  else
-    begin
-      gem "bundler", version
-    rescue LoadError
-      $:.unshift(File.expand_path("../..", __FILE__))
-    end
-  end
-
-  running_version = begin
-    require "bundler/version"
-    Bundler::VERSION
-  rescue LoadError, NameError
-    nil
-  end
-
-  ENV["BUNDLE_POSTIT_TRAMPOLINING_VERSION"] = installed_version.to_s
-
-  if !Gem::Requirement.new(">= 1.13.pre".dup).satisfied_by?(Gem::Version.new(running_version)) && (ARGV.empty? || ARGV.any? {|a| %w(install i).include? a })
-    puts <<-WARN.strip
-You're running Bundler #{installed_version} but this project uses #{running_version}. To update, run `bundle update --bundler`.
-  WARN
-  end
-
-  if !Gem::Version.correct?(running_version.to_s) || !version.satisfied_by?(Gem::Version.create(running_version))
-    abort "The running bundler (#{running_version}) does not match the required `#{version}`"
-  end
-
-end # if ENV["BUNDLE_TRAMPOLINE_FORCE"] && !ENV["BUNDLE_TRAMPOLINE_DISABLE"]

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

@@ -1,15 +0,0 @@
-require 'bundler/vendor/postit/lib/postit/environment'
-require 'bundler/vendor/postit/lib/postit/installer'
-require 'bundler/vendor/postit/lib/postit/parser'
-require 'bundler/vendor/postit/lib/postit/version'
-require 'rubygems'
-
-module BundlerVendoredPostIt::PostIt
-  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

@@ -1,44 +0,0 @@
-require 'bundler/vendor/postit/lib/postit/parser'
-
-module BundlerVendoredPostIt::PostIt
-  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::PostIt::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

@@ -1,28 +0,0 @@
-module BundlerVendoredPostIt::PostIt
-  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

@@ -1,21 +0,0 @@
-require 'rubygems'
-
-module BundlerVendoredPostIt::PostIt
-  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

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

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

@@ -1,3 +0,0 @@
-module BundlerVendoredPostIt::PostIt
-  VERSION = '0.2.0'.freeze
-end