bundler 1.0.3 → 1.0.5

data/spec/runtime/load_spec.rb

@@ -12,37 +12,58 @@ describe "Bundler.load" do
     end
   end
 
-  it "provides a list of the env dependencies" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
-
-    env = Bundler.load
-    env.dependencies.should have_dep("rack", ">= 0")
-  end
+  describe "with a gemfile" do
+    before(:each) do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack"
+      G
+    end
 
-  it "provides a list of the resolved gems" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rack"
-    G
+    it "provides a list of the env dependencies" do
+      Bundler.load.dependencies.should have_dep("rack", ">= 0")
+    end
 
-    env = Bundler.load
-    env.gems.should have_gem("rack-1.0.0", "bundler-#{Bundler::VERSION}")
-  end
+    it "provides a list of the resolved gems" do
+      Bundler.load.gems.should have_gem("rack-1.0.0", "bundler-#{Bundler::VERSION}")
+    end
+
+    it "ignores blank BUNDLE_GEMFILEs" do
+      lambda {
+        ENV['BUNDLE_GEMFILE'] = ""
+        Bundler.load
+      }.should_not raise_error(Bundler::GemfileNotFound)
+    end
 
-  it "raises an exception if the default gemfile is not found" do
-    lambda {
-      Bundler.load
-    }.should raise_error(Bundler::GemfileNotFound, /could not locate gemfile/i)
   end
 
-  it "raises an exception if a specified gemfile is not found" do
-    lambda {
-      ENV['BUNDLE_GEMFILE'] = "omg.rb"
-      Bundler.load
-    }.should raise_error(Bundler::GemfileNotFound, /omg\.rb/)
+  describe "without a gemfile" do
+    it "raises an exception if the default gemfile is not found" do
+      lambda {
+        Bundler.load
+      }.should raise_error(Bundler::GemfileNotFound, /could not locate gemfile/i)
+    end
+
+    it "raises an exception if a specified gemfile is not found" do
+      lambda {
+        ENV['BUNDLE_GEMFILE'] = "omg.rb"
+        Bundler.load
+      }.should raise_error(Bundler::GemfileNotFound, /omg\.rb/)
+    end
+
+    it "does not find a Gemfile above the testing directory" do
+      bundler_gemfile = tmp.join("../Gemfile")
+      unless File.exists?(bundler_gemfile)
+        FileUtils.touch(bundler_gemfile)
+        @remove_bundler_gemfile = true
+      end
+      begin
+        lambda { Bundler.load }.should raise_error(Bundler::GemfileNotFound)
+      ensure
+        bundler_gemfile.rmtree if @remove_bundler_gemfile
+      end
+    end
+
   end
 
   describe "when called twice" do
@@ -69,22 +90,6 @@ describe "Bundler.load" do
     end
   end
 
-  # This is obviously not true on 1.9 thanks to the AWEOME! gem prelude :'(
-  it "does not invoke setup inside env.rb" do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "activesupport"
-    G
-
-    ruby <<-RUBY
-      require 'bundler'
-      Bundler.load
-      puts $LOAD_PATH.grep(/activesupport/i)
-    RUBY
-
-    out.should == ""
-  end if RUBY_VERSION < "1.9"
-
   describe "not hurting brittle rubygems" do
     it "does not inject #source into the generated YAML of the gem specs" do
       system_gems "activerecord-2.3.2", "activesupport-2.3.2"

data/spec/runtime/require_spec.rb

@@ -225,7 +225,7 @@ describe "Bundler.require with platform specific dependencies" do
 
     run "Bundler.require; puts RACK", :expect_err => true
 
-    out.should == "1.0.0"
+    check out.should == "1.0.0"
     err.should be_empty
   end
 end

data/spec/runtime/setup_spec.rb

@@ -156,6 +156,14 @@ describe "Bundler.setup" do
         run "require 'yard'"
         out.should == "bundler-#{Bundler::VERSION}\nyard-1.0"
       end
+
+      context "when the ruby stdlib is a substring of Gem.path" do
+        it "does not reject the stdlib from $LOAD_PATH" do
+          substring = "/" + $LOAD_PATH.find{|p| p =~ /vendor_ruby/ }.split("/")[2]
+          run "puts 'worked!'", :env => {"GEM_PATH" => substring}
+          out.should == "worked!"
+        end
+      end
     end
   end
 
@@ -237,14 +245,14 @@ describe "Bundler.setup" do
     end
 
     it "works even when the cache directory has been deleted" do
-      bundle "install vendor"
+      bundle "install --path vendor/bundle"
       FileUtils.rm_rf vendored_gems('cache')
       should_be_installed "rack 1.0.0"
     end
 
     it "does not randomly change the path when specifying --path and the bundle directory becomes read only" do
       begin
-        bundle "install vendor"
+        bundle "install --path vendor/bundle"
 
         Dir["**/*"].each do |f|
           File.directory?(f) ?
@@ -409,4 +417,162 @@ describe "Bundler.setup" do
 
     out.should == "[]"
   end
+
+  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

data/spec/spec_helper.rb

@@ -27,6 +27,7 @@ $show_err = true
 Spec::Rubygems.setup
 FileUtils.rm_rf(Spec::Path.gem_repo1)
 ENV['RUBYOPT'] = "-I#{Spec::Path.root}/spec/support/rubygems_hax"
+ENV['BUNDLE_SPEC_RUN'] = "true"
 
 RSpec.configure do |config|
   config.include Spec::Builders
@@ -38,7 +39,7 @@ RSpec.configure do |config|
   config.include Spec::Platforms
   config.include Spec::Sudo
 
-  config.filter_run :focused => true
+  config.filter_run :focused => true unless ENV['CI']
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true
 

data/spec/support/builders.rb

@@ -294,8 +294,9 @@ module Spec
     end
 
     def build_git(name, *args, &block)
-      opts = Hash === args.last ? args.last : {}
-      spec = build_with(GitBuilder, name, args, &block)
+      opts = args.last.is_a?(Hash) ? args.last : {}
+      builder = opts[:bare] ? GitBareBuilder : GitBuilder
+      spec = build_with(builder, name, args, &block)
       GitReader.new(opts[:path] || lib_path(spec.full_name))
     end
 
@@ -345,14 +346,7 @@ module Spec
 
       def platforms(platforms)
         platforms.split(/\s+/).each do |platform|
-          platform = 'x86-mswin32' if platform == 'mswin32'
-          platform = Gem::Platform.new(platform)
-          if String === platform
-            class << platform
-              undef =~
-              alias =~ ==
-            end
-          end
+          platform.gsub!(/^(mswin32)$/, 'x86-\1')
           yield Gem::Platform.new(platform)
         end
       end
@@ -484,6 +478,16 @@ module Spec
       end
     end
 
+    class GitBareBuilder < LibBuilder
+      def _build(options)
+        path = options[:path] || _default_path
+        super(options.merge(:path => path))
+        Dir.chdir(path) do
+          `git init --bare`
+        end
+      end
+    end
+
     class GitUpdater < LibBuilder
       WINDOWS = Config::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
       NULL    = WINDOWS ? "NUL" : "/dev/null"
@@ -508,6 +512,10 @@ module Spec
             silently("git checkout #{branch}")
           elsif tag = options[:tag]
             `git tag #{tag}`
+          elsif options[:remote]
+            silently("git remote add origin file://#{options[:remote]}")
+          elsif options[:push]
+            silently("git push origin #{options[:push]}")
           end
 
           current_ref = `git rev-parse HEAD`.strip

data/spec/support/helpers.rb

@@ -29,15 +29,10 @@ module Spec
     def run(cmd, *args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
       expect_err = opts.delete(:expect_err)
+      env = opts.delete(:env)
       groups = args.map {|a| a.inspect }.join(", ")
-
-      if opts[:lite_runtime]
-        setup = "require 'rubygems' ; require 'bundler/setup' ; Bundler.setup(#{groups})\n"
-      else
-        setup = "require 'rubygems' ; require 'bundler' ; Bundler.setup(#{groups})\n"
-      end
-
-      @out = ruby(setup + cmd, :expect_err => expect_err)
+      setup = "require 'rubygems' ; require 'bundler' ; Bundler.setup(#{groups})\n"
+      @out = ruby(setup + cmd, :expect_err => expect_err, :env => env)
     end
 
     def lib
@@ -46,7 +41,7 @@ module Spec
 
     def bundle(cmd, options = {})
       expect_err  = options.delete(:expect_err)
-      exit_status = options.delete(:exit_status)
+      exitstatus = options.delete(:exitstatus)
       options["no-color"] = true unless options.key?("no-color") || cmd.to_s[0..3] == "exec"
 
       env = (options.delete(:env) || {}).map{|k,v| "#{k}='#{v}' "}.join
@@ -56,7 +51,7 @@ module Spec
       gemfile = File.expand_path('../../../bin/bundle', __FILE__)
       cmd = "#{env}#{Gem.ruby} -I#{lib} #{gemfile} #{cmd}#{args}"
 
-      if exit_status
+      if exitstatus
         sys_status(cmd)
       else
         sys_exec(cmd, expect_err){|i| yield i if block_given? }
@@ -65,8 +60,9 @@ module Spec
 
     def ruby(ruby, options = {})
       expect_err = options.delete(:expect_err)
+      env = (options.delete(:env) || {}).map{|k,v| "#{k}='#{v}' "}.join
       ruby.gsub!(/["`\$]/) {|m| "\\#{m}" }
-      sys_exec(%'#{Gem.ruby} -I#{lib} -e "#{ruby}"', expect_err)
+      sys_exec(%{#{env}#{Gem.ruby} -I#{lib} -e "#{ruby}"}, expect_err)
     end
 
     def gembin(cmd)

data/spec/support/indexes.rb

@@ -26,7 +26,6 @@ module Spec
     def should_resolve_as(specs)
       got = resolve
       got = got.map { |s| s.full_name }.sort
-
       got.should == specs.sort
     end
 
@@ -88,17 +87,17 @@ module Spec
         end
 
         versions '1.0 1.2 1.2.1 1.2.2 1.3 1.3.0.1 1.3.5 1.4.0 1.4.2 1.4.2.1' do |version|
-          platforms "ruby java mswin32" do |platform|
+          platforms "ruby java mswin32 mingw32" do |platform|
             next if version == v('1.4.2.1') && platform != pl('x86-mswin32')
             next if version == v('1.4.2') && platform == pl('x86-mswin32')
             gem "nokogiri", version, platform do
-              dep "weakling", ">= 0.0.3" if platform =~ 'java'
+              dep "weakling", ">= 0.0.3" if platform =~ pl('java')
             end
           end
         end
 
         versions '0.0.1 0.0.2 0.0.3' do |version|
-          gem "weakling", version #, pl('java')
+          gem "weakling", version
         end
 
         # --- Rails related