bundler 1.4.0.rc.1 → 1.5.0.rc.1

data/spec/install/gems/mirror_spec.rb

@@ -0,0 +1,39 @@
+require "spec_helper"
+
+describe "bundle install with a mirror configured" do
+  describe "when the mirror does not match the gem source" do
+    before :each do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+
+        gem "rack"
+      G
+      bundle "config --local mirror.http://gems.example.org http://gem-mirror.example.org"
+    end
+
+    it "installs from the normal location" do
+      bundle :install
+      expect(out).to include("Fetching source index from file:#{gem_repo1}")
+      should_be_installed "rack 1.0"
+    end
+  end
+
+  describe "when the gem source matches a configured mirror" do
+    before :each do
+      gemfile <<-G
+        # This source is bogus and doesn't have the gem we're looking for
+        source "file://#{gem_repo2}"
+
+        gem "rack"
+      G
+      bundle "config --local mirror.file://#{gem_repo2} file://#{gem_repo1}"
+    end
+
+    it "installs the gem from the mirror" do
+      bundle :install
+      expect(out).to include("Fetching source index from file:#{gem_repo1}")
+      expect(out).not_to include("Fetching source index from file:#{gem_repo2}")
+      should_be_installed "rack 1.0"
+    end
+  end
+end

data/spec/install/gems/platform_spec.rb

@@ -96,22 +96,10 @@ describe "bundle install across platforms" do
 
     bundle "install --path vendor/bundle"
 
-    expect(vendored_gems("gems/rack-1.0.0")).to exist
-  end
-
-  it "works after switching Rubies" do
-    gemfile <<-G
-      source "file://#{gem_repo1}"
-
-      gem "rack", "1.0.0"
-    G
-
-    bundle "install --path vendor/bundle"
-
     new_version = Gem::ConfigMap[:ruby_version] == "1.8" ? "1.9.1" : "1.8"
     FileUtils.mv(vendored_gems, bundled_app("vendor/bundle", Gem.ruby_engine, new_version))
 
-    bundle "install --path ./vendor/bundle"
+    bundle "install --path vendor/bundle"
     expect(vendored_gems("gems/rack-1.0.0")).to exist
   end
 end
@@ -191,7 +179,7 @@ describe "bundle install with platform conditionals" do
 
 end
 
-describe "when a gem has an architecture in its platform" do
+describe "when a gem has no architecture" do
   it "still installs correctly" do
     simulate_platform mswin
 

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 be_true
+      expect(File.exists?(bundled_app("Gemfile.lock"))).to be true
     end
 
     it "gracefully handles error when rubygems server is unavailable" do
@@ -362,136 +362,6 @@ describe "bundle install with gem sources" do
     end
   end
 
-  describe "when prerelease gems are available" do
-    it "finds prereleases" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "not_released"
-      G
-      should_be_installed "not_released 1.0.pre"
-    end
-
-    it "uses regular releases if available" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "has_prerelease"
-      G
-      should_be_installed "has_prerelease 1.0"
-    end
-
-    it "uses prereleases if requested" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "has_prerelease", "1.1.pre"
-      G
-      should_be_installed "has_prerelease 1.1.pre"
-    end
-  end
-
-  describe "when prerelease gems are not available" do
-    it "still works" do
-      build_repo3
-      install_gemfile <<-G
-        source "file://#{gem_repo3}"
-        gem "rack"
-      G
-
-      should_be_installed "rack 1.0"
-    end
-  end
-
-  describe "when BUNDLE_PATH or the global path config is set" do
-    before :each do
-      build_lib "rack", "1.0.0", :to_system => true do |s|
-        s.write "lib/rack.rb", "raise 'FAIL'"
-      end
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-    end
-
-    def set_bundle_path(type, location)
-      if type == :env
-        ENV["BUNDLE_PATH"] = location
-      elsif type == :global
-        bundle "config path #{location}", "no-color" => nil
-      end
-    end
-
-    [:env, :global].each do |type|
-      it "installs gems to a path if one is specified" do
-        set_bundle_path(type, bundled_app("vendor2").to_s)
-        bundle "install --path vendor/bundle"
-
-        expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-        expect(bundled_app("vendor2")).not_to be_directory
-        should_be_installed "rack 1.0.0"
-      end
-
-      it "installs gems to BUNDLE_PATH with #{type}" do
-        set_bundle_path(type, bundled_app("vendor").to_s)
-
-        bundle :install
-
-        expect(bundled_app('vendor/gems/rack-1.0.0')).to be_directory
-        should_be_installed "rack 1.0.0"
-      end
-
-      it "installs gems to BUNDLE_PATH relative to root when relative" do
-        set_bundle_path(type, "vendor")
-
-        FileUtils.mkdir_p bundled_app('lol')
-        Dir.chdir(bundled_app('lol')) do
-          bundle :install
-        end
-
-        expect(bundled_app('vendor/gems/rack-1.0.0')).to be_directory
-        should_be_installed "rack 1.0.0"
-      end
-    end
-
-    it "installs gems to BUNDLE_PATH from .bundle/config" do
-      config "BUNDLE_PATH" => bundled_app("vendor/bundle").to_s
-
-      bundle :install
-
-      expect(vendored_gems('gems/rack-1.0.0')).to be_directory
-      should_be_installed "rack 1.0.0"
-    end
-
-    it "sets BUNDLE_PATH as the first argument to bundle install" do
-      bundle "install --path ./vendor/bundle"
-
-      expect(vendored_gems('gems/rack-1.0.0')).to be_directory
-      should_be_installed "rack 1.0.0"
-    end
-
-    it "disables system gems when passing a path to install" do
-      # This is so that vendored gems can be distributed to others
-      build_gem "rack", "1.1.0", :to_system => true
-      bundle "install --path ./vendor/bundle"
-
-      expect(vendored_gems('gems/rack-1.0.0')).to be_directory
-      should_be_installed "rack 1.0.0"
-    end
-  end
-
-  describe "when passing in a Gemfile via --gemfile" do
-    it "finds the gemfile" do
-      gemfile bundled_app("NotGemfile"), <<-G
-        source "file://#{gem_repo1}"
-        gem 'rack'
-      G
-
-      bundle :install, :gemfile => bundled_app("NotGemfile")
-
-      ENV['BUNDLE_GEMFILE'] = "NotGemfile"
-      should_be_installed "rack 1.0.0"
-    end
-  end
-
   describe "when requesting a quiet install via --quiet" do
     it "should be quiet if there are no warnings" do
       gemfile <<-G
