bundler 1.5.3 → 1.6.0.pre.1

data/spec/commands/show_spec.rb

@@ -1,102 +1,118 @@
 require "spec_helper"
 
 describe "bundle show" do
-  before :each do
-    install_gemfile <<-G
-      source "file://#{gem_repo1}"
-      gem "rails"
-    G
-  end
+  context "with a standard Gemfile" do
+    before :each do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rails"
+      G
+    end
 
-  it "creates a Gemfile.lock if one did not exist" do
-    FileUtils.rm("Gemfile.lock")
+    it "creates a Gemfile.lock if one did not exist" do
+      FileUtils.rm("Gemfile.lock")
 
-    bundle "show"
+      bundle "show"
 
-    expect(bundled_app("Gemfile.lock")).to exist
-  end
+      expect(bundled_app("Gemfile.lock")).to exist
+    end
 
-  it "creates a Gemfile.lock when invoked with a gem name" do
-    FileUtils.rm("Gemfile.lock")
+    it "creates a Gemfile.lock when invoked with a gem name" do
+      FileUtils.rm("Gemfile.lock")
 
-    bundle "show rails"
+      bundle "show rails"
 
-    expect(bundled_app("Gemfile.lock")).to exist
-  end
+      expect(bundled_app("Gemfile.lock")).to exist
+    end
 
-  it "prints path if gem exists in bundle" do
-    bundle "show rails"
-    expect(out).to eq(default_bundle_path('gems', 'rails-2.3.2').to_s)
-  end
+    it "prints path if gem exists in bundle" do
+      bundle "show rails"
+      expect(out).to eq(default_bundle_path('gems', 'rails-2.3.2').to_s)
+    end
 
-  it "warns if path no longer exists on disk" do
-    FileUtils.rm_rf("#{system_gem_path}/gems/rails-2.3.2")
+    it "warns if path no longer exists on disk" do
+      FileUtils.rm_rf("#{system_gem_path}/gems/rails-2.3.2")
 
-    bundle "show rails"
+      bundle "show rails"
 
-    expect(out).to match(/has been deleted/i)
-    expect(out).to include(default_bundle_path('gems', 'rails-2.3.2').to_s)
-  end
+      expect(out).to match(/has been deleted/i)
+      expect(out).to include(default_bundle_path('gems', 'rails-2.3.2').to_s)
+    end
 
-  it "prints the path to the running bundler" do
-    bundle "show bundler"
-    expect(out).to eq(File.expand_path('../../../', __FILE__))
-  end
+    it "prints the path to the running bundler" do
+      bundle "show bundler"
+      expect(out).to eq(File.expand_path('../../../', __FILE__))
+    end
 
-  it "complains if gem not in bundle" do
-    bundle "show missing"
-    expect(out).to match(/could not find gem 'missing'/i)
-  end
+    it "complains if gem not in bundle" do
+      bundle "show missing"
+      expect(out).to match(/could not find gem 'missing'/i)
+    end
 
-  it "prints path of all gems in bundle sorted by name" do
-    bundle "show --paths"
+    it "prints path of all gems in bundle sorted by name" do
+      bundle "show --paths"
 
-    expect(out).to include(default_bundle_path('gems', 'rake-10.0.2').to_s)
-    expect(out).to include(default_bundle_path('gems', 'rails-2.3.2').to_s)
+      expect(out).to include(default_bundle_path('gems', 'rake-10.0.2').to_s)
+      expect(out).to include(default_bundle_path('gems', 'rails-2.3.2').to_s)
 
-    # Gem names are the last component of their path.
-    gem_list = out.split.map { |p| p.split('/').last }
-    expect(gem_list).to eq(gem_list.sort)
+      # Gem names are the last component of their path.
+      gem_list = out.split.map { |p| p.split('/').last }
+      expect(gem_list).to eq(gem_list.sort)
+    end
   end
-end
 
-describe "bundle show with a git repo" do
-  before :each do
-    @git = build_git "foo", "1.0"
-  end
+  context "with a git repo in the Gemfile" do
+    before :each do
+      @git = build_git "foo", "1.0"
+    end
 
-  it "prints out git info" do
-    install_gemfile <<-G
-      gem "foo", :git => "#{lib_path('foo-1.0')}"
-    G
-    should_be_installed "foo 1.0"
+    it "prints out git info" do
+      install_gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+      should_be_installed "foo 1.0"
 
-    bundle :show
-    expect(out).to include("foo (1.0 #{@git.ref_for('master', 6)}")
-  end
+      bundle :show
+      expect(out).to include("foo (1.0 #{@git.ref_for('master', 6)}")
+    end
+
+    it "prints out branch names other than master" do
+      update_git "foo", :branch => "omg" do |s|
+        s.write "lib/foo.rb", "FOO = '1.0.omg'"
+      end
+      @revision = revision_for(lib_path("foo-1.0"))[0...6]
+
+      install_gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}", :branch => "omg"
+      G
+      should_be_installed "foo 1.0.omg"
 
