bundler 1.2.0.pre.1 → 1.2.0.rc

data/spec/lock/lockfile_spec.rb

@@ -646,7 +646,7 @@ describe "the lockfile format" do
     G
 
     bundled_app("Gemfile.lock").should_not exist
-    out.should include "rack (>= 0) should come from an unspecfied source and git://hubz.com (at master)"
+    out.should include "rack (>= 0) should come from an unspecified source and git://hubz.com (at master)"
   end
 
   it "works correctly with multiple version dependencies" do

data/spec/other/check_spec.rb

@@ -23,7 +23,7 @@ describe "bundle check" do
     out.should == "The Gemfile's dependencies are satisfied"
   end
 
-  it "creates a Gemfile.lock if one did not exist" do
+  it "creates a Gemfile.lock by default if one did not exist" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
       gem "rails"
@@ -36,6 +36,19 @@ describe "bundle check" do
     bundled_app("Gemfile.lock").should exist
   end
 
+  it "does not create a Gemfile.lock if --dry-run was passed" do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rails"
+    G
+
+    FileUtils.rm("Gemfile.lock")
+
+    bundle "check --dry-run"
+
+    bundled_app("Gemfile.lock").should_not exist
+  end
+
   it "prints a generic error if the missing gems are unresolvable" do
     system_gems ["rails-2.3.2"]
 

data/spec/other/newgem_spec.rb

@@ -20,6 +20,7 @@ describe "bundle gem" do
 
   it "generates a gem skeleton" do
     bundled_app("test-gem/test-gem.gemspec").should exist
+    bundled_app("test-gem/LICENSE.txt").should exist
     bundled_app("test-gem/Gemfile").should exist
     bundled_app("test-gem/Rakefile").should exist
     bundled_app("test-gem/lib/test-gem.rb").should exist

data/spec/other/platform_spec.rb

@@ -161,6 +161,7 @@ G
   end
 
   let(:ruby_version_correct) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{local_engine_version}\"" }
+  let(:ruby_version_correct_engineless) { "ruby \"#{RUBY_VERSION}\"" }
   let(:ruby_version_incorrect) { "ruby \"#{not_local_ruby_version}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{not_local_ruby_version}\"" }
   let(:engine_incorrect) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{not_local_tag}\", :engine_version => \"#{RUBY_VERSION}\"" }
   let(:engine_version_incorrect) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{not_local_engine_version}\"" }
@@ -192,6 +193,19 @@ G
       bundled_app('Gemfile.lock').should exist
     end
 
+    it "installs fine with any engine" do
+      simulate_ruby_engine "jruby" do
+        install_gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rack"
+
+          #{ruby_version_correct_engineless}
+        G
+
+        bundled_app('Gemfile.lock').should exist
+      end
+    end
+
     it "doesn't install when the ruby version doesn't match" do
       install_gemfile <<-G, :exitstatus => true
         source "file://#{gem_repo1}"
@@ -250,6 +264,26 @@ G
       out.should == "The Gemfile's dependencies are satisfied"
     end
 
+    it "checks fine with any engine" do
+      simulate_ruby_engine "jruby" do
+        install_gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rack"
+        G
+
+        gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rack"
+
+          #{ruby_version_correct_engineless}
+        G
+
+        bundle :check, :exitstatus => true
+        exitstatus.should eq(0)
+        out.should == "The Gemfile's dependencies are satisfied"
+      end
+    end
+
     it "fails when ruby version doesn't match" do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
@@ -331,6 +365,24 @@ G
       should_be_installed "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
     end
 
+    it "updates fine with any engine" do
+      simulate_ruby_engine "jruby" do
+        gemfile <<-G
+          source "file://#{gem_repo2}"
+          gem "activesupport"
+          gem "rack-obama"
+
+          #{ruby_version_correct_engineless}
+        G
+        update_repo2 do
+          build_gem "activesupport", "3.0"
+        end
+
+        bundle "update"
+        should_be_installed "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
+      end
+    end
+
     it "fails when ruby version doesn't match" do
       gemfile <<-G
         source "file://#{gem_repo2}"
@@ -402,6 +454,20 @@ G
       out.should == default_bundle_path('gems', 'rails-2.3.2').to_s
     end
 
