bundler 1.0.5 → 1.0.7

data/.gitignore

@@ -17,3 +17,6 @@ lib/bundler/man
 
 # output from ci_reporter
 spec/reports
+
+# Netbeans
+nbproject

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 1.0.7 (November 17, 2010)
+
+Bugfixes:
+
+  - Remove Bundler version from the lockfile because it broke
+    backwards compatibility with 1.0.0-1.0.5. Sorry. :(
+
+## 1.0.6 (November 16, 2010)
+
+Bugfixes:
+
+  - Fix regression in `update` that caused long/wrong results
+  - Allow git gems on other platforms while installing (#579)
+
+Features:
+
+  - Speed up `install` command using various optimizations
+  - Significantly increase performance of resolver
+  - Use upcoming Rubygems performance improvements (@tmm1)
+  - Warn if the lockfile was generated by a newer version
+  - Set generated gems' homepage to "", so Rubygems will warn
+
 ## 1.0.5 (November 13, 2010)
 
 Bugfixes:

data/Rakefile

@@ -24,7 +24,7 @@ begin
     namespace :ci do
       desc "Run specs with Hudson output"
       RSpec::Core::RakeTask.new(:spec)
-      task :spec => ["ci:setup:rspec", "man:build"]
+      task :spec => ["ci:setup:rspec", "man:build", "spec:set_sudo"]
     end
 
   rescue LoadError

data/bin/bundle

@@ -15,7 +15,8 @@ rescue Bundler::BundlerError => e
   Bundler.ui.error e.message
   Bundler.ui.debug e.backtrace.join("\n")
   exit e.status_code
-rescue Interrupt
+rescue Interrupt => e
   Bundler.ui.error "\nQuitting..."
+  Bundler.ui.debug e.backtrace.join("\n")
   exit 1
 end

data/lib/bundler/definition.rb

@@ -148,9 +148,7 @@ module Bundler
           end
 
           # Run a resolve against the locally available gems
-          local = Resolver.resolve(expanded_dependencies,
-            index, source_requirements, last_resolve, unlocked?)
-          last_resolve.merge(local)
+          last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve)
         end
       end
     end
@@ -342,7 +340,7 @@ module Bundler
 
         if in_locked_deps?(dep, locked_dep) || satisfies_locked_spec?(dep)
           deps << dep
-        elsif dep.source.is_a?(Source::Path) && (!locked_dep || dep.source != locked_dep.source)
+        elsif dep.source.is_a?(Source::Path) && dep.current_platform? && (!locked_dep || dep.source != locked_dep.source)
           @locked_specs.each do |s|
             @unlock[:gems] << s.name if s.source == dep.source
           end
@@ -385,7 +383,7 @@ module Bundler
         next unless source.respond_to?(:unlock!)
 
         unless resolve.any? { |s| s.source == source }
-          source.unlock! if diff.any? { |s| s.source == source }
+          source.unlock! if !diff.empty? && diff.any? { |s| s.source == source }
         end
       end
 
@@ -427,9 +425,5 @@ module Bundler
       groups.map! { |g| g.to_sym }
       dependencies.reject { |d| !d.should_include? || (d.groups & groups).empty? }
     end
-
-    def unlocked?
-      @lockfile_contents.empty?
-    end
   end
 end

data/lib/bundler/dependency.rb

@@ -9,15 +9,17 @@ module Bundler
     attr_reader :platforms
 
     PLATFORM_MAP = {
-      :ruby    => Gem::Platform::RUBY,
-      :ruby_18 => Gem::Platform::RUBY,
-      :ruby_19 => Gem::Platform::RUBY,
-      :mri     => Gem::Platform::RUBY,
-      :mri_18  => Gem::Platform::RUBY,
-      :mri_19  => Gem::Platform::RUBY,
-      :jruby   => Gem::Platform::JAVA,
-      :mswin   => Gem::Platform::MSWIN,
-      :mingw   => Gem::Platform::MINGW
+      :ruby     => Gem::Platform::RUBY,
+      :ruby_18  => Gem::Platform::RUBY,
+      :ruby_19  => Gem::Platform::RUBY,
+      :mri      => Gem::Platform::RUBY,
+      :mri_18   => Gem::Platform::RUBY,
+      :mri_19   => Gem::Platform::RUBY,
+      :jruby    => Gem::Platform::JAVA,
+      :mswin    => Gem::Platform::MSWIN,
+      :mingw    => Gem::Platform::MINGW,
+      :mingw_18 => Gem::Platform::MINGW,
+      :mingw_19 => Gem::Platform::MINGW
     }.freeze
 
     def initialize(name, version, options = {}, &blk)
@@ -115,5 +117,14 @@ module Bundler
     def mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32"
     end
+
+    def mingw_18?
+      mingw? && RUBY_VERSION < "1.9"
+    end
+
+    def mingw_19?
+      mingw? && RUBY_VERSION >= "1.9"
+    end
+
   end
 end

data/lib/bundler/index.rb

@@ -8,6 +8,9 @@ module Bundler
       i
     end
 
+    attr_reader :specs
+    protected   :specs
+
     def initialize
       @cache = {}
       @specs = Hash.new { |h,k| h[k] = [] }
@@ -17,7 +20,10 @@ module Bundler
       super
       @cache = {}
       @specs = Hash.new { |h,k| h[k] = [] }
-      merge!(o)
+
+      o.specs.each do |name, array|
+        @specs[name] = array.dup
+      end
     end
 
     def empty?
@@ -38,7 +44,7 @@ module Bundler
 
       wants_prerelease = dependency.requirement.prerelease?
       only_prerelease  = specs.all? {|spec| spec.version.prerelease? }
-      found = specs.select { |spec| dependency =~ spec }
+      found = specs.select { |spec| dependency.matches_spec?(spec) }
 
       unless wants_prerelease || only_prerelease
         found.reject! { |spec| spec.version.prerelease? }
@@ -59,7 +65,7 @@ module Bundler
       arr = @specs[spec.name]
 
       arr.delete_if do |s|
-        s.version == spec.version && s.platform == spec.platform
+        same_version?(s.version, spec.version) && s.platform == spec.platform
       end
 
       arr << spec
@@ -91,17 +97,28 @@ module Bundler
 
     def search_by_spec(spec)
       @specs[spec.name].select do |s|
-        s.version == spec.version && Gem::Platform.new(s.platform) == Gem::Platform.new(spec.platform)
+        same_version?(s.version, spec.version) && Gem::Platform.new(s.platform) == Gem::Platform.new(spec.platform)
       end
     end
 
+    def same_version?(a, b)
+      regex = /^(.*?)(?:\.0)*$/
+
+      ret = a.to_s[regex, 1] == b.to_s[regex, 1]
+    end
+
+    def spec_satisfies_dependency?(spec, dep)
+      return false unless dep.name === spec.name
+      dep.requirement.satisfied_by?(spec.version)
+    end
+
     def search_by_dependency(dependency)
       @cache[dependency.hash] ||= begin
         specs = @specs[dependency.name]
 
         wants_prerelease = dependency.requirement.prerelease?
         only_prerelease  = specs.all? {|spec| spec.version.prerelease? }
-        found = specs.select { |spec| dependency =~ spec && Gem::Platform.match(spec.platform) }
+        found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) }
 
         unless wants_prerelease || only_prerelease
           found.reject! { |spec| spec.version.prerelease? }
