bundler 1.16.4 → 1.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6603948ae8baa7859049f1add82a42f4b7aa5d88b1b6d7668a2f612fefa4f0
-  data.tar.gz: f4392924d1507711efe081176356e4c28a7e425370b18a7366fa096bb0402b8d
+  metadata.gz: 3e8f09b15ec720f36b02c5c1019f1be7553a19fbbedad74dc01117e36400ebef
+  data.tar.gz: 7784b991c1d91877448cda94e998759ccfe6537a310e6ea64a762eb76ac025ac
 SHA512:
-  metadata.gz: c2aafdb6623c8deb7ba107a45c73d7d33a27b419aa84e955aa51b3f7541900c92e69d0a5d1f63b6056bbfdc323e7e5989f8019927a7abef5dd1f46b5e6f110dc
-  data.tar.gz: a993c5a5f4d904011bab4a1fa02d8ddc44be4ce24ae91672e56591e651c86ffd43d23e729a2236c20df681e774c7b8e32c48936e2b510a906c19eb4c8b7486fc
+  metadata.gz: 2822b0401f58bcd9a7513e32b3fdc0a4b7bfe31ebf8fee9e46128b9ae9358c552622764ca2172ccc2390aaf8d2b6fddc9726207715e5c33b59e447e291c3a514
+  data.tar.gz: 1abdf68ab861e154efc3aa1f5d7c17520814b872663147b870208f5086cd3f1d643ac803622a7692278465cc7370d55e6805c8c8d3059191180615cc4cd5668d

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.16.5 (2018-09-18)
+
+Changes:
+
+  - Add support for TruffleRuby (@eregon)
+
+Bugfixes:
+
+  - Avoid printing git errors when checking the version on incorrectly packaged versions of Bundler ([#6453](https://github.com/bundler/bundler/issues/6453), @greysteil)
+  - Fix issue where Bundler does not check the given class when comparing equality in DepProxy (@ChrisBr)
+  - Handle `RangeNotSatisfiable` error in Compact Index (@MaxLap)
+  - Check for initialized `search` variable in `LazySpecification` (@voxik)
+  - Fix LoadError occurring in nested bundle exec calls ([#6537](https://github.com/bundler/bundler/issues/6537), @colby-swandale)
+  - Check that Bundler::Deprecate is not an autoload constant ([#6163](https://github.com/bundler/bundler/issues/6163), @eregon)
+  - Prefer non-pre-release versions when performing a `bundle update --patch` ([#6684](https://github.com/bundler/bundler/issues/6684), @segiddins)
+
 ## 1.16.4 (2017-08-17)
 
 Changes:

data/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2018-08-20".freeze
-    @git_commit_sha = "a356d8cf9".freeze
+    @built_at = "2018-09-18".freeze
+    @git_commit_sha = "1da10a61b".freeze
     @release = true
     # end ivars
 
@@ -25,7 +25,15 @@ module Bundler
 
     # The SHA for the git commit the bundler gem was built from.
     def self.git_commit_sha
-      @git_commit_sha ||= Dir.chdir(File.expand_path("..", __FILE__)) do
+      return @git_commit_sha if @git_commit_sha
+
+      # If Bundler has been installed without its .git directory and without a
+      # commit instance variable then we can't determine its commits SHA.
+      git_dir = File.join(File.expand_path("../../..", __FILE__), ".git")
+      return "unknown" unless File.directory?(git_dir)
+
+      # Otherwise shell out to git.
+      @git_commit_sha = Dir.chdir(File.expand_path("..", __FILE__)) do
         `git rev-parse --short HEAD`.strip.freeze
       end
     end

data/lib/bundler/cli/exec.rb

@@ -89,6 +89,7 @@ module Bundler
       possibilities = [
         "#!/usr/bin/env ruby\n",
         "#!/usr/bin/env jruby\n",
+        "#!/usr/bin/env truffleruby\n",
         "#!#{Gem.ruby}\n",
       ]
 

data/lib/bundler/current_ruby.rb

@@ -32,11 +32,13 @@ module Bundler
       mswin64
       rbx
       ruby
+      truffleruby
       x64_mingw
     ].freeze
 
     def ruby?
-      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
+      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" ||
+          RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev" || RUBY_ENGINE == "truffleruby")
     end
 
     def mri?
@@ -55,6 +57,10 @@ module Bundler
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "maglev"
     end
 
+    def truffleruby?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == "truffleruby"
+    end
+
     def mswin?
       Bundler::WINDOWS
     end

data/lib/bundler/dep_proxy.rb

@@ -10,11 +10,11 @@ module Bundler
     end
 
     def hash
-      @hash ||= dep.hash
+      @hash ||= [dep, __platform].hash
     end
 
     def ==(other)
-      return if other.nil?
+      return false if other.class != self.class
       dep == other.dep && __platform == other.__platform
     end
 

data/lib/bundler/dependency.rb

@@ -30,6 +30,7 @@ module Bundler
       :mri_24   => Gem::Platform::RUBY,
       :mri_25   => Gem::Platform::RUBY,
       :rbx      => Gem::Platform::RUBY,
+      :truffleruby => Gem::Platform::RUBY,
       :jruby    => Gem::Platform::JAVA,
       :jruby_18 => Gem::Platform::JAVA,
       :jruby_19 => Gem::Platform::JAVA,

data/lib/bundler/deprecate.rb

@@ -8,7 +8,8 @@ rescue LoadError
 end
 
 module Bundler
-  if defined? Bundler::Deprecate
+  # If Bundler::Deprecate is an autoload constant, we need to define it
+  if defined?(Bundler::Deprecate) && !autoload?(:Deprecate)
     # nothing to do!
   elsif defined? ::Deprecate
     Deprecate = ::Deprecate

data/lib/bundler/env.rb

@@ -88,7 +88,7 @@ module Bundler
 
     def self.version_of(script)
       return "not installed" unless Bundler.which(script)
-      `#{script} --version`
+      `#{script} --version`.chomp
     end
 
     def self.chruby_version

data/lib/bundler/fetcher/downloader.rb

@@ -11,10 +11,10 @@ module Bundler
         @redirect_limit = redirect_limit
       end
 
-      def fetch(uri, options = {}, counter = 0)
+      def fetch(uri, headers = {}, counter = 0)
         raise HTTPError, "Too many redirects" if counter >= redirect_limit
 
-        response = request(uri, options)
+        response = request(uri, headers)
         Bundler.ui.debug("HTTP #{response.code} #{response.message} #{uri}")
 
         case response
@@ -26,7 +26,12 @@ module Bundler
             new_uri.user = uri.user
             new_uri.password = uri.password
           end
-          fetch(new_uri, options, counter + 1)
+          fetch(new_uri, headers, counter + 1)
+        when Net::HTTPRequestedRangeNotSatisfiable
+          new_headers = headers.dup
+          new_headers.delete("Range")
+          new_headers["Accept-Encoding"] = "gzip"
+          fetch(uri, new_headers)
         when Net::HTTPRequestEntityTooLarge
           raise FallbackError, response.body
         when Net::HTTPUnauthorized
@@ -38,11 +43,11 @@ module Bundler
         end
       end
 
-      def request(uri, options)
+      def request(uri, headers)
         validate_uri_scheme!(uri)
 
         Bundler.ui.debug "HTTP GET #{uri}"
-        req = Net::HTTP::Get.new uri.request_uri, options
+        req = Net::HTTP::Get.new uri.request_uri, headers
         if uri.user
           user = CGI.unescape(uri.user)
           password = uri.password ? CGI.unescape(uri.password) : nil

data/lib/bundler/gem_version_promoter.rb

@@ -22,6 +22,8 @@ module Bundler
     # existing in the referenced source.
     attr_accessor :strict
 
+    attr_accessor :prerelease_specified
+
     # Given a list of locked_specs and a list of gems to unlock creates a
     # GemVersionPromoter instance.
     #
@@ -37,6 +39,7 @@ module Bundler
       @locked_specs = locked_specs
       @unlock_gems = unlock_gems
       @sort_versions = {}
+      @prerelease_specified = {}
     end
 
     # @param value [Symbol] One of three Symbols: :major, :minor or :patch.
@@ -121,6 +124,15 @@ module Bundler
       result = spec_groups.sort do |a, b|
         @a_ver = a.version
         @b_ver = b.version
+
+        unless @prerelease_specified[@gem_name]
+          a_pre = @a_ver.prerelease?
+          b_pre = @b_ver.prerelease?
+
+          next -1 if a_pre && !b_pre
+          next  1 if b_pre && !a_pre
+        end
+
         if major?
           @a_ver <=> @b_ver
         elsif either_version_older_than_locked

data/lib/bundler/lazy_specification.rb

@@ -80,7 +80,7 @@ module Bundler
             "To use the platform-specific version of the gem, run `bundle config specific_platform true` and install again."
           search = source.specs.search(self).last
         end
-        search.dependencies = dependencies if search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification)
+        search.dependencies = dependencies if search && (search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification))
         search
       end
     end

data/lib/bundler/resolver.rb

@@ -42,7 +42,7 @@ module Bundler
     end
 
     def start(requirements)
-      @prerelease_specified = {}
+      @gem_version_promoter.prerelease_specified = @prerelease_specified = {}
       requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? }
 
       verify_gemfile_dependencies_are_found!(requirements)
@@ -104,16 +104,17 @@ module Bundler
         index = index_for(dependency)
         results = index.search(dependency, @base[dependency.name])
 
-        unless @prerelease_specified[dependency.name]
+        if vertex = @base_dg.vertex_named(dependency.name)
+          locked_requirement = vertex.payload.requirement
+        end
+
+        if !@prerelease_specified[dependency.name] && (!@use_gvp || locked_requirement.nil?)
           # Move prereleases to the beginning of the list, so they're considered
           # last during resolution.
           pre, results = results.partition {|spec| spec.version.prerelease? }
           results = pre + results
         end
 
-        if vertex = @base_dg.vertex_named(dependency.name)
-          locked_requirement = vertex.payload.requirement
-        end
         spec_groups = if results.any?
           nested = []
           results.each do |spec|

data/lib/bundler/ruby_version.rb

@@ -118,7 +118,7 @@ module Bundler
                             when "jruby"
                               JRUBY_VERSION.dup
                             else
-                              raise BundlerError, "RUBY_ENGINE value #{RUBY_ENGINE} is not recognized"
+                              RUBY_ENGINE_VERSION.dup
       end
       patchlevel = RUBY_PATCHLEVEL.to_s
 

data/lib/bundler/shared_helpers.rb

@@ -293,7 +293,12 @@ module Bundler
 
     def set_bundle_variables
       begin
-        Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", Bundler.rubygems.bin_path("bundler", "bundle", VERSION)
+        exe_file = Bundler.rubygems.bin_path("bundler", "bundle", VERSION)
+        unless File.exist?(exe_file)
+          exe_file = File.expand_path("../../../exe/bundle", __FILE__)
+        end
+
+        Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
       rescue Gem::GemNotFoundException
         Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", File.expand_path("../../../exe/bundle", __FILE__)
       end

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

data/man/bundle-add.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-ADD" "1" "August 2018" "" ""
+.TH "BUNDLE\-ADD" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install

data/man/bundle-add.1.txt

@@ -37,4 +37,4 @@ OPTIONS
 
 
 
-				  August 2018			 BUNDLE-ADD(1)
+				September 2018			 BUNDLE-ADD(1)

data/man/bundle-binstubs.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-BINSTUBS" "1" "August 2018" "" ""
+.TH "BUNDLE\-BINSTUBS" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems

data/man/bundle-binstubs.1.txt

@@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS
 
 
 
-				  August 2018		    BUNDLE-BINSTUBS(1)
+				September 2018		    BUNDLE-BINSTUBS(1)

data/man/bundle-check.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CHECK" "1" "August 2018" "" ""
+.TH "BUNDLE\-CHECK" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems

data/man/bundle-check.1.txt

@@ -30,4 +30,4 @@ OPTIONS
 
 
 
-				  August 2018		       BUNDLE-CHECK(1)
+				September 2018		       BUNDLE-CHECK(1)

data/man/bundle-clean.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CLEAN" "1" "August 2018" "" ""
+.TH "BUNDLE\-CLEAN" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory

data/man/bundle-clean.1.txt

@@ -23,4 +23,4 @@ OPTIONS
 
 
 
-				  August 2018		       BUNDLE-CLEAN(1)
+				September 2018		       BUNDLE-CLEAN(1)

data/man/bundle-config.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CONFIG" "1" "August 2018" "" ""
+.TH "BUNDLE\-CONFIG" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options

data/man/bundle-config.1.txt

@@ -498,4 +498,4 @@ CREDENTIALS FOR GEM SOURCES
 
 
 
-				  August 2018		      BUNDLE-CONFIG(1)
+				September 2018		      BUNDLE-CONFIG(1)

data/man/bundle-doctor.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-DOCTOR" "1" "August 2018" "" ""
+.TH "BUNDLE\-DOCTOR" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-doctor\fR \- Checks the bundle for common problems

data/man/bundle-doctor.1.txt

@@ -41,4 +41,4 @@ OPTIONS
 
 
 
-				  August 2018		      BUNDLE-DOCTOR(1)
+				September 2018		      BUNDLE-DOCTOR(1)

data/man/bundle-exec.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-EXEC" "1" "August 2018" "" ""
+.TH "BUNDLE\-EXEC" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-exec\fR \- Execute a command in the context of the bundle

data/man/bundle-exec.1.txt

@@ -175,4 +175,4 @@ RUBYGEMS PLUGINS
 
 
 
-				  August 2018			BUNDLE-EXEC(1)
+				September 2018			BUNDLE-EXEC(1)

data/man/bundle-gem.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-GEM" "1" "August 2018" "" ""
+.TH "BUNDLE\-GEM" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem

data/man/bundle-gem.1.txt

@@ -88,4 +88,4 @@ SEE ALSO
 
 
 
-				  August 2018			 BUNDLE-GEM(1)
+				September 2018			 BUNDLE-GEM(1)

data/man/bundle-info.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INFO" "1" "August 2018" "" ""
+.TH "BUNDLE\-INFO" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-info\fR \- Show information for the given gem in your bundle

data/man/bundle-info.1.txt

@@ -18,4 +18,4 @@ OPTIONS
 
 
 
-				  August 2018			BUNDLE-INFO(1)
+				September 2018			BUNDLE-INFO(1)

data/man/bundle-init.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INIT" "1" "August 2018" "" ""
+.TH "BUNDLE\-INIT" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-init\fR \- Generates a Gemfile into the current working directory