bundler 1.1.rc.7 → 1.1.rc.8

data/.travis.yml

@@ -17,7 +17,6 @@ env:
   - RGV=v1.6.2
   - RGV=v1.7.2
   - RGV=v1.8.10
-  - RGV=master
 
 matrix:
   exclude:
@@ -37,3 +36,4 @@ matrix:
 notifications:
   email:
     - travis-ci@andrearko.com
+    - hone02@gmail.com

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.1.rc.8 (Jan 13, 2011)
+
+Performance:
+
+  - don't resolve if the Gemfile.lock and Gemfile haven't changed
+
+Bugfixes:
+
+  - Load gemspecs from git even when a released gem has the same version (#1609)
+  - Declare an accurate Ruby version requirement of 1.8.7 or newer (#1619)
+  - handle gemspec development dependencies correctly (@raggi, #1639)
+  - Avoid passing RUBYOPT changes in with_clean_env block. (eric1234, #1604)
+
 ## 1.1.rc.7 (Dec 29, 2011)
 
 Bugfixes:

data/Rakefile

@@ -2,6 +2,8 @@
 $:.unshift File.expand_path("../lib", __FILE__)
 require 'bundler/gem_tasks'
 
+task :release => ["man:clean", "man:build"]
+
 def safe_task(&block)
   yield
   true

data/bundler.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   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}
 
+  s.required_ruby_version     = ">= 1.8.7"
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "bundler"
 

data/lib/bundler.rb

@@ -192,6 +192,10 @@ module Bundler
     def with_clean_env
       with_original_env do
         ENV.delete_if { |k,_| k[0,7] == 'BUNDLE_' }
+        if ENV.has_key? 'RUBYOPT'
+          ENV['RUBYOPT'] = ENV['RUBYOPT'].sub '-rbundler/setup', ''
+          ENV['RUBYOPT'] = ENV['RUBYOPT'].sub "-I#{File.expand_path('..', __FILE__)}", ''
+        end
         yield
       end
     end

data/lib/bundler/definition.rb

@@ -1,4 +1,5 @@
 require "digest/sha1"
+require "set"
 
 module Bundler
   class Definition
@@ -30,6 +31,8 @@ module Bundler
 =end
 
     def initialize(lockfile, dependencies, sources, unlock)
+      @unlocking = unlock == true || !unlock.empty?
+
       @dependencies, @sources, @unlock = dependencies, sources, unlock
       @remote            = false
       @specs             = nil
@@ -65,11 +68,45 @@ module Bundler
       @new_platform = !@platforms.include?(current_platform)
       @platforms |= [current_platform]
 
+      @path_changes = @sources.any? do |source|
+        next unless source.instance_of?(Source::Path)
+
+        locked = @locked_sources.find do |ls|
+          ls.class == source.class && ls.path == source.path
+        end
+
+        if locked
+          unlocking = locked.specs.any? do |spec|
+            @locked_specs.any? do |locked_spec|
+              locked_spec.source != locked
+            end
+          end
+        end
+
+        !locked || unlocking || source.specs != locked.specs
+      end
       eager_unlock = expand_dependencies(@unlock[:gems])
       @unlock[:gems] = @locked_specs.for(eager_unlock).map { |s| s.name }
 
-      converge_sources
-      converge_dependencies
+      @source_changes = converge_sources
+      @dependency_changes = converge_dependencies
+
+      fixup_dependency_types!
+    end
+
+    def fixup_dependency_types!
+      # XXX This is a temporary workaround for a bug when using rubygems 1.8.15
+      # where Gem::Dependency#== matches Gem::Dependency#type. As the lockfile
+      # doesn't carry a notion of the dependency type, if you use
+      # add_development_dependency in a gemspec that's loaded with the gemspec
+      # directive, the lockfile dependencies and resolved dependencies end up
+      # with a mismatch on #type.
+      # Test coverage to catch a regression on this is in gemspec_spec.rb
+      @dependencies.each do |d|
+        if ld = @locked_deps.find { |l| l.name == d.name }
+          ld.instance_variable_set(:@type, d.type)
+        end
+      end
     end
 
     def resolve_with_cache!
@@ -137,7 +174,7 @@ module Bundler
 
     def resolve
       @resolve ||= begin
-        if Bundler.settings[:frozen]
+        if Bundler.settings[:frozen] || (!@unlocking && !@source_changes && !@dependency_changes && !@new_platform && !@path_changes)
           @locked_specs
         else
           last_resolve = converge_locked_specs
@@ -159,20 +196,18 @@ module Bundler
 
     def index
       @index ||= Index.build do |idx|
-        other_sources = @sources.find_all{|s| !s.is_a?(Bundler::Source::Rubygems) }
-        rubygems_sources = @sources.find_all{|s| s.is_a?(Bundler::Source::Rubygems) }
-
         dependency_names = @dependencies.dup || []
         dependency_names.map! {|d| d.name }
-        other_sources.each do |s|
-          source_index = s.specs
-          dependency_names += source_index.unmet_dependency_names
-          idx.add_source source_index
-        end
 
-        rubygems_sources.each do |s|
-          s.dependency_names = dependency_names.uniq if s.is_a?(Bundler::Source::Rubygems)
-          idx.add_source s.specs
+        @sources.each do |s|
+          if s.is_a?(Bundler::Source::Rubygems)
+            s.dependency_names = dependency_names.uniq
+            idx.add_source s.specs
+          else
+            source_index = s.specs
+            dependency_names += source_index.unmet_dependency_names
+            idx.add_source source_index
+          end
         end
       end
     end
@@ -325,20 +360,41 @@ module Bundler
     end
 
     def converge_sources
+      changes = false
+
+      # Get the Rubygems source from the Gemfile.lock
       locked_gem = @locked_sources.find { |s| Source::Rubygems === s }
+
+      # Get the Rubygems source from the Gemfile
       actual_gem = @sources.find { |s| Source::Rubygems === s }
 
+      # If there is a Rubygems source in both
       if locked_gem && actual_gem
-        locked_gem.merge_remotes actual_gem
+        # Merge the remotes from the Gemfile into the Gemfile.lock
+        changes = changes | locked_gem.replace_remotes(actual_gem)
       end
 
+      # Replace the sources from the Gemfile with the sources from the Gemfile.lock,
+      # if they exist in the Gemfile.lock and are `==`. If you can't find an equivalent
+      # source in the Gemfile.lock, use the one from the Gemfile.
       @sources.map! do |source|
         @locked_sources.find { |s| s == source } || source
       end
+      changes = changes | (Set.new(@sources) != Set.new(@locked_sources))
 
       @sources.each do |source|
-        source.unlock! if source.respond_to?(:unlock!) && @unlock[:sources].include?(source.name)
+        # If the source is unlockable and the current command allows an unlock of
+        # the source (for example, you are doing a `bundle update <foo>` of a git-pinned
+        # gem), unlock it. For git sources, this means to unlock the revision, which
+        # will cause the `ref` used to be the most recent for the branch (or master) if
+        # an explicit `ref` is not used.
+        if source.respond_to?(:unlock!) && @unlock[:sources].include?(source.name)
+          source.unlock!
+          changes = true
+        end
       end
+
+      changes
     end
 
     def converge_dependencies
@@ -347,6 +403,7 @@ module Bundler
           dep.source = @sources.find { |s| dep.source == s }
         end
       end
+      Set.new(@dependencies) != Set.new(@locked_deps)
     end
 
     # Remove elements from the locked specs that are expired. This will most

data/lib/bundler/fetcher.rb

@@ -133,8 +133,10 @@ module Bundler
       begin
         Bundler.ui.debug "Fetching from: #{uri}"
         response = @@connection.request(uri)
-      rescue SocketError, Timeout::Error, Net::HTTP::Persistent::Error
-        raise Bundler::HTTPError, "Network error while fetching #{uri}"
+      rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+             SocketError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+             Net::HTTP::Persistent::Error, Net::ProtocolError => e
+        raise HTTPError, "Network error while fetching #{uri}"
       end
 
       case response

data/lib/bundler/index.rb

@@ -1,3 +1,5 @@
+require "set"
+
 module Bundler
   class Index
     include Enumerable
@@ -41,9 +43,15 @@ 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] })
+
       @sources.each do |source|
