bundler 1.10.6 → 1.11.0.pre.1

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}"])

data/lib/bundler/index.rb

@@ -11,21 +11,24 @@ module Bundler
     end
 
     attr_reader :specs, :all_specs, :sources
-    protected   :specs, :all_specs
+    protected :specs, :all_specs
+
+    RUBY = "ruby".freeze
+    NULL = "\0".freeze
 
     def initialize
       @sources = []
       @cache = {}
-      @specs = Hash.new { |h,k| h[k] = Hash.new }
-      @all_specs = Hash.new { |h,k| h[k] = [] }
+      @specs = Hash.new {|h, k| h[k] = {} }
+      @all_specs = Hash.new {|h, k| h[k] = [] }
     end
 
     def initialize_copy(o)
       super
       @sources = @sources.dup
       @cache = {}
-      @specs = Hash.new { |h,k| h[k] = Hash.new }
-      @all_specs = Hash.new { |h,k| h[k] = [] }
+      @specs = Hash.new {|h, k| h[k] = {} }
+      @all_specs = Hash.new {|h, k| h[k] = [] }
 
       o.specs.each do |name, hash|
         @specs[name] = hash.dup
@@ -36,7 +39,7 @@ module Bundler
     end
 
     def inspect
-      "#<#{self.class}:0x#{object_id} sources=#{sources.map{|s| s.inspect}} specs.size=#{specs.size}>"
+      "#<#{self.class}:0x#{object_id} sources=#{sources.map(&:inspect)} specs.size=#{specs.size}>"
     end
 
     def empty?
@@ -56,7 +59,7 @@ module Bundler
     # about, returning all of the results.
     def search(query, base = nil)
       results = local_search(query, base)
-      seen = Set.new(results.map { |spec| [spec.name, spec.version, spec.platform] })
+      seen = Set.new(results.map {|spec| [spec.name, spec.version, spec.platform] })
 
       @sources.each do |source|
         source.search(query, base).each do |spec|
@@ -68,7 +71,7 @@ module Bundler
         end
       end
 
-      results.sort_by {|s| [s.version, s.platform.to_s == 'ruby' ? "\0" : s.platform.to_s] }
+      results.sort_by {|s| [s.version, s.platform.to_s == RUBY ? NULL : s.platform.to_s] }
     end
 
     def local_search(query, base = nil)
@@ -76,12 +79,13 @@ module Bundler
       when Gem::Specification, RemoteSpecification, LazySpecification, EndpointSpecification then search_by_spec(query)
       when String then specs_by_name(query)
       when Gem::Dependency then search_by_dependency(query, base)
+      when DepProxy then search_by_dependency(query.dep, base)
       else
         raise "You can't search for a #{query.inspect}."
       end
     end
 
-    alias [] search
+    alias_method :[], :search
 
     def <<(spec)
       @specs[spec.name]["#{spec.version}-#{spec.platform}"] = spec
@@ -98,13 +102,13 @@ module Bundler
     # returns a list of the dependencies
     def unmet_dependency_names
       names = dependency_names
-      names.delete_if{|n| n == "bundler" }
-      names.select{|n| search(n).empty? }
+      names.delete_if {|n| n == "bundler" }
+      names.select {|n| search(n).empty? }
     end
 
     def dependency_names
       names = []
-      each{|s| names.push(*s.dependencies.map{|d| d.name }) }
+      each {|s| names.push(*s.dependencies.map(&:name)) }
       names.uniq
     end
 
@@ -127,10 +131,10 @@ module Bundler
       end
     end
 
-    def ==(o)
+    def ==(other)
       all? do |spec|
-        other_spec = o[spec].first
-        (spec.dependencies & other_spec.dependencies).empty? && spec.source == other_spec.source
+        other_spec = other[spec].first
+        other_spec && (spec.dependencies & other_spec.dependencies).empty? && spec.source == other_spec.source
       end
     end
 
@@ -165,7 +169,7 @@ module Bundler
         only_prerelease  = specs.all? {|spec| spec.version.prerelease? }
 
         unless wants_prerelease || only_prerelease
-          found.reject! { |spec| spec.version.prerelease? }
+          found.reject! {|spec| spec.version.prerelease? }
         end
 
         found
@@ -177,7 +181,7 @@ module Bundler
       spec ? [spec] : []
     end
 
-    if RUBY_VERSION < '1.9'
+    if RUBY_VERSION < "1.9"
       def same_version?(a, b)
         regex = /^(.*?)(?:\.0)*$/
         a.to_s[regex, 1] == b.to_s[regex, 1]
@@ -192,6 +196,5 @@ module Bundler
       return false unless dep.name == spec.name
       dep.requirement.satisfied_by?(spec.version)
     end
-
   end
 end