bundler 1.1.rc.2 → 1.1.rc.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.rc.3 (Dec 8, 2011)
+
+Bugfixes:
+
+  - fix relative_path so it checks Bundler.root is actually in the beginning of the path (#1582)
+  - fix bundle outdated doesn't list all gems (@joelmoss, #1521)
+
 ## 1.1.rc.2 (Dec 6, 2011)
 
 Features:
@@ -7,7 +14,7 @@ Features:
 
 Bugfixes:
 
-  - only auto-namespace requires for implied requires (#1531) 
+  - only auto-namespace requires for implied requires (#1531)
   - fix bundle clean output for git repos (#1473)
   - use Gem.bindir for bundle clean (#1544, #1532)
   - use `Gem.load_env_plugins` instead of `Gem.load_env_plugins` (#1500, #1543)

data/lib/bundler/cli.rb

@@ -330,35 +330,28 @@ module Bundler
       end
 
       out_count = 0
-      definition.specs.each do |spec|
-        next if !gems.empty? && !gems.include?(spec.name)
+      # Loop through the current specs
+      current_specs.each do |current_spec|
+        next if !gems.empty? && !gems.include?(current_spec.name)
 
-        spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
+        active_spec = definition.index[current_spec.name].sort_by { |b| b.version }
 
-        if spec.source.is_a?(Bundler::Source::Git)
-          current = current_specs.find{|s| spec.name == s.name }
-          next if current.nil?
-        else
-          current = spec
-          spec = definition.index[current.name].sort_by{|b| b.version }
-
-          if !current.version.prerelease? && !options[:pre] && spec.size > 1
-            spec = spec.delete_if{|b| b.respond_to?(:version) && b.version.prerelease? }
-          end
-
-          spec = spec.last
-          next if spec.nil?
+        if !current_spec.version.prerelease? && !options[:pre] && active_spec.size > 1
+          active_spec = active_spec.delete_if { |b| b.respond_to?(:version) && b.version.prerelease? }
         end
 
-        gem_outdated = Gem::Version.new(spec.version) > Gem::Version.new(current.version)
-        git_outdated = current.git_version != spec.git_version
+        active_spec = active_spec.last
+        next if active_spec.nil?
+
+        gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
+        git_outdated = current_spec.git_version != active_spec.git_version
         if gem_outdated || git_outdated
-          spec_version    = "#{spec.version}#{spec.git_version}"
-          current_version = "#{current.version}#{current.git_version}"
-          Bundler.ui.info "  * #{spec.name} (#{spec_version} > #{current_version})"
+          spec_version    = "#{active_spec.version}#{active_spec.git_version}"
+          current_version = "#{current_spec.version}#{current_spec.git_version}"
+          Bundler.ui.info "  * #{active_spec.name} (#{spec_version} > #{current_version})"
           out_count += 1
         end
-        Bundler.ui.debug "from #{spec.loaded_from}"
+        Bundler.ui.debug "from #{active_spec.loaded_from}"
       end
 
       Bundler.ui.info "  Your bundle is up to date!" if out_count < 1

data/lib/bundler/source.rb

@@ -415,7 +415,7 @@ module Bundler
     private
 
       def relative_path
-        if path.to_s.include?(Bundler.root.to_s)
+        if path.to_s.match(%r{^#{Bundler.root.to_s}})
           return path.relative_path_from(Bundler.root)
         end
 

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

data/spec/other/outdated_spec.rb

@@ -32,7 +32,7 @@ describe "bundle outdated" do
       FileUtils.rm_rf(gem_repo2)
 
       bundle "outdated --local"
-      out.should_not match(/Fetching source index/)
+      out.should_not match(/Fetching/)
     end
   end
 

data/spec/runtime/setup_spec.rb

@@ -567,6 +567,31 @@ describe "Bundler.setup" do
       end
       err.should == ""
     end
+
+    it "should make sure the Bundler.root is really included in the path relative to the Gemfile" do
+      relative_path = File.join('vendor', Dir.pwd[1..-1], 'foo')
+      absolute_path = bundled_app(relative_path)
+      FileUtils.mkdir_p(absolute_path)
+      build_lib "foo", :path => absolute_path
+
+      # If the .gemspec exists, then Bundler handles the path differently.
+      # See Source::Path.load_spec_files for details.
+      FileUtils.rm(File.join(absolute_path, 'foo.gemspec'))
+
+      gemfile <<-G
+        gem 'foo', '1.2.3', :path => '#{relative_path}'
+      G
+
+      bundle :install
+
+      Dir.chdir(bundled_app.parent) do
+        run <<-R, :env => {"BUNDLE_GEMFILE" => bundled_app('Gemfile')}
+          require 'foo'
+        R
+      end
+
+      err.should == ""
+    end
   end
 
   describe "with git gems that don't have gemspecs" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 15424249
+  hash: 15424251
   prerelease: true
   segments: 
   - 1
   - 1
   - rc
-  - 2
-  version: 1.1.rc.2
+  - 3
+  version: 1.1.rc.3
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 -08:00
+date: 2011-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency