bundler 1.0.3 → 1.0.5

data/spec/support/matchers.rb

@@ -35,7 +35,7 @@ module Spec
         version_const = name == 'bundler' ? 'Bundler::VERSION' : Spec::Builders.constantize(name)
         run "require '#{name}.rb'; puts #{version_const}", *groups
         actual_version, actual_platform = out.split(/\s+/)
-        Gem::Version.new(actual_version).should == Gem::Version.new(version)
+        check Gem::Version.new(actual_version).should == Gem::Version.new(version)
         actual_platform.should == platform
       end
     end

data/spec/support/path.rb

@@ -31,7 +31,7 @@ module Spec
     end
 
     def vendored_gems(path = nil)
-      bundled_app("vendor/#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}/#{path}")
+      bundled_app("vendor/bundle/#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}/#{path}")
     end
 
     def cached_gem(path)

data/spec/support/platforms.rb

@@ -22,8 +22,12 @@ module Spec
       Gem::Platform.new(['x86', 'mswin32', nil])
     end
 
+    def mingw
+      Gem::Platform.new(['x86', 'mingw32', nil])
+    end
+
     def all_platforms
-      [rb, java, linux, mswin]
+      [rb, java, linux, mswin, mingw]
     end
 
     def local

data/spec/support/sudo.rb

@@ -1,7 +1,7 @@
 module Spec
   module Sudo
     def self.present?
-      @which_sudo ||= `which sudo`.strip
+      @which_sudo ||= (`which sudo`.chomp rescue '')
       !@which_sudo.empty? && ENV['BUNDLER_SUDO_TESTS']
     end
 

data/spec/update/gems_spec.rb

@@ -84,3 +84,29 @@ describe "bundle update without a Gemfile.lock" do
     should_be_installed "rack 1.0.0"
   end
 end
+
+describe "bundle update when a gem depends on a newer version of bundler" do
+  before(:each) do
+    build_repo2 do
+      build_gem "rails", "3.0.1" do |s|
+        s.add_dependency "bundler", Bundler::VERSION.succ
+      end
+    end
+
+    gemfile <<-G
+      source "file://#{gem_repo2}"
+      gem "rails", "3.0.1"
+    G
+  end
+
+  it "should not explode" do
+    bundle "update"
+    err.should be_empty
+  end
+
+  it "should explain that bundler conflicted" do
+    bundle "update"
+    out.should_not =~ /In snapshot/
+    out.should =~ /Current Bundler version/
+  end
+end

data/spec/update/git_spec.rb

@@ -94,6 +94,29 @@ describe "bundle update" do
       out.should include("Your bundle is complete!")
     end
 
+
+    it "fetches tags from the remote" do
+      build_git "foo"
+      @remote = build_git("bar", :bare => true)
+      update_git "foo", :remote => @remote.path
+      update_git "foo", :push => "master"
+
+      install_gemfile <<-G
+        gem 'foo', :git => "#{@remote.path}"
+      G
+
+      # Create a new tag on the remote that needs fetching
+      update_git "foo", :tag => "fubar"
+      update_git "foo", :push => "fubar"
+
+      gemfile <<-G
+        gem 'foo', :git => "#{@remote.path}", :tag => "fubar"
+      G
+
+      bundle "update", :exitstatus => true
+      exitstatus.should == 0
+    end
+
     describe "with submodules" do
       before :each do
         build_gem "submodule", :to_system => true do |s|
@@ -122,7 +145,7 @@ describe "bundle update" do
         G
 
         run "require 'submodule'"
-        out.should == 'GEM'
+        check out.should == 'GEM'
 
         install_gemfile <<-G
           git "#{lib_path('has_submodule-1.0')}", :submodules => true do
@@ -143,7 +166,7 @@ describe "bundle update" do
         G
 
         run "require 'submodule'"
-        out.should == 'GIT'
+        check out.should == 'GIT'
 
         install_gemfile <<-G
           git "#{lib_path('has_submodule-1.0')}" do

data/spec/update/source_spec.rb

@@ -47,4 +47,5 @@ describe "bundle update" do
       should_be_installed "rack 1.0"
     end
   end
-end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Carl Lerche
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -07:00
+date: 2010-11-13 00:00:00 -06:00
 default_executable: bundle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,8 +156,8 @@ files:
 - spec/install/invalid_spec.rb
 - spec/install/path_spec.rb
 - spec/install/upgrade_spec.rb
-- spec/lock/flex_spec.rb
 - spec/lock/git_spec.rb
+- spec/lock/lockfile_spec.rb
 - spec/other/check_spec.rb
 - spec/other/config_spec.rb
 - spec/other/console_spec.rb
@@ -173,7 +173,6 @@ files:
 - spec/quality_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
-- spec/runtime/environment_rb_spec.rb
 - spec/runtime/executable_spec.rb
 - spec/runtime/load_spec.rb
 - spec/runtime/platform_spec.rb
@@ -266,8 +265,8 @@ test_files:
 - spec/install/invalid_spec.rb
 - spec/install/path_spec.rb
 - spec/install/upgrade_spec.rb
-- spec/lock/flex_spec.rb
 - spec/lock/git_spec.rb
+- spec/lock/lockfile_spec.rb
 - spec/other/check_spec.rb
 - spec/other/config_spec.rb
 - spec/other/console_spec.rb
@@ -283,7 +282,6 @@ test_files:
 - spec/quality_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
-- spec/runtime/environment_rb_spec.rb
 - spec/runtime/executable_spec.rb
 - spec/runtime/load_spec.rb
 - spec/runtime/platform_spec.rb

data/spec/runtime/environment_rb_spec.rb

@@ -1,162 +0,0 @@
-require "spec_helper"
-
-describe "environment.rb file" do
-
-  describe "with git gems that don't have gemspecs" do
-    before :each do
-      build_git "no-gemspec", :gemspec => false
-
-      install_gemfile <<-G
-        gem "no-gemspec", "1.0", :git => "#{lib_path('no-gemspec-1.0')}"
-      G
-    end
-
-    it "loads the library via a virtual spec" do
-      run <<-R
-        require 'no-gemspec'
-        puts NOGEMSPEC
-      R
-
-      out.should == "1.0"
-    end
-  end
-
-  describe "with bundled and system gems" do
-    before :each do
-      system_gems "rack-1.0.0"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        gem "activesupport", "2.3.5"
-      G
-    end
-
-    it "does not pull in system gems" do
-      run <<-R
-        require 'rubygems'
-
-        begin;
-          require 'rack'
-        rescue LoadError
-          puts 'WIN'
-        end
-      R
-
-      out.should == "WIN"
-    end
-
-    it "provides a gem method" do
-      run <<-R
-        gem 'activesupport'
-        require 'activesupport'
-        puts ACTIVESUPPORT
-      R
-
-      out.should == "2.3.5"
-    end
-
-    it "raises an exception if gem is used to invoke a system gem not in the bundle" do
-      run <<-R
-        begin
-          gem 'rack'
-        rescue LoadError => e
-          puts e.message
-        end
-      R
-
-      out.should == "rack is not part of the bundle. Add it to Gemfile."
-    end
-
-    it "sets GEM_HOME appropriately" do
-      run "puts ENV['GEM_HOME']"
-      out.should == default_bundle_path.to_s
-    end
-  end
-
-  describe "with system gems in the bundle" do
-    before :each do
-      system_gems "rack-1.0.0"
-
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack", "1.0.0"
-        gem "activesupport", "2.3.5"
-      G
-    end
-
-    it "sets GEM_PATH appropriately" do
-      run "puts Gem.path"
-      paths = out.split("\n")
-      paths.should include(system_gem_path.to_s)
-      paths.should include(default_bundle_path.to_s)
-    end
-  end
-
-  describe "with a gemspec that requires other files" do
-    before :each do
-      build_git "bar", :gemspec => false do |s|
-        s.write "lib/bar/version.rb", %{BAR_VERSION = '1.0'}
-        s.write "bar.gemspec", <<-G
-          lib = File.expand_path('../lib/', __FILE__)
-          $:.unshift lib unless $:.include?(lib)
-          require 'bar/version'
-
-          Gem::Specification.new do |s|
-            s.name        = 'bar'
-            s.version     = BAR_VERSION
-            s.summary     = 'Bar'
-            s.files       = Dir["lib/**/*.rb"]
-          end
-        G
-      end
-
-      gemfile <<-G
-        gem "bar", :git => "#{lib_path('bar-1.0')}"
-      G
-    end
-
-    it "evals each gemspec in the context of its parent directory" do
-      bundle :install
-      run "require 'bar'; puts BAR"
-      out.should == "1.0"
-    end
-
-    it "error intelligently if the gemspec has a LoadError" do
-      update_git "bar", :gemspec => false do |s|
-        s.write "bar.gemspec", "require 'foobarbaz'"
-      end
-      bundle :install
-      out.should include("was a LoadError while evaluating bar.gemspec")
-      out.should include("foobarbaz")
-      out.should include("bar.gemspec:1")
-      out.should include("try to require a relative path") if RUBY_VERSION >= "1.9.0"
-    end
-
-    it "evals each gemspec with a binding from the top level" do
-      bundle "install"
-
-      ruby <<-RUBY
-        require 'bundler'
-        def Bundler.require(path)
-          raise "LOSE"
-        end
-        Bundler.load
-      RUBY
-
-      err.should be_empty
-      out.should be_empty
-    end
-  end
-
-  describe "when Bundler is bundled" do
-    it "doesn't blow up" do
-      install_gemfile <<-G
-        gem "bundler", :path => "#{File.expand_path("..", lib)}"
-      G
-
-      bundle %|exec ruby -e "require 'bundler'; Bundler.setup"|
-      err.should be_empty
-    end
-  end
-end