bundler 1.1.pre.8 → 1.1.pre.9

data/.travis.yml

@@ -1,8 +1,32 @@
+before_script:
+  - sudo apt-get install groff -y
+  - rake spec:deps
+
+script: rake spec:travis
+
 rvm:
-  - 1.8.6
   - 1.8.7
   - 1.9.2
-  - jruby
-  - rbx
-  - ree
-  - ruby-head
+
+env:
+  - RGV=v1.3.6
+  - RGV=v1.3.7
+  - RGV=v1.4.2
+  - RGV=v1.5.3
+  - RGV=v1.6.2
+  - RGV=v1.7.2
+  - RGV=v1.8.10
+  - RGV=master
+
+matrix:
+  exclude:
+    - rvm: 1.9.2
+      env: RGV=v1.3.6
+    - rvm: 1.9.2
+      env: RGV=v1.3.7
+    - rvm: 1.9.2
+      env: RGV=v1.4.2
+
+notifications:
+  email:
+    - travis-ci@andrearko.com

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 1.1.pre.9 (Sep 18, 2011)
+
+Features:
+
+  - `clean` will now clean up all old .gem and .gemspec files, cleaning up older pres
+  - `clean` will be automatically run after bundle install and update when using `--path` (#1420, #1425)
+  - `clean` now takes a `--force` option (#1247, #1426)
+  - `clean` will clean up cached git dirs in bundle clean (#1390)
+  - remove deprecations from DSL (#1119)
+  - autorequire tries directories for gems with dashed names (#1205)
+  - adds a `--paths` flag to `bundle show` to list all the paths of bundled gems (@tiegz, #1360)
+  - load rubygems plugins in the bundle binary (@tpope, #1364)
+  - make `--standalone` respect `--path` (@cowboyd, #1361)
+
+Bugfixes:
+
+  - Fix `clean` to handle nested gems in a git repo (#1329)
+  - Fix conflict from revert of benchmark tool (@boffbowsh, #1355)
+  - Fix fatal error when unable to connect to gem source (#1269)
+  - Fix `outdated` to find pre-release gems that are installed. (#1359)
+  - Fix color for ui. (#1374)
+  - Fix installing to user-owned system gems on OS X
+  - Fix caching issue in the resolver (#1353, #1421)
+  - Fix :github DSL option
+
 ## 1.1.pre.8 (Aug 13, 2011)
 
 Bugfixes:
@@ -100,12 +125,42 @@ Removed:
   - Removed bundle install --production
   - Removed bundle install --disable-shared-gems
 
-## 1.0.18 (Aug 13, 2011)
+## 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:
 
@@ -114,14 +169,14 @@ Features:
   - Make fetch_specs faster (@zeha, #1294)
   - Allow overriding development deps loaded by #gemspec (@lgierth, #1245)
 
-## 1.0.17 (Aug 8, 2011)
+## 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 (Aug 8, 2011)
+## 1.0.16 (August 8, 2011)
 
 Features:
 

data/Rakefile

@@ -2,6 +2,13 @@
 $:.unshift File.expand_path("../lib", __FILE__)
 require 'bundler/gem_tasks'
 
+def safe_task(&block)
+  yield
+  true
+rescue
+  false
+end
+
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
@@ -42,7 +49,7 @@ begin
     namespace :rubygems do
       # Rubygems specs by version
       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.7).each do |rg|
+      %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|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -71,7 +78,7 @@ begin
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
         end
 
-        task rg => "clone_rubygems_#{rg}"
+        task rg => ["clone_rubygems_#{rg}", "man:build"]
         task "rubygems:all" => rg
       end
 
@@ -114,6 +121,22 @@ 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
+
+      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 }
+
+      unless specs && sudos
+        fail "Bundler tests failed, please review the log for more information"
+      end
+    end
   end
 
   namespace :man do

data/UPGRADING.md

@@ -33,7 +33,7 @@ your deploy.rb file to run Bundler automatically as part of deploying:
     require 'bundler/capistrano'
 
 For more details on deploying using bundler, see the documentation
-for the bundler cap task, and the [documentation on deploying](http://gembundler.com/v1.0/deploying.html).
+for the bundler cap task, and the [documentation on deploying](http://gembundler.com/deploying.html).
 
 
 ## Bundler 0.8 to 0.9 and above
@@ -100,4 +100,4 @@ Bundler 0.9 changes the following Bundler 0.8 Gemfile APIs:
    mode, where using system gems, this becomes
    `Bundler.setup(:multiple, :groups)`. If you don't
    specify any groups, this puts all groups on the load
-   path. In locked, mode, it becomes `require '.bundle/environment'`
+   path. In locked mode, it becomes `require '.bundle/environment'`

data/bin/bundle

@@ -1,15 +1,15 @@
 #!/usr/bin/env ruby
-
-# Check if an older version of bundler is installed
-require 'bundler'
-$:.each do |path|
-  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
-    abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
-  end
-end
-require 'bundler/cli'
-
 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
+      err = "Please remove Bundler 0.8 versions."
+      err << "This can be done by running `gem cleanup bundler`."
+      abort(err)
+    end
+  end
+  require 'bundler/cli'
   Bundler::CLI.start
 rescue Bundler::BundlerError => e
   Bundler.ui.error e.message

data/bundler.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
 
   # Man files are required because they are ignored by git
   man_files            = Dir.glob("lib/bundler/man/**/*")
-  s.files              = `git ls-files`.split("\n") + man_files
+  git_files            = `git ls-files`.split("\n") rescue ''
+  s.files              = git_files + man_files
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables        = %w(bundle)
   s.require_paths      = ["lib"]

data/lib/bundler.rb

@@ -3,11 +3,12 @@ require 'fileutils'
 require 'pathname'
 
 begin
-  require 'psych'
+  # Pull in Psych if we can, but not if Syck is already loaded
+  require 'psych' unless defined?(YAML)
 rescue LoadError
+  require 'yaml'
 end
 
-require 'yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'
@@ -22,6 +23,7 @@ module Bundler
   autoload :Environment,           'bundler/environment'
   autoload :Fetcher,               'bundler/fetcher'
   autoload :GemHelper,             'bundler/gem_helper'
+  autoload :GemInstaller,          'bundler/gem_installer'
   autoload :Graph,                 'bundler/graph'
   autoload :Index,                 'bundler/index'
   autoload :Installer,             'bundler/installer'
@@ -38,7 +40,7 @@ module Bundler
   autoload :UI,                    'bundler/ui'
 
   class BundlerError < StandardError
-    def self.status_code(code = nil)
+    def self.status_code(code)
       define_method(:status_code) { code }
     end
   end
@@ -46,6 +48,7 @@ module Bundler
   class GemfileNotFound  < BundlerError; status_code(10) ; end
   class GemNotFound      < BundlerError; status_code(7)  ; end
   class GemfileError     < BundlerError; status_code(4)  ; end
+  class InstallError     < BundlerError; status_code(5)  ; end
   class PathError        < BundlerError; status_code(13) ; end
   class GitError         < BundlerError; status_code(11) ; end
   class DeprecatedError  < BundlerError; status_code(12) ; end
@@ -114,8 +117,7 @@ module Bundler
         unloaded = groups - @completed_groups
         # Record groups that are now loaded
         @completed_groups = groups
-        # Load any groups that are not yet loaded
-        unloaded.any? ? load.setup(*unloaded) : load
+        unloaded.any? ? load.setup(*groups) : load
       end
     end
 
@@ -218,7 +220,7 @@ module Bundler
     end
 
     def requires_sudo?
-      return @requires_sudo if defined?(@checked_for_sudo) && @checked_for_sudo
+      return @requires_sudo if defined?(@checked_for_sudo)
 
       path = bundle_path
       path = path.parent until path.exist?

data/lib/bundler/cli.rb

@@ -154,14 +154,15 @@ module Bundler
       "Make a bundle that can work without the Bundler runtime"
     method_option "full-index", :tpye => :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"
     def install
       opts = options.dup
-      opts[:without] ||= []
-      if opts[:without].size == 1
-        opts[:without] = opts[:without].map{|g| g.split(" ") }
+      if opts[:without]
+        opts[:without].map!{|g| g.split(" ") }
         opts[:without].flatten!
+        opts[:without].map!{|g| g.to_sym }
       end
-      opts[:without] = opts[:without].map{|g| g.to_sym }
 
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
@@ -204,11 +205,13 @@ module Bundler
       Bundler.settings[:path] ||= "bundle" if opts[:standalone]
       Bundler.settings[:bin]    = opts["binstubs"] if opts[:binstubs]
       Bundler.settings[:no_prune] = true if opts["no-prune"]
-      Bundler.settings[:disable_shared_gems] = '1' if Bundler.settings[:path]
-      Bundler.settings.without  = opts[:without] unless opts[:without].empty?
+      Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
+      Bundler.settings.without = opts[:without]
       Bundler.ui.be_quiet! if opts[:quiet]
 
       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)
 
       Installer.install(Bundler.root, Bundler.definition, opts)
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
@@ -224,6 +227,8 @@ module Bundler
       Installer.post_install_messages.to_a.each do |name, msg|
         Bundler.ui.confirm "Post-install message from #{name}:\n#{msg}"
       end
+
+      clean if opts["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."
@@ -244,6 +249,8 @@ 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])
 
@@ -255,8 +262,12 @@ module Bundler
       end
 
       opts = {"update" => true, "local" => options[:local]}
+      # rubygems plugins sometimes hook into the gem install process
+      Gem.load_plugins if Gem.respond_to?(:load_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]
       Bundler.ui.confirm "Your bundle is updated! " +
         "Use `bundle show [gemname]` to see where a bundled gem is installed."
     end
@@ -266,11 +277,17 @@ module Bundler
       Show lists the names and versions of all gems that are required by your Gemfile.
       Calling show with [GEM] will list the exact location of that gem on your machine.
     D
+    method_option "paths", :type => :boolean,
+      :banner => "List the paths of all gems that are required by your Gemfile."
     def show(gem_name = nil)
       Bundler.load.lock
 
       if gem_name
         Bundler.ui.info locate_gem(gem_name)
+      elsif options[:paths]
+        Bundler.load.specs.sort_by { |s| s.name }.each do |s|
+          Bundler.ui.info locate_gem(s.name)
+        end
       else
         Bundler.ui.info "Gems included by the bundle:"
         Bundler.load.specs.sort_by { |s| s.name }.each do |s|
@@ -302,7 +319,14 @@ module Bundler
       end
       options["local"] ? definition.resolve_with_cache! : definition.resolve_remotely!
 
-      Bundler.ui.info "Outdated gems included in the bundle:"
+      Bundler.ui.info ""
+      if options["pre"]
+        Bundler.ui.info "Outdated gems included in the bundle (including pre-releases):"
+      else
+        Bundler.ui.info "Outdated gems included in the bundle:"
+      end
+
+      out_count = 0
       definition.specs.each do |spec|
         next if !gems.empty? && !gems.include?(spec.name)
 
@@ -315,11 +339,12 @@ module Bundler
           current = spec
           spec = definition.index[current.name].sort_by{|b| b.version }
 
-          if !options[:pre] && spec.size > 1
+          if !current.version.prerelease? && !options[:pre] && spec.size > 1
             spec = spec.delete_if{|b| b.respond_to?(:version) && b.version.prerelease? }
           end
 
           spec = spec.last
+          next if spec.nil?
         end
 
         gem_outdated = Gem::Version.new(spec.version) > Gem::Version.new(current.version)
@@ -328,10 +353,12 @@ module Bundler
           spec_version    = "#{spec.version}#{spec.git_version}"
           current_version = "#{current.version}#{current.git_version}"
           Bundler.ui.info "  * #{spec.name} (#{spec_version} > #{current_version})"
+          out_count += 1
         end
         Bundler.ui.debug "from #{spec.loaded_from}"
       end
 
+      Bundler.ui.info "  Your bundle is up to date!" if out_count < 1
       Bundler.ui.info ""
     end
 
@@ -370,7 +397,7 @@ module Bundler
       into the systemwide Rubygems repository.
     D
     def exec(*)
-      ARGV.delete("exec")
+      ARGV.shift # remove "exec"
 
       Bundler.setup
 
@@ -508,9 +535,10 @@ module Bundler
     desc "gem GEM", "Creates a skeleton for creating a rubygem"
     method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :banner => "Generate a binary for your library."
     def gem(name)
+      name = name.chomp("/") # remove trailing slash if present
       target = File.join(Dir.pwd, name)
-      constant_name = name.split('_').map{|p| p.capitalize}.join
-      constant_name = constant_name.split('-').map{|q| q.capitalize}.join('::') if constant_name =~ /-/
+      constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
+      constant_name = constant_name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
       constant_array = constant_name.split('::')
       FileUtils.mkdir_p(File.join(target, 'lib', name))
       git_user_name = `git config user.name`.chomp
@@ -540,10 +568,13 @@ module Bundler
     end
 
     desc "clean", "Cleans up unused gems in your bundler directory"
+    method_option "force", :type => :boolean, :default => false, :banner =>
+      "forces clean even if --path is set"
     def clean
-      clean_output = Bundler.load.clean
-      if !clean_output
-        Bundler.ui.error "Can only use bundle clean when --path is set"
+      if Bundler.settings[:path] || options[:force]
+        Bundler.load.clean
+      else
+        Bundler.ui.error "Can only use bundle clean when --path is set or --force is set"
       end
     end