-        results += source.search(query, base)
+        source.search(query, base).each do |spec|
+          results << spec unless seen.include?([spec.name, spec.version, spec.platform])
+          seen << [spec.name, spec.version, spec.platform]
+        end
       end
+
       results
     end
 
@@ -109,8 +117,9 @@ module Bundler
     end
 
     def ==(o)
-      all? do |s|
-        s2 = o[s].first and (s.dependencies & s2.dependencies).empty?
+      all? do |spec|
+        other_spec = o[spec].first
+        (spec.dependencies & other_spec.dependencies).empty? && spec.source == other_spec.source
       end
     end
 

data/lib/bundler/resolver.rb

@@ -342,13 +342,14 @@ module Bundler
       length = @stack.length
       @stack << requirement.name
       retval = catch(requirement.name) do
-        # clear the search cache since the catch means we couldn't meet the
-        # requirement we need with the current constraints on search
-        clear_search_cache
         # try to resolve the next option
         resolve(reqs, activated)
       end
 
+      # clear the search cache since the catch means we couldn't meet the
+      # requirement we need with the current constraints on search
+      clear_search_cache
+
       # Since we're doing a lot of throw / catches. A push does not necessarily match
       # up to a pop. So, we simply slice the stack back to what it was before the catch
       # block.

data/lib/bundler/source.rb

@@ -127,11 +127,15 @@ module Bundler
         @remotes << normalize_uri(source)
       end
 
-      def merge_remotes(source)
+      def replace_remotes(source)
+        return false if source.remotes == @remotes
+
         @remotes = []
         source.remotes.each do |r|
           add_remote r.to_s
         end
+
+        true
       end
 
     private

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.1.rc.7" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.rc.8" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gemspec_spec.rb

@@ -110,6 +110,27 @@ describe "bundle install from an existing gemspec" do
     should_be_installed "bar-dev 1.0.0", :groups => :dev
   end
 
+  it "should match a lockfile even if the gemspec defines development dependencies" do
+    build_lib("foo", :path => tmp.join("foo")) do |s|
+      s.write("Gemfile", "source 'file://#{gem_repo1}'\ngemspec")
+      s.add_dependency "actionpack", "=2.3.2"
+      s.add_development_dependency "rake", '=0.8.7'
+    end
+
+    Dir.chdir(tmp.join("foo")) do
+      bundle "install"
+      # This should really be able to rely on $stderr, but, it's not written
+      # right, so we can't. In fact, this is a bug negation test, and so it'll
+      # ghost pass in future, and will only catch a regression if the message
+      # doesn't change. Exit codes should be used correctly (they can be more
+      # than just 0 and 1).
+      output = bundle("install --deployment")
+      output.should_not match(/You have added to the Gemfile/)
+      output.should_not match(/You have deleted from the Gemfile/)
+      output.should_not match(/install in deployment mode after changing/)
+    end
+  end
+
   it "should evaluate the gemspec in its directory" do
     build_lib("foo", :path => tmp.join("foo"))
     File.open(tmp.join("foo/foo.gemspec"), "w") do |s|
@@ -122,4 +143,28 @@ describe "bundle install from an existing gemspec" do
     @err.should_not match(/ahh/)
   end
 
+  context "when child gemspecs conflict with a released gemspec" do
+    before do
+      # build the "parent" gem that depends on another gem in the same repo
+      build_lib "source_conflict", :path => bundled_app do |s|
+        s.add_dependency "rack_middleware"
+      end
+
+      # build the "child" gem that is the same version as a released gem, but
+      # has completely different and conflicting dependency requirements
+      build_lib "rack_middleware", "1.0", :path => bundled_app("rack_middleware") do |s|
+        s.add_dependency "rack", "1.0" # anything other than 0.9.1
+      end
+    end
+
+    it "should install the child gemspec's deps" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gemspec
+      G
+
+      should_be_installed "rack 1.0"
+    end
+  end
+
 end

data/spec/runtime/with_clean_env_spec.rb

@@ -15,10 +15,10 @@ describe "Bundler.with_env helpers" do
   end
 
   around do |example|
-    bundle_path = Bundler::ORIGINAL_ENV['BUNDLE_PATH']
+    env = Bundler::ORIGINAL_ENV.dup
     Bundler::ORIGINAL_ENV['BUNDLE_PATH'] = "./Gemfile"
     example.run
-    Bundler::ORIGINAL_ENV['BUNDLE_PATH'] = bundle_path
+    Bundler::ORIGINAL_ENV.replace env
   end
 
   describe "Bundler.with_clean_env" do
@@ -31,6 +31,18 @@ describe "Bundler.with_env helpers" do
       end
     end
 
+    it "should not pass RUBYOPT changes" do
+      lib_path = File.expand_path('../../../lib', __FILE__)
+      Bundler::ORIGINAL_ENV['RUBYOPT'] = " -I#{lib_path} -rbundler/setup"
+
+      Bundler.with_clean_env do
+        `echo $RUBYOPT`.strip.should_not include '-rbundler/setup'
+        `echo $RUBYOPT`.strip.should_not include "-I#{lib_path}"
+      end
+
+      Bundler::ORIGINAL_ENV['RUBYOPT'].should == " -I#{lib_path} -rbundler/setup"
+    end
+
     it "should not change ORIGINAL_ENV" do
       Bundler::ORIGINAL_ENV['BUNDLE_PATH'].should == './Gemfile'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 15424243
-  prerelease: true
+  hash: 15424237
+  prerelease: 4
   segments: 
   - 1
   - 1
   - rc
-  - 7
-  version: 1.1.rc.7
+  - 8
+  version: 1.1.rc.8
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,8 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 -05:00
-default_executable: 
+date: 2012-03-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -249,7 +248,6 @@ files:
 - lib/bundler/man/bundle.txt
 - lib/bundler/man/bundle-package.txt
 - lib/bundler/man/bundle-install.txt
-has_rdoc: true
 homepage: http://gembundler.com
 licenses: []
 
@@ -263,10 +261,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies