bundler 1.1.rc → 1.1.rc.2

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 1.1.rc.2 (Dec 6, 2011)
+
+Features:
+
+  - Added README.md to `newgem` (@ognevsky, #1574)
+  - Added LICENSE (MIT) to newgem (@ognevsky, #1571)
+
+Bugfixes:
+
+  - only auto-namespace requires for implied requires (#1531) 
+  - fix bundle clean output for git repos (#1473)
+  - use Gem.bindir for bundle clean (#1544, #1532)
+  - use `Gem.load_env_plugins` instead of `Gem.load_env_plugins` (#1500, #1543)
+  - differentiate Ruby 2.0 (trunk) from Ruby 1.9 (@tenderlove, #1539)
+  - `bundle clean` handles 7 length git hash for bundle clean (#1490, #1491)
+  - fix Psych loading issues
+  - Search $PATH for a binary rather than shelling out to `which` (@tenderlove, #1573)
+  - do not clear RG cache unless we actually modify GEM_PATH and GEM_HOME- use `Gem.load_env_plugins` instead of `Gem.load_env_plugins` (#1500, #1543)
+  - `newgem` now uses https://rubygems.org (#1562)
+  - `bundle init` now uses https://rubygems.org (@jjb, #1522)
+  - `bundle install/update` does not autoclean when using --path for semver
+
+Documentation:
+
+  - added documentation for --shebang option for `bundle install` (@lunks, #1475, #1558)
+
 ## 1.1.rc (Oct 3, 2011)
 
 Features:

data/ISSUES.md

@@ -1,15 +1,5 @@
 # Bundler Issues
 
-## Frequently encountered issues
-
-### REE and Zlib::GzipFile::Error
-
-Ruby Enterprise Edition users may see a `Zlib::GzipFile::Error` while installing gems. It is due to [a bug in REE](http://code.google.com/p/rubyenterpriseedition/issues/detail?id=45). You may be able to resolve the issue by upgrading REE, or changing to a different interpreter.
-
-### Rake activation error
-
-Anyone who has installed the Spork gem may see activation errors while running `rake` directly. This is because old versions of Spork would [install the newest rake using a mkmf file](https://github.com/timcharper/spork/issues/119). To resolve the issue, update the Spork version requirement in your Gemfile to at least `"~>0.8.5"` or `"~>0.9.0.rc8"`.
-
 ## Troubleshooting
 
 Instructions for common Bundler use-cases can be found on the [Bundler documentation site](http://gembundler.com/v1.0/).
@@ -36,6 +26,21 @@ After reading the documentation, try these troubleshooting steps:
     # try to install one more time
     bundle install
 
+## Frequently encountered issues
+
+### Heroku errors
+
+Open a ticket with Heroku. If the issue somehow turns out to be with Bundler itself, the Heroku support team will forward the details of your issue to us.
+
+### REE and Zlib::GzipFile::Error
+
+Ruby Enterprise Edition users may see a `Zlib::GzipFile::Error` while installing gems. It is due to [a bug in REE](http://code.google.com/p/rubyenterpriseedition/issues/detail?id=45). You may be able to resolve the issue by upgrading REE, or changing to a different interpreter.
+
+### Rake activation error
+
+Anyone who has installed the Spork gem may see activation errors while running `rake` directly. This is because old versions of Spork would [install the newest rake using a mkmf file](https://github.com/timcharper/spork/issues/119). To resolve the issue, update the Spork version requirement in your Gemfile to at least `"~>0.8.5"` or `"~>0.9.0.rc8"`.
+
+
 ## Reporting unresolved problems
 
 Instructions that allow the Bundler team to reproduce your issue are vitally important. When you report a bug, please include the following information:

data/bin/bundle

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
+require 'bundler'
 begin
-  require 'bundler'
   # Check if an older version of bundler is installed
   $:.each do |path|
     if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9

data/lib/bundler.rb

@@ -1,14 +1,7 @@
 require 'rbconfig'
 require 'fileutils'
 require 'pathname'
-
-begin
-  # Pull in Psych if we can, but not if Syck is already loaded
-  require 'psych' unless defined?(Syck)
-rescue LoadError
-end
-
-require 'yaml'
+require 'bundler/psyched_yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'
@@ -236,7 +229,7 @@ module Bundler
 
       path = bundle_path
       path = path.parent until path.exist?
-      sudo_present = !(`which sudo` rescue '').empty?
+      sudo_present = which "sudo"
       bin_dir = Pathname.new(Bundler.system_bindir)
       bin_dir = bin_dir.parent until bin_dir.exist?
 
@@ -253,6 +246,17 @@ module Bundler
       end
     end
 
+    def which(executable)
+      if File.executable?(executable)
+        executable
+      else
+        path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |path|
+          File.executable?(File.join(path, executable))
+        }
+        path && File.expand_path(executable, path)
+      end
+    end
+
     def sudo(str)
       `sudo -p 'Enter your password to install the bundled RubyGems to your system: ' #{str}`
     end
@@ -278,7 +282,7 @@ module Bundler
             msg << " from\n  #{original_line}" if original_line
             msg << "\n"
 
-            if RUBY_VERSION >= "1.9.0"
+            if RUBY_VERSION >= "1.9"
               msg << "\nDoes it try to require a relative path? That doesn't work in Ruby 1.9."
             end
 
@@ -294,17 +298,20 @@ module Bundler
       if settings[:disable_shared_gems]
         ENV['GEM_PATH'] = ''
         ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
+        # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)
+        FileUtils.mkdir_p bundle_path.to_s rescue nil
+
+        Bundler.rubygems.clear_paths
       elsif Bundler.rubygems.gem_dir != bundle_path.to_s
         possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
         paths = possibles.flatten.compact.uniq.reject { |p| p.empty? }
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
         ENV["GEM_HOME"] = bundle_path.to_s
-      end
+        # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)
+        FileUtils.mkdir_p bundle_path.to_s rescue nil
 
-      # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)
-      FileUtils.mkdir_p bundle_path.to_s rescue nil
-
-      Bundler.rubygems.clear_paths
+        Bundler.rubygems.clear_paths
+      end
     end
 
     def upgrade_lockfile

data/lib/bundler/cli.rb

@@ -154,10 +154,10 @@ module Bundler
       "Install using defaults tuned for deployment environments"
     method_option "standalone", :type => :array, :lazy_default => [], :banner =>
       "Make a bundle that can work without the Bundler runtime"
-    method_option "full-index", :tpye => :boolean, :banner =>
+    method_option "full-index", :type => :boolean, :banner =>
       "Use the rubygems modern index instead of the API endpoint"
-    method_option "clean", :type => :boolean, :default => true, :banner =>
-      "Run bundle clean automatically after clean"
+    method_option "clean", :type => :boolean, :banner =>
+      "Run bundle clean automatically after install"
     def install
       opts = options.dup
       if opts[:without]
@@ -211,10 +211,11 @@ module Bundler
       Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
       Bundler.settings.without = opts[:without]
       Bundler.ui.be_quiet! if opts[:quiet]
+      Bundler.settings[:clean] = opts[:clean] if opts[:clean]
 
       Bundler::Fetcher.disable_endpoint = opts["full-index"]
       # rubygems plugins sometimes hook into the gem install process
-      Gem.load_plugins if Gem.respond_to?(:load_plugins)
+      Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
 
       Installer.install(Bundler.root, Bundler.definition, opts)
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
@@ -232,7 +233,7 @@ module Bundler
         Bundler.ui.confirm "Post-install message from #{name}:\n#{msg}"
       end
 
-      clean if opts["clean"] && Bundler.settings[:path]
+      clean if Bundler.settings[:clean] && Bundler.settings[:path]
     rescue GemNotFound => e
       if opts[:local] && Bundler.app_cache.exist?
         Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
@@ -253,8 +254,6 @@ module Bundler
     method_option "source", :type => :array, :banner => "Update a specific source (and all gems associated with it)"
     method_option "local", :type => :boolean, :banner =>
       "Do not attempt to fetch gems remotely and use the gem cache instead"
-    method_option "clean", :type => :boolean, :default => true, :banner =>
-      "Run bundle clean automatically after clean"
     def update(*gems)
       sources = Array(options[:source])
 
@@ -267,11 +266,11 @@ module Bundler
 
       opts = {"update" => true, "local" => options[:local]}
       # rubygems plugins sometimes hook into the gem install process
-      Gem.load_plugins if Gem.respond_to?(:load_plugins)
+      Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
 
       Installer.install Bundler.root, Bundler.definition, opts
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
-      clean if options["clean"] && Bundler.settings[:path]
+      clean if Bundler.settings[:clean] && Bundler.settings[:path]
       Bundler.ui.confirm "Your bundle is updated! " +
         "Use `bundle show [gemname]` to see where a bundled gem is installed."
     end
@@ -415,6 +414,9 @@ module Bundler
         Bundler.ui.error "bundler: command not found: #{ARGV.first}"
         Bundler.ui.warn  "Install missing gem executables with `bundle install`"
         exit 127
+      rescue ArgumentError
+        Bundler.ui.error "bundle exec needs a command to run"
+        exit 128
       end
     end
 
@@ -556,6 +558,8 @@ module Bundler
       }
       template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                opts)
       template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),               opts)
+      template(File.join("newgem/LICENSE.tt"),               File.join(target, "LICENSE"),                opts)
+      template(File.join("newgem/README.md.tt"),             File.join(target, "README.md"),              opts)
       template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),             opts)
       template(File.join("newgem/newgem.gemspec.tt"),        File.join(target, "#{name}.gemspec"),        opts)
       template(File.join("newgem/lib/newgem.rb.tt"),         File.join(target, "lib/#{name}.rb"),         opts)
@@ -579,6 +583,7 @@ module Bundler
         Bundler.load.clean
       else
         Bundler.ui.error "Can only use bundle clean when --path is set or --force is set"
+        exit 1
       end
     end
 

data/lib/bundler/dep_proxy.rb

@@ -21,6 +21,14 @@ module Bundler
       @dep.type
     end
 
+    def name
+      @dep.name
+    end
+
+    def requirement
+      @dep.requirement
+    end
+
     def to_s
       "#{name} (#{requirement}) #{__platform}"
     end

data/lib/bundler/dependency.rb

@@ -87,7 +87,7 @@ module Bundler
     end
 
     def ruby_19?
-      ruby? && RUBY_VERSION >= "1.9"
+      ruby? && RUBY_VERSION >= "1.9" && RUBY_VERSION < "2.0"
     end
 
     def mri?
@@ -99,7 +99,7 @@ module Bundler
     end
 
     def mri_19?
-      mri? && RUBY_VERSION >= "1.9"
+      mri? && RUBY_VERSION >= "1.9" && RUBY_VERSION < "2.0"
     end
 
     def rbx?

data/lib/bundler/fetcher.rb

@@ -133,7 +133,7 @@ module Bundler
       begin
         Bundler.ui.debug "Fetching from: #{uri}"
         response = @@connection.request(uri)
-      rescue SocketError, Timeout, Net::HTTP::Persistent::Error
+      rescue SocketError, Timeout::Error, Net::HTTP::Persistent::Error
         raise Bundler::HTTPError, "Network error while fetching #{uri}"
       end
 
@@ -172,7 +172,7 @@ module Bundler
               raise GemspecError, %{Unfortunately, the gem #{s[:name]} (#{s[:number]}) } +
                 %{has an invalid gemspec. As a result, Bundler cannot install this Gemfile. } +
                 %{Please ask the gem author to yank the bad version to fix this issue. For } +
-                %{more information, see http://bit.ly/illformed-requirement.}
+                %{more information, see http://bit.ly/syck-defaultkey.}
             else
               raise e
             end

data/lib/bundler/index.rb

@@ -130,7 +130,8 @@ module Bundler
     end
 
     def search_by_dependency(dependency, base = nil)
-      @cache[dependency.hash^base.hash] ||= begin
+      @cache[base || false] ||= {}
+      @cache[base || false][dependency] ||= begin
         specs = specs_by_name(dependency.name) + (base || [])
         found = specs.select do |spec|
           if base # allow all platforms when searching from a lockfile

data/lib/bundler/psyched_yaml.rb

@@ -0,0 +1,15 @@
+# Psych could be a gem
+begin
+  gem 'psych'
+rescue Gem::LoadError
+end if defined?(Gem)
+
+# Psych could be a stdlib
+begin
+  # it's too late if Syck is already loaded
+  require 'psych' unless defined?(Syck)
+rescue LoadError
+end
+
+# Psych might NOT EXIST AT ALL
+require 'yaml'

data/lib/bundler/rubygems_integration.rb

@@ -255,14 +255,9 @@ module Bundler
     # by monkeypatching it into the method in Rubygems 1.3.6 and 1.3.7.
     def backport_segment_generation
       Gem::Version.send(:define_method, :segments) do
-        @segments_generated ||= false
-        unless @segments_generated
-          @segments ||= @version.scan(/[0-9a-z]+/i).map do |s|
-            /^\d+$/ =~ s ? s.to_i : s
-          end
+        @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
+          /^\d+$/ =~ s ? s.to_i : s
         end
-        @segments_generated = true
-        @segments
       end
     end
 

data/lib/bundler/runtime.rb

@@ -68,9 +68,7 @@ module Bundler
             Kernel.require file
           end
         rescue LoadError => e
-          REGEXPS.find { |r| r =~ e.message }
-
-          if dep.name.include?('-')
+          if dep.autorequire.nil? && dep.name.include?('-')
             begin
               namespaced_file = dep.name.gsub('-', '/')
               Kernel.require namespaced_file
@@ -79,6 +77,7 @@ module Bundler
               raise if dep.autorequire || $1.gsub('-', '/') != namespaced_file
             end
           else
+            REGEXPS.find { |r| r =~ e.message }
             raise if dep.autorequire || $1 != required_file
           end
         end
@@ -146,10 +145,10 @@ module Bundler
       specs.each do |spec|
         spec_gem_paths << spec.full_gem_path
         # need to check here in case gems are nested like for the rails git repo
-        md = %r{(.+bundler/gems/.+-[a-f0-9]{12})}.match(spec.full_gem_path)
+        md = %r{(.+bundler/gems/.+-[a-f0-9]{7,12})}.match(spec.full_gem_path)
         spec_git_paths << md[1] if md
         spec_gem_executables << spec.executables.collect do |executable|
-          "#{Gem.dir}/#{spec.bindir}/#{executable}"
+          "#{Bundler.rubygems.gem_bindir}/#{executable}"
         end
         spec_cache_paths << spec.cache_file
         spec_gemspec_paths << spec.spec_file
@@ -185,10 +184,9 @@ module Bundler
         FileUtils.rm_rf(gem_dir)
 
         parts    = full_name.split('-')
-        name     = parts[0..-3].join('-')
+        name     = parts[0..-2].join('-')
         revision = parts[-1]
-        version  = parts[-2]
-        output   = "#{name} (#{version} #{revision})"
+        output   = "#{name} (#{revision})"
 
         Bundler.ui.info "Removing #{output}"
 

data/lib/bundler/templates/Gemfile

@@ -1,4 +1,4 @@
 # A sample Gemfile
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # gem "rails"

data/lib/bundler/templates/newgem/Gemfile.tt

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in <%=config[:name]%>.gemspec
 gemspec

data/lib/bundler/templates/newgem/LICENSE.tt

@@ -0,0 +1,22 @@
+Copyright (c) <%=Time.now.year%> <%=config[:author]%>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/bundler/templates/newgem/README.md.tt

@@ -0,0 +1,29 @@
+# <%=config[:constant_name]%>
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem '<%=config[:name]%>'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install <%=config[:name]%>
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.1.rc" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.rc.2" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -70,6 +70,11 @@ update process below under [CONSERVATIVE UPDATING][].
   a `bin/rails` executable that ensures that all dependencies used
   come from the bundled gems.
 
+* `--shebang ruby-install-name`:
+  Uses the ruby executable (usually `ruby`) provided to execute the scripts created
+  with --binstubs. For instance, if you use --binstubs with `--shebang jruby`,
+  all executables will be created to use jruby instead.
+
 * `--standalone[=<list>]`:
   Make a bundle that can work without Ruby Gems or Bundler at runtime.
   It takes a space separated list of groups to install. It creates a

data/spec/other/clean_spec.rb

@@ -32,7 +32,7 @@ describe "bundle clean" do
 
       gem "thin"
     G
-    bundle "install --no-clean"
+    bundle "install"
 
     bundle :clean
 
@@ -60,7 +60,7 @@ describe "bundle clean" do
       gem "rack", "1.0.0"
       gem "foo"
     G
-    bundle "install --no-clean"
+    bundle "install"
 
     bundle :clean
 
@@ -88,7 +88,7 @@ describe "bundle clean" do
       gem "rack", "0.9.1"
       gem "foo"
     G
-    bundle "install --no-clean"
+    bundle "install"
 
     bundle :clean
 
@@ -111,8 +111,8 @@ describe "bundle clean" do
       end
     G
 
-    bundle "install --path vendor/bundle --no-clean"
-    bundle "install --without test_group --no-clean"
+    bundle "install --path vendor/bundle"
+    bundle "install --without test_group"
     bundle :clean
 
     out.should eq("Removing rack (1.0.0)")
@@ -137,7 +137,7 @@ describe "bundle clean" do
       end
     G
 
-    bundle "install --path vendor/bundle --no-clean"
+    bundle "install --path vendor/bundle"
 
     bundle :clean
 
@@ -146,9 +146,9 @@ describe "bundle clean" do
   end
 
   it "removes unused git gems" do
-    build_git "foo"
-    revision = revision_for(lib_path("foo-1.0"))
-    git_path = lib_path('foo-1.0')
+    build_git "foo", :path => lib_path("foo")
+    git_path = lib_path('foo')
+    revision = revision_for(git_path)
 
     gemfile <<-G
       source "file://#{gem_repo1}"
@@ -159,23 +159,23 @@ describe "bundle clean" do
       end
     G
 
-    bundle "install --path vendor/bundle --no-clean"
+    bundle "install --path vendor/bundle"
 
     gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "1.0.0"
     G
-    bundle "install --no-clean"
+    bundle "install"
 
     bundle :clean
 
-    out.should eq("Removing foo (1.0 #{revision[0..11]})")
+    out.should eq("Removing foo (#{revision[0..11]})")
 
     vendored_gems("gems/rack-1.0.0").should exist
-    vendored_gems("bundler/gems/foo-1.0-#{revision[0..11]}").should_not exist
+    vendored_gems("bundler/gems/foo-#{revision[0..11]}").should_not exist
     digest = Digest::SHA1.hexdigest(git_path.to_s)
-    vendored_gems("cache/bundler/git/foo-1.0-#{digest}").should_not exist
+    vendored_gems("cache/bundler/git/foo-#{digest}").should_not exist
 
     vendored_gems("specifications/rack-1.0.0.gemspec").should exist
 
@@ -183,31 +183,31 @@ describe "bundle clean" do
   end
 
   it "removes old git gems" do
-    build_git "foo"
-    revision = revision_for(lib_path("foo-1.0"))
+    build_git "foo-bar", :path => lib_path("foo-bar")
+    revision = revision_for(lib_path("foo-bar"))
 
     gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack", "1.0.0"
-      git "#{lib_path('foo-1.0')}" do
-        gem "foo"
+      git "#{lib_path('foo-bar')}" do
+        gem "foo-bar"
       end
     G
 
-    bundle "install --path vendor/bundle --no-clean"
+    bundle "install --path vendor/bundle"
 
-    update_git "foo"
-    revision2 = revision_for(lib_path("foo-1.0"))
+    update_git "foo", :path => lib_path("foo-bar")
+    revision2 = revision_for(lib_path("foo-bar"))
 
-    bundle "update --no-clean"
+    bundle "update"
     bundle :clean
 
-    out.should eq("Removing foo (1.0 #{revision[0..11]})")
+    out.should eq("Removing foo-bar (#{revision[0..11]})")
 
     vendored_gems("gems/rack-1.0.0").should exist
-    vendored_gems("bundler/gems/foo-1.0-#{revision[0..11]}").should_not exist
-    vendored_gems("bundler/gems/foo-1.0-#{revision2[0..11]}").should exist
+    vendored_gems("bundler/gems/foo-bar-#{revision[0..11]}").should_not exist
+    vendored_gems("bundler/gems/foo-bar-#{revision2[0..11]}").should exist
 
     vendored_gems("specifications/rack-1.0.0.gemspec").should exist
 
@@ -225,7 +225,7 @@ describe "bundle clean" do
       gem "activesupport", :git => "#{lib_path('rails')}", :ref => '#{revision}'
     G
 
-    bundle "install --path vendor/bundle --no-clean"
+    bundle "install --path vendor/bundle"
     bundle :clean
     out.should eq("")
 
@@ -239,8 +239,9 @@ describe "bundle clean" do
       gem "rack", "1.0.0"
     G
 
-    bundle :clean
+    bundle :clean, :exitstatus => true
 
+    exitstatus.should eq(1)
     out.should == "Can only use bundle clean when --path is set or --force is set"
   end
 
@@ -253,14 +254,14 @@ describe "bundle clean" do
       gem "foo"
     G
 
-    bundle "install --path vendor/bundle --no-clean"
+    bundle "install --path vendor/bundle"
 
     gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "foo"
     G
-    bundle "install --no-clean"
+    bundle "install"
 
     FileUtils.rm(vendored_gems("bin/rackup"))
     FileUtils.rm_rf(vendored_gems("gems/thin-1.0"))
@@ -295,27 +296,47 @@ describe "bundle clean" do
     out.should include("thin (1.0)")
   end
 
-  it "--clean should override the bundle setting" do
+  it "--clean should override the bundle setting on install" do
     gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "thin"
       gem "rack"
     G
-    bundle "install --path vendor/bundle --no-clean"
+    bundle "install --path vendor/bundle --clean"
 
     gemfile <<-G
       source "file://#{gem_repo1}"
 
       gem "rack"
     G
-    bundle "install --clean"
+    bundle "install"
 
     should_have_gems 'rack-1.0.0'
     should_not_have_gems 'thin-1.0'
   end
 
-  it "clean automatically on --path" do
+  it "--clean should override the bundle setting on update" do
+    build_repo2
+
+    gemfile <<-G
+      source "file://#{gem_repo2}"
+
+      gem "foo"
+    G
+    bundle "install --path vendor/bundle --clean"
+
+    update_repo2 do
+      build_gem 'foo', '1.0.1'
+    end
+
+    bundle "update"
+
+    should_have_gems 'foo-1.0.1'
+    should_not_have_gems 'foo-1.0'
+  end
+
+  it "does not clean automatically on --path" do
     gemfile <<-G
       source "file://#{gem_repo1}"
 
@@ -331,11 +352,10 @@ describe "bundle clean" do
     G
     bundle "install"
 
-    should_have_gems 'rack-1.0.0'
-    should_not_have_gems 'thin-1.0'
+    should_have_gems 'rack-1.0.0', 'thin-1.0'
   end
 
-  it "cleans on bundle update with --path" do
+  it "does not clean on bundle update with --path" do
     build_repo2
 
     gemfile <<-G
@@ -350,7 +370,7 @@ describe "bundle clean" do
     end
 
     bundle :update
-    should_not_have_gems 'foo-1.0'
+    should_have_gems 'foo-1.0', 'foo-1.0.1'
   end
 
   it "does not clean on bundle update when using --system" do
@@ -394,4 +414,58 @@ describe "bundle clean" do
     out.should_not include("foo (1.0)")
     out.should include("rack (1.0.0)")
   end
+
+  it "cleans git gems with a 7 length git revision" do
+    build_git "foo"
+    revision = revision_for(lib_path("foo-1.0"))
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo", :git => "#{lib_path('foo-1.0')}"
+    G
+
+    bundle "install --path vendor/bundle"
+
+    # mimic 7 length git revisions in Gemfile.lock
+    gemfile_lock = File.read(bundled_app('Gemfile.lock')).split("\n")
+    gemfile_lock.each_with_index do |line, index|
+      gemfile_lock[index] = line[0..(11 + 7)] if line.include?("  revision:")
+    end
+    File.open(bundled_app('Gemfile.lock'), 'w') do |file|
+      file.print gemfile_lock.join("\n")
+    end
+
+    bundle "install --path vendor/bundle"
+
+    bundle :clean
+
+    out.should_not include("Removing foo (1.0 #{revision[0..6]})")
+
+    vendored_gems("bundler/gems/foo-1.0-#{revision[0..6]}").should exist
+  end
+
+  it "when using --force on system gems, it doesn't remove binaries" do
+    build_repo2
+    update_repo2 do
+      build_gem 'bindir' do |s|
+        s.bindir = "exe"
+        s.executables = "foo"
+      end
+    end
+
+    gemfile <<-G
+      source "file://#{gem_repo2}"
+
+      gem "bindir"
+    G
+    bundle :install
+
+    bundle "clean --force"
+
+    sys_status "foo"
+
+    exitstatus.should == 0
+    out.should == "1.0"
+  end
 end

data/spec/other/exec_spec.rb

@@ -121,6 +121,16 @@ describe "bundle exec" do
     out.should include("bundler: not executable: ./foo")
   end
 
+  it "errors nicely when no arguments are passed" do
+    install_gemfile <<-G
+      gem "rack"
+    G
+
+    bundle "exec", :exitstatus => true
+    # exitstatus.should eq(128)
+    out.should include("bundle exec needs a command to run")
+  end
+
   describe "with gem executables" do
     describe "run from a random directory" do
       before(:each) do

data/spec/realworld/edgecases_spec.rb

@@ -1,12 +1,50 @@
+require 'spec_helper'
+
 describe "real world edgecases", :realworld => true do
-  if RUBY_VERSION < "1.9"
-    # there is no rbx-relative-require gem that will install on 1.9
-    it "ignores extra gems with bad platforms" do
-      install_gemfile <<-G
-        source :rubygems
-        gem "linecache", "0.46"
-      G
-      err.should eq("")
-    end
+  # there is no rbx-relative-require gem that will install on 1.9
+  it "ignores extra gems with bad platforms", :ruby => "1.8" do
+    install_gemfile <<-G
+      source :rubygems
+      gem "linecache", "0.46"
+    G
+    err.should eq("")
+  end
+
+  # https://github.com/carlhuda/bundler/issues/1202
+  it "bundle cache works with rubygems 1.3.7 and pre gems" do
+    install_gemfile <<-G
+      source :rubygems
+      gem "rack", "1.3.0.beta2"
+    G
+    bundle :cache
+    out.should_not include("Removing outdated .gem files from vendor/cache")
+  end
+
+  # 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
+    install_gemfile <<-G
+      source :rubygems
+
+      gem 'i18n', '~> 0.4'
+      gem 'activesupport', '~> 3.0'
+      gem 'activerecord', '~> 3.0'
+      gem 'builder', '~> 2.1.2'
+    G
+    out.should include("activemodel (3.0.5)")
+  end
+
+  # https://github.com/carlhuda/bundler/issues/1500
+  it "does not fail install because of gem plugins" do
+    realworld_system_gems("open_gem --version 1.4.2", "rake --version 0.9.2")
+    gemfile <<-G
+      source :rubygems
+
+      gem 'rack', '1.0.0'
+    G
+
+    bundle "install --path vendor/bundle", :expect_err => true
+    err.should_not include("Could not find rake")
+    err.should be_empty
   end
 end

data/spec/runtime/require_spec.rb

@@ -89,6 +89,37 @@ describe "Bundler.require" do
     err.should == "ZOMG LOAD ERROR"
   end
 
+  describe "with namespaced gems" do
+    before :each do
+      build_lib "jquery-rails", "1.0.0" do |s|
+        s.write "lib/jquery/rails.rb", "puts 'jquery/rails'"
+      end
+      lib_path('jquery-rails-1.0.0/lib/jquery-rails.rb').rmtree
+    end
+
+    it "requires gem names that are namespaced" do
+      gemfile <<-G
+        path '#{lib_path}'
+        gem 'jquery-rails'
+      G
+
+      run "Bundler.require"
+      out.should eq("jquery/rails")
+    end
+
+    it "does not mangle explictly given requires" do
+      gemfile <<-G
+        path "#{lib_path}"
+        gem 'jquery-rails', :require => 'jquery-rails'
+      G
+
+      load_error_run <<-R, 'jquery-rails'
+        Bundler.require
+      R
+      err.should == "ZOMG LOAD ERROR"
+    end
+  end
+
   describe "using bundle exec" do
     it "requires the locked gems" do
       bundle "exec ruby -e 'Bundler.require'"

data/spec/runtime/setup_spec.rb

@@ -697,7 +697,7 @@ describe "Bundler.setup" do
       out.should include("was a LoadError while evaluating bar.gemspec")
       out.should include("foobarbaz")
       out.should include("bar.gemspec:1")
-      out.should include("try to require a relative path") if RUBY_VERSION >= "1.9.0"
+      out.should include("try to require a relative path") if RUBY_VERSION >= "1.9"
     end
 
     it "evals each gemspec with a binding from the top level" do

data/spec/spec_helper.rb

@@ -1,18 +1,12 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
-
-begin
-  require 'psych'
-rescue LoadError
-ensure
-  require 'yaml'
-end
-
+require 'bundler/psyched_yaml'
 require 'fileutils'
 require 'rubygems'
 require 'bundler'
 require 'rspec'
 require 'uri'
+require 'digest/sha1'
 
 # Require the correct version of popen for the current platform
 if RbConfig::CONFIG['host_os'] =~ /mingw|mswin/
@@ -59,6 +53,12 @@ RSpec.configure do |config|
     config.filter_run_excluding :realworld => true
   end
 
+  if RUBY_VERSION >= "1.9"
+    config.filter_run_excluding :ruby => "1.8"
+  else
+    config.filter_run_excluding :ruby => "1.9"
+  end
+
   config.filter_run :focused => true unless ENV['CI']
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true
@@ -96,4 +96,3 @@ RSpec.configure do |config|
     ENV['BUNDLE_APP_CONFIG']     = nil
   end
 end
-

data/spec/support/builders.rb

@@ -421,7 +421,7 @@ module Spec
 
       def executables=(val)
         Array(val).each do |file|
-          write "bin/#{file}", "require '#{@name}' ; puts #{@name.upcase}"
+          write "#{@spec.bindir}/#{file}", "require '#{@name}' ; puts #{@name.upcase}"
         end
         @spec.executables = Array(val)
       end

data/spec/support/helpers.rb

@@ -232,6 +232,30 @@ module Spec
       end
     end
 
+    def realworld_system_gems(*gems)
+      gems = gems.flatten
+
+      FileUtils.rm_rf(system_gem_path)
+      FileUtils.mkdir_p(system_gem_path)
+
+      Gem.clear_paths
+
+      gem_home, gem_path, path = ENV['GEM_HOME'], ENV['GEM_PATH'], ENV['PATH']
+      ENV['GEM_HOME'], ENV['GEM_PATH'] = system_gem_path.to_s, system_gem_path.to_s
+
+      gems.each do |gem|
+        gem_command :install, "--no-rdoc --no-ri #{gem}"
+      end
+      if block_given?
+        begin
+          yield
+        ensure
+          ENV['GEM_HOME'], ENV['GEM_PATH'] = gem_home, gem_path
+          ENV['PATH'] = path
+        end
+      end
+    end
+
     def cache_gems(*gems)
       gems = gems.flatten
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 7712070
+  hash: 15424249
   prerelease: true
   segments: 
   - 1
   - 1
   - rc
-  version: 1.1.rc
+  - 2
+  version: 1.1.rc.2
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 -05:00
+date: 2011-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +92,7 @@ files:
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
 - lib/bundler/match_platform.rb
+- lib/bundler/psyched_yaml.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems_ext.rb
@@ -104,6 +106,8 @@ files:
 - lib/bundler/templates/Executable
 - lib/bundler/templates/Gemfile
 - lib/bundler/templates/newgem/Gemfile.tt
+- lib/bundler/templates/newgem/LICENSE.tt
+- lib/bundler/templates/newgem/README.md.tt
 - lib/bundler/templates/newgem/Rakefile.tt
 - lib/bundler/templates/newgem/bin/newgem.tt
 - lib/bundler/templates/newgem/gitignore.tt
@@ -234,7 +238,6 @@ files:
 - lib/bundler/man/bundle
 - lib/bundler/man/bundle-install
 - lib/bundler/man/gemfile.5
-- lib/bundler/man/bundle-benchmark
 - lib/bundler/man/bundle-package
 - lib/bundler/man/bundle-update
 - lib/bundler/man/bundle-exec.txt
@@ -242,7 +245,6 @@ files:
 - lib/bundler/man/bundle-update.txt
 - lib/bundler/man/bundle-config
 - lib/bundler/man/bundle-config.txt
-- lib/bundler/man/bundle-benchmark.txt
 - lib/bundler/man/bundle.txt
 - lib/bundler/man/bundle-package.txt
 - lib/bundler/man/bundle-install.txt