bundler 1.0.10 → 1.0.11

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.0.11 (April 1, 2011)
+
+Features:
+
+  - Compatibility with Rubygems 1.6 and 1.7
+  - Better error messages when a git command fails
+
+Bugfixes:
+
+  - Don't always update gemspec gems (@carllerche)
+  - Remove ivar warnings (@jackdempsey)
+  - Fix occasional git failures in zsh (@jonah-carbonfive)
+  - Consistent lock for gems with double deps like Cap (@akahn)
+
 ## 1.0.10 (February 1, 2011)
 
 Bugfixes:

data/Rakefile

@@ -60,7 +60,7 @@ begin
     namespace :rubygems do
       # Rubygems 1.3.5, 1.3.6, and HEAD specs
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.0 v1.4.1 v1.5.0).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.1).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -71,7 +71,11 @@ begin
           unless File.directory?("tmp/rubygems")
             system("git clone git://github.com/rubygems/rubygems.git tmp/rubygems")
           end
-          system("cd tmp/rubygems && git remote update && git reset --hard origin/#{rg}")
+          Dir.chdir("tmp/rubygems") do
+            system("git remote update")
+            system("git checkout #{rg}")
+            system("git pull origin master") if rg == "master"
+          end
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
         end
 

data/bundler.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.name        = "bundler"
   s.version     = Bundler::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Carl Lerche", "Yehuda Katz", "André Arko", "Terence Lee"]
-  s.email       = ["carlhuda@engineyard.com"]
+  s.authors     = ["André Arko", "Terence Lee", "Carl Lerche", "Yehuda Katz"]
+  s.email       = ["andre@arko.net"]
   s.homepage    = "http://gembundler.com"
   s.summary     = %q{The best way to manage your application's dependencies}
   s.description = %q{Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably}
@@ -25,6 +25,5 @@ Gem::Specification.new do |s|
   s.files              = `git ls-files`.split("\n") + man_files
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables        = %w(bundle)
-  s.default_executable = "bundle"
   s.require_paths      = ["lib"]
 end

data/lib/bundler.rb

@@ -200,7 +200,7 @@ module Bundler
     end
 
     def requires_sudo?
-      return @requires_sudo if @checked_for_sudo
+      return @requires_sudo if defined?(@checked_for_sudo) && @checked_for_sudo
 
       path = bundle_path
       path = path.parent until path.exist?

data/lib/bundler/definition.rb

@@ -225,7 +225,7 @@ module Bundler
 
       handled = []
       dependencies.
-        sort_by { |d| d.name }.
+        sort_by { |d| d.to_s }.
         each do |dep|
           next if handled.include?(dep.name)
           out << dep.to_lock
@@ -367,8 +367,10 @@ module Bundler
           # If the spec is no longer in the path source, unlock it. This
           # commonly happens if the version changed in the gemspec
           next unless other
+
+          deps2 = other.dependencies.select { |d| d.type != :development }
           # If the dependencies of the path source have changed, unlock it
-          next unless s.dependencies.sort == other.dependencies.sort
+          next unless s.dependencies.sort == deps2.sort
         end
 
         converged << s

data/lib/bundler/dependency.rb

@@ -72,7 +72,8 @@ module Bundler
       out = "  #{name}"
 
       unless requirement == Gem::Requirement.default
-        out << " (#{requirement.to_s})"
+        reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
+        out << " (#{reqs.join(', ')})"
       end
 
       out << '!' if source

data/lib/bundler/index.rb

@@ -115,11 +115,10 @@ module Bundler
     def search_by_dependency(dependency)
       @cache[dependency.hash] ||= begin
         specs = @specs[dependency.name]
+        found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) }
 
         wants_prerelease = dependency.requirement.prerelease?
         only_prerelease  = specs.all? {|spec| spec.version.prerelease? }
-        found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) }
-
         unless wants_prerelease || only_prerelease
           found.reject! { |spec| spec.version.prerelease? }
         end

data/lib/bundler/rubygems_ext.rb

@@ -118,11 +118,13 @@ module Gem
     def to_lock
       out = "  #{name}"
       unless requirement == Gem::Requirement.default
-        out << " (#{requirement.to_s})"
+        reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
+        out << " (#{reqs.join(', ')})"
       end
       out
     end
 
+    # Backport of performance enhancement added to Rubygems 1.4
     def matches_spec?(spec)
       # name can be a Regexp, so use ===
       return false unless name === spec.name
@@ -133,6 +135,7 @@ module Gem
   end
 
   class Requirement
+    # Backport of performance enhancement added to Rubygems 1.4
     def none?
       @none ||= (to_s == ">= 0")
     end unless allocate.respond_to?(:none?)

data/lib/bundler/shared_helpers.rb

@@ -123,13 +123,22 @@ module Bundler
       # === Following hacks are to improve on the generated bin wrappers ===
 
       # Yeah, talk about a hack
-      source_index_class = (class << Gem::SourceIndex ; self ; end)
-      source_index_class.send(:remove_method, :from_gems_in)
-      source_index_class.send(:define_method, :from_gems_in) do |*args|
-        source_index = Gem::SourceIndex.new
-        source_index.spec_dirs = *args
-        source_index.add_specs(*specs)
-        source_index
+      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.7.0')
+        Gem::SourceIndex.send(:define_method, :initialize) do |*args|
+          @gems = {}
+          spec_dirs = *args
+          add_specs(*specs)
+        end
+      else
+        # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
+        source_index_class = (class << Gem::SourceIndex ; self ; end)
+        source_index_class.send(:remove_method, :from_gems_in)
+        source_index_class.send(:define_method, :from_gems_in) do |*args|
+          source_index = Gem::SourceIndex.new
+          source_index.spec_dirs = *args
+          source_index.add_specs(*specs)
+          source_index
+        end
       end
 
       # OMG more hacks

data/lib/bundler/source.rb

@@ -317,7 +317,6 @@ module Bundler
       def eql?(o)
         o.instance_of?(Path) &&
         path.expand_path(Bundler.root) == o.path.expand_path(Bundler.root) &&
-        name == o.name &&
         version == o.version
       end
 
