bundler 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c15aaa11ff788fac27d745977d65c170a91071b
-  data.tar.gz: eb9e4cb055efa20be455f6c537c6ffcf4678adbe
+  metadata.gz: 2b5433fc9cc8573aa85b617097a9c959a633b4fc
+  data.tar.gz: 53fe7741d85bcc26b81211e9b51ab6056e907f3e
 SHA512:
-  metadata.gz: 9c3435f9a2b65a9ad4d04b4ca7138186792189579de8cc5adc9656ae07e044adbb84ad7f2ad4c29f1b270435afd9c65fc08e00949abcc6b9f591eebd4ae3b2e7
-  data.tar.gz: 685ea90c4ad254f3637e155658d9a3f54fa618f06c73854d0752619b36286b772a1c80e727b9c0670e8c9afcb535d49caa982b00c2a35501052fd102433311bd
+  metadata.gz: e738d624fbd192e6d6fd01ac413675e5e15e3f514618530bf36451798ee4798e73f6dd5f5b1b5b7acf151cc5326ec4c0f828424914d209d36d351b31d356cd8f
+  data.tar.gz: 11996eed9e6045a19e039044e151bdb010b013c697d8abbdef9d6d3cd5157e2c70de3087c130617f5bdee95f53243459e3ea83053c401055a706542b61d0e789

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.12.4 (2016-05-16)
+
+Bugfixes:
+  - ensure concurrent use of the new index can't corrupt the cache (#4519, @domcleal)
+  - allow missing rubygems credentials when pushing a gem with a custom host (#4437, @Cohen-Carlisle)
+  - fix installing built-in specs with `--standalone` (#4557, @segiddins)
+  - fix `bundle show` when a gem has a prerelease version that includes a `-` (#4385, @segiddins)
+
 ## 1.12.3 (2016-05-06)
 
 Bugfixes:

data/lib/bundler/gem_helper.rb

@@ -92,15 +92,15 @@ module Bundler
   protected
 
     def rubygem_push(path)
-      unless  Pathname.new("~/.gem/credentials").expand_path.file?
-        raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
-      end
       allowed_push_host = nil
       gem_command = "gem push '#{path}'"
       if @gemspec.respond_to?(:metadata)
         allowed_push_host = @gemspec.metadata["allowed_push_host"]
         gem_command += " --host #{allowed_push_host}" if allowed_push_host
       end
+      unless allowed_push_host || Pathname.new("~/.gem/credentials").expand_path.file?
+        raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
+      end
       sh(gem_command)
       Bundler.ui.confirm "Pushed #{name} #{version} to #{allowed_push_host ? allowed_push_host : "rubygems.org."}"
     end

data/lib/bundler/index.rb

@@ -89,7 +89,7 @@ module Bundler
     alias_method :[], :search
 
     def <<(spec)
-      @specs[spec.name]["#{spec.version}-#{spec.platform}"] = spec
+      @specs[spec.name][spec.full_name] = spec
 
       spec
     end
@@ -175,7 +175,7 @@ module Bundler
     end
 
     def search_by_spec(spec)
-      spec = @specs[spec.name]["#{spec.version}-#{spec.platform}"]
+      spec = @specs[spec.name][spec.full_name]
       spec ? [spec] : []
     end
 

data/lib/bundler/source/git.rb

@@ -25,7 +25,7 @@ module Bundler
         @ref        = options["ref"] || options["branch"] || options["tag"] || "master"
         @submodules = options["submodules"]
         @name       = options["name"]
-        @version    = options["version"]
+        @version    = options["version"].to_s.strip.gsub("-", ".pre.")
 
         @copied     = false
         @local      = false

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
+require "fileutils"
 require "stringio"
+require "tmpdir"
 require "zlib"
 
 class Bundler::CompactIndexClient
@@ -24,33 +26,41 @@ class Bundler::CompactIndexClient
     def update(local_path, remote_path, retrying = nil)
       headers = {}
 
-      if local_path.file?
-        headers["If-None-Match"] = etag_for(local_path)
-        headers["Range"] = "bytes=#{local_path.size}-"
-      else
-        # Fastly ignores Range when Accept-Encoding: gzip is set
-        headers["Accept-Encoding"] = "gzip"
-      end
+      Dir.mktmpdir(local_path.basename.to_s, local_path.dirname) do |local_temp_dir|
+        local_temp_path = Pathname.new(local_temp_dir).join(local_path.basename)
 
-      response = @fetcher.call(remote_path, headers)
-      return if response.is_a?(Net::HTTPNotModified)
+        # download new file if retrying
+        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}-"
+        else
+          # Fastly ignores Range when Accept-Encoding: gzip is set
+          headers["Accept-Encoding"] = "gzip"
+        end
 
-      content = response.body
-      if response["Content-Encoding"] == "gzip"
-        content = Zlib::GzipReader.new(StringIO.new(content)).read
-      end
+        response = @fetcher.call(remote_path, headers)
+        return if response.is_a?(Net::HTTPNotModified)
+
+        content = response.body
+        if response["Content-Encoding"] == "gzip"
+          content = Zlib::GzipReader.new(StringIO.new(content)).read
+        end
 
-      mode = response.is_a?(Net::HTTPPartialContent) ? "a" : "w"
-      local_path.open(mode) {|f| f << content }
+        mode = response.is_a?(Net::HTTPPartialContent) ? "a" : "w"
+        local_temp_path.open(mode) {|f| f << content }
 
-      response_etag = response["ETag"]
-      return if etag_for(local_path) == response_etag
+        response_etag = response["ETag"]
+        if etag_for(local_temp_path) == response_etag
+          FileUtils.mv(local_temp_path, local_path)
+          return
+        end
 
-      if retrying.nil?
-        local_path.delete
-        update(local_path, remote_path, :retrying)
-      else
-        raise MisMatchedChecksumError.new(remote_path, response_etag, etag_for(local_path))
+        if retrying.nil?
+          update(local_path, remote_path, :retrying)
+        else
+          raise MisMatchedChecksumError.new(remote_path, response_etag, etag_for(local_temp_path))
+        end
       end
     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.12.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.12.4" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek