bundler 1.10.6 → 1.11.0

data/lib/bundler/fetcher.rb

@@ -1,14 +1,14 @@
-require 'bundler/vendored_persistent'
-require 'cgi'
-require 'securerandom'
+require "bundler/vendored_persistent"
+require "cgi"
+require "securerandom"
+require "zlib"
 
 module Bundler
-
   # Handles all the fetching with the rubygems server
   class Fetcher
-    autoload :Downloader, 'bundler/fetcher/downloader'
-    autoload :Dependency, 'bundler/fetcher/dependency'
-    autoload :Index, 'bundler/fetcher/index'
+    autoload :Downloader, "bundler/fetcher/downloader"
+    autoload :Dependency, "bundler/fetcher/dependency"
+    autoload :Index, "bundler/fetcher/index"
 
     # This error is raised when it looks like the network is down
     class NetworkDownError < HTTPError; end
@@ -21,7 +21,7 @@ module Bundler
           " is a chance you are experiencing a man-in-the-middle attack, but" \
           " most likely your system doesn't have the CA certificates needed" \
           " for verification. For information about OpenSSL certificates, see" \
-          " bit.ly/ruby-ssl. To connect without using SSL, edit your Gemfile" \
+          " http://bit.ly/ruby-ssl. To connect without using SSL, edit your Gemfile" \
           " sources and change 'https' to 'http'."
       end
     end
@@ -58,7 +58,7 @@ module Bundler
       attr_accessor :disable_endpoint, :api_timeout, :redirect_limit, :max_retries
     end
 
-    self.redirect_limit = Bundler.settings[:redirect]  # How many redirects to allow in one request
+    self.redirect_limit = Bundler.settings[:redirect] # How many redirects to allow in one request
     self.api_timeout    = Bundler.settings[:timeout] # How long to wait for each API call
     self.max_retries    = Bundler.settings[:retry] # How many retries for the API call
 
@@ -75,11 +75,11 @@ module Bundler
 
     # fetch a gem specification
     def fetch_spec(spec)
-      spec = spec - [nil, 'ruby', '']
-      spec_file_name = "#{spec.join '-'}.gemspec"
+      spec -= [nil, "ruby", ""]
+      spec_file_name = "#{spec.join "-"}.gemspec"
 
       uri = URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
-      if uri.scheme == 'file'
+      if uri.scheme == "file"
         Bundler.load_marshal Gem.inflate(Gem.read_binary(uri.path))
       elsif cached_spec_path = gemspec_cached_path(spec_file_name)
         Bundler.load_gemspec(cached_spec_path)
@@ -91,6 +91,13 @@ module Bundler
         "Your network or your gem server is probably having issues right now."
     end
 
+    # return the specs in the bundler format as an index with retries
+    def specs_with_retry(gem_names, source)
+      Bundler::Retry.new("fetcher").attempts do
+        specs(gem_names, source)
+      end
+    end
+
     # return the specs in the bundler format as an index
     def specs(gem_names, source)
       old = Bundler.rubygems.sources
@@ -98,15 +105,13 @@ module Bundler
 
       specs = {}
       fetchers.dup.each do |f|
-        unless f.api_fetcher? && !gem_names
-          break if specs = f.specs(gem_names)
-        end
+        break unless f.api_fetcher? && !gem_names || !specs = f.specs(gem_names)
         fetchers.delete(f)
       end
       @use_api = false if fetchers.none?(&:api_fetcher?)
 
       specs[remote_uri].each do |name, version, platform, dependencies|
-        next if name == 'bundler'
+        next if name == "bundler"
         spec = nil
         if dependencies
           spec = EndpointSpecification.new(name, version, platform, dependencies)
@@ -132,7 +137,7 @@ module Bundler
       if remote_uri.scheme == "file" || Bundler::Fetcher.disable_endpoint
         @use_api = false
       else