+    it "prints path if ruby version is correct for any engine" do
+      simulate_ruby_engine "jruby" do
+        gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rails"
+
+          #{ruby_version_correct_engineless}
+        G
+
+        bundle "show rails"
+        out.should == default_bundle_path('gems', 'rails-2.3.2').to_s
+      end
+    end
+
     it "fails if ruby version doesn't match" do
       gemfile <<-G
         source "file://#{gem_repo1}"
@@ -461,6 +527,19 @@ G
       bundled_app("vendor/cache/rack-1.0.0.gem").should exist
     end
 
+    it "copies the .gem file to vendor/cache when ruby version matches for any engine" do
+      simulate_ruby_engine "jruby" do
+        gemfile <<-G
+          gem 'rack'
+
+          #{ruby_version_correct_engineless}
+        G
+
+        bundle :cache
+        bundled_app("vendor/cache/rack-1.0.0.gem").should exist
+      end
+    end
+
     it "fails if the ruby version doesn't match" do
       gemfile <<-G
         gem 'rack'
@@ -517,6 +596,19 @@ G
       bundled_app("vendor/cache/rack-1.0.0.gem").should exist
     end
 
+    it "copies the .gem file to vendor/cache when ruby version matches any engine" do
+      simulate_ruby_engine "jruby" do
+        gemfile <<-G
+          gem 'rack'
+
+          #{ruby_version_correct_engineless}
+        G
+
+        bundle :pack
+        bundled_app("vendor/cache/rack-1.0.0.gem").should exist
+      end
+    end
+
     it "fails if the ruby version doesn't match" do
       gemfile <<-G
         gem 'rack'
@@ -569,6 +661,19 @@ G
       out.should == "0.9.1"
     end
 
+    it "activates the correct gem when ruby version matches any engine" do
+      simulate_ruby_engine "jruby" do
+        gemfile <<-G
+          gem "rack", "0.9.1"
+
+          #{ruby_version_correct_engineless}
+        G
+
+        bundle "exec rackup"
+        out.should == "0.9.1"
+      end
+    end
+
     it "fails when the ruby version doesn't match" do
       gemfile <<-G
         gem "rack", "0.9.1"
@@ -632,6 +737,25 @@ G
       out.should include("0.9.1")
     end
 
+    it "starts IRB with the default group loaded when ruby version matches any engine" do
+      simulate_ruby_engine "jruby" do
+        gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rack"
+          gem "activesupport", :group => :test
+          gem "rack_middleware", :group => :development
+
+          #{ruby_version_correct_engineless}
+        G
+
+        bundle "console" do |input|
+          input.puts("puts RACK")
+          input.puts("exit")
+        end
+        out.should include("0.9.1")
+      end
+    end
+
     it "fails when ruby version doesn't match" do
       gemfile <<-G
         source "file://#{gem_repo1}"
@@ -703,6 +827,25 @@ G
       bundled_app("Gemfile.lock").should exist
     end
 
+    it "makes a Gemfile.lock if setup succeeds for any engine" do
+      simulate_ruby_engine "jruby" do
+        install_gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "yard"
+          gem "rack"
+
+          #{ruby_version_correct_engineless}
+        G
+
+        File.read(bundled_app("Gemfile.lock"))
+
+        FileUtils.rm(bundled_app("Gemfile.lock"))
+
+        run "1"
+        bundled_app("Gemfile.lock").should exist
+      end
+    end
+
     it "fails when ruby version doesn't match" do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
@@ -822,6 +965,27 @@ G
       out.should include("foo (1.0")
     end
 
+    it "returns list of outdated gems when the ruby version matches for any engine" do
+      simulate_ruby_engine "jruby" do
+        update_repo2 do
+          build_gem "activesupport", "3.0"
+          update_git "foo", :path => lib_path("foo")
+        end
+
+        gemfile <<-G
+          source "file://#{gem_repo2}"
+          gem "activesupport", "2.3.5"
+          gem "foo", :git => "#{lib_path('foo')}"
+
+          #{ruby_version_correct_engineless}
+        G
+
+        bundle "outdated"
+        out.should include("activesupport (3.0 > 2.3.5)")
+        out.should include("foo (1.0")
+      end
+    end
+
     it "fails when the ruby version doesn't match" do
       update_repo2 do
         build_gem "activesupport", "3.0"

data/spec/runtime/setup_spec.rb

@@ -374,6 +374,93 @@ describe "Bundler.setup" do
     end
   end
 
