bundler 1.13.3 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 177901039df31f7f5566686a174528c2a14de127
-  data.tar.gz: 0cabc0228980a453c6a88f10ff2c2f93480b2405
+  metadata.gz: 8edc4be5a8fbb416aba0869287aec8623cd9baa5
+  data.tar.gz: b7e41ec3343924ac3e7ffe38887e6dc54a58c718
 SHA512:
-  metadata.gz: 4949ae5901cae37459e2574e220a61361ed62605e836d1fa15c057c75d4a1259c98ea118e034f8cbae474b7bc7bc953d6fbaf7ea899b35d47530229411a54eaf
-  data.tar.gz: b7406880fcd732e8421b9c2e53d9cc5c98d5eb75e3b9846bbcd7f2edfb38f1b660e13dc68f708a14bb9128a21e7932efc73f0b433bd19ae5ceace7303c9faff4
+  metadata.gz: 785e12cdce6c2c4148da290f32fa53c13fb020cf24a50231136dd6e3650652c3091047bff37d99ad8fc8f86dc3b317761d8f78c532a04a098b2bd936111b5b82
+  data.tar.gz: 5c1d362093591c6b678a8a760c91dbe53c4b446077ff01d0d5daba5632f37b5b0e31415b247b920ccccf76af1248fe3411e622aa927fdac1baa0f98348cbd686

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.13.4 (2016-10-11)
+
+Bugfixes:
+
+ - stop printing warning when compact index versions file is rewritten (#5064, @indirect)
+ - fix `parent directory is world writable but not sticky` error on install (#5043, @indirect)
+ - fix for `uninitialized constant Bundler::Plugin::API::Source` error (#5010, @hsbt, @aycabta)
+ - make `update` options for major, minor, and patch updates consistent (#4934, @chrismo)
+
 ## 1.13.3 (2016-10-10)
 
 Bugfixes:

data/lib/bundler/definition.rb

@@ -103,8 +103,6 @@ module Bundler
       end
       @unlocking ||= @unlock[:ruby] ||= (!@locked_ruby_version ^ !@ruby_version)
 
-      @gem_version_promoter = create_gem_version_promoter
-
       current_platform = Bundler.rubygems.platforms.map {|p| generic(p) }.compact.last
       add_platform(current_platform)
 
@@ -112,6 +110,8 @@ module Bundler
       eager_unlock = expand_dependencies(@unlock[:gems])
       @unlock[:gems] = @locked_specs.for(eager_unlock).map(&:name)
 
+      @gem_version_promoter = create_gem_version_promoter
+
       @source_changes = converge_sources
       @dependency_changes = converge_dependencies
       @local_changes = converge_locals

data/lib/bundler/deployment.rb

@@ -15,7 +15,7 @@ module Bundler
       else
         context_name = "vlad"
         role_default = "[:app]"
-        error_type = ::Vlad::CommandFailedError
+        error_type = ::Rake::CommandFailedError
       end
 
       roles = context.fetch(:bundle_roles, false)

data/lib/bundler/fetcher/compact_index.rb

@@ -66,7 +66,7 @@ module Bundler
         # Read info file checksums out of /versions, so we can know if gems are up to date
         fetch_uri.scheme != "file" && compact_index_client.update_and_parse_checksums!
       rescue CompactIndexClient::Updater::MisMatchedChecksumError => e
-        Bundler.ui.warn(e.message)
+        Bundler.ui.debug(e.message)
         nil
       end
       compact_index_request :available?
@@ -78,9 +78,9 @@ module Bundler
     private
 
       def compact_index_client
-        @compact_index_client ||=
+        @compact_index_client ||= begin
           SharedHelpers.filesystem_access(cache_path) do
-            CompactIndexClient.new(cache_path, compact_fetcher)
+            CompactIndexClient.new(cache_path, client_fetcher)
           end.tap do |client|
             client.in_parallel = lambda do |inputs, &blk|
               func = lambda {|object, _index| blk.call(object) }
@@ -89,6 +89,7 @@ module Bundler
               inputs.map { worker.deq }
             end
           end
+        end
       end
 
       def bundle_worker(func = nil)
@@ -105,15 +106,17 @@ module Bundler
         Bundler.user_cache.join("compact_index", remote.cache_slug)
       end
 
-      def compact_fetcher
-        lambda do |path, headers|
-          begin
-            downloader.fetch(fetch_uri + path, headers)
-          rescue NetworkDownError => e
-            raise unless Bundler.settings[:allow_offline_install] && headers["If-None-Match"]
-            Bundler.ui.warn "Using the cached data for the new index because of a network error: #{e}"
-            Net::HTTPNotModified.new(nil, nil, nil)
-          end
+      def client_fetcher
+        ClientFetcher.new(self, Bundler.ui)
+      end
+
+      ClientFetcher = Struct.new(:fetcher, :ui) do
+        def call(path, headers)
+          fetcher.downloader.fetch(fetcher.fetch_uri + path, headers)
+        rescue NetworkDownError => e
+          raise unless Bundler.settings[:allow_offline_install] && headers["If-None-Match"]
+          ui.warn "Using the cached data for the new index because of a network error: #{e}"
+          Net::HTTPNotModified.new(nil, nil, nil)
         end
       end
     end

data/lib/bundler/plugin.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+require "bundler/plugin/api"
 
 module Bundler
   module Plugin
-    autoload :API,        "bundler/plugin/api"
     autoload :DSL,        "bundler/plugin/dsl"
     autoload :Index,      "bundler/plugin/index"
     autoload :Installer,  "bundler/plugin/installer"

data/lib/bundler/plugin/api.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "bundler/plugin/api/source"
 
 module Bundler
   # This is the interfacing class represents the API that we intend to provide
@@ -23,7 +24,6 @@ module Bundler
   # and hooks).
   module Plugin
     class API
-      autoload :Source, "bundler/plugin/api/source"
       # The plugins should declare that they handle a command through this helper.
       #
       # @param [String] command being handled by them

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

@@ -22,6 +22,7 @@ class Bundler::CompactIndexClient
     @cache = Cache.new(@directory)
     @endpoints = Set.new
     @info_checksums_by_name = {}
+    @parsed_checksums = false
     @in_parallel = lambda do |inputs, &blk|
       inputs.map(&blk)
     end

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

@@ -26,10 +26,10 @@ class Bundler::CompactIndexClient
     def update(local_path, remote_path, retrying = nil)
       headers = {}
 
-      Dir.mktmpdir(local_path.basename.to_s, local_path.dirname) do |local_temp_dir|
+      Dir.mktmpdir("bundler-compact-index-") do |local_temp_dir|
         local_temp_path = Pathname.new(local_temp_dir).join(local_path.basename)
 
-        # download new file if retrying
+        # first try to fetch any new bytes on the existing file
         if retrying.nil? && local_path.file?
           FileUtils.cp local_path, local_temp_path
           headers["If-None-Match"] = etag_for(local_temp_path)

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.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.13.4" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.4
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek