bundler 1.0.22 → 1.1.pre

data/CHANGELOG.md

@@ -1,196 +1,30 @@
-## 1.0.22 (February 8, 2012)
-
-Bugfixes:
-
-  - Tweaks to cache on Rubygems 1.3
-  - Fix for `gemspec` with development dependencies in deployment (@raggi)
-
-## 1.0.21 (September 30, 2011)
-
-  - No changes from RC
-
-## 1.0.21.rc (September 29, 2011)
-
-Bugfixes:
-
-  - Load Psych unless Syck is defined, because 1.9.2 defines YAML
-
-## 1.0.20 (September 27, 2011)
-
-Features:
-
-  - Add platform :maglev (@timfel, #1444)
-
-Bugfixes:
-
-  - Ensure YAML is required even if Psych is found
-  - Handle directory names that contain invalid regex characters
-
-## 1.0.20.rc (September 18, 2011)
-
-Features:
-
-  - Rescue interrupts to `bundle` while loading bundler.rb (#1395)
-  - Allow clearing without groups by passing `--without ''` (#1259)
-
-Bugfixes:
-
-  - Manually sort requirements in the lockfile (#1375)
-  - Remove several warnings generated by ruby -w (@stephencelis)
-  - Handle trailing slashes on names passed to `gem` (#1372)
-  - Name modules for gems like 'test-foo_bar' correctly (#1303)
-  - Don't require Psych if Syck is already loaded (#1239)
-
-## 1.0.19.rc (September 13, 2011)
-
-Features:
-
-  - Compatability with Rubygems 1.8.10 installer changes
-  - Report gem installation failures clearly (@rwilcox, #1380)
-  - Useful error for cap and vlad on first deploy (@nexmat, @kirs)
-
-Bugfixes:
-
-  - `exec` now works when the command contains 'exec'
-  - Only touch lock after changes on Windows (@robertwahler, #1358)
-  - Keep load paths when #setup is called multiple times (@radsaq, #1379)
-
-## 1.0.18 (August 16, 2011)
-
-Bugfixes:
-
-  - Fix typo in DEBUG_RESOLVER (@geemus)
-  - Fixes rake 0.9.x warning (@mtylty, #1333)
-  - Fix `bundle cache` again for rubygems 1.3.x
-
-Features:
-
-  - Run the bundle install earlier in a Capistrano deployment (@cgriego, #1300)
-  - Support hidden gemspec (@trans, @cldwalker, #827)
-  - Make fetch_specs faster (@zeha, #1294)
-  - Allow overriding development deps loaded by #gemspec (@lgierth, #1245)
-
-## 1.0.17 (August 8, 2011)
-
-Bugfixes:
-
-  - Fix rake issues with rubygems 1.3.x (#1342)
-  - Fixed invalid byte sequence error while installing gem on Ruby 1.9 (#1341)
-
-## 1.0.16 (August 8, 2011)
+## 1.1.pre (January 21, 2010)
 
 Features:
 
-  - Performance fix for MRI 1.9 (@efficientcloud, #1288)
-  - Shortcuts (like `bundle i`) for all commands (@amatsuda)
-  - Correcly identify missing child dependency in error message
+  - Add bundle clean. Removes unused gems from --path directory
+  - Initial Gemcutter Endpoint API work, BAI Fetching source index
+  - Added bundle install --standalone
+  - Ignore Gemfile.lock when buliding new gems
+  - Make it possible to override a .gemspec dependency's source in the
+    Gemfile
 
-Bugfixes:
-
-  - Allow Windows network share paths with forward slashes (@mtscout6, #1253)
-  - Check for rubygems.org credentials so `rake release` doesn't hang (#980)
-  - Find cached prerelease gems on rubygems 1.3.x (@dburt, #1202)
-  - Fix `bundle install --without` on kiji (@tmm1, #1287)
-  - Get rid of warning in ruby 1.9.3 (@smartinez87, #1231)
-
-Documentation:
-
-  - Documentation for `gem ..., :require => false` (@kmayer, #1292)
-  - Gems provide "executables", they are rarely also binaries (@fxn, #1242)
-
-## 1.0.15 (June 9, 2011)
-
-Features:
-
-  - Improved Rubygems integration, removed many deprecation notices
-
-Bugfixes:
-
-  - Escape URL arguments to git correctly on Windows (1.0.14 regression)
-
-## 1.0.14 (May 27, 2011)
-
-Features:
-
-  - Rubinius platform :rbx (@rkbodenner)
-  - Include gem rake tasks with "require 'bundler/gem_tasks" (@indirect)
-  - Include user name and email from git config in new gemspec (@ognevsky)
-
-Bugfixes:
-
-  - Set file permissions after checking out git repos (@tissak)
-  - Remove deprecated call to Gem::SourceIndex#all_gems (@mpj)
-  - Require the version file in new gemspecs (@rubiii)
-  - Allow relative paths from the Gemfile in gems with no gemspec (@mbirk)
-  - Install gems that contain 'bundler', e.g. guard-bundler (@hone)
-  - Display installed path correctly on Windows (@tadman)
-  - Escape quotes in git URIs (@mheffner)
-  - Improve Rake 0.9 support (@quix)
-  - Handle certain directories already existing (@raggi)
-  - Escape filenames containing regex characters (@indirect)
-
-## 1.0.13 (May 4, 2011)
-
-Features:
-
-  - Compatibility with Rubygems master (soon to be v1.8) (@evanphx)
-  - Informative error when --path points to a broken symlink
-  - Support Rake 0.9 and greater (@e2)
-  - Output full errors for non-TTYs e.g. pow (@josh)
-
-Bugfixes:
-
-  - Allow spaces in gem path names for gem tasks (@rslifka)
-  - Have cap run bundle install from release_path (@martinjagusch)
-  - Quote git refspec so zsh doesn't expand it (@goneflyin)
-
-## 1.0.12 (April 8, 2011)
-
-Features:
-
-  - Add --no-deployment option to `install` for disabling it on dev machines
-  - Better error message when git fails and cache is present (@parndt)
-  - Honor :bundle_cmd in cap `rake` command (@voidlock, @cgriego)
-
-Bugfixes:
-
-  - Compatibility with Rubygems 1.7 and Rails 2.3 and vendored gems (@evanphx)
-  - Fix changing gem order in lock (@gucki)
-  - Remove color escape sequences when displaying man pages (@bgreenlee)
-  - Fix creating GEM_HOME on both JRuby 1.5 and 1.6 (@nickseiger)
-  - Fix gems without a gemspec and directories in bin/ (@epall)
-  - Fix --no-prune option for `bundle install` (@cmeiklejohn)
-
-## 1.0.11 (April 1, 2011)
-
-Features:
-
-  - Compatibility with Rubygems 1.6 and 1.7
-  - Better error messages when a git command fails
-
-Bugfixes:
-
-  - Don't always update gemspec gems (@carllerche)
-  - Remove ivar warnings (@jackdempsey)
-  - Fix occasional git failures in zsh (@jonah-carbonfive)
-  - Consistent lock for gems with double deps like Cap (@akahn)
-
-## 1.0.10 (February 1, 2011)
-
-Bugfixes:
+Removed:
 
-  - Fix a regression loading YAML gemspecs from :git and :path gems
-  - Requires, namespaces, etc. to work with changes in Rubygems 1.5
+  - Removed bundle lock
+  - Removed bundle install <path>
+  - Removed bundle install --production
+  - Removed bundle install --disable-shared-gems
 
-## 1.0.9 (January 19, 2011)
+## 1.0.9 (January 19, 2010)
 
 Bugfixes:
 
   - Fix a bug where Bundler.require could remove gems from the load
     path. In Rails apps with a default application.rb, this removed
-    all gems in groups other than :default and Rails.env.
+    all gems in groups other than :default and Rails.env
 
-## 1.0.8 (January 18, 2011)
+## 1.0.8 (January 18, 2010)
 
 Features:
 

data/ISSUES.md

@@ -1,20 +1,8 @@
 # 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/).
-
-Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/man/bundle.1.html).
+Instructions for common Bundler use-cases can be found on the [Bundler documentation site](http://gembundler.com/v1.0/). Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/man/bundle.1.html).
 
 After reading the documentation, try these troubleshooting steps:
 
@@ -38,25 +26,22 @@ After reading the documentation, try these troubleshooting steps:
 
 ## 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:
+If you are still having problems, please report issues to the [Bundler issue tracker](http://github.com/carlhuda/bundler/issues/).
+
+Instructions that allow the Bundler team to reproduce your issue are vitally important. When you report a bug, please create a gist of the following information and include a link in your ticket:
 
-  - The command you ran
-  - Exception backtrace(s), if any
+  - What version of bundler you are using
+  - What version of Ruby you are using
+  - Whether you are using RVM, and if so what version
   - Your Gemfile
   - Your Gemfile.lock
-  - Your Bundler configuration settings (run `bundle config`)
-  - What version of bundler you are using (run `bundle -v`)
-  - What version of Ruby you are using (run `ruby -v`)
-  - What version of Rubygems you are using (run `gem -v`)
-  - Whether you are using RVM, and if so what version (run `rvm -v`)
-  - Whether you have the `rubygems-bundler` gem, which can break gem binares
-  - Whether you have the `open_gem` gem, which can cause rake activation conflicts
-
+  - If you are on 0.9, whether you have locked or not
+  - If you are on 1.0, the result of `bundle config`
+  - The command you ran to generate exception(s)
+  - The exception backtrace(s)
 
 If you are using Rails 2.3, please also include:
 
   - Your boot.rb file
   - Your preinitializer.rb file
   - Your environment.rb file
-
-[Create a gist](https://gist.github.com) containing all of that information, then visit the [Bundler issue tracker](https://github.com/carlhuda/bundler) and create a new ticket describing your problem and linking to your gist.

data/LICENSE

@@ -1,8 +1,6 @@
 Portions copyright (c) 2010 Andre Arko
 Portions copyright (c) 2009 Engine Yard
 
-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

data/Rakefile

@@ -1,26 +1,13 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
-require 'bundler/gem_tasks'
+require 'bundler/gem_helper'
+Bundler::GemHelper.install_tasks
 
-task :release => ["man:clean", "man:build"]
-
-def safe_task(&block)
-  yield
-  true
-rescue
-  false
-end
-
-namespace :spec do
-  desc "Ensure spec dependencies are installed"
-  task :deps do
-    sh "gem list ronn | (grep 'ronn' 1> /dev/null) || gem install ronn --no-ri --no-rdoc"
-    sh "gem list rspec | (grep 'rspec (2.' 1> /dev/null) || gem install rspec --no-ri --no-rdoc"
-  end
+def sudo?
+  ENV['BUNDLER_SUDO_TESTS']
 end
 
 begin
-  # running the specs needs both rspec and ronn
   require 'rspec/core/rake_task'
   require 'ronn'
 
@@ -31,71 +18,65 @@ begin
   end
   task :spec => "man:build"
 
-  namespace :spec do
-    task :clean do
-      rm_rf 'tmp'
+  begin
+    require 'ci/reporter/rake/rspec'
+
+    namespace :ci do
+      desc "Run specs with Hudson output"
+      RSpec::Core::RakeTask.new(:spec)
+      task :spec => ["ci:setup:rspec", "man:build"]
     end
 
+  rescue LoadError
+    namespace :ci do
+      task :spec do
+        abort "Run `rake ci:deps` to be able to run the CI specs"
+      end
+
+      desc "Install CI dependencies"
+      task :deps do
+        sh "gem list ci_reporter | (grep 'ci_reporter' 1> /dev/null) || gem install ci_reporter --no-ri --no-rdoc"
+      end
+      task :deps => "spec:deps"
+    end
+  end
+
+  namespace :spec do
     desc "Run the spec suite with the sudo tests"
-    task :sudo => ["set_sudo", "spec", "clean_sudo"]
+    task :sudo => ["set_sudo", "clean", "spec"]
 
     task :set_sudo do
       ENV['BUNDLER_SUDO_TESTS'] = '1'
     end
 
-    task :clean_sudo do
-      puts "Cleaning up sudo test files..."
-      system "sudo rm -rf #{File.expand_path('../tmp/sudo_gem_home', __FILE__)}"
+    task :clean do
+      if sudo?
+        system "sudo rm -rf #{File.expand_path('../tmp', __FILE__)}"
+      else
+        rm_rf 'tmp'
+      end
     end
 
     namespace :rubygems do
-      # Rubygems specs by version
+      # Rubygems 1.3.5, 1.3.6, and HEAD specs
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.10).each do |rg|
+      %w(master v1.3.5 v1.3.6 v1.3.7 v1.4.0 v1.4.1).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
           t.ruby_opts  = %w(-w)
         end
 
-        # Create tasks like spec:rubygems:v1.8.3:sudo to run the sudo specs
-        namespace rg do
-          task :sudo => ["set_sudo", rg, "clean_sudo"]
-        end
-
         task "clone_rubygems_#{rg}" do
-          unless File.directory?("tmp/rubygems")
-            system("git clone git://github.com/rubygems/rubygems.git tmp/rubygems")
-          end
-          hash = nil
-
-          Dir.chdir("tmp/rubygems") do
-            system("git remote update")
-            system("git checkout #{rg}")
-            system("git pull origin master") if rg == "master"
-            hash = `git rev-parse HEAD`.strip
+          unless File.directory?("tmp/rubygems_#{rg}")
+            system("git clone git://github.com/rubygems/rubygems.git tmp/rubygems_#{rg} && cd tmp/rubygems_#{rg} && git reset --hard #{rg}")
           end
-
-          puts "Running bundler specs against rubygems '#{rg}' at #{hash}"
-          ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
+          ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems_#{rg}/lib")} #{rubyopt}"
         end
 
-        task rg => ["clone_rubygems_#{rg}", "man:build"]
+        task rg => "clone_rubygems_#{rg}"
         task "rubygems:all" => rg
       end
-
-      desc "Run specs under a Rubygems checkout (set RG=path)"
-      RSpec::Core::RakeTask.new("co") do |t|
-        t.rspec_opts = %w(-fs --color)
-        t.ruby_opts  = %w(-w)
-      end
-
-      task "setup_co" do
-        ENV["RUBYOPT"] = "-I#{File.expand_path ENV['RG']} #{rubyopt}"
-      end
-
-      task "co" => "setup_co"
-      task "rubygems:all" => "co"
     end
 
     namespace :ruby do
@@ -104,7 +85,7 @@ begin
         raise "RVM is not available" unless File.exist?(File.expand_path("~/.rvm/scripts/rvm"))
       end
 
-      %w(1.8.6-p420 1.8.7-p334 1.9.2-p180).each do |ruby|
+      %w(1.8.6-p399 1.8.7-p302 1.9.2-p0).each do |ruby|
         ruby_cmd = File.expand_path("~/.rvm/bin/ruby-#{ruby}")
 
         desc "Run specs on Ruby #{ruby}"
@@ -123,77 +104,47 @@ begin
       end
     end
 
-    desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
-    task "travis" do
-      rg = ENV['RGV'] || 'master'
-
-      puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
-      specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }
-
-      Rake::Task["spec:rubygems:#{rg}"].reenable
+  end
 
-      puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
-      sudos = safe_task { Rake::Task["spec:rubygems:#{rg}:sudo"].invoke }
+rescue LoadError
+  task :spec do
+    abort "Run `rake spec:deps` to be able to run the specs"
+  end
 
-      unless specs && sudos
-        fail "Bundler tests failed, please review the log for more information"
-      end
+  namespace :spec do
+    desc "Ensure spec dependencies are installed"
+    task :deps do
+      sh "gem list ronn | (grep 'ronn' 1> /dev/null) || gem install ronn --no-ri --no-rdoc"
+      sh "gem list rspec | (grep 'rspec (2.0' 1> /dev/null) || gem install rspec --no-ri --no-rdoc"
     end
   end
 
-  namespace :man do
-    directory "lib/bundler/man"
+end
 
-    Dir["man/*.ronn"].each do |ronn|
-      basename = File.basename(ronn, ".ronn")
-      roff = "lib/bundler/man/#{basename}"
+namespace :man do
+  directory "lib/bundler/man"
 
-      file roff => ["lib/bundler/man", ronn] do
-        sh "ronn --roff --pipe #{ronn} > #{roff}"
-      end
+  Dir["man/*.ronn"].each do |ronn|
+    basename = File.basename(ronn, ".ronn")
+    roff = "lib/bundler/man/#{basename}"
 
-      file "#{roff}.txt" => roff do
-        sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
-      end
-
-      task :build_all_pages => "#{roff}.txt"
+    file roff => ["lib/bundler/man", ronn] do
+      sh "ronn --roff --pipe #{ronn} > #{roff}"
     end
 
-    desc "Build the man pages"
-    task :build => "man:build_all_pages"
-
-    desc "Clean up from the built man pages"
-    task :clean do
-      rm_rf "lib/bundler/man"
+    file "#{roff}.txt" => roff do
+      sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
     end
-  end
-
-  begin
-    require 'ci/reporter/rake/rspec'
 
-    namespace :ci do
-      desc "Run specs with Hudson output"
-      RSpec::Core::RakeTask.new(:spec)
-      task :spec => ["ci:setup:rspec", "man:build"]
-    end
-
-  rescue LoadError
-    namespace :ci do
-      task :spec do
-        abort "Run `rake ci:deps` to be able to run the CI specs"
-      end
-
-      desc "Install CI dependencies"
-      task :deps do
-        sh "gem list ci_reporter | (grep 'ci_reporter' 1> /dev/null) || gem install ci_reporter --no-ri --no-rdoc"
-      end
-      task :deps => "spec:deps"
-    end
+    task :build_all_pages => "#{roff}.txt"
   end
 
-rescue LoadError
-  task :spec do
-    abort "Run `rake spec:deps` to be able to run the specs"
+  desc "Build the man pages"
+  task :build => "man:build_all_pages"
+
+  desc "Clean up from the built man pages"
+  task :clean do
+    rm_rf "lib/bundler/man"
   end
 end