@@ -111,4 +128,4 @@ module Bundler
       end
     end
   end
-end
+end

data/lib/bundler/resolver.rb

@@ -121,9 +121,9 @@ module Bundler
     # ==== Returns
     # <GemBundle>,nil:: If the list of dependencies can be resolved, a
     #   collection of gemspecs is returned. Otherwise, nil is returned.
-    def self.resolve(requirements, index, source_requirements = {}, base = [], sort = true)
+    def self.resolve(requirements, index, source_requirements = {}, base = [])
       base = SpecSet.new(base) unless base.is_a?(SpecSet)
-      resolver = new(index, source_requirements, base, sort)
+      resolver = new(index, source_requirements, base)
       result = catch(:success) do
         resolver.start(requirements)
         raise resolver.version_conflict
@@ -132,14 +132,14 @@ module Bundler
       SpecSet.new(result)
     end
 
-    def initialize(index, source_requirements, base, sort)
+    def initialize(index, source_requirements, base)
       @errors               = {}
       @stack                = []
       @base                 = base
       @index                = index
+      @gems_size            = {}
       @missing_gems         = Hash.new(0)
       @source_requirements  = source_requirements
-      @sort                 = sort
     end
 
     def debug
@@ -172,14 +172,12 @@ module Bundler
       #   1) Is this gem already activated?
       #   2) Do the version requirements include prereleased gems?
       #   3) Sort by number of gems available in the source.
-      # This is a pretty expensive operation, so we skip it when the bundle is
-      # locked and sorting isn't necessary.
       reqs = reqs.sort_by do |a|
         [ activated[a.name] ? 0 : 1,
           a.requirement.prerelease? ? 0 : 1,
           @errors[a.name]   ? 0 : 1,
-          activated[a.name] ? 0 : search(a).size ]
-      end if @sort
+          activated[a.name] ? 0 : gems_size(a) ]
+      end
 
       debug { "Activated:\n" + activated.values.map { |a| "  #{a.name} (#{a.version})" }.join("\n") }
       debug { "Requirements:\n" + reqs.map { |r| "  #{r.name} (#{r.requirement})"}.join("\n") }