+  describe "when specifying local override" do
+    it "explodes if given path does not exist on runtime" do
+      build_git "rack", "0.8"
+
+      FileUtils.cp_r("#{lib_path('rack-0.8')}/.", lib_path('local-rack'))
+
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
+      G
+
+      bundle %|config local.rack #{lib_path('local-rack')}|
+      bundle :install
+      out.should =~ /at #{lib_path('local-rack')}/
+
+      FileUtils.rm_rf(lib_path('local-rack'))
+      run "require 'rack'"
+      err.should =~ /Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/
+    end
+
+    it "explodes if branch is not given on runtime" do
+      build_git "rack", "0.8"
+
+      FileUtils.cp_r("#{lib_path('rack-0.8')}/.", lib_path('local-rack'))
+
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
+      G
+
+      bundle %|config local.rack #{lib_path('local-rack')}|
+      bundle :install
+      out.should =~ /at #{lib_path('local-rack')}/
+
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}"
+      G
+
+      run "require 'rack'"
+      err.should =~ /because :branch is not specified in Gemfile/
+    end
+
+    it "explodes on different branches on runtime" do
+      build_git "rack", "0.8"
+
+      FileUtils.cp_r("#{lib_path('rack-0.8')}/.", lib_path('local-rack'))
+
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "master"
+      G
+
+      bundle %|config local.rack #{lib_path('local-rack')}|
+      bundle :install
+      out.should =~ /at #{lib_path('local-rack')}/
+
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}", :branch => "changed"
+      G
+
+      run "require 'rack'"
+      err.should =~ /is using branch master but Gemfile specifies changed/
+    end
+
+    it "explodes on refs with different branches on runtime" do
+      build_git "rack", "0.8"
+
+      FileUtils.cp_r("#{lib_path('rack-0.8')}/.", lib_path('local-rack'))
+
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}", :ref => "master", :branch => "master"
+      G
+
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", :git => "#{lib_path('rack-0.8')}", :ref => "master", :branch => "nonexistant"
+      G
+
+      bundle %|config local.rack #{lib_path('local-rack')}|
+      run "require 'rack'"
+      err.should =~ /is using branch master but Gemfile specifies nonexistant/
+    end
+  end
+
   describe "when excluding groups" do
     it "doesn't change the resolve if --without is used" do
       install_gemfile <<-G, :without => :rails

data/spec/runtime/with_clean_env_spec.rb

@@ -25,6 +25,20 @@ describe "Bundler.with_env helpers" do
 
     it_should_behave_like "Bundler.with_*_env"
 
+    it "should keep the original GEM_PATH even in sub processes" do
+      gemfile ""
+      bundle "install --path vendor/bundle"
+
+      gem_path = ENV['GEM_PATH']
+
+      code = "Bundler.with_clean_env do;" +
+             "  print ENV['GEM_PATH'] != '';" +
+             "end"
+
+      result = bundle "exec ruby -e #{code.inspect}"
+      result.should == "true"
+    end
+
     it "should not pass any bundler environment variables" do
       Bundler.with_clean_env do
         `echo $BUNDLE_PATH`.strip.should_not == './Gemfile'

metadata

@@ -1,60 +1,65 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bundler
-version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.1
+version: !ruby/object:Gem::Version 
+  hash: 1143790945
   prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  version: 1.2.0.rc
 platform: ruby
-authors:
-- André Arko
+authors: 
+- "Andr\xC3\xA9 Arko"
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ronn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-description: Bundler manages an application's dependencies through its entire life,
-  across many machines, systematically and repeatably
-email:
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id002
+description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
+email: 
 - andre@arko.net
-executables:
+executables: 
 - bundle
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -80,6 +85,7 @@ files:
 - lib/bundler/gem_helper.rb
 - lib/bundler/gem_helpers.rb
 - lib/bundler/gem_installer.rb
+- lib/bundler/gem_path_manipulation.rb
 - lib/bundler/gem_tasks.rb
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
@@ -103,7 +109,7 @@ files:
 - lib/bundler/templates/Executable.standalone
 - lib/bundler/templates/Gemfile
 - lib/bundler/templates/newgem/Gemfile.tt
-- lib/bundler/templates/newgem/LICENSE.tt
+- lib/bundler/templates/newgem/LICENSE.txt.tt
 - lib/bundler/templates/newgem/README.md.tt
 - lib/bundler/templates/newgem/Rakefile.tt
 - lib/bundler/templates/newgem/bin/newgem.tt
@@ -123,6 +129,7 @@ files:
 - lib/bundler/vendor/thor/actions/file_manipulation.rb
 - lib/bundler/vendor/thor/actions/inject_into_file.rb
 - lib/bundler/vendor/thor/base.rb
