bundler 1.1.pre.10 → 1.1.rc

data/.travis.yml

@@ -7,6 +7,7 @@ script: rake spec:travis
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
 
 env:
   - RGV=v1.3.6
@@ -26,6 +27,12 @@ matrix:
       env: RGV=v1.3.7
     - rvm: 1.9.2
       env: RGV=v1.4.2
+    - rvm: 1.9.3
+      env: RGV=v1.3.6
+    - rvm: 1.9.3
+      env: RGV=v1.3.7
+    - rvm: 1.9.3
+      env: RGV=v1.4.2
 
 notifications:
   email:

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 1.1.rc (Oct 3, 2011)
+
+Features:
+
+  - add `--shebang` option to bundle install (@bensie, #1467)
+  - build passes on ruby 1.9.3rc1 (#1458, #1469)
+  - hide basic auth credentials for custom sources (#1440, #1463)
+
+Bugfixes:
+
+  - fix index search result caching (#1446, #1466)
+  - fix fetcher prints multiple times during install (#1445, #1462)
+  - don't mention API errors from non-rubygems.org sources
+  - fix autoclean so it doesn't remove bins that are used (#1459, #1460)
+
+Documentation:
+
+  - add :require => [...] to the gemfile(5) manpage (@nono, #1468)
+
 ## 1.1.pre.10 (Sep 27, 2011)
 
 Features:
@@ -131,6 +150,16 @@ Removed:
   - Removed bundle install --production
   - Removed bundle install --disable-shared-gems
 
+## 1.0.21 (September 30, 2011)
+
+  - No changes from RC
+
+## 1.0.21.rc (September 29, 2011)
+
+Bugfixes:
+
+  - Load Psych unless Syck is defined, because 1.9.2 defines YAML
+
 ## 1.0.20 (September 27, 2011)
 
 Features:
@@ -139,7 +168,7 @@ Features:
 
 Bugfixes:
 
-  - Ensure yaml is required even if psych is found
+  - Ensure YAML is required even if Psych is found
   - Handle directory names that contain invalid regex characters
 
 ## 1.0.20.rc (September 18, 2011)

data/Rakefile

@@ -34,6 +34,13 @@ begin
       rm_rf 'tmp'
     end
 
+    desc "Run the real-world spec suite (reequires internet)"
+    task :realworld => ["set_realworld", "spec"]
+
+    task :set_realworld do
+      ENV['BUNDLER_REALWORLD_TESTS'] = '1'
+    end
+
     desc "Run the spec suite with the sudo tests"
     task :sudo => ["set_sudo", "spec", "clean_sudo"]
 
@@ -59,6 +66,7 @@ begin
         # Create tasks like spec:rubygems:v1.8.3:sudo to run the sudo specs
         namespace rg do
           task :sudo => ["set_sudo", rg, "clean_sudo"]
+          task :realworld => ["set_realworld", rg]
         end
 
         task "clone_rubygems_#{rg}" do
@@ -96,33 +104,8 @@ begin
       task "rubygems:all" => "co"
     end
 
-    namespace :ruby do
-      # Ruby 1.8.6, 1.8.7, and 1.9.2 specs
-      task "ensure_rvm" do
-        raise "RVM is not available" unless File.exist?(File.expand_path("~/.rvm/scripts/rvm"))
-      end
-
-      %w(1.8.6-p420 1.8.7-p334 1.9.2-p180).each do |ruby|
-        ruby_cmd = File.expand_path("~/.rvm/bin/ruby-#{ruby}")
-
-        desc "Run specs on Ruby #{ruby}"
-        RSpec::Core::RakeTask.new(ruby) do |t|
-          t.rspec_opts = %w(-fs --color)
-          t.ruby_opts  = %w(-w)
-        end
-
-        task "ensure_ruby_#{ruby}" do
-          raise "Could not find Ruby #{ruby} at #{ruby_cmd}" unless File.exist?(ruby_cmd)
-        end
-
-        task "ensure_ruby_#{ruby}" => "ensure_rvm"
-        task ruby => "ensure_ruby_#{ruby}"
-        task "ruby:all" => ruby
-      end
-    end
-
     desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
-    task "travis" do
+    task :travis do
       rg = ENV['RGV'] || 'master'
 
       puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
@@ -133,7 +116,12 @@ begin
       puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
       sudos = safe_task { Rake::Task["spec:rubygems:#{rg}:sudo"].invoke }
 
-      unless specs && sudos
+      Rake::Task["spec:rubygems:#{rg}"].reenable
+
+      puts "\n\e[1;33m[Travis CI] Running bundler real world specs against rubygems #{rg}\e[m\n\n"
+      realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }
+
+      unless specs && sudos && realworld
         fail "Bundler tests failed, please review the log for more information"
       end
     end

data/lib/bundler.rb

@@ -4,12 +4,11 @@ require 'pathname'
 
 begin
   # Pull in Psych if we can, but not if Syck is already loaded
-  require 'psych' unless defined?(::YAML)
+  require 'psych' unless defined?(Syck)
 rescue LoadError
-ensure
-  require 'yaml'
 end
 
+require 'yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'
@@ -19,17 +18,20 @@ module Bundler
 
   autoload :Definition,            'bundler/definition'
   autoload :Dependency,            'bundler/dependency'
+  autoload :DepProxy,              'bundler/dep_proxy'
   autoload :Dsl,                   'bundler/dsl'
   autoload :EndpointSpecification, 'bundler/endpoint_specification'
   autoload :Environment,           'bundler/environment'
   autoload :Fetcher,               'bundler/fetcher'
   autoload :GemHelper,             'bundler/gem_helper'
+  autoload :GemHelpers,            'bundler/gem_helpers'
   autoload :GemInstaller,          'bundler/gem_installer'
   autoload :Graph,                 'bundler/graph'
   autoload :Index,                 'bundler/index'
   autoload :Installer,             'bundler/installer'
   autoload :LazySpecification,     'bundler/lazy_specification'
   autoload :LockfileParser,        'bundler/lockfile_parser'
+  autoload :MatchPlatform,         'bundler/match_platform'
   autoload :RemoteSpecification,   'bundler/remote_specification'
   autoload :Resolver,              'bundler/resolver'
   autoload :Runtime,               'bundler/runtime'

data/lib/bundler/cli.rb

@@ -142,6 +142,8 @@ module Bundler
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
       "Generate bin stubs for bundled gems to ./bin"
+    method_option "shebang", :type => :string, :banner =>
+      "Specify a different shebang executable name than the default (usually 'ruby')"
     method_option "path", :type => :string, :banner =>
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     method_option "system", :type => :boolean, :banner =>
@@ -204,6 +206,7 @@ module Bundler
       Bundler.settings[:path]   = opts[:path] if opts[:path]
       Bundler.settings[:path] ||= "bundle" if opts[:standalone]
       Bundler.settings[:bin]    = opts["binstubs"] if opts[:binstubs]
+      Bundler.settings[:shebang] = opts["shebang"] if opts[:shebang]
       Bundler.settings[:no_prune] = true if opts["no-prune"]
       Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
       Bundler.settings.without = opts[:without]

data/lib/bundler/dep_proxy.rb

@@ -0,0 +1,35 @@
+module Bundler
+  class DepProxy
+
+    attr_reader :required_by, :__platform, :dep
+
+    def initialize(dep, platform)
+      @dep, @__platform, @required_by = dep, platform, []
+    end
+
+    def hash
+      @hash ||= dep.hash
+    end
+
+    def ==(o)
+      dep == o.dep && __platform == o.__platform
+    end
+
+    alias eql? ==
+
+    def type
+      @dep.type
+    end
+
+    def to_s
+      "#{name} (#{requirement}) #{__platform}"
+    end
+
+  private
+
+    def method_missing(*args)
+      @dep.send(*args)
+    end
+
+  end
+end

data/lib/bundler/endpoint_specification.rb

@@ -42,6 +42,17 @@ module Bundler
       end
     end
 
+    # needed for bundle clean
+    def bindir
+      if @remote_specification
+        @remote_specification.bindir
+      elsif _local_specification
+        _local_specification.bindir
+      else
+        super
+      end
+    end
+
     def _local_specification
       eval(File.read(local_specification_path)) if @loaded_from && File.exists?(local_specification_path)
     end

data/lib/bundler/fetcher.rb

@@ -18,7 +18,7 @@ module Bundler
         if spec
           path = download_gem_from_uri(spec, uri)
           s = Bundler.rubygems.spec_from_gem(path)
-          spec.__swap__(s) if spec.is_a?(RemoteSpecification)
+          spec.__swap__(s)
         end
       end
 
@@ -61,7 +61,36 @@ module Bundler
     def specs(gem_names, source)
       index = Index.new
 
-      fetch_remote_specs(gem_names)[@remote_uri].each do |name, version, platform, dependencies|
+      if !gem_names || @remote_uri.scheme == "file" || Bundler::Fetcher.disable_endpoint
+        Bundler.ui.info "Fetching source index from #{strip_user_pass_from_uri(@remote_uri)}"
+        specs = fetch_all_remote_specs
+      else
+        Bundler.ui.info "Fetching gem metadata from #{strip_user_pass_from_uri(@remote_uri)}", Bundler.ui.debug?
+        begin
+          specs = fetch_remote_specs(gem_names)
+        # fall back to the legacy index in the following cases
+        # 1. Gemcutter Endpoint doesn't return a 200
+        # 2. Marshal blob doesn't load properly
+        # 3. One of the YAML gemspecs has the Syck::DefaultKey problem
+        rescue HTTPError, TypeError => e
+          # new line now that the dots are over
+          Bundler.ui.info "" unless Bundler.ui.debug?
+
+          if @remote_uri.to_s.include?("rubygems.org")
+            Bundler.ui.info "Error #{e.class} during request to dependency API"
+          end
+          Bundler.ui.debug e.message
+          Bundler.ui.debug e.backtrace
+
+          Bundler.ui.info "Fetching full source index from #{strip_user_pass_from_uri(@remote_uri)}"
+          specs = fetch_all_remote_specs
+        else
+          # new line now that the dots are over
+          Bundler.ui.info "" unless Bundler.ui.debug?
+        end
+      end
+
+      specs[@remote_uri].each do |name, version, platform, dependencies|
         next if name == 'bundler'
         spec = nil
         if dependencies
@@ -79,34 +108,21 @@ module Bundler
 
     # fetch index
     def fetch_remote_specs(gem_names, full_dependency_list = [], last_spec_list = [])
-      return fetch_all_remote_specs if !gem_names || @remote_uri.scheme == "file" || Bundler::Fetcher.disable_endpoint
-
       query_list = gem_names - full_dependency_list
+
       # only display the message on the first run
-      if full_dependency_list.empty?
-        Bundler.ui.info "Fetching dependency information from the API at #{@remote_uri}", false
+      if Bundler.ui.debug?
+        Bundler.ui.debug "Query List: #{query_list.inspect}"
       else
         Bundler.ui.info ".", false
       end
 
-      Bundler.ui.debug "Query List: #{query_list.inspect}"
-      if query_list.empty?
-        Bundler.ui.info "\n"
-        return {@remote_uri => last_spec_list}
-      end
+      return {@remote_uri => last_spec_list} if query_list.empty?
 
       spec_list, deps_list = fetch_dependency_remote_specs(query_list)
       returned_gems = spec_list.map {|spec| spec.first }.uniq
 
       fetch_remote_specs(deps_list, full_dependency_list + returned_gems, spec_list + last_spec_list)
-    # fall back to the legacy index in the following cases
-    # 1.) Gemcutter Endpoint doesn't return a 200
-    # 2.) Marshal blob doesn't load properly
-    rescue HTTPError, TypeError => e
-      Bundler.ui.info "\nError using the API"
-      Bundler.ui.debug "Error #{e.class} from Gemcutter Dependency Endpoint API: #{e.message}"
-      Bundler.ui.debug e.backtrace
-      fetch_all_remote_specs
     end
 
   private
@@ -176,8 +192,6 @@ module Bundler
     # fetch from modern index: specs.4.8.gz
     def fetch_all_remote_specs
       @has_api = false
-      Bundler.ui.info "Fetching source index for #{@remote_uri}"
-      Bundler.ui.debug "Fetching modern index"
       Gem.sources = ["#{@remote_uri}"]
       spec_list = Hash.new { |h,k| h[k] = [] }
       begin
@@ -187,13 +201,21 @@ module Bundler
         begin
           Gem::SpecFetcher.new.list(false, true).each {|k, v| spec_list[k] += v }
         rescue Gem::RemoteFetcher::FetchError
-          Bundler.ui.warn "Could not fetch prerelease specs from #{@remote_uri}"
+          Bundler.ui.debug "Could not fetch prerelease specs from #{strip_user_pass_from_uri(@remote_uri)}"
         end
       rescue Gem::RemoteFetcher::FetchError
-        raise Bundler::HTTPError, "Could not reach #{@remote_uri}"
+        raise Bundler::HTTPError, "Could not reach #{strip_user_pass_from_uri(@remote_uri)}"
       end
 
       return spec_list
     end
+
+    def strip_user_pass_from_uri(uri)
+      uri_dup = uri.dup
+      uri_dup.user = "****" if uri_dup.user
+      uri_dup.password = "****" if uri_dup.password
+
+      uri_dup
+    end
   end
 end

data/lib/bundler/gem_helpers.rb

@@ -0,0 +1,23 @@
+module Bundler
+  module GemHelpers
+
+    GENERIC_CACHE = {}
+    GENERICS = [
+      Gem::Platform.new('java'),
+      Gem::Platform.new('mswin32'),
+      Gem::Platform.new('x86-mingw32'),
+      Gem::Platform::RUBY
+    ]
+
+    def generic(p)
+      return p if p == Gem::Platform::RUBY
+
+      GENERIC_CACHE[p] ||= begin
+        found = GENERICS.find do |p2|
+          p2.is_a?(Gem::Platform) && p.os == p2.os
+        end
+        found || Gem::Platform::RUBY
+      end
+    end
+  end
+end

data/lib/bundler/index.rb

@@ -130,7 +130,7 @@ module Bundler
     end
 
     def search_by_dependency(dependency, base = nil)
-      @cache[dependency.hash] ||= begin
+      @cache[dependency.hash^base.hash] ||= begin
         specs = specs_by_name(dependency.name) + (base || [])
         found = specs.select do |spec|
           if base # allow all platforms when searching from a lockfile

data/lib/bundler/match_platform.rb

@@ -0,0 +1,13 @@
+require 'bundler/gem_helpers'
+
+module Bundler
+  module MatchPlatform
+    include GemHelpers
+
+    def match_platform(p)
+      Gem::Platform::RUBY == platform or
+      platform.nil? or p == platform or
+      generic(Gem::Platform.new(platform)) == p
+    end
+  end
+end

data/lib/bundler/resolver.rb

@@ -364,28 +364,25 @@ module Bundler
         d = dep.dep
       end
 
-      key = "#{d}-#{dep.__platform}"
-      return @deps_for[key] if @deps_for[key]
-
-      index = @source_requirements[d.name] || @index
-      results = index.search(d, @base[d.name])
-
-      if results.any?
-        version = results.first.version
-        nested  = [[]]
-        results.each do |spec|
-          if spec.version != version
-            nested << []
-            version = spec.version
+      @deps_for[d.hash] ||= begin
+        index = @source_requirements[d.name] || @index
+        results = index.search(d, @base[d.name])
+
+        if results.any?
+          version = results.first.version
+          nested  = [[]]
+          results.each do |spec|
+            if spec.version != version
+              nested << []
+              version = spec.version
+            end
+            nested.last << spec
           end
-          nested.last << spec
+          deps = nested.map{|a| SpecGroup.new(a) }.select{|sg| sg.for?(dep.__platform) }
+        else
+          deps = []
         end
-        deps = nested.map{|a| SpecGroup.new(a) }.select{|sg| sg.for?(dep.__platform) }
-      else
-        deps = []
       end
-
-      @deps_for[key] = deps
     end
 
     def clean_req(req)