-        fetchers.reject! { |f| f.api_fetcher? && !f.api_available? }
+        fetchers.reject! {|f| f.api_fetcher? && !f.api_available? }
         @use_api = fetchers.any?(&:api_fetcher?)
       end
     end
@@ -149,7 +154,11 @@ module Bundler
 
         if ruby.engine != "ruby"
           # engine_version raises on unknown engines
-          engine_version = ruby.engine_version rescue "???"
+          engine_version = begin
+                             ruby.engine_version
+                           rescue
+                             "???"
+                           end
           agent << " #{ruby.engine}/#{engine_version}"
         end
 
@@ -169,7 +178,13 @@ module Bundler
     end
 
     def fetchers
-      @fetchers ||= FETCHERS.map { |f| f.new(downloader, remote_uri, fetch_uri, uri) }
+      @fetchers ||= FETCHERS.map {|f| f.new(downloader, @remote, uri) }
+    end
+
+    def http_proxy
+      if uri = connection.proxy_uri
+        uri.to_s
+      end
     end
 
     def inspect
@@ -192,7 +207,7 @@ module Bundler
         "CI_NAME" => ENV["CI_NAME"],
         "CI" => "ci"
       }
-      env_cis.find_all{ |env, ci| ENV[env]}.map{ |env, ci| ci }
+      env_cis.find_all {|env, _| ENV[env] }.map {|_, ci| ci }
     end
 
     def connection
@@ -202,7 +217,10 @@ module Bundler
           Bundler.settings[:ssl_client_cert]
         raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
 
-        con = Net::HTTP::Persistent.new 'bundler', :ENV
+        con = Net::HTTP::Persistent.new "bundler", :ENV
+        if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
+          con.proxy = URI.parse(gem_proxy)
+        end
 
         if remote_uri.scheme == "https"
           con.verify_mode = (Bundler.settings[:ssl_verify_mode] ||
@@ -218,22 +236,23 @@ module Bundler
 
         con.read_timeout = Fetcher.api_timeout
         con.override_headers["User-Agent"] = user_agent
+        con.override_headers["X-Gemfile-Source"] = @remote.original_uri.to_s if @remote.original_uri
         con
       end
     end
 
     # cached gem specification path, if one exists
-    def gemspec_cached_path spec_file_name
-      paths = Bundler.rubygems.spec_cache_dirs.map { |dir| File.join(dir, spec_file_name) }
+    def gemspec_cached_path(spec_file_name)
+      paths = Bundler.rubygems.spec_cache_dirs.map {|dir| File.join(dir, spec_file_name) }
       paths = paths.select {|path| File.file? path }
       paths.first
     end
 
     HTTP_ERRORS = [
-      Timeout::Error, EOFError, SocketError, Errno::ENETDOWN,
+      Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
       Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
       Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
-      Net::HTTP::Persistent::Error
+      Net::HTTP::Persistent::Error, Zlib::BufError
     ]
 
     def bundler_cert_store
@@ -247,25 +266,13 @@ module Bundler
       else
         store.set_default_paths
         certs = File.expand_path("../ssl_certs/*.pem", __FILE__)
-        Dir.glob(certs).each { |c| store.add_file c }
+        Dir.glob(certs).each {|c| store.add_file c }
       end
       store
     end
 
   private
 
-    def fetch_uri
-      @fetch_uri ||= begin
-        if remote_uri.host == "rubygems.org"
-          uri = remote_uri.dup
-          uri.host = "bundler.rubygems.org"
-          uri
-        else
-          remote_uri
-        end
-      end
-    end
-
     def remote_uri
       @remote.uri
     end
@@ -273,6 +280,5 @@ module Bundler
     def downloader
       @downloader ||= Downloader.new(connection, self.class.redirect_limit)
     end
-
   end
 end

data/lib/bundler/friendly_errors.rb

@@ -5,9 +5,17 @@ require "bundler/vendored_thor"
 module Bundler
   def self.with_friendly_errors
     yield
+  rescue YAMLSyntaxError => e
+    Bundler.ui.error e.message
+    Bundler.ui.trace e.orig_exception
+    exit e.status_code
   rescue Bundler::Dsl::DSLError => e
     Bundler.ui.error e.message
     exit e.status_code
+  rescue Bundler::GemRequireError => e
+    Bundler.ui.error e.message
+    Bundler.ui.trace e.orig_exception, nil, true
+    exit e.status_code
   rescue Bundler::BundlerError => e
     Bundler.ui.error e.message, :wrap => true
     Bundler.ui.trace e
@@ -43,11 +51,11 @@ module Bundler
   end
 
   def self.request_issue_report_for(e)
-    Bundler.ui.info <<-EOS.gsub(/^ {6}/, '')
-      #{'--- ERROR REPORT TEMPLATE -------------------------------------------------------'}
+    Bundler.ui.info <<-EOS.gsub(/^ {6}/, "")
+      --- ERROR REPORT TEMPLATE -------------------------------------------------------
       - What did you do?
 
-        I ran the command `#{$PROGRAM_NAME} #{ARGV.join(' ')}`
+        I ran the command `#{$PROGRAM_NAME} #{ARGV.join(" ")}`
 
       - What did you expect to happen?
 
@@ -63,14 +71,14 @@ module Bundler
           #{e.class}: #{e.message}
             #{e.backtrace.join("\n            ")}
 
-      #{Bundler::Env.new.report(:print_gemfile => false).gsub(/\n/, "\n      ").strip}
-      #{'--- TEMPLATE END ----------------------------------------------------------------'}
+      #{Bundler::Env.new.report(:print_gemfile => false, :print_gemspecs => false).gsub(/\n/, "\n      ").strip}
+      --- TEMPLATE END ----------------------------------------------------------------
 
     EOS
 
     Bundler.ui.error "Unfortunately, an unexpected error occurred, and Bundler cannot continue."
 
-    Bundler.ui.warn <<-EOS.gsub(/^ {6}/, '')
+    Bundler.ui.warn <<-EOS.gsub(/^ {6}/, "")
 
       First, try this link to see if there are any existing issue reports for this error:
       #{issues_url(e)}
@@ -81,8 +89,7 @@ module Bundler
   end
 
   def self.issues_url(exception)
-    'https://github.com/bundler/bundler/search?q=' \
+    "https://github.com/bundler/bundler/search?q=" \
     "#{CGI.escape(exception.message.lines.first.chomp)}&type=Issues"
   end
-
 end

data/lib/bundler/gem_helper.rb

@@ -1,5 +1,5 @@
-require 'bundler/vendored_thor' unless defined?(Thor)
-require 'bundler'
+require "bundler/vendored_thor" unless defined?(Thor)
+require "bundler"
 
 module Bundler
   class GemHelper
@@ -35,35 +35,35 @@ module Bundler
       built_gem_path = nil
 
       desc "Build #{name}-#{version}.gem into the pkg directory."
-      task 'build' do
+      task "build" do
         built_gem_path = build_gem
       end
 
       desc "Build and install #{name}-#{version}.gem into system gems."
-      task 'install' => 'build' do
+      task "install" => "build" do
         install_gem(built_gem_path)
       end
 
       desc "Build and install #{name}-#{version}.gem into system gems without network access."
-      task 'install:local' => 'build' do
+      task "install:local" => "build" do
         install_gem(built_gem_path, :local)
       end
 
       desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to Rubygems\n" \
            "To prevent publishing in Rubygems use `gem_push=no rake release`"
-      task 'release' => ['build', 'release:guard_clean',
-                         'release:source_control_push', 'release:rubygem_push'] do
+      task "release", [:remote] => ["build", "release:guard_clean",
+                                    "release:source_control_push", "release:rubygem_push"] do
       end
 
-      task 'release:guard_clean' do
+      task "release:guard_clean" do
         guard_clean
       end
 
-      task 'release:source_control_push' do
-        tag_version { git_push } unless already_tagged?
+      task "release:source_control_push", [:remote] do |_, args|
+        tag_version { git_push(args[:remote]) } unless already_tagged?
       end
 
-      task 'release:rubygem_push' do
+      task "release:rubygem_push" do
         rubygem_push(built_gem_path) if gem_push?
       end
 
@@ -72,57 +72,64 @@ module Bundler
 
     def build_gem
       file_name = nil
-      sh("gem build -V '#{spec_path}'") { |out, code|
+      sh("gem build -V '#{spec_path}'") do
         file_name = File.basename(built_gem_path)
-        FileUtils.mkdir_p(File.join(base, 'pkg'))
-        FileUtils.mv(built_gem_path, 'pkg')
+        SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) }
+        FileUtils.mv(built_gem_path, "pkg")
         Bundler.ui.confirm "#{name} #{version} built to pkg/#{file_name}."
-      }
-      File.join(base, 'pkg', file_name)
+      end
+      File.join(base, "pkg", file_name)
     end
 
     def install_gem(built_gem_path = nil, local = false)
       built_gem_path ||= build_gem
-      out, _ = sh_with_code("gem install '#{built_gem_path}'#{' --local' if local}")
+      out, _ = sh_with_code("gem install '#{built_gem_path}'#{" --local" if local}")
       raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/]
       Bundler.ui.confirm "#{name} (#{version}) installed."
     end
 
-    protected
+  protected
+
     def rubygem_push(path)
       if Pathname.new("~/.gem/credentials").expand_path.exist?
-        sh("gem push '#{path}'")
-        Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org."
+        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
+        sh(gem_command)
+        Bundler.ui.confirm "Pushed #{name} #{version} to #{allowed_push_host ? allowed_push_host : "rubygems.org."}"
       else
         raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
       end
     end
 
     def built_gem_path
-      Dir[File.join(base, "#{name}-*.gem")].sort_by{|f| File.mtime(f)}.last
+      Dir[File.join(base, "#{name}-*.gem")].sort_by {|f| File.mtime(f) }.last
     end
 
-    def git_push
-      perform_git_push
-      perform_git_push ' --tags'
+    def git_push(remote = "")
+      perform_git_push remote
+      perform_git_push "#{remote} --tags"
       Bundler.ui.confirm "Pushed git commits and tags."
     end
 
-    def perform_git_push(options = '')
+    def perform_git_push(options = "")
       cmd = "git push #{options}"
       out, code = sh_with_code(cmd)
       raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" unless code == 0
     end
 
     def already_tagged?
-      if sh('git tag').split(/\n/).include?(version_tag)
+      if sh("git tag").split(/\n/).include?(version_tag)
         Bundler.ui.confirm "Tag #{version_tag} has already been created."
         true
       end
     end
 
     def guard_clean
-      clean? && committed? or raise("There are files that need to be committed first.")
+      clean? && committed? || raise("There are files that need to be committed first.")
     end
 
     def clean?
@@ -157,24 +164,26 @@ module Bundler
 
     def sh(cmd, &block)
       out, code = sh_with_code(cmd, &block)
-      code == 0 ? out : raise(out.empty? ? "Running `#{cmd}' failed. Run this command directly for more detailed output." : out)
+      if code == 0
+        out
+      else
+        raise(out.empty? ? "Running `#{cmd}` failed. Run this command directly for more detailed output." : out)
+      end
     end
 
     def sh_with_code(cmd, &block)
       cmd << " 2>&1"
-      outbuf = ''
+      outbuf = ""
       Bundler.ui.debug(cmd)
-      SharedHelpers.chdir(base) {
+      SharedHelpers.chdir(base) do
         outbuf = `#{cmd}`
-        if $? == 0
-          block.call(outbuf) if block
-        end
-      }
+        block.call(outbuf) if $? == 0 && block
+      end
       [outbuf, $?]
     end
 
     def gem_push?
-      ! %w{n no nil false off 0}.include?(ENV['gem_push'].to_s.downcase)
+      ! %w(n no nil false off 0).include?(ENV["gem_push"].to_s.downcase)
     end
   end
 end