@@ -560,7 +559,10 @@ module Bundler
           out = %x{git #{command}}
 
           if $?.exitstatus != 0
-            raise GitError, "An error has occurred in git when running `git #{command}`. Cannot complete bundling."
+            msg = "Git error: " +
+              "command `git #{command}` in directory #{Dir.pwd} has failed.\n" +
+              "Cannot complete bundling."
+            raise GitError, msg
           end
           out
         else
@@ -611,7 +613,7 @@ module Bundler
           return if has_revision_cached?
           Bundler.ui.info "Updating #{uri}"
           in_cache do
-            git %|fetch --force --quiet --tags "#{uri}" refs/heads/*:refs/heads/*|
+            git %|fetch --force --quiet --tags "#{uri}" "refs/heads/*:refs/heads/*"|
           end
         else
           Bundler.ui.info "Fetching #{uri}"

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.10" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.11" unless defined?(::Bundler::VERSION)
 end

data/spec/install/git_spec.rb

@@ -348,7 +348,7 @@ describe "bundle install with git sources" do
 
     bundle :install, :expect_err => true
 
-    out.should include("An error has occurred in git")
+    out.should include("Git error:")
     err.should include("fatal")
     err.should include("omgomg")
     err.should include("fatal: The remote end hung up unexpectedly")

data/spec/install/path_spec.rb

@@ -141,6 +141,47 @@ describe "bundle install with explicit source paths" do
     should_be_installed "rack 1.0"
   end
 
+  it "doesn't automatically unlock dependencies when using the gemspec syntax" do
+    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+      s.add_dependency "rack", ">= 1.0"
+    end
+
+    Dir.chdir lib_path("foo")
+
+    install_gemfile lib_path("foo/Gemfile"), <<-G
+      source "file://#{gem_repo1}"
+      gemspec
+    G
+
+    build_gem "rack", "1.0.1", :to_system => true
+
+    bundle "install"
+
+    should_be_installed "foo 1.0"
+    should_be_installed "rack 1.0"
+  end
+
+  it "doesn't automatically unlock dependencies when using the gemspec syntax and the gem has development dependencies" do
+    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+      s.add_dependency "rack", ">= 1.0"
+      s.add_development_dependency "activesupport"
+    end
+
+    Dir.chdir lib_path("foo")
+
+    install_gemfile lib_path("foo/Gemfile"), <<-G
+      source "file://#{gem_repo1}"
+      gemspec
+    G
+
+    build_gem "rack", "1.0.1", :to_system => true
+
+    bundle "install"
+
+    should_be_installed "foo 1.0"
+    should_be_installed "rack 1.0"
+  end
+
   it "raises if there are multiple gemspecs" do
     build_lib "foo", "1.0", :path => lib_path("foo") do |s|
       s.write "bar.gemspec"

data/spec/lock/lockfile_spec.rb

@@ -329,6 +329,29 @@ describe "the lockfile format" do
     G
   end
 
+  it "orders dependencies according to version" do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem 'double_deps'
+    G
+
+    lockfile_should_be <<-G
+      GEM
+        remote: file:#{gem_repo1}/
+        specs:
+          double_deps (1.0)
+            net-ssh (>= 1.0.0)
+            net-ssh
+          net-ssh (1.0)
+
+      PLATFORMS
+        #{generic(Gem::Platform.local)}
+
+      DEPENDENCIES
+        double_deps
+    G
+  end
+
   it "does not add the :require option to the lockfile" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"

data/spec/support/builders.rb

@@ -217,6 +217,12 @@ module Spec
           s.add_dependency "net_d"
         end
 
+        # Capistrano did this (at least until version 2.5.10)
+        build_gem "double_deps" do |s|
+          s.add_dependency "net-ssh", ">= 1.0.0"
+          s.add_dependency "net-ssh"
+        end
+
         build_gem "foo"
       end
     end

data/spec/support/helpers.rb

@@ -3,7 +3,7 @@ module Spec
     def reset!
       @in_p, @out_p, @err_p = nil, nil, nil
       Dir["#{tmp}/{gems/*,*}"].each do |dir|
-        next if %(base remote1 gems rubygems_v1.3.5 rubygems_v1.3.6 rubygems_v1.3.7 rubygems_v1.4.0 rubygems_v1.4.1 rubygems_master).include?(File.basename(dir))
+        next if %(base remote1 gems rubygems).include?(File.basename(dir))
         unless ENV['BUNDLER_SUDO_TESTS']
           FileUtils.rm_rf(dir)
         else

data/spec/support/matchers.rb

@@ -67,23 +67,11 @@ module Spec
       bundled_app("Gemfile.lock").should exist
     end
 
-    RSpec::Matchers.define :be_with_diff do |expected|
+    def lockfile_should_be(expected)
+      should_be_locked
       spaces = expected[/\A\s+/, 0] || ""
       expected.gsub!(/^#{spaces}/, '')
-
-      failure_message_for_should do |actual|
-        "The lockfile did not match.\n=== Expected:\n" <<
-          expected << "\n=== Got:\n" << actual << "\n===========\n"
-      end
-
-      match do |actual|
-        expected == actual
-      end
-    end
-
-    def lockfile_should_be(expected)
-      lock = File.read(bundled_app("Gemfile.lock"))
-      lock.should be_with_diff(expected)
+      bundled_app("Gemfile.lock").read.should == expected
     end
   end
 end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
-- Carl Lerche
-- Yehuda Katz
 - "Andr\xC3\xA9 Arko"
 - Terence Lee
+- Carl Lerche
+- Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -08:00
-default_executable: bundle
+date: 2011-04-01 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -51,7 +51,7 @@ dependencies:
   version_requirements: *id002
 description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
 email: 
-- carlhuda@engineyard.com
+- andre@arko.net
 executables: 
 - bundle
 extensions: []