bundler 1.0.22 → 1.1.pre

data/spec/install/gems/dependency_api_spec.rb

@@ -0,0 +1,85 @@
+require "spec_helper"
+
+describe "gemcutter's dependency API" do
+  it "should use the API" do
+    gemfile <<-G
+      source "http://localgemserver.test"
+      gem "rack"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    should_be_installed "rack 1.0.0"
+  end
+
+  it "should handle nested dependencies" do
+    gemfile <<-G
+      source "http://localgemserver.test"
+      gem "rails"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    should_be_installed(
+      "rails 2.3.2",
+      "actionpack 2.3.2",
+      "activerecord 2.3.2",
+      "actionmailer 2.3.2",
+      "activeresource 2.3.2",
+      "activesupport 2.3.2")
+  end
+
+  it "falls back when the API errors out" do
+    simulate_platform mswin
+
+    gemfile <<-G
+      source "http://localgemserver.test/"
+      gem "rcov"
+    G
+
+    bundle :install, :fakeweb => "windows"
+    should_be_installed "rcov 1.0.0"
+  end
+
+  it "falls back when hitting the Gemcutter Dependency Limit" do
+    gemfile <<-G
+      source "http://localgemserver.test"
+      gem "activesupport"
+      gem "actionpack"
+      gem "actionmailer"
+      gem "activeresource"
+      gem "thin"
+      gem "rack"
+      gem "rails"
+    G
+    bundle :install, :artifice => "endpoint_fallback"
+
+    should_be_installed(
+      "activesupport 2.3.2",
+      "actionpack 2.3.2",
+      "actionmailer 2.3.2",
+      "activeresource 2.3.2",
+      "activesupport 2.3.2",
+      "thin 1.0.0",
+      "rack 1.0.0",
+      "rails 2.3.2")
+  end
+
+  it "falls back when Gemcutter API doesn't return proper Marshal format" do
+    gemfile <<-G
+      source "http://localgemserver.test"
+      gem "rack"
+    G
+
+    bundle :install, :artifice => "endpoint_marshal_fail"
+    should_be_installed "rack 1.0.0"
+  end
+
+  it "timeouts when Bundler::Fetcher redirects to much" do
+    gemfile <<-G
+      source "http://localgemserver.test"
+      gem "rack"
+    G
+
+    bundle :install, :artifice => "endpoint_redirect"
+    out.should match(/Too many redirects/)
+  end
+end

data/spec/install/gems/flex_spec.rb

@@ -185,10 +185,10 @@ describe "bundle flex_install" do
 
     it "does not install gems whose dependencies are not met" do
       bundle :install
-      ruby <<-RUBY, :expect_err => true
+      ruby <<-RUBY
         require 'bundler/setup'
       RUBY
-      err.should =~ /could not find gem 'rack-obama/i
+      out.should =~ /could not find gem 'rack-obama/i
     end
 
     it "suggests bundle update when the Gemfile requires different versions than the lock" do
@@ -199,8 +199,8 @@ describe "bundle flex_install" do
             rack (0.9.1)
 
           In Gemfile:
-            rack-obama (= 2.0) ruby depends on
-              rack (= 1.2) ruby
+            rack-obama (= 2.0) depends on
+              rack (= 1.2)
 
         Running `bundle update` will rebuild your snapshot from scratch, using only
         the gems in your Gemfile, which may resolve the conflict.

data/spec/install/gems/groups_spec.rb

@@ -35,13 +35,13 @@ describe "bundle install with gem sources" do
 
       it "sets up everything if Bundler.setup is used with no groups" do
         out = run("require 'rack'; puts RACK")
-        out.should eq('1.0.0')
+        check out.should == '1.0.0'
 
         out = run("require 'activesupport'; puts ACTIVESUPPORT")
-        out.should eq('2.3.5')
+        check out.should == '2.3.5'
 
         out = run("require 'thin'; puts THIN")
-        out.should eq('1.0')
+        out.should == '1.0'
       end
 
       it "removes old groups when new groups are set up" do
@@ -136,20 +136,6 @@ describe "bundle install with gem sources" do
 
           ENV["BUNDLE_WITHOUT"] = nil
         end
-
-        it "clears without when passed an empty list" do
-          bundle :install, :without => "emo"
-
-          bundle 'install --without ""'
-          should_be_installed "activesupport 2.3.5"
-        end
-
-        it "doesn't clear without when nothing is passed" do
-          bundle :install, :without => "emo"
-
-          bundle :install
-          should_not_be_installed "activesupport 2.3.5"
-        end
       end
 
       describe "with gems assigned to multiple groups" do

data/spec/install/gems/platform_spec.rb

@@ -190,3 +190,19 @@ describe "bundle install with platform conditionals" do
   end
 
 end
