bundler 1.2.0.pre.1 → 1.2.0.rc

data/CHANGELOG.md

@@ -1,8 +1,28 @@
+## 1.2.0.rc (Jul 17, 2012)
+
+Features:
+
+  - `check` now has a `--dry-run` option (@svenfuchs, #1811)
+  - loosen ruby directive for engines
+  - prune git/path directories inside vendor/cache (@josevalim, #1988)
+  - update vendored thor to 0.15.2 (@sferik)
+  - add .txt to LICENSCE (@postmodern, #2001)
+  - add `config disable_local_branch_check` (@josevalim, #1985)
+  - fall back on the full index when experiencing syck errors (#1419)
+  - handle syntax errors in Ruby gemspecs (#1974)
+
+Bugfixes:
+
+  - fix `pack`/`cache` with `--all` (@josevalim, #1989)
+  - don't display warning message when `cache_all` is set
+  - check for `nil` PATH (#2006)
+  - Always try to keep original GEM_PATH (@drogus, #1920)
+
 ## 1.2.0.pre.1 (May 27, 2012)
 
 Features:
 
-  - Import git submodules of submodules recursively (@nwwatson, #1935)
+  - Git gems import submodules of submodules recursively (@nwwatson, #1935)
 
 Bugfixes:
 
@@ -52,6 +72,12 @@ Documentation:
   - Add basic documentation for bin_path and bundle_path (@radar)
   - Add documentation for the run method in Bundler::Installer
 
+## 1.1.5 (Jul 17, 2012)
+
+Features:
+
+  - Special case `ruby` directive from 1.2.0, so you can install Gemfiles that use it
+
 ## 1.1.4 (May 27, 2012)
 
 Bugfixes:

data/ISSUES.md

@@ -49,8 +49,8 @@ The Bundler team needs to know some things in order to diagnose and hopefully fi
   - 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
+  - Whether you have the `rubygems-bundler` gem, which can break gem binares (run `gem list rubygems-bundler`)
+  - Whether you have the `open_gem` gem, which can cause rake activation conflicts (run `gem list open_gem`)
 
 If you are using Rails 2.3, please also include:
 
@@ -58,6 +58,6 @@ If you are using Rails 2.3, please also include:
   - 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.
+[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 ticket](https://github.com/carlhuda/bundler/issues/new) describing your problem and linking to your gist.
 
 Thanks for reporting issues and making Bundler better!

data/lib/bundler.rb

@@ -1,12 +1,14 @@
 require 'rbconfig'
 require 'fileutils'
 require 'pathname'
+require 'bundler/gem_path_manipulation'
 require 'bundler/psyched_yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'
 
 module Bundler
+  preserve_gem_path
   ORIGINAL_ENV = ENV.to_hash
 
   autoload :Definition,            'bundler/definition'
@@ -258,7 +260,7 @@ module Bundler
     def which(executable)
       if File.executable?(executable)
         executable
-      else
+      elsif ENV['PATH']
         path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |p|
           File.executable?(File.join(p, executable))
         end
@@ -294,14 +296,14 @@ module Bundler
         rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception
           begin
             eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
-          rescue LoadError => e
+          rescue LoadError, SyntaxError => e
             original_line = e.backtrace.find { |line| line.include?(path.to_s) }
-            msg  = "There was a LoadError while evaluating #{path.basename}:\n  #{e.message}"
+            msg  = "There was a #{e.class} while evaluating #{path.basename}: \n#{e.message}"
             msg << " from\n  #{original_line}" if original_line
             msg << "\n"
 
-            if RUBY_VERSION >= "1.9"
-              msg << "\nDoes it try to require a relative path? That doesn't work in Ruby 1.9."
+            if e.is_a?(LoadError) && RUBY_VERSION >= "1.9"
+              msg << "\nDoes it try to require a relative path? That's been removed in Ruby 1.9."
             end
 
             raise GemspecError, msg

data/lib/bundler/cli.rb

@@ -14,7 +14,7 @@ module Bundler
       Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
     end
 
-    check_unknown_options!
+    check_unknown_options!(:except => [:config, :exec])
 
     default_task :install
     class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
@@ -94,6 +94,8 @@ module Bundler
       "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"
+    method_option "dry-run", :type => :boolean, :default => false, :banner =>
+      "Lock the Gemfile"
     def check
       ENV['BUNDLE_GEMFILE'] = File.expand_path(options[:gemfile]) if options[:gemfile]
 
@@ -117,7 +119,7 @@ module Bundler
         Bundler.ui.error "This bundle has been frozen, but there is no Gemfile.lock present"
         exit 1
       else
-        Bundler.load.lock
+        Bundler.load.lock unless options[:"dry-run"]
         Bundler.ui.info "The Gemfile's dependencies are satisfied"
       end
     end
@@ -416,20 +418,18 @@ module Bundler
       bundle exec you can require and call the bundled gems as if they were installed
       into the systemwide Rubygems repository.
     D
-    def exec(*)
-      ARGV.shift # remove "exec"
-
+    def exec(*args)
       Bundler.definition.validate_ruby!
       Bundler.load.setup_environment
 
       begin
         # Run
-        Kernel.exec(*ARGV)
+        Kernel.exec(*args)
       rescue Errno::EACCES
-        Bundler.ui.error "bundler: not executable: #{ARGV.first}"
+        Bundler.ui.error "bundler: not executable: #{args.first}"
         exit 126
       rescue Errno::ENOENT
-        Bundler.ui.error "bundler: command not found: #{ARGV.first}"
+        Bundler.ui.error "bundler: command not found: #{args.first}"
         Bundler.ui.warn  "Install missing gem executables with `bundle install`"
         exit 127
       rescue ArgumentError
@@ -450,14 +450,11 @@ module Bundler
       will show the current value, as well as any superceded values and
       where they were specified.
     D
-    def config(*)
-      values = ARGV.dup
-      values.shift # remove config
-
-      peek = values.shift
+    def config(*args)
+      peek = args.shift
 
       if peek && peek =~ /^\-\-/
-        name, scope = values.shift, $'
+        name, scope = args.shift, $'
       else
         name, scope = peek, "global"
       end
@@ -482,7 +479,7 @@ module Bundler
         Bundler.settings.set_local(name, nil)
         Bundler.settings.set_global(name, nil)
       when "local", "global"
-        if values.empty?
+        if args.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 }
@@ -512,7 +509,7 @@ module Bundler
           Bundler.ui.info "You are replacing the current local value of #{name}, which is currently #{local.inspect}"
         end
 
-        Bundler.settings.send("set_#{scope}", name, values.join(" "))
+        Bundler.settings.send("set_#{scope}", name, args.join(" "))
       else
         Bundler.ui.error "Invalid scope --#{scope} given. Please use --local or --global."
         exit 1
@@ -600,7 +597,7 @@ 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/LICENSE.txt.tt"),           File.join(target, "LICENSE.txt"),            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)
@@ -667,9 +664,9 @@ module Bundler
   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.settings[:cache_all] = options[:all] if options.key?("all")
+
+      if Bundler.definition.sources.any? { |s| !s.is_a?(Source::Rubygems) } && !Bundler.settings[:cache_all]
         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."

data/lib/bundler/definition.rb

@@ -230,6 +230,11 @@ module Bundler
       end
 
       File.open(file, 'wb'){|f| f.puts(contents) }
+    rescue Errno::EACCES => e
+      raise Bundler::InstallError,
+        "There was an error while trying to write to Gemfile.lock. It is likely that \n" \
+        "you need to allow write permissions for the file at path: \n" \
+        "#{File.expand_path(file)}"
     end
 
     def to_lock

data/lib/bundler/dsl.rb

@@ -93,7 +93,7 @@ module Bundler
           else
             raise DslError, "You cannot specify the same gem twice coming from different sources. You " \
                             "specified that #{dep.name} (#{dep.requirement}) should come from " \
-                            "#{current.source || 'an unspecfied source'} and #{dep.source}"
+                            "#{current.source || 'an unspecified source'} and #{dep.source}"
           end
         end
       end

data/lib/bundler/fetcher.rb

@@ -72,7 +72,7 @@ module Bundler
         # 1. Gemcutter Endpoint doesn't return a 200
         # 2. Marshal blob doesn't load properly
         # 3. One of the YAML gemspecs has the Syck::DefaultKey problem
-        rescue HTTPError, TypeError => e
+        rescue HTTPError, TypeError, GemspecError => e
           # new line now that the dots are over
           Bundler.ui.info "" unless Bundler.ui.debug?
 
@@ -182,11 +182,10 @@ module Bundler
           rescue ArgumentError => e
             if e.message.include?('Ill-formed requirement ["#<YAML::Syck::DefaultKey')
               puts # we shouldn't print the error message on the "fetching info" status line
-              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/syck-defaultkey. For a temporary } +
-                %{workaround try using the --full-index option.}
+              raise GemspecError,
+                "Unfortunately, the gem #{s[:name]} (#{s[:number]}) has an invalid gemspec. \n" \
+                "Please ask the gem author to yank the bad version to fix this issue. For \n" \
+                "more information, see http://bit.ly/syck-defaultkey."
             else
               raise e
             end

data/lib/bundler/gem_path_manipulation.rb

@@ -0,0 +1,8 @@
+module Bundler
+  def self.preserve_gem_path
+    original_gem_path = ENV["_ORIGINAL_GEM_PATH"]
+    gem_path          = ENV["GEM_PATH"]
+    ENV["_ORIGINAL_GEM_PATH"] = gem_path          if original_gem_path.nil? || original_gem_path == ""
+    ENV["GEM_PATH"]           = original_gem_path if gem_path.nil? || gem_path == ""
+  end
+end

data/lib/bundler/ruby_version.rb

@@ -17,6 +17,8 @@ module Bundler
 
       @version        = version
       @engine         = engine || "ruby"
+      # keep track of the engine specified by the user
+      @input_engine   = engine
       @engine_version = engine_version || version
     end
 
@@ -40,11 +42,11 @@ module Bundler
     #   2. ruby_version
     #   3. engine_version
     def diff(other)
-      if engine != other.engine
+      if engine != other.engine && @input_engine
         [ :engine, engine, other.engine ]
       elsif version != other.version
         [ :version, version, other.version ]
-      elsif engine_version != other.engine_version
+      elsif engine_version != other.engine_version && @input_engine
         [ :engine_version, engine_version, other.engine_version ]
       else
         nil

data/lib/bundler/runtime.rb

@@ -107,26 +107,9 @@ module Bundler
 
     def prune_cache
       FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
-
       resolve = @definition.resolve
-      cached  = Dir["#{cache_path}/*.gem"]
-
-      cached = cached.delete_if do |path|
-        spec = Bundler.rubygems.spec_from_gem path
-
-        resolve.any? do |s|
-          s.name == spec.name && s.version == spec.version && !s.source.is_a?(Bundler::Source::Git)
-        end
-      end
-
-      if cached.any?
-        Bundler.ui.info "Removing outdated .gem files from vendor/cache"
-
-        cached.each do |path|
-          Bundler.ui.info "  * #{File.basename(path)}"
-          File.delete(path)
-        end
-      end
+      prune_gem_cache(resolve)
+      prune_git_and_path_cache(resolve)
     end
 
     def clean
@@ -226,6 +209,50 @@ module Bundler
 
   private
 
+    def prune_gem_cache(resolve)
+      cached  = Dir["#{cache_path}/*.gem"]
+
+      cached = cached.delete_if do |path|
+        spec = Bundler.rubygems.spec_from_gem path
+
+        resolve.any? do |s|
+          s.name == spec.name && s.version == spec.version && !s.source.is_a?(Bundler::Source::Git)
+        end
+      end
+
+      if cached.any?
+        Bundler.ui.info "Removing outdated .gem files from vendor/cache"
+
+        cached.each do |path|
+          Bundler.ui.info "  * #{File.basename(path)}"
+          File.delete(path)
+        end
+      end
+    end
+
+    def prune_git_and_path_cache(resolve)
+      cached  = Dir["#{cache_path}/*/.bundlecache"]
+
+      cached = cached.delete_if do |path|
+        name = File.basename(File.dirname(path))
+
+        resolve.any? do |s|
+          source = s.source
+          source.respond_to?(:app_cache_dirname) && source.app_cache_dirname == name
+        end
+      end
+
+      if cached.any?
+        Bundler.ui.info "Removing outdated .git/path repos from vendor/cache"
+
+        cached.each do |path|
+          path = File.dirname(path)
+          Bundler.ui.info "  * #{File.basename(path)}"
+          FileUtils.rm_rf(path)
+        end
+      end
+    end
+
     def cache_path
       root.join("vendor/cache")
     end

data/lib/bundler/source.rb

@@ -374,6 +374,7 @@ module Bundler
         return if @original_path.expand_path(Bundler.root).to_s.index(Bundler.root.to_s) == 0
         FileUtils.rm_rf(app_cache_path)
         FileUtils.cp_r("#{@original_path}/.", app_cache_path)
+        FileUtils.touch(app_cache_path.join(".bundlecache"))
       end
 
       def local_specs(*)
@@ -387,10 +388,14 @@ module Bundler
         local_specs
       end
 
+      def app_cache_dirname
+        name
+      end
+
     private
 
       def app_cache_path
-        @app_cache_path ||= Bundler.app_cache.join(name)
+        @app_cache_path ||= Bundler.app_cache.join(app_cache_dirname)
       end
 
       def has_app_cache?
@@ -628,7 +633,7 @@ module Bundler
         end
       end
 
-      attr_reader :uri, :ref, :options, :submodules
+      attr_reader :uri, :ref, :branch, :options, :submodules
 
       def initialize(options)
         @options = options
@@ -641,6 +646,7 @@ module Bundler
         %w(ref branch tag revision).each{|k| options[k] = options[k].to_s if options[k] }
 
         @uri        = options["uri"]
+        @branch     = options["branch"]
         @ref        = options["ref"] || options["branch"] || options["tag"] || 'master'
         @submodules = options["submodules"]
         @name       = options["name"]
@@ -670,6 +676,7 @@ module Bundler
         Git === o            &&
         uri == o.uri         &&
         ref == o.ref         &&
+        branch == o.branch   &&
         name == o.name       &&
         version == o.version &&
         submodules == o.submodules
@@ -692,6 +699,9 @@ module Bundler
         File.basename(@uri, '.git')
       end
 
+      # This is the path which is going to contain a specific
+      # checkout of the git repository. When using local git
+      # repos, this is set to the local repo.
       def install_path
         @install_path ||= begin
           git_scope = "#{base_name}-#{shortref_for_path(revision)}"
@@ -716,9 +726,9 @@ module Bundler
         path = Pathname.new(path)
         path = path.expand_path(Bundler.root) unless path.relative?
 
-        unless options["branch"]
+        unless options["branch"] || Bundler.settings[:disable_local_branch_check]
           raise GitError, "Cannot use local override for #{name} at #{path} because " \
-            ":branch is not specified in Gemfile. Specify a branch or check " \
+            ":branch is not specified in Gemfile. Specify a branch or use " \
             "`bundle config --delete` to remove the local override"
         end
 
@@ -733,7 +743,7 @@ module Bundler
         # so the Gemfile.lock always picks up the new revision.
         @git_proxy = GitProxy.new(path, uri, ref)
 
-        if git_proxy.branch != options["branch"]
+        if git_proxy.branch != options["branch"] && !Bundler.settings[:disable_local_branch_check]
           raise GitError, "Local override for #{name} at #{path} is using branch " \
             "#{git_proxy.branch} but Gemfile specifies #{options["branch"]}"
         end
@@ -776,12 +786,13 @@ module Bundler
 
       def cache(spec)
         return unless Bundler.settings[:cache_all]
-        return if path.expand_path(Bundler.root).to_s.index(Bundler.root.to_s) == 0
+        return if path == app_cache_path
         cached!
         FileUtils.rm_rf(app_cache_path)
         git_proxy.checkout if requires_checkout?
         git_proxy.copy_to(app_cache_path, @submodules)
         FileUtils.rm_rf(app_cache_path.join(".git"))
+        FileUtils.touch(app_cache_path.join(".bundlecache"))
       end
 
       def load_spec_files
@@ -790,6 +801,10 @@ module Bundler
         raise GitError, "#{to_s} is not checked out. Please run `bundle install`"
       end
 
+      # This is the path which is going to contain a cache
+      # of the git repository. When using the same git repository
+      # across different projects, this cache will be shared.
+      # When using local git repos, this is set to the local repo.
       def cache_path
         @cache_path ||= begin
           git_scope = "#{base_name}-#{uri_hash}"
@@ -802,6 +817,10 @@ module Bundler
         end
       end
 
+      def app_cache_dirname
+        "#{base_name}-#{shortref_for_path(cached_revision || revision)}"
+      end
+
     private
 
       def set_local!(path)
@@ -814,10 +833,6 @@ module Bundler
         cached_revision && super
       end
 
-      def app_cache_path
-        @app_cache_path ||= Bundler.app_cache.join("#{base_name}-#{shortref_for_path(cached_revision || revision)}")
-      end
-
       def local?
         @local
       end