bundler 1.3.0.pre.7 → 1.3.0.pre.8

data/spec/install/gems/flex_spec.rb

@@ -194,6 +194,7 @@ describe "bundle flex_install" do
     it "suggests bundle update when the Gemfile requires different versions than the lock" do
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
+        Resolving dependencies...
         Bundler could not find compatible versions for gem "rack":
           In snapshot (Gemfile.lock):
             rack (0.9.1)

data/spec/install/gems/groups_spec.rb

@@ -182,16 +182,6 @@ describe "bundle install with gem sources" do
           should_be_installed "rack 1.0.0", "activesupport 2.3.5"
         end
 
-        it "works when locked as well" do
-          bundle "install --without emo"
-          bundle "lock"
-
-          simulate_new_machine
-
-          bundle "install --without lolercoaster"
-          should_be_installed "rack 1.0.0", "activesupport 2.3.5"
-        end
-
         describe "with a gem defined multiple times in different groups" do
           before :each do
             gemfile <<-G
@@ -253,15 +243,6 @@ describe "bundle install with gem sources" do
           should_be_installed "rack 1.0.0", "activesupport 2.3.5"
         end
 
-        it "works when locked as well" do
-          bundle "install --without emo"
-          bundle "lock"
-
-          simulate_new_machine
-
-          bundle "install --without lolercoaster"
-          should_be_installed "rack 1.0.0", "activesupport 2.3.5"
-        end
       end
     end
   end

data/spec/install/gems/simple_case_spec.rb

@@ -310,7 +310,7 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install
-      expect(out).to include("Could not reach http://localhost:9384/")
+      expect(out).to include("Could not fetch specs from http://localhost:9384/")
       expect(out).not_to include("file://")
     end
 
@@ -658,6 +658,7 @@ describe "bundle install with gem sources" do
 
       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
@@ -715,6 +716,7 @@ describe "bundle install with gem sources" do
 
       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
@@ -735,6 +737,7 @@ describe "bundle install with gem sources" do
 
       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

data/spec/install/gems/sudo_spec.rb

@@ -61,24 +61,20 @@ describe "when using sudo", :sudo => true do
     end
   end
 
-  describe "and BUNDLE_PATH is not writable" do
+  describe "and GEM_HOME is not writable" do
     it "installs" do
-      begin
-        gem_home = tmp('sudo_gem_home')
-
-        sudo "mkdir -p #{gem_home}"
-        sudo "chmod ugo-w #{gem_home}"
-        ENV['GEM_HOME'] = gem_home.to_s
-        ENV['GEM_PATH'] = nil
+      gem_home = tmp('sudo_gem_home')
+      sudo "mkdir -p #{gem_home}"
+      sudo "chmod ugo-w #{gem_home}"
 
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack", '1.0'
-        G
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", '1.0'
+      G
 
-        expect(gem_home.join('bin/rackup')).to exist
-        should_be_installed "rack 1.0"
-      end
+      bundle :install, :env => {'GEM_HOME' => gem_home.to_s, 'GEM_PATH' => nil}
+      expect(gem_home.join('bin/rackup')).to exist
+      should_be_installed "rack 1.0", :env => {'GEM_HOME' => gem_home.to_s, 'GEM_PATH' => nil}
     end
   end
 

data/spec/install/git_spec.rb

@@ -30,6 +30,23 @@ describe "bundle install with git sources" do
       expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have(1).item
     end
 
+    it "caches the evaluated gemspec" do
+      git = update_git "foo" do |s|
+        s.executables = ["foobar"] # we added this the first time, so keep it now
+        s.files = ["bin/foobar"] # updating git nukes the files list
+        foospec = s.to_ruby.gsub(/s\.files.*/, 's.files = `git ls-files`.split("\n")')
+        s.write "foo.gemspec", foospec
+      end
+
+      bundle "update foo"
+
+      sha = git.ref_for("master", 11)
+      spec_file = default_bundle_path.join("bundler/gems/foo-1.0-#{sha}/foo.gemspec").to_s
+      ruby_code = Gem::Specification.load(spec_file).to_ruby
+      file_code = File.read(spec_file)
+      expect(file_code).to eq(ruby_code)
+    end
+
     it "does not update the git source implicitly" do
       update_git "foo"
 

data/spec/install/security_policy_spec.rb

@@ -0,0 +1,78 @@
+require "spec_helper"
+require "rubygems/security"
+
+# unfortunately, testing signed gems with a provided CA is extremely difficult
+# as 'gem cert' is currently the only way to add CAs to the system.
+
+describe "policies with unsigned gems" do
+  before do
+    build_security_repo
+    gemfile <<-G
+      source "file://#{security_repo}"
+      gem "rack"
+      gem "signed_gem"
+    G
+  end
+
+  it "works after you try to deploy without a lock" do
+    bundle "install --deployment"
+    bundle :install, :exitstatus => true
+    expect(exitstatus).to eq(0)
+    should_be_installed "rack 1.0", "signed_gem 1.0"
+  end
+
+  it "fails when given invalid security policy" do
+    bundle "install --trust-policy=InvalidPolicyName"
+    expect(out).to include("Rubygems doesn't know about trust policy")
+  end
+
+  it "fails with High Security setting due to presence of unsigned gem" do
+    bundle "install --trust-policy=HighSecurity"
+    expect(out).to include("security policy didn't allow")
+  end
+
+  # This spec will fail on Rubygems 2 rc1 due to a bug in policy.rb. the bug is fixed in rc3.
+  it "fails with Medium Security setting due to presence of unsigned gem", :unless => ENV['RGV'] == "v2.0.0.rc.1" do
+    bundle "install --trust-policy=MediumSecurity"
+    expect(out).to include("security policy didn't allow")
+  end
+
+  it "succeeds with no policy" do
+    bundle "install", :exitstatus => true
+    expect(exitstatus).to eq(0)
+  end
+
+end
+
+describe "policies with signed gems, no CA" do
+  before do
+    build_security_repo
+    gemfile <<-G
+      source "file://#{security_repo}"
+      gem "signed_gem"
+    G
+  end
+
+  it "fails with High Security setting, gem is self-signed" do
+    bundle "install --trust-policy=HighSecurity"
+    expect(out).to include("security policy didn't allow")
+  end
+
+  it "fails with Medium Security setting, gem is self-signed" do
+    bundle "install --trust-policy=MediumSecurity"
+    expect(out).to include("security policy didn't allow")
+  end
+
+  it "succeeds with Low Security setting, low security accepts self signed gem" do
+    bundle "install --trust-policy=LowSecurity", :exitstatus => true
+    expect(exitstatus).to eq(0)
+    should_be_installed "signed_gem 1.0"
+  end
+
+  it "succeeds with no policy" do
+    bundle "install", :exitstatus => true
+    expect(exitstatus).to eq(0)
+    should_be_installed "signed_gem 1.0"
+  end
+
+end

data/spec/other/licenses_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe "bundle licenses" do
+  before :each do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rails"
+      gem "with_license"
+    G
+  end
+
+  it "prints license information for all gems in the bundle" do
+    bundle "licenses"
+
+    expect(out).to include("actionpack: Unknown")
+    expect(out).to include("with_license: MIT")
+  end
+end

data/spec/other/newgem_spec.rb

@@ -120,6 +120,22 @@ RAKEFILE
       end
     end
 
+    context "no --test parameter" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name}"
+      end
+
+      it "doesn't create any spec/test file" do
+        expect(bundled_app("test_gem/.rspec")).to_not exist
+        expect(bundled_app("test_gem/spec/test_gem_spec.rb")).to_not exist
+        expect(bundled_app("test_gem/spec/spec_helper.rb")).to_not exist
+        expect(bundled_app("test_gem/test/test_test_gem.rb")).to_not exist
+        expect(bundled_app("test_gem/test/minitest_helper.rb")).to_not exist
+      end
+    end
+
     context "--test parameter set to rspec" do
       before do
         reset!
@@ -178,6 +194,10 @@ RAKEFILE
         expect(bundled_app("test_gem/spec/spec_helper.rb")).to exist
         expect(bundled_app("test_gem/test/minitest_helper.rb")).to_not exist
       end