@@ -513,323 +383,4 @@ describe "bundle install with gem sources" do
     end
   end
 
-  describe "when disabling system gems" do
-    before :each do
-      build_gem "rack", "1.0.0", :to_system => true do |s|
-        s.write "lib/rack.rb", "puts 'FAIL'"
-      end
-
-      gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-    end
-
-    it "behaves like bundle install vendor/bundle with --deployment" do
-      bundle "install"
-      bundle "install --deployment"
-      expect(out).to include("It was installed into ./vendor/bundle")
-      should_be_installed "rack 1.0.0"
-      expect(bundled_app("vendor/bundle")).to exist
-    end
-
-    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"
-        expect(out).to include("installed into ./vendor/bundle")
-      end
-
-      dir.rmtree
-    end
-
-    it "prints a warning to let the user know what has happened with bundle --path vendor/bundle" do
-      bundle "install --path vendor/bundle"
-      expect(out).to include("It was installed into ./vendor")
-    end
-
-    it "disallows --path vendor/bundle --system" do
-      bundle "install --path vendor/bundle --system"
-      expect(out).to include("Please choose.")
-    end
-
-    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"
-
-      expect(vendored_gems('gems/rack-1.0.0')).to be_directory
-      should_be_installed "rack 1.0.0"
-    end
-  end
-
-  describe "when loading only the default group" do
-    it "should not load all groups" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-        gem "activesupport", :groups => :development
-      G
-
-      ruby <<-R
-        require "bundler"
-        Bundler.setup :default
-        Bundler.require :default
-        puts RACK
-        begin
-          require "activesupport"
-        rescue LoadError
-          puts "no activesupport"
-        end
-      R
-
-      expect(out).to include("1.0")
-      expect(out).to include("no activesupport")
-    end
-  end
-
-  describe "when a gem has a YAML gemspec" do
-    before :each do
-      build_repo2 do
-        build_gem "yaml_spec", :gemspec => :yaml
-      end
-    end
-
-    it "still installs correctly" do
-      gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "yaml_spec"
-      G
-      bundle :install
-      expect(err).to 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
-      expect(err).to eq("")
-    end
-  end
-
-  describe "bundler dependencies" do
-    before(:each) do
-      build_repo2 do
-        build_gem "rails", "3.0" do |s|
-          s.add_dependency "bundler", ">= 0.9.0.pre"
-        end
-        build_gem "bundler", "0.9.1"
-        build_gem "bundler", Bundler::VERSION
-      end
-    end
-
-    it "are forced to the current bundler version" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-      G
-
-      should_be_installed "bundler #{Bundler::VERSION}"
-    end
-
-    it "are not added if not already present" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-      should_not_be_installed "bundler #{Bundler::VERSION}"
-    end
-
-    it "causes a conflict if explicitly requesting a different version" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-        gem "bundler", "0.9.2"
-      G
-
-      nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index from file:#{gem_repo2}/
-        Resolving dependencies...
-        Bundler could not find compatible versions for gem "bundler":
-          In Gemfile:
-            bundler (= 0.9.2) ruby
-
-          Current Bundler version:
-            bundler (#{Bundler::VERSION})
-        E
-      expect(out).to include(nice_error)
-    end
-
-    it "works for gems with multiple versions in its dependencies" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "multiple_versioned_deps"
-      G
-
-
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-
-        gem "multiple_versioned_deps"
-        gem "rack"
-      G
-
-      should_be_installed "multiple_versioned_deps 1.0.0"
-    end
-
-    it "includes bundler in the bundle when it's a child dependency" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-      G
-
-      run "begin; gem 'bundler'; puts 'WIN'; rescue Gem::LoadError; puts 'FAIL'; end"
-      expect(out).to eq("WIN")
-    end
-
-    it "allows gem 'bundler' when Bundler is not in the Gemfile or its dependencies" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rack"
-      G
-
-      run "begin; gem 'bundler'; puts 'WIN'; rescue Gem::LoadError => e; puts e.backtrace; end"
-      expect(out).to eq("WIN")
-    end
-
-    it "causes a conflict if child dependencies conflict" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "activemerchant"
-        gem "rails_fail"
-      G
-
-      nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index from file:#{gem_repo2}/
-        Resolving dependencies...
-        Bundler could not find compatible versions for gem "activesupport":
-          In Gemfile:
-            activemerchant (>= 0) ruby depends on
-              activesupport (>= 2.0.0) ruby
-
-            rails_fail (>= 0) ruby depends on
-              activesupport (1.2.3)
-      E
-      expect(out).to eq(nice_error)
-    end
-
-    it "causes a conflict if a child dependency conflicts with the Gemfile" do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails_fail"
-        gem "activesupport", "2.3.5"
-      G
-
-      nice_error = <<-E.strip.gsub(/^ {8}/, '')
-        Fetching source index from file:#{gem_repo2}/
-        Resolving dependencies...
-        Bundler could not find compatible versions for gem "activesupport":
-          In Gemfile:
-            rails_fail (>= 0) ruby depends on
-              activesupport (= 1.2.3) ruby
-
-            activesupport (2.3.5)
-      E
-      expect(out).to eq(nice_error)
-    end
-
-    it "can install dependencies even if " do
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem "rails", "3.0"
-      G
-
-      simulate_bundler_version "10.0.0"
-      #simulate_new_machine
-
-      bundle "check"
-      expect(out).to eq("The Gemfile's dependencies are satisfied")
-    end
-  end
-
-  describe "when locked and installed with --without" do
-    before(:each) do
-      build_repo2
-      system_gems "rack-0.9.1" do
-        install_gemfile <<-G, :without => :rack
-          source "file://#{gem_repo2}"
-          gem "rack"
-
-          group :rack do
-            gem "rack_middleware"
-          end
-        G
-      end
-    end
-
-    it "uses the correct versions even if --without was used on the original" do
-      should_be_installed "rack 0.9.1"
-      should_not_be_installed "rack_middleware 1.0"
-      simulate_new_machine
-
-      bundle :install
-
-      should_be_installed "rack 0.9.1"
-      should_be_installed "rack_middleware 1.0"
-    end
-
-    it "does not hit the remote a second time" do
-      FileUtils.rm_rf gem_repo2
-      bundle "install --without rack"
-      expect(err).to be_empty
-    end
-  end
-
-  describe "when system_bindir is set" do
-    # On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if
-    # you want to avoid sudo installs for system gems with OS X's default ruby
-    it "overrides Gem.bindir" do
-      expect(Pathname.new("/usr/bin")).not_to be_writable unless Process::euid == 0
-      gemfile <<-G
-        require 'rubygems'
-        def Gem.bindir; "/usr/bin"; end
-        source "file://#{gem_repo1}"
-        gem "rack"
-      G
-
-      config "BUNDLE_SYSTEM_BINDIR" => system_gem_path('altbin').to_s
-      bundle :install
-      should_be_installed "rack 1.0.0"
-      expect(system_gem_path("altbin/rackup")).to exist
-    end
-  end
-
-  it "should use gemspecs in the system cache when available" do
-    gemfile <<-G
-      source "http://localtestserver.gem"
-      gem 'rack'
-    G
-
-    FileUtils.mkdir_p "#{tmp}/gems/system/specifications"
-    File.open("#{tmp}/gems/system/specifications/rack-1.0.0.gemspec", 'w+') do |f|
-      spec = Gem::Specification.new do |s|
-        s.name = 'rack'
-        s.version = '1.0.0'
-        s.add_runtime_dependency 'activesupport', '2.3.2'
-      end
-      f.write spec.to_ruby
-    end
-    bundle :install, :artifice => 'endpoint_marshal_fail' # force gemspec load
-    should_be_installed "activesupport 2.3.2"
-  end
 end