+
+describe "when a gem has an architecture in its platform" do
+  it "still installs correctly" do
+    simulate_platform mswin
+
+    gemfile <<-G
+      # Try to install gem with nil arch
+      source "http://localgemserver.test/"
+      gem "rcov"
+    G
+
+    bundle :install, :fakeweb => "windows"
+    should_be_installed "rcov 1.0.0"
+  end
+end
+

data/spec/install/gems/simple_case_spec.rb

@@ -466,54 +466,28 @@ describe "bundle install with gem sources" do
       bundled_app("vendor/bundle").should exist
     end
 
-    it "prints a warning if you try to use --disable-shared-gems" do
-      bundle "install --path vendor --disable-shared-gems"
-      out.should include "The disable-shared-gem option is no longer available"
+    it "does not use available system gems with bundle --path vendor/bundle" do
+      bundle "install --path vendor/bundle"
+      should_be_installed "rack 1.0.0"
     end
 
-    it "handles paths with regex characters in them" do
-      dir = bundled_app("bun++dle")
-      dir.mkpath
-
-      Dir.chdir(dir) do
-        bundle "install --path vendor/bundle"
-        out.should include("installed into ./vendor/bundle")
-      end
-
-      dir.rmtree
+    it "prints a warning to let the user know what has happened with bundle --path vendor/bundle" do
+      bundle "install --path vendor/bundle"
+      out.should include("It was installed into ./vendor")
     end
 
-    ["install vendor/bundle", "install --path vendor/bundle"].each do |install|
-      if install == "install vendor/bundle"
-        it "displays the deprecation warning for path as an argument to install" do
-          bundle install
-          out.should include("The path argument to `bundle install` is deprecated.")
-        end
-      end
-
-      it "does not use available system gems with bundle #{install}" do
-        bundle install
-        should_be_installed "rack 1.0.0"
-      end
-
-      it "prints a warning to let the user know what has happened with bundle #{install}" do
-        bundle install
-        out.should include("It was installed into ./vendor")
-      end
-
-      it "disallows #{install} --system" do
-        bundle "#{install} --system"
-        out.should include("Please choose.")
-      end
+    it "disallows --path vendor/bundle --system" do
+      bundle "install --path vendor/bundle --system"
+      out.should include("Please choose.")
+    end
 
-      it "remembers to disable system gems after the first time with bundle #{install}" do
-        bundle install
-        FileUtils.rm_rf bundled_app('vendor')
-        bundle "install"
+    it "remembers to disable system gems after the first time with bundle --path vendor/bundle" do
+      bundle "install --path vendor/bundle"
+      FileUtils.rm_rf bundled_app('vendor')
+      bundle "install"
 
-        vendored_gems('gems/rack-1.0.0').should be_directory
-        should_be_installed "rack 1.0.0"
-      end
+      vendored_gems('gems/rack-1.0.0').should be_directory
+      should_be_installed "rack 1.0.0"
     end
   end
 
@@ -522,7 +496,7 @@ describe "bundle install with gem sources" do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rack"
-        gem "activesupport", :group => :development
+        gem "activesupport", :groups => :development
       G
 
       ruby <<-R
@@ -557,44 +531,6 @@ describe "bundle install with gem sources" do
       bundle :install
       err.should be_empty
     end
-
-    it "still installs correctly when using path" do
-      build_lib 'yaml_spec', :gemspec => :yaml
-
-      install_gemfile <<-G
-        gem 'yaml_spec', :path => "#{lib_path('yaml_spec-1.0')}"
-      G
-      err.should == ""
-    end
-  end
-
-  describe "when the gem has an architecture in its platform" do
-    it "still installs correctly" do
-      simulate_platform mswin
-
-      gemfile <<-G
-        # Set up pretend http gem server with FakeWeb
-        $LOAD_PATH.unshift '#{Dir[base_system_gems.join("gems/fakeweb*/lib")].first}'
-        require 'fakeweb'
-        FakeWeb.allow_net_connect = false
-        files = [ 'specs.4.8.gz',
-                  'prerelease_specs.4.8.gz',
-                  'quick/Marshal.4.8/rcov-1.0-mswin32.gemspec.rz',
-                  'gems/rcov-1.0-mswin32.gem' ]
-        files.each do |file|
-          FakeWeb.register_uri(:get, "http://localgemserver.com/\#{file}",
-            :body => File.read("#{gem_repo1}/\#{file}"))
-        end
-        FakeWeb.register_uri(:get, "http://localgemserver.com/gems/rcov-1.0-x86-mswin32.gem",
-          :status => ["404", "Not Found"])
-
-        # Try to install gem with nil arch
-        source "http://localgemserver.com/"
-        gem "rcov"
-      G
-      bundle :install
-      should_be_installed "rcov 1.0.0"
-    end
   end
 
   describe "bundler dependencies" do
@@ -636,12 +572,12 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "bundler":
           In Gemfile:
-            bundler (= 0.9.2) ruby
+            bundler (= 0.9.2)
 
           Current Bundler version:
             bundler (#{Bundler::VERSION})
         E
-      out.should include(nice_error)
+      out.should == nice_error
     end
 
     it "works for gems with multiple versions in its dependencies" do
@@ -693,10 +629,10 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            activemerchant (>= 0) ruby depends on
-              activesupport (>= 2.0.0) ruby
+            activemerchant depends on
+              activesupport (>= 2.0.0)
 
-            rails_fail (>= 0) ruby depends on
+            rails_fail depends on
               activesupport (1.2.3)
       E
       out.should == nice_error
@@ -713,8 +649,8 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            rails_fail (>= 0) ruby depends on
-              activesupport (= 1.2.3) ruby
+            rails_fail depends on
+              activesupport (= 1.2.3)
 
             activesupport (2.3.5)
       E

data/spec/install/gems/standalone_spec.rb

@@ -0,0 +1,162 @@
+require "spec_helper"
+
+describe "bundle install --standalone" do
+  describe "with simple gems" do
+    before do
+      install_gemfile <<-G, :standalone => true
+        source "file://#{gem_repo1}"
+        gem "rails"
+      G
+    end
+
+    it "still makes the gems available to normal bundler" do
+      should_be_installed "actionpack 2.3.2", "rails 2.3.2"
+    end
+
+    it "generates a bundle/bundler/setup.rb" do
+      bundled_app("bundle/bundler/setup.rb").should exist
+    end
+
+    it "makes the gems available without bundler" do
+      ruby <<-RUBY, :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+      RUBY
+
+      out.should == "2.3.2"
+    end
+
+    it "works on a different system" do
+      FileUtils.mv(bundled_app, "#{bundled_app}2")
+      Dir.chdir("#{bundled_app}2")
+
+      ruby <<-RUBY, :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+      RUBY
+
+      out.should == "2.3.2"
+    end
+  end
+
+  describe "with a combination of gems and git repos" do
+    before do
+      build_git "devise", "1.0"
+
+      install_gemfile <<-G, :standalone => true
+        source "file://#{gem_repo1}"
+        gem "rails"
+        gem "devise", :git => "#{lib_path('devise-1.0')}"
+      G
+    end
+
+    it "still makes the gems available to normal bundler" do
+      should_be_installed "actionpack 2.3.2", "rails 2.3.2", "devise 1.0"
+    end
+
+    it "generates a bundle/bundler/setup.rb" do
+      bundled_app("bundle/bundler/setup.rb").should exist
+    end
+
+    it "makes the gems available without bundler" do
+      ruby <<-RUBY, :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "devise"
+        require "actionpack"
+        puts DEVISE
+        puts ACTIONPACK
+      RUBY
+
+      out.should == "1.0\n2.3.2"
+    end
+  end
+
+  describe "with groups" do
+    before do
+      build_git "devise", "1.0"
+
+      install_gemfile <<-G, :standalone => true
+        source "file://#{gem_repo1}"
+        gem "rails"
+
+        group :test do
+          gem "rspec"
+          gem "rack-test"
+        end
+      G
+    end
+
+    it "makes the gems available without bundler" do
+      ruby <<-RUBY, :no_lib => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        require "spec"
+        require "rack/test"
+        puts ACTIONPACK
+        puts SPEC
+        puts RACK_TEST
+      RUBY
+
+      out.should == "2.3.2\n1.2.7\n1.0"
+    end
+
+    it "allows creating a standalone file with limited groups" do
+      bundle "install --standalone default"
+
+      ruby <<-RUBY, :no_lib => true, :expect_err => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+        require "spec"
+      RUBY
+
+      out.should == "2.3.2"
+      err.should =~ /no such file to load.*spec/
+    end
+
+    it "allows --without to limit the groups used in a standalone" do
+      bundle "install --standalone --without test"
+
+      ruby <<-RUBY, :no_lib => true, :expect_err => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+        require "spec"
+      RUBY
+
+      out.should == "2.3.2"
+      err.should =~ /no such file to load.*spec/
+    end
+
+    it "allows remembered --without to limit the groups used in a standalone" do
+      bundle "install --without test"
+      bundle "install --standalone"
+
+      ruby <<-RUBY, :no_lib => true, :expect_err => true
+        $:.unshift File.expand_path("bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+        require "spec"
+      RUBY
+
+      out.should == "2.3.2"
+      err.should =~ /no such file to load.*spec/
+    end
+  end
+end