+
+      it "creates a .travis.yml file to test the library against the current Ruby version on Travis CI" do
+        expect(bundled_app("test_gem/.travis.yml").read).to match(%r(- #{RUBY_VERSION}))
+      end
     end
 
     context "--edit option" do
@@ -276,6 +296,22 @@ RAKEFILE
       end
     end
 
+    context "no --test parameter" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name}"
+      end
+
+      it "doesn't create any spec/test file" do
+        expect(bundled_app("test-gem/.rspec")).to_not exist
+        expect(bundled_app("test-gem/spec/test/gem_spec.rb")).to_not exist
+        expect(bundled_app("test-gem/spec/spec_helper.rb")).to_not exist
+        expect(bundled_app("test-gem/test/test_test/gem.rb")).to_not exist
+        expect(bundled_app("test-gem/test/minitest_helper.rb")).to_not exist
+      end
+    end
+
     context "--test parameter set to rspec" do
       before do
         reset!

data/spec/other/outdated_spec.rb

@@ -5,25 +5,33 @@ describe "bundle outdated" do
   before :each do
     build_repo2 do
       build_git "foo", :path => lib_path("foo")
+      build_git "zebra", :path => lib_path("zebra")
     end
 
     install_gemfile <<-G
       source "file://#{gem_repo2}"
-      gem "activesupport", "2.3.5"
+      gem "zebra", :git => "#{lib_path('zebra')}"
       gem "foo", :git => "#{lib_path('foo')}"
+      gem "activesupport", "2.3.5"
     G
   end
 
   describe "with no arguments" do
-    it "returns list of outdated gems" do
+    it "returns a sorted list of outdated gems" do
       update_repo2 do
         build_gem "activesupport", "3.0"
         update_git "foo", :path => lib_path("foo")
+        update_git "zebra", :path => lib_path("zebra")
       end
 
       bundle "outdated"
+
       expect(out).to include("activesupport (3.0 > 2.3.5)")
       expect(out).to include("foo (1.0")
+
+      # Gem names are one per-line, between "*" and their parenthesized version.
+      gem_list = out.split("\n").map { |g| g[ /\* (.*) \(/, 1] }.compact
+      expect(gem_list).to eq(gem_list.sort)
     end
 
     it "returns non zero exit status if outdated gems present" do

data/spec/other/show_spec.rb

@@ -48,10 +48,15 @@ describe "bundle show" do
     expect(out).to match(/could not find gem 'missing'/i)
   end
 
-  it "prints path of all gems in bundle" do
+  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)
+
+    # 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
 

data/spec/realworld/dependency_api_spec.rb

@@ -53,9 +53,9 @@ describe "gemcutter's dependency API", :realworld => true do
       G
 
       bundle :install
-      expect(out).to include("\nFetching full source index from #{@server_uri}")
+      expect(out).to include("Fetching source index from #{@server_uri}/")
       should_be_installed "rack 1.0.0"
     end
   end
 
-end
+end

data/spec/realworld/edgecases_spec.rb

@@ -11,7 +11,7 @@ describe "real world edgecases", :realworld => true do
   end
 
   # https://github.com/carlhuda/bundler/issues/1202
-  it "bundle cache works with rubygems 1.3.7 and pre gems" do
+  it "bundle cache works with rubygems 1.3.7 and pre gems", :ruby => "1.8" do
     install_gemfile <<-G
       source :rubygems
       gem "rack",          "1.3.0.beta2"
@@ -23,7 +23,7 @@ describe "real world edgecases", :realworld => true do
 
   # https://github.com/carlhuda/bundler/issues/1486
   # this is a hash collision that only manifests on 1.8.7
-  it "finds the correct child versions" do
+  it "finds the correct child versions", :ruby => "1.8" do
     install_gemfile <<-G
       source :rubygems
 
@@ -141,7 +141,7 @@ describe "real world edgecases", :realworld => true do
             multi_json (~> 1.0)
 
       GEM
-        remote: http://rubygems.org/
+        remote: https://rubygems.org/
         specs:
           arel (3.0.2)
           builder (3.0.0)

data/spec/resolver/basic_spec.rb

@@ -17,4 +17,10 @@ describe "Resolving" do
 
     should_resolve_as %w(actionpack-2.3.5 activesupport-2.3.5 rack-1.0)
   end
-end
+
+  it "resolve a conflicting index" do
+    @index = a_conflict_index
+    dep "my_app"
+    should_resolve_as %w(activemodel-3.2.11 builder-3.0.4 grape-0.2.6 my_app-1.0.0)
+  end
+end

data/spec/resolver/platform_spec.rb

@@ -79,4 +79,4 @@ describe "Resolving platform craziness" do
       should_conflict_on "baz"
     end
   end
-end
+end

data/spec/runtime/executable_spec.rb

@@ -130,7 +130,7 @@ describe "Running bin/* commands" do
     expect(bundled_app("bin/rackup")).to exist
   end
 
-  it "doesn't overwrite on --binstub" do
+  it "rewrites bins on --binstubs (to maintain backwards compatibility)" do
     gemfile <<-G
       source "file://#{gem_repo1}"
       gem "rack"
@@ -144,6 +144,6 @@ describe "Running bin/* commands" do
 
     bundle "install"
 
-    expect(bundled_app("bin/rackup").read).to eq("OMG")
+    expect(bundled_app("bin/rackup").read).to_not eq("OMG")
   end
 end

data/spec/runtime/setup_spec.rb

@@ -46,6 +46,19 @@ describe "Bundler.setup" do
       expect(out).to eq("WIN")
     end
 
+    it "accepts string for group name" do
+      ruby <<-RUBY
+        require 'rubygems'
+        require 'bundler'
+        Bundler.setup(:default, 'test')
+
+        require 'rack'
+        puts RACK
+      RUBY
+      expect(err).to eq("")
+      expect(out).to eq("1.0.0")
+    end
+
     it "leaves all groups available if they were already" do
       ruby <<-RUBY
         require 'rubygems'
@@ -806,7 +819,7 @@ describe "Bundler.setup" do
         s.write "bar.gemspec", "require 'foobarbaz'"
       end
       bundle :install
-      expect(out).to include("was a LoadError while evaluating bar.gemspec")
+      expect(out).to include("was a LoadError while loading bar.gemspec")
       expect(out).to include("foobarbaz")
       expect(out).to include("bar.gemspec:1")
       expect(out).to include("try to require a relative path") if RUBY_VERSION >= "1.9"