-  it "prints out branch names other than master" do
-    update_git "foo", :branch => "omg" do |s|
-      s.write "lib/foo.rb", "FOO = '1.0.omg'"
+      bundle :show
+      expect(out).to include("foo (1.0 #{@git.ref_for('omg', 6)}")
     end
-    @revision = revision_for(lib_path("foo-1.0"))[0...6]
 
-    install_gemfile <<-G
-      gem "foo", :git => "#{lib_path('foo-1.0')}", :branch => "omg"
-    G
-    should_be_installed "foo 1.0.omg"
+    it "doesn't print the branch when tied to a ref" do
+      sha = revision_for(lib_path("foo-1.0"))
+      install_gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}", :ref => "#{sha}"
+      G
 
-    bundle :show
-    expect(out).to include("foo (1.0 #{@git.ref_for('omg', 6)}")
+      bundle :show
+      expect(out).to include("foo (1.0 #{sha[0..6]})")
+    end
   end
 
-  it "doesn't print the branch when tied to a ref" do
-    sha = revision_for(lib_path("foo-1.0"))
-    install_gemfile <<-G
-      gem "foo", :git => "#{lib_path('foo-1.0')}", :ref => "#{sha}"
-    G
+  context "in a fresh gem in a blank git repo" do
+    before :each do
+      build_git "foo", :path => lib_path("foo")
+      in_app_root_custom lib_path("foo")
+      File.open('Gemfile', 'w') {|f| f.puts "gemspec" }
+      sys_exec 'rm -rf .git && git init'
+    end
 
-    bundle :show
-    expect(out).to include("foo (1.0 #{sha[0..6]})")
+    it "does not output git errors" do
+      bundle :show
+      expect(err).to be_empty
+    end
   end
 end

data/spec/install/binstubs_spec.rb

@@ -21,4 +21,4 @@ describe "bundle install" do
     end
   end
 
-end
+end

data/spec/install/bundler_spec.rb

@@ -143,4 +143,4 @@ describe "bundle install" do
     end
   end
 
-end
+end

data/spec/install/gemfile/git_spec.rb

@@ -27,7 +27,7 @@ describe "bundle install with git sources" do
     end
 
     it "caches the git repo" do
-      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have(1).item
+      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"].size).to eq(1)
     end
 
     it "caches the evaluated gemspec" do

data/spec/install/gemfile/path_spec.rb

@@ -46,6 +46,18 @@ describe "bundle install with explicit source paths" do
     should_be_installed("foo 1.0")
   end
 
+  it "expands paths raise error with not existing user's home dir" do
+    build_lib "foo"
+    username = 'some_unexisting_user'
+    relative_path = lib_path('foo-1.0').relative_path_from(Pathname.new("/home/#{username}").expand_path)
+
+    install_gemfile <<-G
+      gem 'foo', :path => "~#{username}/#{relative_path}"
+    G
+    expect(out).to match("There was an error while trying to use the path `~#{username}/#{relative_path}`.")
+    expect(out).to match("user #{username} doesn't exist")
+  end
+
   it "expands paths relative to Bundler.root" do
     build_lib "foo", :path => bundled_app("foo-1.0")
 

data/spec/install/gemfile_spec.rb

@@ -41,4 +41,4 @@ describe "bundle install" do
     end
   end
 
-end
+end

data/spec/install/gems/groups_spec.rb

@@ -305,4 +305,4 @@ describe "bundle install with groups" do
     end
   end
 
-end
+end

data/spec/install/gems/platform_spec.rb

@@ -193,4 +193,3 @@ describe "when a gem has no architecture" do
     should_be_installed "rcov 1.0.0"
   end
 end
-

data/spec/install/gems/post_install_spec.rb

@@ -45,3 +45,77 @@ describe "bundle install with gem sources" do
     end
   end
 end
+
+describe "bundle install with git sources" do
+  describe "when gems include post install messages" do
+    it "should display the post-install messages after installing" do
+      build_git "foo" do |s|
+        s.post_install_message = "Foo's post install message"
+      end
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'foo', :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle :install
+      expect(out).to include("Post-install message from foo:")
+      expect(out).to include("Foo's post install message")
+    end
+
+    it "should display the post-install messages if repo is updated" do
+      build_git "foo" do |s|
+        s.post_install_message = "Foo's post install message"
+      end
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'foo', :git => '#{lib_path("foo-1.0")}'
+      G
+      bundle :install
+
+      build_git "foo", "1.1" do |s|
+        s.post_install_message = "Foo's 1.1 post install message"
+      end
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'foo', :git => '#{lib_path("foo-1.1")}'
+      G
+      bundle :install
+
+      expect(out).to include("Post-install message from foo:")
+      expect(out).to include("Foo's 1.1 post install message")
+    end
+
+    it "should not display the post-install messages if repo is not updated" do
+      build_git "foo" do |s|
+        s.post_install_message = "Foo's post install message"
+      end
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'foo', :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle :install
+      expect(out).to include("Post-install message from foo:")
+      expect(out).to include("Foo's post install message")
+
+      bundle :install
+      expect(out).not_to include("Post-install message")
+    end
+  end
+
+  describe "when gems do not include post install messages" do
+    it "should not display any post-install messages" do
+      build_git "foo" do |s|
+        s.post_install_message = nil
+      end
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem 'foo', :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle :install
+      expect(out).not_to include("Post-install message")
+    end
+  end
+
+end

data/spec/install/gems/resolving_spec.rb

@@ -69,38 +69,34 @@ describe "bundle install with gem sources" do
       end
 
       context "with ENV['DEBUG_RESOLVER'] set" do
-        before do
-          ENV['DEBUG_RESOLVER'] = '1'
-        end
         it "produces debug output" do
-          expect(capture(:stdout) do
-            install_gemfile <<-G
-              source "file://#{gem_repo1}"
-              gem "net_c"
-              gem "net_e"
-            G
-          end).to include "==== Iterating ===="
-        end
-        after do
-          ENV['DEBUG_RESOLVER'] = nil
+          gemfile <<-G
+            source "file://#{gem_repo1}"
+            gem "net_c"
+            gem "net_e"
+          G
+
+          resolve_output = capture(:stdout) do
+            bundle :install, :env => {"DEBUG_RESOLVER" => "1"}
+          end
+
+          expect(resolve_output).to include("==== Iterating ====")
         end
       end
 
       context "with ENV['DEBUG_RESOLVER_TREE'] set" do
-        before do
-          ENV['DEBUG_RESOLVER_TREE'] = '1'
-        end
         it "produces debug output" do
-          expect(capture(:stdout) do
-            install_gemfile <<-G
-              source "file://#{gem_repo1}"
-              gem "net_c"
-              gem "net_e"
-            G
-          end).to include " net_b (>= 0) ruby"
-        end
-        after do
-          ENV['DEBUG_RESOLVER_TREE'] = nil
+          gemfile <<-G
+            source "file://#{gem_repo1}"
+            gem "net_c"
+            gem "net_e"
+          G
+
+          resolve_output = capture(:stdout) do
+            bundle :install, :env => {"DEBUG_RESOLVER_TREE" => "1"}
+          end
+
+          expect(resolve_output).to include(" net_b (>= 0) ruby")
         end
       end
 

data/spec/install/gems/simple_case_spec.rb

@@ -298,7 +298,7 @@ describe "bundle install with gem sources" do
       install_gemfile <<-G
       G
 
-      expect(File.exists?(bundled_app("Gemfile.lock"))).to eq(true)
+      expect(File.exists?(bundled_app("Gemfile.lock"))).to be true
     end
 
     it "gracefully handles error when rubygems server is unavailable" do
@@ -337,6 +337,22 @@ describe "bundle install with gem sources" do
       G
       expect(exitstatus).to eq(0)
     end
+
+    it "reinstalls the gem if the gem dir is missing but the specification file exists" do
+      gemfile(<<-G)
+        source "file://#{gem_repo1}"
+
+        gem 'foo'
+      G
+
+      bundle "install --path vendor/bundle"
+
+      FileUtils.rm_rf(vendored_gems('gems/foo-1.0'))
+
+      bundle "install"
+
+      expect(vendored_gems('gems/foo-1.0')).to exist
+    end
   end
 
   describe "when Bundler root contains regex chars" do

data/spec/install/gemspecs_spec.rb

@@ -47,4 +47,4 @@ describe "bundle install" do
     should_be_installed "activesupport 2.3.2"
   end
 
-end
+end

data/spec/install/path_spec.rb

@@ -147,4 +147,4 @@ describe "bundle install" do
     end
   end
 
-end
+end

data/spec/install/prereleases_spec.rb

@@ -40,4 +40,4 @@ describe "bundle install" do
     end
   end
 
-end
+end

data/spec/other/ext_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Gem::Specification#match_platform" do
   it "does not match platforms other than the gem platform" do
     darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10"
-    expect(darwin.match_platform(pl('java'))).to eq(false)
+    expect(darwin.match_platform(pl('java'))).to be false
   end
 end