bundler 1.13.0.pre.1 → 1.13.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b53f9f6d4261f192e8a29fcd3dde588d2b60f1cb
-  data.tar.gz: c0d3f7377fcd4d3ceaf92c61adcbab5eef1c434d
+  metadata.gz: 31a0bcb37c5ab89c38532e3b0d371229203b9646
+  data.tar.gz: 0c078555eef96e3d7da95300bc8be26b887269ea
 SHA512:
-  metadata.gz: 954bf042fe84dce7a3e5bff018761240b3e5ae29da10960afcdf23da4139829b9f19f2d85b152a420bd73edcbe3606b2fef61cf661f7d647c1e7020cff21240b
-  data.tar.gz: 123e6cdb0d99b018add47043dfb45ec83ce78523a2a391eadaab15ba344b94ada9ec02be45b269ca18eb5e4861038b20149b770d21ca2715a20bf56c458a79ab
+  metadata.gz: 41715dd0d7cc5255ea6ddb7845386bb99505da31255404d15939b0fc438f2bfd81f57b9b517f1044ba7377a13c01e73caa9c496b5ff91b9919829787d8fcf51a
+  data.tar.gz: dff803691aaf4503f58c8f2cca06d98cc265bdaf45292f87daeefbcf20c12f810e39fd89d17dccff6ae8c4e997eab7a7253277d68a3e464b7c32129d027d45b3

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.13.0.rc.1 (2016-06-27)
+
+Features:
+
+  - when `bundle config major_deprecations` or `BUNDLE_MAJOR_DEPRECATIONS` is set, deprecation warnings for bundler 2 will be printed (@segiddins)
+  - when running with `--verbose`, bundler will print the reason it is re-resolving a gemfile (@segiddins)
+
+Bug fixes:
+
+  - fix support for running RubyGems 1.x on Ruby 2.3 (#4698, @segiddins)
+  - fix bundle exec'ing to a ruby file when gems are installed into a path (#4592, @chrismo)
+  - when multiple specs in a bundle have the same executable, prefer activating the one from the requested gem (#4705, @segiddins)
+  - stop changing the load path to require the vendored postit when trampolining (@segiddins)
+  - ensure relative paths are properly printed after completing an installation (@jenseng)
+  - fix re-resolving when there are multiple unchanged path sources (@segiddins)
+  - de-init submodules when running git 2.9 and requesting a git gem without submodules (@segiddins)
+
 ## 1.13.0.pre.1 (2016-06-20)
 
 Performance:

data/DEVELOPMENT.md

@@ -36,9 +36,9 @@ 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='ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'
+        $ alias dbundle='BUNDLE_DISABLE_POSTIT=1 ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'
 
-     With that set up, you can test changes you've made to Bundler by running `dbundle`, without interfering with the regular `bundle` command.
+     The `BUNDLE_DISABLE_POSTIT` 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.
 
 # Submitting Pull Requests
 

data/Rakefile

@@ -300,11 +300,8 @@ begin
   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"
-
-    def lib.namespace_files
-      process_files(namespace, "BundlerVendoredPostIt")
-    end
   end
 rescue LoadError
   namespace :vendor do

data/exe/bundle_ruby

@@ -3,14 +3,12 @@
 
 Signal.trap("INT") { exit 1 }
 
+require "bundler/errors"
 require "bundler/ruby_version"
 require "bundler/ruby_dsl"
 require "bundler/shared_helpers"
 
 module Bundler
-  class GemfileError < RuntimeError; end
-  class GemfileEvalError < GemfileError; end
-
   class Dsl
     include RubyDsl
 
@@ -44,7 +42,7 @@ module Bundler
   end
 end
 
-STDERR.puts "Warning: bundle_ruby will be deprecated in Bundler 2.0.0."
+Bundler::SharedHelpers.major_deprecation("the bundle_ruby executable has been removed in favor of `bundle platform --ruby`")
 
 dsl = Bundler::Dsl.new
 begin

data/lib/bundler.rb

@@ -92,6 +92,8 @@ module Bundler
 
       definition.validate_ruby!
 
+      SharedHelpers.print_major_deprecations!
+
       if groups.empty?
         # Load all groups, but only once
         @setup = load.setup
@@ -209,6 +211,7 @@ module Bundler
     # @deprecated Use `original_env` instead
     # @return [Hash] Environment with all bundler-related variables removed
     def clean_env
+      Bundler::SharedHelpers.major_deprecation("`Bundler.clean_env` has weird edge cases, use `.original_env` instead")
       env = original_env
 
       if env.key?("BUNDLE_ORIG_MANPATH")
@@ -411,17 +414,20 @@ module Bundler
     end
 
     def configure_gem_home_and_path
-      blank_home = ENV["GEM_HOME"].nil? || ENV["GEM_HOME"].empty?
+      configure_gem_path
+      configure_gem_home
+      bundle_path
+    end
+
+    def configure_gem_path(env = ENV, settings = self.settings)
+      blank_home = env["GEM_HOME"].nil? || env["GEM_HOME"].empty?
       if settings[:disable_shared_gems]
-        ENV["GEM_PATH"] = ""
+        env["GEM_PATH"] = nil
       elsif blank_home || Bundler.rubygems.gem_dir != bundle_path.to_s
         possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
         paths = possibles.flatten.compact.uniq.reject(&:empty?)
-        ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
+        env["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
       end
-
-      configure_gem_home
-      bundle_path
     end
 
     def configure_gem_home

data/lib/bundler/cli.rb

@@ -12,6 +12,8 @@ module Bundler
     rescue Exception => e
       Bundler.ui = UI::Shell.new
       raise e
+    ensure
+      Bundler::SharedHelpers.print_major_deprecations!
     end
 
     def initialize(*args)

data/lib/bundler/cli/install.rb

@@ -69,7 +69,7 @@ module Bundler
 
       if Bundler.settings[:path]
         absolute_path = File.expand_path(Bundler.settings[:path])
-        relative_path = absolute_path.sub(File.expand_path("."), ".")
+        relative_path = absolute_path.sub(File.expand_path(".") + File::SEPARATOR, "." + File::SEPARATOR)
         Bundler.ui.confirm "Bundled gems are installed into #{relative_path}."
       else
         Bundler.ui.confirm "Use `bundle show [gemname]` to see where a bundled gem is installed."

data/lib/bundler/definition.rb

@@ -92,7 +92,7 @@ module Bundler
         end
         @ruby_version.diff(locked_ruby_version_object)
       end
-      @unlocking ||= @unlock[:ruby] || (!@locked_ruby_version ^ !@ruby_version)
+      @unlocking ||= @unlock[:ruby] ||= (!@locked_ruby_version ^ !@ruby_version)
 
       current_platform = Bundler.rubygems.platforms.map {|p| generic(p) }.compact.last
       add_platform(current_platform)
@@ -220,7 +220,7 @@ module Bundler
           last_resolve
         else
           # Run a resolve against the locally available gems
-          Bundler.ui.debug("Found changes from the lockfile, re-resolving dependencies")
+          Bundler.ui.debug("Found changes from the lockfile, re-resolving dependencies because #{change_reason}")
           last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve, ruby_version)
         end
       end
@@ -462,6 +462,27 @@ module Bundler
       !@source_changes && !@dependency_changes && !@new_platform && !@path_changes && !@local_changes
     end
 
+    def change_reason
+      if @unlocking
+        unlock_reason = @unlock.reject {|_k, v| Array(v).empty? }.map do |k, v|
+          if v == true
+            k.to_s
+          else
+            v = Array(v)
+            "#{k}: (#{v.join(", ")})"
+          end
+        end.join(", ")
+        return "bundler is unlocking #{unlock_reason}"
+      end
+      [
+        [@source_changes, "the list of sources changed"],
+        [@dependency_changes, "the dependencies in your gemfile changed"],
+        [@new_platform, "you added a new platform to your gemfile"],
+        [@path_changes, "the gemspecs for path gems changed"],
+        [@local_changes, "the gemspecs for git local gems changed"],
+      ].select(&:first).map(&:last).join(", ")
+    end
+
     def pretty_dep(dep, source = false)
       msg = String.new(dep.name)
       msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
@@ -470,19 +491,11 @@ module Bundler
     end
 
     # Check if the specs of the given source changed
-    # according to the locked source. A block should be
-    # in order to specify how the locked version of
-    # the source should be found.
-    def specs_changed?(source, &block)
-      locked = @locked_sources.find(&block)
-
-      if locked
-        unlocking = @locked_specs.any? do |locked_spec|
-          locked_spec.source.class == locked.class && locked_spec.source != locked
-        end
-      end
+    # according to the locked source.
+    def specs_changed?(source)
+      locked = @locked_sources.find(source)
 
-      !locked || unlocking || dependencies_for_source_changed?(source) || specs_for_source_changed?(source)
+      !locked || dependencies_for_source_changed?(source) || specs_for_source_changed?(source)
     end
 
     def dependencies_for_source_changed?(source)
@@ -515,15 +528,13 @@ module Bundler
       end
 
       locals.any? do |source, changed|
-        changed || specs_changed?(source) {|o| source.class == o.class && source.uri == o.uri }
+        changed || specs_changed?(source)
       end
     end
 
     def converge_paths
       sources.path_sources.any? do |source|
-        specs_changed?(source) do |ls|
-          ls.class == source.class && ls.path == source.path
-        end
+        specs_changed?(source)
       end
     end
 

data/lib/bundler/deprecate.rb

@@ -10,7 +10,23 @@ module Bundler
 
   unless Deprecate.respond_to?(:skip_during)
     def Deprecate.skip_during
+      original = skip
+      self.skip = true
       yield
+    ensure
+      self.skip = original
+    end
+  end
+
+  unless Deprecate.respond_to?(:skip)
+    def Deprecate.skip
+      @skip
+    end
+  end
+
+  unless Deprecate.respond_to?(:skip=)
+    def Deprecate.skip=(skip)
+      @skip = skip
     end
   end
 end

data/lib/bundler/dsl.rb

@@ -374,7 +374,7 @@ module Bundler
     def normalize_source(source)
       case source
       when :gemcutter, :rubygems, :rubyforge
-        Bundler.ui.warn "The source :#{source} is deprecated because HTTP " \
+        Bundler::SharedHelpers.major_deprecation "The source :#{source} is deprecated because HTTP " \
           "requests are insecure.\nPlease change your source to 'https://" \
           "rubygems.org' if possible, or 'http://rubygems.org' if not."
         "http://rubygems.org"

data/lib/bundler/lockfile_parser.rb

@@ -27,9 +27,11 @@ module Bundler
     SOURCE       = [GIT, GEM, PATH].freeze
 
     SECTIONS_BY_VERSION_INTRODUCED = {
-      Gem::Version.create("1.0") => [DEPENDENCIES, PLATFORMS, GIT, GEM, PATH].freeze,
-      Gem::Version.create("1.10") => [BUNDLED].freeze,
-      Gem::Version.create("1.12") => [RUBY].freeze,
+      # The strings have to be dup'ed for old RG on Ruby 2.3+
+      # TODO: remove dup in Bundler 2.0
+      Gem::Version.create("1.0".dup) => [DEPENDENCIES, PLATFORMS, GIT, GEM, PATH].freeze,
+      Gem::Version.create("1.10".dup) => [BUNDLED].freeze,
+      Gem::Version.create("1.12".dup) => [RUBY].freeze,
     }.freeze
 
     KNOWN_SECTIONS = SECTIONS_BY_VERSION_INTRODUCED.values.flatten.freeze
@@ -46,7 +48,7 @@ module Bundler
 
     def self.sections_to_ignore(base_version = nil)
       base_version &&= base_version.release
-      base_version ||= Gem::Version.create("1.0")
+      base_version ||= Gem::Version.create("1.0".dup)
       attributes = []
       SECTIONS_BY_VERSION_INTRODUCED.each do |version, introduced|
         next if version <= base_version

data/lib/bundler/postit_trampoline.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-postit_lib = File.expand_path("../vendor/postit/lib", __FILE__)
-$:.unshift(postit_lib)
-require "postit"
+module BundlerVendoredPostIt; end
+require "bundler/vendor/postit/lib/postit"
 require "rubygems"
 
-environment = BundlerVendoredPostIt::Environment.new([])
+environment = BundlerVendoredPostIt::PostIt::Environment.new([])
 version = Gem::Requirement.new(environment.bundler_version)
 
 installed_version =
@@ -19,7 +18,7 @@ installed_version &&= Gem::Version.new(installed_version)
 
 if !version.satisfied_by?(installed_version)
   begin
-    installer = BundlerVendoredPostIt::Installer.new(version)
+    installer = BundlerVendoredPostIt::PostIt::Installer.new(version)
     installer.install!
   rescue => e
     abort <<-EOS.strip
@@ -50,5 +49,3 @@ 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
-
-$:.delete_at($:.find_index(postit_lib))

data/lib/bundler/rubygems_integration.rb

@@ -362,19 +362,21 @@ module Bundler
     def replace_bin_path(specs)
       gem_class = (class << Gem; self; end)
 
-      redefine_method(gem_class, :find_spec_for_exe) do |name, *args|
+      redefine_method(gem_class, :find_spec_for_exe) do |gem_name, *args|
         exec_name = args.first
 
         spec = if exec_name
-          specs.find {|s| s.executables.include?(exec_name) }
+          specs.find {|s| s.name == gem_name && s.executables.include?(exec_name) } ||
+            specs.find {|s| s.executables.include?(exec_name) }
         else
-          specs.find {|s| s.name == name }
+          specs.find {|s| s.name == gem_name }
         end
         raise(Gem::Exception, "can't find executable #{exec_name}") unless spec
         raise Gem::Exception, "no default executable for #{spec.full_name}" unless exec_name ||= spec.default_executable
         unless spec.name == name
-          warn "Bundler is using a binstub that was created for a different gem.\n" \
-            "This is deprecated, in future versions you may need to `bundle binstub #{name}` " \
+          Bundler::SharedHelpers.major_deprecation \
+            "Bundler is using a binstub that was created for a different gem.\n" \
+            "You should run `bundle binstub #{gem_name}` " \
             "to work around a system/bundle conflict."
         end
         spec

data/lib/bundler/settings.rb

@@ -3,9 +3,33 @@ require "uri"
 
 module Bundler
   class Settings
-    BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check disable_shared_gems ignore_messages gem.mit gem.coc silence_root_warning no_install plugins).freeze
-    NUMBER_KEYS = %w(retry timeout redirect ssl_verify_mode).freeze
-    DEFAULT_CONFIG = { :retry => 3, :timeout => 10, :redirect => 5 }.freeze
+    BOOL_KEYS = %w(
+      cache_all
+      disable_local_branch_check
+      disable_shared_gems
+      frozen
+      gem.coc
+      gem.mit
+      ignore_messages
+      major_deprecations
+      no_install
+      no_prune
+      plugins
+      silence_root_warning
+    ).freeze
+
+    NUMBER_KEYS = %w(
+      redirect
+      retry
+      ssl_verify_mode
+      timeout
+    ).freeze
+
+    DEFAULT_CONFIG = {
+      :redirect => 5,
+      :retry => 3,
+      :timeout => 10,
+    }.freeze
 
     def initialize(root = nil)
       @root          = root

data/lib/bundler/shared_helpers.rb

@@ -120,6 +120,21 @@ module Bundler
       namespace.const_get(constant_name)
     end
 
+    def major_deprecation(message)
+      return unless prints_major_deprecations?
+      @major_deprecation_ui ||= Bundler::UI::Shell.new("no-color" => true)
+      ui = Bundler.ui.is_a?(@major_deprecation_ui.class) ? Bundler.ui : @major_deprecation_ui
+      ui.warn("[DEPRECATED FOR #{Bundler::VERSION.split(".").first.to_i + 1}.0] #{message}")
+    end
+
+    def print_major_deprecations!
+      if RUBY_VERSION < "2"
+        major_deprecation("Bundler will only support ruby >= 2.0, you are running #{RUBY_VERSION}")
+      end
+      return if Bundler.rubygems.provides?(">= 2")
+      major_deprecation("Bundler will only support rubygems >= 2.0, you are running #{Bundler.rubygems.version}")
+    end
+
   private
 
     def find_gemfile
@@ -207,6 +222,14 @@ module Bundler
       end
     end
 
+    def prints_major_deprecations?
+      require "bundler"
+      return false unless Bundler.settings[:major_deprecations]
+      require "bundler/deprecate"
+      return false if Bundler::Deprecate.skip
+      true
+    end
+
     extend self
   end
 end

data/lib/bundler/source/git/git_proxy.rb

@@ -123,7 +123,11 @@ module Bundler
             git_retry %(fetch --force --quiet --tags "#{path}")
             git "reset --hard #{@revision}"
 
-            git_retry "submodule update --init --recursive" if submodules
+            if submodules
+              git_retry "submodule update --init --recursive"
+            elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
+              git_retry "submodule deinit --all"
+            end
           end
         end
 

data/lib/bundler/spec_set.rb

@@ -18,7 +18,7 @@ module Bundler
       handled = {}
       deps = dependencies.dup
       specs = []
-      skip << "bundler"
+      skip += ["bundler"]
 
       until deps.empty?
         dep = deps.shift

data/lib/bundler/ui/shell.rb

@@ -79,12 +79,8 @@ module Bundler
         tell_me(msg, nil, newline)
       end
 
-      def silence
-        old_level = @level
-        @level = "silent"
-        yield
-      ensure
-        @level = old_level
+      def silence(&blk)
+        with_level("silent", &blk)
       end
 
     private
@@ -109,6 +105,14 @@ module Bundler
           line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
         end * "\n"
       end
+
+      def with_level(level)
+        original = @level
+        @level = level
+        yield
+      ensure
+        @level = original
+      end
     end
   end
 end

data/lib/bundler/ui/silent.rb

@@ -40,6 +40,9 @@ module Bundler
       def trace(message, newline = nil)
       end
 
+      def major_deprecation(message)
+      end
+
       def silence
         yield
       end

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

@@ -1,10 +1,10 @@
-require 'postit/environment'
-require 'postit/installer'
-require 'postit/parser'
-require 'postit/version'
+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
+module BundlerVendoredPostIt::PostIt
   def self.setup
     load File.expand_path('../postit/setup.rb', __FILE__)
   end

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

@@ -1,6 +1,6 @@
-require 'postit/parser'
+require 'bundler/vendor/postit/lib/postit/parser'
 
-module BundlerVendoredPostIt
+module BundlerVendoredPostIt::PostIt
   class Environment
     def initialize(argv)
       @argv = argv
@@ -31,7 +31,7 @@ module BundlerVendoredPostIt
     end
 
     def lockfile_version
-      BundlerVendoredPostIt::Parser.new(lockfile).parse
+      BundlerVendoredPostIt::PostIt::Parser.new(lockfile).parse
     end
 
     def bundler_version

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

@@ -1,4 +1,4 @@
-module BundlerVendoredPostIt
+module BundlerVendoredPostIt::PostIt
   class Installer
     def initialize(bundler_version)
       @bundler_version = bundler_version

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

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-module BundlerVendoredPostIt
+module BundlerVendoredPostIt::PostIt
   class Parser
     def initialize(file)
       @file = file

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

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

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

@@ -1,3 +1,3 @@
-module BundlerVendoredPostIt
-  VERSION = '0.1.2'.freeze
+module BundlerVendoredPostIt::PostIt
+  VERSION = '0.2.0'.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.13.0.pre.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.13.0.rc.1" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.13.0.pre.1
+  version: 1.13.0.rc.1
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -377,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies