bundler 1.0.21 → 1.1.rc

data/spec/other/clean_spec.rb

@@ -0,0 +1,397 @@
+require "spec_helper"
+
+describe "bundle clean" do
+  def should_have_gems(*gems)
+    gems.each do |g|
+      vendored_gems("gems/#{g}").should exist
+      vendored_gems("specifications/#{g}.gemspec").should exist
+      vendored_gems("cache/#{g}.gem").should exist
+    end
+  end
+
+  def should_not_have_gems(*gems)
+    gems.each do |g|
+      vendored_gems("gems/#{g}").should_not exist
+      vendored_gems("specifications/#{g}.gemspec").should_not exist
+      vendored_gems("cache/#{g}.gem").should_not exist
+    end
+  end
+
+  it "removes unused gems that are different" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "foo"
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+    G
+    bundle "install --no-clean"
+
+    bundle :clean
+
+    out.should eq("Removing foo (1.0)")
+
+    should_have_gems 'thin-1.0', 'rack-1.0.0'
+    should_not_have_gems 'foo-1.0'
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "removes old version of gem if unused" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "0.9.1"
+      gem "foo"
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      gem "foo"
+    G
+    bundle "install --no-clean"
+
+    bundle :clean
+
+    out.should eq("Removing rack (0.9.1)")
+
+    should_have_gems 'foo-1.0', 'rack-1.0.0'
+    should_not_have_gems 'rack-0.9.1'
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "removes new version of gem if unused" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      gem "foo"
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "0.9.1"
+      gem "foo"
+    G
+    bundle "install --no-clean"
+
+    bundle :clean
+
+    out.should eq("Removing rack (1.0.0)")
+
+    should_have_gems 'foo-1.0', 'rack-0.9.1'
+    should_not_have_gems 'rack-1.0.0'
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "remove gems in bundle without groups" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+
+      group :test_group do
+        gem "rack", "1.0.0"
+      end
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+    bundle "install --without test_group --no-clean"
+    bundle :clean
+
+    out.should eq("Removing rack (1.0.0)")
+
+    should_have_gems 'foo-1.0'
+    should_not_have_gems 'rack-1.0.0'
+
+    vendored_gems("bin/rackup").should_not exist
+  end
+
+  it "does not remove cached git dir if it's being used" do
+    build_git "foo"
+    revision = revision_for(lib_path("foo-1.0"))
+    git_path = lib_path('foo-1.0')
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      git "#{git_path}", :ref => "#{revision}" do
+        gem "foo"
+      end
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    bundle :clean
+
+    digest = Digest::SHA1.hexdigest(git_path.to_s)
+    vendored_gems("cache/bundler/git/foo-1.0-#{digest}").should exist
+  end
+
+  it "removes unused git gems" do
+    build_git "foo"
+    revision = revision_for(lib_path("foo-1.0"))
+    git_path = lib_path('foo-1.0')
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      git "#{git_path}", :ref => "#{revision}" do
+        gem "foo"
+      end
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+    G
+    bundle "install --no-clean"
+
+    bundle :clean
+
+    out.should eq("Removing foo (1.0 #{revision[0..11]})")
+
+    vendored_gems("gems/rack-1.0.0").should exist
+    vendored_gems("bundler/gems/foo-1.0-#{revision[0..11]}").should_not exist
+    digest = Digest::SHA1.hexdigest(git_path.to_s)
+    vendored_gems("cache/bundler/git/foo-1.0-#{digest}").should_not exist
+
+    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "removes old git gems" do
+    build_git "foo"
+    revision = revision_for(lib_path("foo-1.0"))
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+      git "#{lib_path('foo-1.0')}" do
+        gem "foo"
+      end
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    update_git "foo"
+    revision2 = revision_for(lib_path("foo-1.0"))
+
+    bundle "update --no-clean"
+    bundle :clean
+
+    out.should eq("Removing foo (1.0 #{revision[0..11]})")
+
+    vendored_gems("gems/rack-1.0.0").should exist
+    vendored_gems("bundler/gems/foo-1.0-#{revision[0..11]}").should_not exist
+    vendored_gems("bundler/gems/foo-1.0-#{revision2[0..11]}").should exist
+
+    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
+
+    vendored_gems("bin/rackup").should exist
+  end
+
+  it "does not remove nested gems in a git repo" do
+    build_lib "activesupport", "3.0", :path => lib_path("rails/activesupport")
+    build_git "rails", "3.0", :path => lib_path("rails") do |s|
+      s.add_dependency "activesupport", "= 3.0"
+    end
+    revision = revision_for(lib_path("rails"))
+
+    gemfile <<-G
+      gem "activesupport", :git => "#{lib_path('rails')}", :ref => '#{revision}'
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+    bundle :clean
+    out.should eq("")
+
+    vendored_gems("bundler/gems/rails-#{revision[0..11]}").should exist
+  end
+
+  it "displays an error when used without --path" do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack", "1.0.0"
+    G
+
+    bundle :clean
+
+    out.should == "Can only use bundle clean when --path is set or --force is set"
+  end
+
+  # handling bundle clean upgrade path from the pre's
+  it "removes .gem/.gemspec file even if there's no corresponding gem dir is already moved" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "foo"
+    G
+
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+    G
+    bundle "install --no-clean"
+
+    FileUtils.rm(vendored_gems("bin/rackup"))
+    FileUtils.rm_rf(vendored_gems("gems/thin-1.0"))
+    FileUtils.rm_rf(vendored_gems("gems/rack-1.0.0"))
+
+    bundle :clean
+
+    should_not_have_gems 'thin-1.0', 'rack-1.0'
+    should_have_gems 'foo-1.0'
+
+    vendored_gems("bin/rackup").should_not exist
+  end
+
+  it "does not call clean automatically when using system gems" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "rack"
+    G
+    bundle :install
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle :install
+
+    sys_exec "gem list"
+    out.should include("rack (1.0.0)")
+    out.should include("thin (1.0)")
+  end
+
+  it "--clean should override the bundle setting" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "rack"
+    G
+    bundle "install --path vendor/bundle --no-clean"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle "install --clean"
+
+    should_have_gems 'rack-1.0.0'
+    should_not_have_gems 'thin-1.0'
+  end
+
+  it "clean automatically on --path" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "thin"
+      gem "rack"
+    G
+    bundle "install --path vendor/bundle"
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle "install"
+
+    should_have_gems 'rack-1.0.0'
+    should_not_have_gems 'thin-1.0'
+  end
+
+  it "cleans on bundle update with --path" do
+    build_repo2
+
+    gemfile <<-G
+      source "file://#{gem_repo2}"
+
+      gem "foo"
+    G
+    bundle "install --path vendor/bundle"
+
+    update_repo2 do
+      build_gem 'foo', '1.0.1'
+    end
+
+    bundle :update
+    should_not_have_gems 'foo-1.0'
+  end
+
+  it "does not clean on bundle update when using --system" do
+    build_repo2
+
+    gemfile <<-G
+      source "file://#{gem_repo2}"
+
+      gem "foo"
+    G
+    bundle "install"
+
+    update_repo2 do
+      build_gem 'foo', '1.0.1'
+    end
+    bundle :update
+
+    sys_exec "gem list"
+    out.should include("foo (1.0.1, 1.0)")
+  end
+
+  it "cleans system gems when --force is used" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+      gem "rack"
+    G
+    bundle :install
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle :install
+    bundle "clean --force"
+
+    out.should eq("Removing foo (1.0)")
+    sys_exec "gem list"
+    out.should_not include("foo (1.0)")
+    out.should include("rack (1.0.0)")
+  end
+end

data/spec/other/exec_spec.rb

@@ -216,33 +216,4 @@ describe "bundle exec" do
     end
 
   end
-
-  describe "bundling bundler" do
-    before(:each) do
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      bundle "install --path vendor/bundle --disable-shared-gems"
-    end
-
-    it "does not explode with --disable-shared-gems" do
-      bundle "exec bundle check", :exitstatus => true
-      exitstatus.should == 0
-    end
-
-    it "does not explode when starting with Bundler.setup" do
-      ruby <<-R
-        require "rubygems"
-        require "bundler"
-        Bundler.setup
-        puts `bundle check`
-        puts $?.exitstatus
-      R
-
-      out.should include("satisfied")
-      out.should include("\n0")
-    end
-  end
 end

data/spec/other/newgem_spec.rb

@@ -2,9 +2,20 @@ require "spec_helper"
 
 describe "bundle gem" do
   before :each do
+    @git_name = `git config --global user.name`.chomp
+    `git config --global user.name "Bundler User"`
+    @git_email = `git config --global user.email`.chomp
+    `git config --global user.email user@example.com`
     bundle 'gem test-gem'
   end
 
+  after :each do
+    `git config --global user.name "#{@git_name}"`
+    `git config --global user.email #{@git_email}`
+  end
+
+  let(:generated_gem) { Bundler::GemHelper.new(bundled_app("test-gem").to_s) }
+
   it "generates a gem skeleton" do
     bundled_app("test-gem/test-gem.gemspec").should exist
     bundled_app("test-gem/Gemfile").should exist
@@ -22,6 +33,34 @@ describe "bundle gem" do
     bundled_app("test-gem/lib/test-gem.rb").read.should =~ /module Test\n  module Gem/
   end
 
+  context "git config user.{name,email} present" do
+    it "sets gemspec author to git user.name if available" do
+      generated_gem.gemspec.authors.first.should == "Bundler User"
+    end
+
+    it "sets gemspec email to git user.email if available" do
+      generated_gem.gemspec.email.first.should == "user@example.com"
+    end
+  end
+
+  context "git config user.{name,email} is not set" do
+    before :each do
+      `git config --global --unset user.name`
+      `git config --global --unset user.email`
+      reset!
+      in_app_root
+      bundle 'gem test-gem'
+    end
+
+    it "sets gemspec author to default message if git user.name is not set or empty" do
+      generated_gem.gemspec.authors.first.should == "TODO: Write your name"
+    end
+
+    it "sets gemspec email to default message if git user.email is not set or empty" do
+      generated_gem.gemspec.email.first.should == "TODO: Write your email address"
+    end
+  end
+
   it "requires the version file" do
     bundled_app("test-gem/lib/test-gem.rb").read.should =~ /require "test-gem\/version"/
   end

data/spec/other/outdated_spec.rb

@@ -0,0 +1,93 @@
+require "spec_helper"
+
+describe "bundle outdated" do
+
+  before :each do
+    build_repo2 do
+      build_git "foo", :path => lib_path("foo")
+    end
+
+    install_gemfile <<-G
+      source "file://#{gem_repo2}"
+      gem "activesupport", "2.3.5"
+      gem "foo", :git => "#{lib_path('foo')}"
+    G
+  end
+
+  describe "with no arguments" do
+    it "returns list of outdated gems" do
+      update_repo2 do
+        build_gem "activesupport", "3.0"
+        update_git "foo", :path => lib_path("foo")
+      end
+
+      bundle "outdated"
+      out.should include("activesupport (3.0 > 2.3.5)")
+      out.should include("foo (1.0")
+    end
+  end
+
+  describe "with --local option" do
+    it "doesn't hit repo2" do
+      FileUtils.rm_rf(gem_repo2)
+
+      bundle "outdated --local"
+      out.should_not match(/Fetching source index/)
+    end
+  end
+
+  describe "with specified gems" do
+    it "returns list of outdated gems" do
+      update_repo2 do
+        build_gem "activesupport", "3.0"
+        update_git "foo", :path => lib_path("foo")
+      end
+
+      bundle "outdated foo"
+      out.should_not include("activesupport (3.0 > 2.3.5)")
+      out.should include("foo (1.0")
+    end
+  end
+
+  describe "pre-release gems" do
+    context "without the --pre option" do
+      it "ignores pre-release versions" do
+        update_repo2 do
+          build_gem "activesupport", "3.0.0.beta"
+        end
+
+        bundle "outdated"
+        out.should_not include("activesupport (3.0.0.beta > 2.3.5)")
+      end
+    end
+
+    context "with the --pre option" do
+      it "includes pre-release versions" do
+        update_repo2 do
+          build_gem "activesupport", "3.0.0.beta"
+        end
+
+        bundle "outdated --pre"
+        out.should include("activesupport (3.0.0.beta > 2.3.5)")
+      end
+    end
+
+    context "when current gem is a pre-release" do
+      it "includes the gem" do
+        update_repo2 do
+          build_gem "activesupport", "3.0.0.beta.1"
+          build_gem "activesupport", "3.0.0.beta.2"
+        end
+
+        install_gemfile <<-G
+          source "file://#{gem_repo2}"
+          gem "activesupport", "3.0.0.beta.1"
+        G
+
+        bundle "outdated"
+        out.should include("activesupport (3.0.0.beta.2 > 3.0.0.beta.1)")
+      end
+    end
+  end
+
+end

data/spec/other/show_spec.rb

@@ -38,6 +38,12 @@ describe "bundle show" do
     bundle "show missing"
     out.should =~ /could not find gem 'missing'/i
   end
+
+  it "prints path of all gems in bundle" do
+    bundle "show --paths"
+    out.should include(default_bundle_path('gems', 'rake-0.8.7').to_s)
+    out.should include(default_bundle_path('gems', 'rails-2.3.2').to_s)
+  end
 end
 
 describe "bundle show with a git repo" do

data/spec/quality_spec.rb

@@ -42,7 +42,7 @@ describe "The library itself" do
     error_messages = []
     Dir.chdir(File.expand_path("../..", __FILE__)) do
       `git ls-files`.split("\n").each do |filename|
-        next if filename =~ /\.gitmodules|fixtures/
+        next if filename =~ /\.gitmodules|\.marshal|fixtures|vendor/
         error_messages << check_for_tab_characters(filename)
         error_messages << check_for_extra_spaces(filename)
       end

data/spec/realworld/edgecases_spec.rb

@@ -0,0 +1,12 @@
+describe "real world edgecases", :realworld => true do
+  if RUBY_VERSION < "1.9"
+    # there is no rbx-relative-require gem that will install on 1.9
+    it "ignores extra gems with bad platforms" do
+      install_gemfile <<-G
+        source :rubygems
+        gem "linecache", "0.46"
+      G
+      err.should eq("")
+    end
+  end
+end

data/spec/runtime/executable_spec.rb

@@ -36,6 +36,16 @@ describe "Running bin/* commands" do
     out.should == "1.0.0"
   end
 
+  it "uses the default ruby install name when shebang is not specified" do
+   bundle "install --binstubs"
+   File.open("bin/rackup").gets.should == "#!/usr/bin/env #{RbConfig::CONFIG['ruby_install_name']}\n"
+  end
+
+  it "allows the name of the shebang executable to be specified" do
+    bundle "install --binstubs --shebang ruby-foo"
+    File.open("bin/rackup").gets.should == "#!/usr/bin/env ruby-foo\n"
+  end
+
   it "runs the bundled command when out of the bundle" do
     bundle "install --binstubs"
 

data/spec/runtime/require_spec.rb

@@ -82,14 +82,11 @@ describe "Bundler.require" do
       gem "two", :require => 'fail'
     G
 
-    run <<-R
-      begin
-        Bundler.require
-      rescue LoadError => e
-        puts e.message
-      end
+    load_error_run <<-R, 'fail'
+      Bundler.require
     R
-    out.should == 'no such file to load -- fail'
+
+    err.should == "ZOMG LOAD ERROR"
   end
 
   describe "using bundle exec" do
@@ -191,8 +188,10 @@ describe "Bundler.require" do
           gem "busted_require"
         G
 
-        run "Bundler.require", :expect_err => true
-        err.should include("no such file to load -- no_such_file_omg")
+        load_error_run <<-R, 'no_such_file_omg'
+          Bundler.require
+        R
+        err.should == 'ZOMG LOAD ERROR'
       end
     end
   end