data/lib/bundler/gem_helpers.rb

@@ -1,15 +1,14 @@
 module Bundler
   module GemHelpers
-
     GENERIC_CACHE = {}
     GENERICS = [
-      [Gem::Platform.new('java'), Gem::Platform.new('java')],
-      [Gem::Platform.new('mswin32'), Gem::Platform.new('mswin32')],
-      [Gem::Platform.new('mswin64'), Gem::Platform.new('mswin64')],
-      [Gem::Platform.new('universal-mingw32'), Gem::Platform.new('universal-mingw32')],
-      [Gem::Platform.new('x64-mingw32'), Gem::Platform.new('x64-mingw32')],
-      [Gem::Platform.new('x86_64-mingw32'), Gem::Platform.new('x64-mingw32')],
-      [Gem::Platform.new('mingw32'), Gem::Platform.new('x86-mingw32')]
+      [Gem::Platform.new("java"), Gem::Platform.new("java")],
+      [Gem::Platform.new("mswin32"), Gem::Platform.new("mswin32")],
+      [Gem::Platform.new("mswin64"), Gem::Platform.new("mswin64")],
+      [Gem::Platform.new("universal-mingw32"), Gem::Platform.new("universal-mingw32")],
+      [Gem::Platform.new("x64-mingw32"), Gem::Platform.new("x64-mingw32")],
+      [Gem::Platform.new("x86_64-mingw32"), Gem::Platform.new("x64-mingw32")],
+      [Gem::Platform.new("mingw32"), Gem::Platform.new("x86-mingw32")]
     ]
 
     def generic(p)

data/lib/bundler/gem_remote_fetcher.rb

@@ -0,0 +1,41 @@
+require "rubygems/remote_fetcher"
+
+module Bundler
+  # Adds support for setting custom HTTP headers when fetching gems from the
+  # server.
+  #
+  # TODO: Get rid of this when and if gemstash only supports RubyGems versions
+  # that contain https://github.com/rubygems/rubygems/commit/3db265cc20b2f813.
+  class GemRemoteFetcher < Gem::RemoteFetcher
+    attr_accessor :headers
+
+    # Extracted from RubyGems 2.4.
+    def fetch_http(uri, last_modified = nil, head = false, depth = 0)
+      fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
+      # beginning of change
+      response   = request uri, fetch_type, last_modified do |req|
+        headers.each {|k, v| req.add_field(k, v) } if headers
+      end
+      # end of change
+
+      case response
+      when Net::HTTPOK, Net::HTTPNotModified then
+        response.uri = uri if response.respond_to? :uri
+        head ? response : response.body
+      when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
+           Net::HTTPTemporaryRedirect then
+        raise FetchError.new("too many redirects", uri) if depth > 10
+
+        location = URI.parse response["Location"]
+
+        if https?(uri) && !https?(location)
+          raise FetchError.new("redirecting to non-https resource: #{location}", uri)
+        end
+
+        fetch_http(location, last_modified, head, depth + 1)
+      else
+        raise FetchError.new("bad response #{response.message} #{response.code}", uri)
+      end
+    end
+  end
+end

data/lib/bundler/gem_tasks.rb

@@ -1,2 +1,5 @@
-require 'bundler/gem_helper'
+require "rake/clean"
+CLOBBER.include "pkg"
+
+require "bundler/gem_helper"
 Bundler::GemHelper.install_tasks

data/lib/bundler/graph.rb

@@ -1,4 +1,4 @@
-require 'set'
+require "set"
 module Bundler
   class Graph
     GRAPH_NAME = :Gemfile
@@ -12,7 +12,7 @@ module Bundler
       @without_groups    = without.map(&:to_sym)
 
       @groups            = []
-      @relations         = Hash.new {|h, k| h[k] = Set.new}
+      @relations         = Hash.new {|h, k| h[k] = Set.new }
       @node_options      = {}
       @edge_options      = {}
 