@@ -352,6 +350,10 @@ module Bundler
       retval
     end
 
+    def gems_size(dep)
+      @gems_size[dep] ||= search(dep).size
+    end
+
     def search(dep)
       if base = @base[dep.name] and base.any?
         d = Gem::Dependency.new(base.first.name, *[dep.requirement.as_list, base.first.version].flatten)

data/lib/bundler/rubygems_ext.rb

@@ -116,6 +116,20 @@ module Gem
       end
       out
     end
+
+    def matches_spec?(spec)
+      # name can be a Regexp, so use ===
+      return false unless name === spec.name
+      return true  if requirement.none?
+
+      requirement.satisfied_by?(spec.version)
+    end unless allocate.respond_to?(:matches_spec?)
+  end
+
+  class Requirement
+    def none?
+      @none ||= (to_s == ">= 0")
+    end unless allocate.respond_to?(:none?)
   end
 
   class Platform

data/lib/bundler/source.rb

@@ -158,7 +158,7 @@ module Bundler
         @installed_specs ||= begin
           idx = Index.new
           have_bundler = false
-          Gem::SourceIndex.from_installed_gems.to_a.reverse.each do |dont_use_this_var, spec|
+          Gem.source_index.to_a.reverse.each do |dont_use_this_var, spec|
             next if spec.name == 'bundler' && spec.version.to_s != VERSION
             have_bundler = true if spec.name == 'bundler'
             spec.source = self
@@ -185,27 +185,24 @@ module Bundler
 
       def cached_specs
         @cached_specs ||= begin
-          idx = Index.new
-          @caches.each do |path|
-            Dir["#{path}/*.gem"].each do |gemfile|
-              next if gemfile =~ /bundler\-[\d\.]+?\.gem/
-
-              # Try to skip decompressing the gem to get at the gemspec if possible
-              cached_gemspec = gemfile.gsub(%r{cache/(.*?)\.gem}, 'specifications/\1.gemspec')
-              s = Gem::Specification.load(cached_gemspec) if File.exist?(cached_gemspec)
-
-              begin
-                s ||= Gem::Format.from_file_by_path(gemfile).spec
-              rescue Gem::Package::FormatError
-                raise GemspecError, "Could not read gem at #{gemfile}. It may be corrupted."
-              end
+          idx = installed_specs.dup
 
-              s.source = self
-              idx << s
+          path = Bundler.app_cache
+          Dir["#{path}/*.gem"].each do |gemfile|
+            next if gemfile =~ /bundler\-[\d\.]+?\.gem/
+
+            begin
+              s ||= Gem::Format.from_file_by_path(gemfile).spec
+            rescue Gem::Package::FormatError
+              raise GemspecError, "Could not read gem at #{gemfile}. It may be corrupted."
             end
+
+            s.source = self
+            idx << s
           end
-          idx
         end
+
+        idx
       end
 
       def remote_specs
@@ -530,7 +527,7 @@ module Bundler
       # TODO: actually cache git specs
       def specs
         if allow_git_ops? && !@update
-        # Start by making sure the git cache is up to date
+          # Start by making sure the git cache is up to date
           cache
           checkout
           @update = true
@@ -612,7 +609,9 @@ module Bundler
         if cached?
           return if has_revision_cached?
           Bundler.ui.info "Updating #{uri}"
