bundler 1.1.pre.4 → 1.1.pre.5

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
   - jruby
   - rbx
   - ree
+  - ruby-head

data/CHANGELOG.md

@@ -1,10 +1,28 @@
-## 1.1.pre.4 (5 May, 2011)
+## 1.1.pre.5 (June 11, 2011)
+
+Bugfixes:
+
+  - Fix LazySpecification on Ruby 1.9 (@dpiddy, #1232)
+  - Fix HTTP proxy support (@leobessa, #878)
+
+Features:
+
+  - Speed up `install --deployment` by using the API endpoint
+  - Support Basic HTTP Auth for the API endpoint (@dpiddy, #1229)
+  - Add `install --full-index` to disable the API endpoint, just in case
+  - Significantly speed up install by removing unneeded gemspec fetches
+  - `outdated` command shows outdated gems (@joelmoss, #1130)
+  - Print gem post install messages (@csquared, #1155)
+  - Reduce memory use by removing Specification.new inside method_missing (@tenderlove, #1222)
+  - Allow `check --path`
+
+## 1.1.pre.4 (May 5, 2011)
 
 Bugfixes:
 
   - Fix bug that could prevent installing new gems
 
-## 1.1.pre.3 (4 May, 2011)
+## 1.1.pre.3 (May 4, 2011)
 
 Features:
 
@@ -48,6 +66,37 @@ Removed:
   - Removed bundle install <path>
   - Removed bundle install --production
   - Removed bundle install --disable-shared-gems
+=======
+## 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)
 

data/ISSUES.md

@@ -1,8 +1,20 @@
 # 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:
 
@@ -26,22 +38,24 @@ After reading the documentation, try these troubleshooting steps:
 
 ## Reporting unresolved problems
 
-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:
+Instructions that allow the Bundler team to reproduce your issue are vitally important. When you report a bug, please include the following information:
 
-  - What version of bundler you are using
-  - What version of Ruby you are using
-  - Whether you are using RVM, and if so what version
+  - The command you ran
+  - Exception backtrace(s), if any
   - Your Gemfile
   - Your Gemfile.lock
-  - 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)
+  - 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
+
 
 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/README.md

@@ -12,17 +12,17 @@ See [gembundler.com](http://gembundler.com) for up-to-date installation and usag
 
 ### Troubleshooting
 
-For help with common problems, see [ISSUES](http://github.com/carlhuda/bundler/blob/master/ISSUES.md).
+For help with common problems, see [ISSUES](https://github.com/carlhuda/bundler/blob/master/ISSUES.md).
 
 ### Development
 
-To see what has changed in recent versions of bundler, see the [CHANGELOG](http://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
+To see what has changed in recent versions of bundler, see the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
 
 The `master` branch contains our current progress towards version 1.1. Because of that, please submit bugfix pull requests against the `1-0-stable` branch.
 
 ### Upgrading from Bundler 0.8 to 0.9 and above
 
-See [UPGRADING](http://github.com/carlhuda/bundler/blob/master/UPGRADING.md).
+See [UPGRADING](https://github.com/carlhuda/bundler/blob/master/UPGRADING.md).
 
 ### Other questions
 

data/Rakefile

@@ -1,15 +1,19 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
-require 'bundler/gem_helper'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
-def sudo?
-  ENV['BUNDLER_SUDO_TESTS']
+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
 end
 
 begin
-  # set up rspec tasks
+  # running the specs needs both rspec and ronn
   require 'rspec/core/rake_task'
+  require 'ronn'
 
   desc "Run specs"
   RSpec::Core::RakeTask.new do |t|
@@ -18,55 +22,38 @@ begin
   end
   task :spec => "man:build"
 
-  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"
+  namespace :spec do
+    task :clean do
+      rm_rf 'tmp'
     end
-  end
 
-  namespace :spec do
     desc "Run the spec suite with the sudo tests"
-    task :sudo => ["set_sudo", "clean", "spec"]
+    task :sudo => ["set_sudo", "spec", "clean_sudo"]
 
     task :set_sudo do
       ENV['BUNDLER_SUDO_TESTS'] = '1'
     end
 
-    task :clean do
-      if sudo?
-        system "sudo rm -rf #{File.expand_path('../tmp', __FILE__)}"
-      else
-        rm_rf 'tmp'
-      end
+    task :clean_sudo do
+      puts "Cleaning up sudo test files..."
+      system "sudo rm -rf #{File.expand_path('../tmp/sudo_gem_home', __FILE__)}"
     end
 
     namespace :rubygems do
       # 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.1 v1.7.2).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.3).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")
@@ -129,10 +116,6 @@ begin
 
   end
 
-
-  # set up man tasks that use ronn
-  require 'ronn'
-
   namespace :man do
     directory "lib/bundler/man"
 
@@ -160,20 +143,33 @@ begin
     end
   end
 
+  begin
+    require 'ci/reporter/rake/rspec'
 
-rescue LoadError
-  task :spec do
-    abort "Run `rake spec:deps` to be able to run the specs"
-  end
+    namespace :ci do
+      desc "Run specs with Hudson output"
+      RSpec::Core::RakeTask.new(:spec)
+      task :spec => ["ci:setup:rspec", "man:build"]
+    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"
+  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
 
+rescue LoadError
+  task :spec do
+    abort "Run `rake spec:deps` to be able to run the specs"
+  end
 end
 
 namespace :vendor do

data/lib/bundler.rb

@@ -15,26 +15,27 @@ require 'bundler/version'
 module Bundler
   ORIGINAL_ENV = ENV.to_hash
 
-  autoload :Definition,          'bundler/definition'
-  autoload :Dependency,          'bundler/dependency'
-  autoload :Dsl,                 'bundler/dsl'
-  autoload :Environment,         'bundler/environment'
-  autoload :Fetcher,             'bundler/fetcher'
-  autoload :GemHelper,           'bundler/gem_helper'
-  autoload :Graph,               'bundler/graph'
-  autoload :Index,               'bundler/index'
-  autoload :Installer,           'bundler/installer'
-  autoload :LazySpecification,   'bundler/lazy_specification'
-  autoload :LockfileParser,      'bundler/lockfile_parser'
-  autoload :RemoteSpecification, 'bundler/remote_specification'
-  autoload :Resolver,            'bundler/resolver'
-  autoload :Runtime,             'bundler/runtime'
-  autoload :Settings,            'bundler/settings'
-  autoload :SharedHelpers,       'bundler/shared_helpers'
-  autoload :SpecSet,             'bundler/spec_set'
-  autoload :Source,              'bundler/source'
-  autoload :Specification,       'bundler/shared_helpers'
-  autoload :UI,                  'bundler/ui'
+  autoload :Definition,            'bundler/definition'
+  autoload :Dependency,            'bundler/dependency'
+  autoload :Dsl,                   'bundler/dsl'
+  autoload :EndpointSpecification, 'bundler/endpoint_specification'
+  autoload :Environment,           'bundler/environment'
+  autoload :Fetcher,               'bundler/fetcher'
+  autoload :GemHelper,             'bundler/gem_helper'
+  autoload :Graph,                 'bundler/graph'
+  autoload :Index,                 'bundler/index'
+  autoload :Installer,             'bundler/installer'
+  autoload :LazySpecification,     'bundler/lazy_specification'
+  autoload :LockfileParser,        'bundler/lockfile_parser'
+  autoload :RemoteSpecification,   'bundler/remote_specification'
+  autoload :Resolver,              'bundler/resolver'
+  autoload :Runtime,               'bundler/runtime'
+  autoload :Settings,              'bundler/settings'
+  autoload :SharedHelpers,         'bundler/shared_helpers'
+  autoload :SpecSet,               'bundler/spec_set'
+  autoload :Source,                'bundler/source'
+  autoload :Specification,         'bundler/shared_helpers'
+  autoload :UI,                    'bundler/ui'
 
   class BundlerError < StandardError
     def self.status_code(code = nil)

data/lib/bundler/cli.rb

@@ -1,6 +1,4 @@
-$:.unshift File.expand_path('../vendor', __FILE__)
-require 'thor'
-require 'thor/actions'
+require 'bundler/vendored_thor'
 require 'rubygems/user_interaction'
 require 'rubygems/config_file'
 
@@ -94,8 +92,12 @@ module Bundler
     D
     method_option "gemfile", :type => :string, :banner =>
       "Use the specified gemfile instead of Gemfile"
+    method_option "path", :type => :string, :banner =>
+      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     def check
       ENV['BUNDLE_GEMFILE'] = File.expand_path(options[:gemfile]) if options[:gemfile]
+
+      Bundler.settings[:path] = File.expand_path(options[:path]) if options[:path]
       begin
         not_installed = Bundler.definition.missing_specs
       rescue GemNotFound, VersionConflict
@@ -150,6 +152,8 @@ 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 =>
+      "Use the rubygems modern index instead of the API endpoint"
     def install
       opts = options.dup
       opts[:without] ||= []
@@ -204,18 +208,22 @@ module Bundler
       Bundler.settings.without  = opts[:without] unless opts[:without].empty?
       Bundler.ui.be_quiet! if opts[:quiet]
 
+      Bundler::Fetcher.disable_endpoint = opts["full-index"]
+
       Installer.install(Bundler.root, Bundler.definition, opts)
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
 
       if Bundler.settings[:path]
-        relative_path = Bundler.settings[:path]
-        relative_path = "./" + relative_path unless relative_path[0] == ?/
+        relative_path = File.expand_path(Bundler.settings[:path]).sub(/^#{File.expand_path('.')}/, '.')
         Bundler.ui.confirm "Your bundle is complete! " +
           "It was installed into #{relative_path}"
       else
         Bundler.ui.confirm "Your bundle is complete! " +
           "Use `bundle show [gemname]` to see where a bundled gem is installed."
       end
+      Installer.post_install_messages.to_a.each do |name, msg|
+        Bundler.ui.confirm "Post-install message from #{name}:\n#{msg}"
+      end
     rescue GemNotFound => e
       if opts[:local] && Bundler.app_cache.exist?
         Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
@@ -272,16 +280,19 @@ module Bundler
     end
     map %w(list) => "show"
 
-    desc "outdated", "Returns a list of installed gems that are outdated."
+    desc "outdated [GEM]", "list installed gems with newer versions available"
     long_desc <<-D
-      Outdated lists the names and versions of all gems that are outdated when compared to the source.
-      Calling outdated with [GEM [GEM]] will check only the given gems.
+      Outdated lists the names and versions of gems that have a newer version available
+      in the given source. Calling outdated with [GEM [GEM]] will only check for newer
+      versions of the given gems. By default, available prerelease gems will be ignored.
     D
+    method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
     method_option "source", :type => :array, :banner => "Check against a specific source"
     method_option "local", :type => :boolean, :banner =>
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     def outdated(*gems)
       sources = Array(options[:source])
+      current_specs = Bundler.load.specs
 
       if gems.empty? && sources.empty?
         # We're doing a full update
@@ -289,14 +300,38 @@ module Bundler
       else
         definition = Bundler.definition(:gems => gems, :sources => sources)
       end
-
       options["local"] ? definition.resolve_with_cache! : definition.resolve_remotely!
 
+      Bundler.ui.info "Outdated gems included in the bundle:"
       definition.specs.each do |spec|
+        next if !gems.empty? && !gems.include?(spec.name)
+
         spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
-        spec.source.outdated(spec)
-        Bundler.ui.debug "from #{spec.loaded_from} "
+
+        if spec.git_version
+          current = current_specs.find{|s| spec.name == s.name }
+        else
+          current = spec
+          spec = definition.index[current.name].sort_by{|b| b.version }
+
+          if !options[:pre] && spec.size > 1
+            spec = spec.delete_if{|b| b.respond_to?(:version) && b.version.prerelease? }
+          end
+
+          spec = spec.last
+        end
+
+        gem_outdated = Gem::Version.new(spec.version) > Gem::Version.new(current.version)
+        git_outdated = current.git_version != spec.git_version
+        if gem_outdated || git_outdated
+          spec_version    = "#{spec.version}#{spec.git_version}"
+          current_version = "#{current.version}#{current.git_version}"
+          Bundler.ui.info "  * #{spec.name} (#{spec_version} > #{current_version})"
+        end
+        Bundler.ui.debug "from #{spec.loaded_from}"
       end
+
+      Bundler.ui.info ""
     end
 
     desc "cache", "Cache all the gems to vendor/cache", :hide => true