bundler 1.1.5 → 1.2.0.pre

data/.travis.yml

@@ -2,13 +2,6 @@ before_script:
   - sudo apt-get install groff -y
   - rake spec:deps
 
-script: rake spec:travis
-
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-
 env:
   - RGV=v1.3.6
   - RGV=v1.3.7
@@ -18,6 +11,8 @@ env:
   - RGV=v1.7.2
   - RGV=v1.8.10
 
+language: ruby
+
 matrix:
   exclude:
     - rvm: 1.9.2
@@ -37,3 +32,11 @@ notifications:
   email:
     - travis-ci@andrearko.com
     - hone02@gmail.com
+    - sferik@gmail.com
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+
+script: rake spec:travis

data/CHANGELOG.md

@@ -1,18 +1,37 @@
-## 1.1.5 (Jul 17, 2012)
+## 1.2.0.pre
 
 Features:
 
-  - Special case `ruby` directive from 1.2.0, so you can install Gemfiles that use it
+  - bundle package now accepts --all to package git and path dependencies
+  - bundle config now accepts --local, --global and --delete options
+  - It is possible to override a git repository via configuration.
+    For instance, if you have a git dependency on rack, you can force
+    it to use a local repo with `bundle config local.rack ~/path/to/rack`
+  - Cache gemspec loads for performance (@dekellum, #1635)
+  - add --full-index flag to `bundle update` (@fluxx, #1829)
+  - add --quiet flag to `bundle update` (@nashby, #1654)
+  - Add Bundler::GemHelper.gemspec (@knu, #1637)
+  - Graceful handling of Gemfile syntax errors (@koraktor, #1661)
+  - `bundle platform` command
+  - add ruby to DSL, to specify version of ruby
+  - error out if the ruby version doesn't match
 
-## 1.1.4 (May 27, 2012)
+Performance:
+
+  - bundle exec shouldn't run Bundler.setup just setting the right rubyopts options is enough (@spastorino, #1598)
 
 Bugfixes:
 
-  - Use `latest_release` in Capistrano and Vlad integration (#1264)
-  - Unknown exceptions now link to ISSUES for help instead of a new ticket
-  - When OpenSSL is missing, provide instructions for fixing (#1776 etc.)
-  - Correct inline help for `clean --force` (@dougbarth, #1911)
-  - Work around a Ruby 1.9.3p194 bug in Psych when config files are empty
+  - Avoid passing RUBYOPT changes in with_clean_env block (@eric1234, #1604)
+  - Use the same ruby to run subprocesses as is running rake (@brixen)
+
+Documentation:
+
+  - Add :github documentation in DSL (@zofrex, #1848, #1851, #1852)
+  - Add docs for the --no-cache option (@fluxx, #1796)
+  - Add basic documentation for bin_path and bundle_path (@radar)
+  - Add documentation for the run method in Bundler::Installer
+
 
 ## 1.1.3 (March 23, 2012)
 

data/ISSUES.md

@@ -1,20 +1,10 @@
 # Bundler Issues
 
-So! You're having problems with Bundler. This file is here to help. If you're running into an error, try reading the rest of this file for help. If you can't figure out how to solve your problem, there are also instructions on how to report a bug.
-
-## Documentation
-
-Instructions for common Bundler uses 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).
-
 ## Troubleshooting
 
-### Heroku errors
-
-Please open a ticket with Heroku if you're having trouble deploying. They have a professional support team who can help you resolve Heroku issues far better than the Bundler team can. If the problem that you are having turns out to be a bug in Bundler itself, Heroku support can get the exact details to us.
+Instructions for common Bundler use-cases can be found on the [Bundler documentation site](http://gembundler.com/v1.0/).
 
-### Something else
+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:
 
@@ -36,9 +26,24 @@ 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
 
-The Bundler team needs to know some things in order to diagnose and hopefully fix the bug you've found. When you report a bug, please include the following information:
+Instructions that allow the Bundler team to reproduce your issue are vitally important. When you report a bug, please include the following information:
 
   - The command you ran
   - Exception backtrace(s), if any
@@ -52,12 +57,11 @@ The Bundler team needs to know some things in order to diagnose and hopefully fi
   - 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 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/issues) and [create a new ticket](https://github.com/carlhuda/bundler/issues/new) describing your problem and linking to your gist.
-
-Thanks for reporting issues and making Bundler better!
+[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

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/carlhuda/bundler.png?branch=master)](http://travis-ci.org/carlhuda/bundler)
+
 # Bundler: a gem to bundle gems
 
 Bundler is a tool that manages gem dependencies for your ruby application. It

data/Rakefile

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
+require 'rubygems'
 require 'bundler/gem_tasks'
 
 task :release => ["man:clean", "man:build"]
@@ -18,8 +19,8 @@ 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"
+    sh "#{Gem.ruby} -S gem list ronn | (grep 'ronn' 1> /dev/null) || #{Gem.ruby} -S gem install ronn --no-ri --no-rdoc"
+    sh "#{Gem.ruby} -S gem list rspec | (grep 'rspec (2.' 1> /dev/null) || #{Gem.ruby} -S gem install rspec --no-ri --no-rdoc"
   end
 end
 
@@ -40,7 +41,7 @@ begin
       rm_rf 'tmp'
     end
 
-    desc "Run the real-world spec suite (reequires internet)"
+    desc "Run the real-world spec suite (requires internet)"
     task :realworld => ["set_realworld", "spec"]
 
     task :set_realworld do
@@ -142,7 +143,7 @@ begin
       roff = "lib/bundler/man/#{basename}"
 
       file roff => ["lib/bundler/man", ronn] do
-        sh "ronn --roff --pipe #{ronn} > #{roff}"
+        sh "#{Gem.ruby} -S ronn --roff --pipe #{ronn} > #{roff}"
       end
 
       file "#{roff}.txt" => roff do
@@ -178,7 +179,7 @@ begin
 
       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"
+        sh "#{Gem.ruby} -S gem list ci_reporter | (grep 'ci_reporter' 1> /dev/null) || #{Gem.ruby} -S gem install ci_reporter --no-ri --no-rdoc"
       end
       task :deps => "spec:deps"
     end

data/bin/bundle

@@ -22,8 +22,10 @@ rescue Interrupt => e
 rescue SystemExit => e
   exit e.status
 rescue Exception => e
-  Bundler.ui.error(
-    "Unfortunately, a fatal error has occurred. Please see the Bundler \n" \
-    "troubleshooting documentation at http://bit.ly/bundler-issues. Thanks! \n")
+  Bundler.ui.error "Unfortunately, a fatal error has occurred. " +
+    "Please report this error to the Bundler issue tracker at " +
+    "https://github.com/carlhuda/bundler/issues so that we can fix it. " +
+    "Please include the full output of the command, your Gemfile and Gemfile.lock. " +
+    "Thanks!"
   raise e
 end

data/lib/bundler.rb

@@ -27,12 +27,14 @@ module Bundler
   autoload :MatchPlatform,         'bundler/match_platform'
   autoload :RemoteSpecification,   'bundler/remote_specification'
   autoload :Resolver,              'bundler/resolver'
+  autoload :RubyVersion,           'bundler/ruby_version'
   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 :SystemRubyVersion,     'bundler/ruby_version'
   autoload :UI,                    'bundler/ui'
 
   class BundlerError < StandardError
@@ -41,19 +43,20 @@ module Bundler
     end
   end
 
-  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 InstallHookError < BundlerError; status_code(6)  ; end
-  class PathError        < BundlerError; status_code(13) ; end
-  class GitError         < BundlerError; status_code(11) ; end
-  class DeprecatedError  < BundlerError; status_code(12) ; end
-  class GemspecError     < BundlerError; status_code(14) ; end
-  class DslError         < BundlerError; status_code(15) ; end
-  class ProductionError  < BundlerError; status_code(16) ; end
-  class InvalidOption    < DslError                      ; end
-  class HTTPError        < BundlerError; status_code(17) ; end
+  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 InstallHookError    < BundlerError; status_code(6)  ; end
+  class PathError           < BundlerError; status_code(13) ; end
+  class GitError            < BundlerError; status_code(11) ; end
+  class DeprecatedError     < BundlerError; status_code(12) ; end
+  class GemspecError        < BundlerError; status_code(14) ; end
+  class DslError            < BundlerError; status_code(15) ; end
+  class ProductionError     < BundlerError; status_code(16) ; end
+  class InvalidOption       < DslError                      ; end
+  class HTTPError           < BundlerError; status_code(17) ; end
+  class RubyVersionMismatch < BundlerError; status_code(18) ; end
 
 
   WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
@@ -85,10 +88,12 @@ module Bundler
       @ui ||= UI.new
     end
 
+    # Returns absolute path of where gems are installed on the filesystem.
     def bundle_path
       @bundle_path ||= Pathname.new(settings.path).expand_path(root)
     end
 
+    # Returns absolute location of where binstubs are installed to.
     def bin_path
       @bin_path ||= begin
         path = settings[:bin] || "bin"
@@ -102,6 +107,8 @@ module Bundler
       # Just return if all groups are already loaded
       return @setup if defined?(@setup)
 
+      definition.validate_ruby!
+
       if groups.empty?
         # Load all groups, but only once
         @setup = load.setup
@@ -268,6 +275,15 @@ module Bundler
     end
 
     def load_gemspec(file)
+      @gemspec_cache ||= {}
+      key = File.expand_path(file)
+      spec = ( @gemspec_cache[key] ||= load_gemspec_uncached(file) )
+      # Protect against caching side-effected gemspecs by returning a
+      # new instance each time.
+      spec.dup if spec
+    end
+
+    def load_gemspec_uncached(file)
       path = Pathname.new(file)
       # Eval the gemspec from its parent directory
       Dir.chdir(path.dirname.to_s) do
@@ -294,6 +310,10 @@ module Bundler
       end
     end
 
+    def clear_gemspec_cache
+      @gemspec_cache = {}
+    end
+
   private
 
     def configure_gem_home_and_path

data/lib/bundler/capistrano.rb

@@ -5,7 +5,7 @@
 require 'bundler/deployment'
 
 Capistrano::Configuration.instance(:must_exist).load do
-  before "deploy:finalize_update", "bundle:install"
+  after "deploy:finalize_update", "bundle:install"
   Bundler::Deployment.define_task(self, :task, :except => { :no_release => true })
   set :rake, lambda { "#{fetch(:bundle_cmd, "bundle")} exec rake" }
 end

data/lib/bundler/cli.rb

@@ -99,7 +99,9 @@ module Bundler
 
       Bundler.settings[:path] = File.expand_path(options[:path]) if options[:path]
       begin
-        not_installed = Bundler.definition.missing_specs
+        definition = Bundler.definition
+        definition.validate_ruby!
+        not_installed = definition.missing_specs
       rescue GemNotFound, VersionConflict
         Bundler.ui.error "Your Gemfile's dependencies could not be satisfied"
         Bundler.ui.warn  "Install missing gems with `bundle install`"
@@ -217,7 +219,9 @@ module Bundler
       # rubygems plugins sometimes hook into the gem install process
       Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
 
-      Installer.install(Bundler.root, Bundler.definition, opts)
+      definition = Bundler.definition
+      definition.validate_ruby!
+      Installer.install(Bundler.root, definition, opts)
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
 
       if Bundler.settings[:path]
@@ -256,8 +260,13 @@ 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 "quiet", :type => :boolean, :banner =>
+      "Only output warnings and errors."
+    method_option "full-index", :type => :boolean, :banner =>
+        "Use the rubygems modern index instead of the API endpoint"
     def update(*gems)
       sources = Array(options[:source])
+      Bundler.ui.be_quiet! if options[:quiet]
 
       if gems.empty? && sources.empty?
         # We're doing a full update
@@ -266,10 +275,13 @@ module Bundler
         Bundler.definition(:gems => gems, :sources => sources)
       end
 
+      Bundler::Fetcher.disable_endpoint = options["full-index"]
+
       opts = {"update" => true, "local" => options[:local]}
       # rubygems plugins sometimes hook into the gem install process
       Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
 
+      Bundler.definition.validate_ruby!
       Installer.install Bundler.root, Bundler.definition, opts
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
       clean if Bundler.settings[:clean] && Bundler.settings[:path]
@@ -285,6 +297,7 @@ module Bundler
     method_option "paths", :type => :boolean,
       :banner => "List the paths of all gems that are required by your Gemfile."
     def show(gem_name = nil)
+      Bundler.definition.validate_ruby!
       Bundler.load.lock
 
       if gem_name
@@ -314,6 +327,7 @@ module Bundler
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     def outdated(*gems)
       sources = Array(options[:source])
+      Bundler.definition.validate_ruby!
       current_specs = Bundler.load.specs
 
       if gems.empty? && sources.empty?
@@ -362,8 +376,11 @@ module Bundler
 
     desc "cache", "Cache all the gems to vendor/cache", :hide => true
     method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
+    method_option "all",  :type => :boolean, :banner => "Include all sources (including path and git)."
     def cache
+      Bundler.definition.validate_ruby!
       Bundler.definition.resolve_with_cache!
+      setup_cache_all
       Bundler.load.cache
       Bundler.settings[:no_prune] = true if options["no-prune"]
       Bundler.load.lock
@@ -375,6 +392,7 @@ module Bundler
 
     desc "package", "Locks and then caches all of the gems into vendor/cache"
     method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
+    method_option "all",  :type => :boolean, :banner => "Include all sources (including path and git)."
     long_desc <<-D
       The package command will copy the .gem files for every gem in the bundle into the
       directory ./vendor/cache. If you then check that directory into your source
@@ -382,6 +400,7 @@ module Bundler
       bundle without having to download any additional gems.
     D
     def package
+      setup_cache_all
       install
       # TODO: move cache contents here now that all bundles are locked
       Bundler.load.cache
@@ -397,6 +416,7 @@ module Bundler
     def exec(*)
       ARGV.shift # remove "exec"
 
+      Bundler.definition.validate_ruby!
       Bundler.load.setup_environment
 
       begin
@@ -427,10 +447,17 @@ module Bundler
       will show the current value, as well as any superceded values and
       where they were specified.
     D
-    def config(name = nil, *args)
+    def config(*)
       values = ARGV.dup
       values.shift # remove config
-      values.shift # remove the name
+
+      peek = values.shift
+
+      if peek && peek =~ /^\-\-/
+        name, scope = values.shift, $'
+      else
+        name, scope = peek, "global"
+      end
 
       unless name
         Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
@@ -447,29 +474,45 @@ module Bundler
         return
       end
 
-      if values.empty?
-        Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used"
-        with_padding do
-          Bundler.settings.pretty_values_for(name).each { |line| Bundler.ui.info line }
+      case scope
+      when "delete"
+        Bundler.settings.set_local(name, nil)
+        Bundler.settings.set_global(name, nil)
+      when "local", "global"
+        if values.empty?
+          Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used"
+          with_padding do
+            Bundler.settings.pretty_values_for(name).each { |line| Bundler.ui.info line }
+          end
+          return
         end
-      else
+
         locations = Bundler.settings.locations(name)
 
-        if local = locations[:local]
-          Bundler.ui.info "Your application has set #{name} to #{local.inspect}. This will override the " \
-            "system value you are currently setting"
-        end
+        if scope == "global"
+          if local = locations[:local]
+            Bundler.ui.info "Your application has set #{name} to #{local.inspect}. This will override the " \
+              "global value you are currently setting"
+          end
+
+          if env = locations[:env]
+            Bundler.ui.info "You have a bundler environment variable for #{name} set to #{env.inspect}. " \
+              "This will take precedence over the global value you are setting"
+          end
 
-        if global = locations[:global]
-          Bundler.ui.info "You are replacing the current system value of #{name}, which is currently #{global}"
+          if global = locations[:global]
+            Bundler.ui.info "You are replacing the current global value of #{name}, which is currently #{global.inspect}"
+          end
         end
 
-        if env = locations[:env]
-          Bundler.ui.info "You have set a bundler environment variable for #{env}. This will take precedence " \
-            "over the system value you are setting"
+        if scope == "local" && local = locations[:local]
+          Bundler.ui.info "You are replacing the current local value of #{name}, which is currently #{local.inspect}"
         end
 
-        Bundler.settings.set_global(name, values.join(" "))
+        Bundler.settings.send("set_#{scope}", name, values.join(" "))
+      else
+        Bundler.ui.error "Invalid scope --#{scope} given. Please use --local or --global."
+        exit 1
       end
     end
 
@@ -573,7 +616,7 @@ module Bundler
 
     desc "clean", "Cleans up unused gems in your bundler directory"
     method_option "force", :type => :boolean, :default => false, :banner =>
-      "forces clean even if --path is not set"
+      "forces clean even if --path is set"
     def clean
       if Bundler.settings[:path] || options[:force]
         Bundler.load.clean
@@ -583,8 +626,53 @@ module Bundler
       end
     end
 
+    desc "platform", "Displays platform compatibility information"
+    method_option "ruby", :type => :boolean, :default => false, :banner =>
+      "only display ruby related platform information"
+    def platform
+      platforms    = Bundler.definition.platforms.map {|p| "* #{p}" }
+      ruby_version = Bundler.definition.ruby_version
+      output       = []
+
+      if options[:ruby]
+        if ruby_version
+          output << ruby_version
+        else
+          output << "No ruby version specified"
+        end
+      else
+        output << "Your platform is: #{RUBY_PLATFORM}"
+        output << "Your app has gems that work on these platforms:\n#{platforms.join("\n")}"
+
+        if ruby_version
+          output << "Your Gemfile specifies a Ruby version requirement:\n* #{ruby_version}"
+
+          begin
+            Bundler.definition.validate_ruby!
+            output << "Your current platform satisfies the Ruby version requirement."
+          rescue RubyVersionMismatch => e
+            output << e.message
+          end
+        else
+          output << "Your Gemfile does not specify a Ruby version requirement."
+        end
+      end
+
+      Bundler.ui.info output.join("\n\n")
+    end
+
   private
 
+    def setup_cache_all
+      if options.key?("all")
+        Bundler.settings[:cache_all] = options[:all] || nil
+      elsif Bundler.definition.sources.any? { |s| !s.is_a?(Source::Rubygems) }
+        Bundler.ui.warn "Your Gemfile contains path and git dependencies. If you want "    \
+          "to package them as well, please pass the --all flag. This will be the default " \
+          "on Bundler 2.0."
+      end
+    end
+
     def have_groff?
       !(`which groff` rescue '').empty?
     end