-          in_cache { git %|fetch --force --quiet --tags "#{uri}" refs/heads/*:refs/heads/*| }
+          in_cache do
+            git %|fetch --force --quiet --tags "#{uri}" refs/heads/*:refs/heads/*|
+          end
         else
           Bundler.ui.info "Fetching #{uri}"
           FileUtils.mkdir_p(cache_path.dirname)
@@ -623,6 +622,7 @@ module Bundler
       def checkout
         unless File.exist?(path.join(".git"))
           FileUtils.mkdir_p(path.dirname)
+          FileUtils.rm_rf(path)
           git %|clone --no-checkout "#{cache_path}" "#{path}"|
         end
         Dir.chdir(path) do
@@ -667,5 +667,6 @@ module Bundler
         Dir.chdir(cache_path, &blk)
       end
     end
+
   end
 end

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["TODO: Write your name"]
   s.email       = ["TODO: Write your email address"]
-  s.homepage    = "http://rubygems.org/gems/<%=config[:name]%>"
+  s.homepage    = ""
   s.summary     = %q{TODO: Write a gem summary}
   s.description = %q{TODO: Write a gem description}
 

data/lib/bundler/version.rb

@@ -2,5 +2,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.0.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.7" unless defined?(::Bundler::VERSION)
 end

data/man/gemfile.5.ronn

@@ -124,6 +124,12 @@ There are a number of `Gemfile` platforms:
     JRuby
   * `mswin`:
     Windows
+  * `mingw`:
+    Windows 'mingw32' platform (aka RubyInstaller)
+  * `mingw_18`:
+    _mingw_ `AND` version 1.8
+  * `mingw_19`:
+    _mingw_ `AND` version 1.9
 
 As with groups, you can specify one or more platforms:
 

data/spec/install/gems/platform_spec.rb

@@ -175,4 +175,18 @@ describe "bundle install with platform conditionals" do
     G
     should_not_be_installed "nokogiri 1.4.2"
   end
+
+  it "does not blow up on sources with all platform-excluded specs" do
+    git = build_git "foo"
+
+    install_gemfile <<-G
+      platform :#{not_local_tag} do
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      end
+    G
+
+    bundle :show, :exitstatus => true
+    exitstatus.should == 0
+  end
+
 end

data/spec/install/gems/sudo_spec.rb

@@ -1,10 +1,6 @@
 require "spec_helper"
 
-describe "when using sudo" do
-  before :each do
-    pending "set BUNDLER_SUDO_TESTS to run sudo specs" unless test_sudo?
-  end
-
+describe "when using sudo", :sudo => true do
   describe "and GEM_HOME is owned by root" do
     before :each do
       chown_system_gems_to_root

data/spec/spec_helper.rb

@@ -40,6 +40,7 @@ RSpec.configure do |config|
   config.include Spec::Sudo
 
   config.filter_run :focused => true unless ENV['CI']
+  config.filter_run_excluding :sudo => true unless Spec::Sudo.test_sudo?
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true
 
@@ -81,3 +82,4 @@ RSpec.configure do |config|
     ENV['BUNDLE_APP_CONFIG']     = nil
   end
 end
+

data/spec/support/ruby_ext.rb

@@ -1,5 +1,5 @@
 class IO
-  def read_available_bytes(chunk_size = 1024, select_timeout = 5)
+  def read_available_bytes(chunk_size = 16384, select_timeout = 0.02)
     buffer = []
 
     return "" if closed? || eof?
@@ -7,8 +7,9 @@ class IO
     # just does not work on windows
     while true
       begin
+        IO.select([self], nil, nil, select_timeout)
+        break if eof? # stop raising :-(
         buffer << self.readpartial(chunk_size)
-        sleep 0.1
       rescue(EOFError)
         break
       end

data/spec/support/rubygems_ext.rb

@@ -9,8 +9,11 @@ module Spec
 
       unless File.exist?("#{Path.base_system_gems}")
         FileUtils.mkdir_p(Path.base_system_gems)
-        puts "running `gem install builder rake fakeweb --no-rdoc --no-ri`"
-        `gem install builder rake fakeweb --no-rdoc --no-ri`
+        puts "running `gem install rake fakeweb --no-rdoc --no-ri`"
+        `gem install rake fakeweb --no-rdoc --no-ri`
+        # 3.0.0 breaks 1.9.2 specs
+        puts "running `gem install builder --version 2.1.2 --no-rdoc --no-ri`"
+        `gem install builder --version 2.1.2 --no-rdoc --no-ri`
       end
 
       ENV['HOME'] = Path.home.to_s

data/spec/support/sudo.rb

@@ -2,11 +2,11 @@ module Spec
   module Sudo
     def self.present?
       @which_sudo ||= (`which sudo`.chomp rescue '')
-      !@which_sudo.empty? && ENV['BUNDLER_SUDO_TESTS']
+      !@which_sudo.empty?
     end
 
-    def test_sudo?
-      Sudo.present?
+    def self.test_sudo?
+      present? && ENV['BUNDLER_SUDO_TESTS']
     end
 
     def sudo(cmd)
@@ -18,4 +18,4 @@ module Spec
       sudo "chown -R root #{system_gem_path}"
     end
   end
-end
+end

data/spec/update/git_spec.rb

@@ -178,5 +178,19 @@ describe "bundle update" do
         out.should == 'GEM'
       end
     end
+
+    it "errors with a message when the .git repo is gone" do
+      build_git "foo", "1.0"
+
+      install_gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      lib_path("foo-1.0").join(".git").rmtree
+
+      bundle :update, :expect_err => true
+      out.should include(lib_path("foo-1.0").to_s)
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Carl Lerche
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-13 00:00:00 -06:00
+date: 2010-11-17 00:00:00 -08:00
 default_executable: bundle
 dependencies: 
 - !ruby/object:Gem::Dependency