+- lib/bundler/vendor/thor/core_ext/dir_escape.rb
 - lib/bundler/vendor/thor/core_ext/file_binary_read.rb
 - lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb
 - lib/bundler/vendor/thor/core_ext/ordered_hash.rb
@@ -155,6 +162,7 @@ files:
 - man/bundle.ronn
 - man/gemfile.5.ronn
 - man/index.txt
+- spec/bundler/definition_spec.rb
 - spec/bundler/dsl_spec.rb
 - spec/bundler/gem_helper_spec.rb
 - spec/bundler/source_spec.rb
@@ -232,119 +240,56 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle-exec
-- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/bundle
 - lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
 - lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
 - lib/bundler/man/bundle-update
+- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-install.txt
 homepage: http://gembundler.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: bundler
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files:
-- spec/bundler/dsl_spec.rb
-- spec/bundler/gem_helper_spec.rb
-- spec/bundler/source_spec.rb
-- spec/cache/gems_spec.rb
-- spec/cache/git_spec.rb
-- spec/cache/path_spec.rb
-- spec/cache/platform_spec.rb
-- spec/install/deploy_spec.rb
-- spec/install/gems/c_ext_spec.rb
-- spec/install/gems/dependency_api_spec.rb
-- spec/install/gems/env_spec.rb
-- spec/install/gems/flex_spec.rb
-- spec/install/gems/groups_spec.rb
-- spec/install/gems/packed_spec.rb
-- spec/install/gems/platform_spec.rb
-- spec/install/gems/post_install_spec.rb
-- spec/install/gems/resolving_spec.rb
-- spec/install/gems/simple_case_spec.rb
-- spec/install/gems/standalone_spec.rb
-- spec/install/gems/sudo_spec.rb
-- spec/install/gems/win32_spec.rb
-- spec/install/gemspec_spec.rb
-- spec/install/git_spec.rb
-- spec/install/invalid_spec.rb
-- spec/install/path_spec.rb
-- spec/install/upgrade_spec.rb
-- spec/lock/git_spec.rb
-- spec/lock/lockfile_spec.rb
-- spec/other/check_spec.rb
-- spec/other/clean_spec.rb
-- spec/other/config_spec.rb
-- spec/other/console_spec.rb
-- spec/other/exec_spec.rb
-- spec/other/ext_spec.rb
-- spec/other/help_spec.rb
-- spec/other/init_spec.rb
-- spec/other/newgem_spec.rb
-- spec/other/open_spec.rb
-- spec/other/outdated_spec.rb
-- spec/other/platform_spec.rb
-- spec/other/show_spec.rb
-- spec/quality_spec.rb
-- spec/realworld/edgecases_spec.rb
-- spec/resolver/basic_spec.rb
-- spec/resolver/platform_spec.rb
-- spec/runtime/executable_spec.rb
-- spec/runtime/load_spec.rb
-- spec/runtime/platform_spec.rb
-- spec/runtime/require_spec.rb
-- spec/runtime/setup_spec.rb
-- spec/runtime/with_clean_env_spec.rb
-- spec/spec_helper.rb
-- spec/support/artifice/endopint_marshal_fail_basic_authentication.rb
-- spec/support/artifice/endpoint.rb
-- spec/support/artifice/endpoint_500.rb
-- spec/support/artifice/endpoint_api_missing.rb
-- spec/support/artifice/endpoint_basic_authentication.rb
-- spec/support/artifice/endpoint_extra.rb
-- spec/support/artifice/endpoint_extra_missing.rb
-- spec/support/artifice/endpoint_fallback.rb
-- spec/support/artifice/endpoint_marshal_fail.rb
-- spec/support/artifice/endpoint_redirect.rb
-- spec/support/builders.rb
-- spec/support/fakeweb/rack-1.0.0.marshal
-- spec/support/fakeweb/windows.rb
-- spec/support/helpers.rb
-- spec/support/indexes.rb
-- spec/support/matchers.rb
-- spec/support/path.rb
-- spec/support/platforms.rb
-- spec/support/ruby_ext.rb
-- spec/support/rubygems_ext.rb
-- spec/support/rubygems_hax/platform.rb
-- spec/support/sudo.rb
-- spec/update/gems_spec.rb
-- spec/update/git_spec.rb
-- spec/update/source_spec.rb
+test_files: []
+