@@ -26,11 +26,11 @@ module Bundler
       GraphVizClient.new(self).run
     end
 
-    private
+  private
 
     def _populate_relations
       parent_dependencies = _groups.values.to_set.flatten
-      while true
+      loop do
         if parent_dependencies.empty?
           break
         else
@@ -54,7 +54,7 @@ module Bundler
     end
 
     def _groups
-      relations = Hash.new {|h, k| h[k] = Set.new}
+      relations = Hash.new {|h, k| h[k] = Set.new }
       @env.current_dependencies.each do |dependency|
         dependency.groups.each do |group|
           next if @without_groups.include?(group)
@@ -75,7 +75,7 @@ module Bundler
       when :node
         if symbol_or_string_or_dependency.is_a?(Gem::Dependency)
           label = symbol_or_string_or_dependency.name.dup
-          label << "\n#{symbol_or_string_or_dependency.to_spec.version.to_s}" if @show_version
+          label << "\n#{symbol_or_string_or_dependency.to_spec.version}" if @show_version
         else
           label = symbol_or_string_or_dependency.to_s
         end
@@ -95,19 +95,19 @@ module Bundler
       # method borrow from rubygems/dependency.rb
       # redefinition of matching_specs will also redefine to_spec and to_specs
       Gem::Dependency.class_eval do
-        def matching_specs platform_only = false
-          matches = Bundler.load.specs.select { |spec|
-            self.name == spec.name and
-              requirement.satisfied_by? spec.version
-          }
+        def matching_specs(platform_only = false)
+          matches = Bundler.load.specs.select do |spec|
+            name == spec.name &&
+              requirement.satisfied_by?(spec.version)
+          end
 
           if platform_only
-            matches.reject! { |spec|
-              not Gem::Platform.match spec.platform
-            }
+            matches.select! do |spec|
+              Gem::Platform.match spec.platform
+            end
           end
 
-          matches = matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed
+          matches = matches.sort_by(&:sort_obj) # HACK: shouldn't be needed
         end
       end
     end
@@ -124,9 +124,9 @@ module Bundler
       end
 
       def g
-        @g ||= ::GraphViz.digraph(@graph_name, {:concentrate => true, :normalize => true, :nodesep => 0.55}) do |g|
+        @g ||= ::GraphViz.digraph(@graph_name, :concentrate => true, :normalize => true, :nodesep => 0.55) do |g|
           g.edge[:weight]   = 2
-          g.edge[:fontname] = g.node[:fontname] = 'Arial, Helvetica, SansSerif'
+          g.edge[:fontname] = g.node[:fontname] = "Arial, Helvetica, SansSerif"
           g.edge[:fontsize] = 12
         end
       end
@@ -134,19 +134,20 @@ module Bundler
       def run
         @groups.each do |group|
           g.add_nodes(
-            group,
-            {:style     => 'filled',
-             :fillcolor => '#B9B9D5',
-             :shape     => "box3d",
-             :fontsize  => 16}.merge(@node_options[group])
+            group, {
+              :style     => "filled",
+              :fillcolor => "#B9B9D5",
+              :shape     => "box3d",
+              :fontsize  => 16
+            }.merge(@node_options[group])
           )
         end
 
         @relations.each do |parent, children|
           children.each do |child|
             if @groups.include?(parent)
-              g.add_nodes(child, {:style => 'filled', :fillcolor => '#B9B9D5'}.merge(@node_options[child]))
-              g.add_edges(parent, child, {:constraint => false}.merge(@edge_options["#{parent}_#{child}"]))
+              g.add_nodes(child, { :style => "filled", :fillcolor => "#B9B9D5" }.merge(@node_options[child]))
+              g.add_edges(parent, child, { :constraint => false }.merge(@edge_options["#{parent}_#{child}"]))
             else
               g.add_nodes(child, @node_options[child])
               g.add_edges(parent, child, @edge_options["#{parent}_#{child}"])