bundler 1.1.pre.1 → 1.1.pre.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.pre.2 (April 28, 2011)
+
+Features:
+
+  - Add :github option to Gemfile DSL for easy git repos
+  - Merge all fixes from 1.0.12 and 1.0.13
+
 ## 1.1.pre.1 (February 2, 2011)
 
 Bugfixes:
@@ -22,6 +29,45 @@ Removed:
   - Removed bundle install --production
   - Removed bundle install --disable-shared-gems
 
+## 1.0.13 (April 28, 2011)
+
+Features:
+
+  - Compatibility with Rubygems master (soon to be v1.8)
+  - Check for Rubygems features before overriding them
+  - Informative error when --path points to a broken symlink
+
+## 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:

data/Rakefile

@@ -60,7 +60,7 @@ begin
     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.0 v1.4.1 v1.5.0).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.1 v1.7.2).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -71,14 +71,31 @@ begin
           unless File.directory?("tmp/rubygems")
             system("git clone git://github.com/rubygems/rubygems.git tmp/rubygems")
           end
-          system("cd tmp/rubygems && git checkout #{rg}")
-          system("git pull") if rg == "master"
+          Dir.chdir("tmp/rubygems") do
+            system("git remote update")
+            system("git checkout #{rg}")
+            system("git pull origin master") if rg == "master"
+          end
+          puts "Running bundler specs against rubygems '#{rg}'"
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
         end
 
         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

data/bin/bundle

@@ -19,4 +19,9 @@ rescue Interrupt => e
   Bundler.ui.error "\nQuitting..."
   Bundler.ui.debug e.backtrace.join("\n")
   exit 1
+rescue Exception => e
+  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. Thanks!"
+  raise e
 end

data/bundler.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.name        = "bundler"
   s.version     = Bundler::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Carl Lerche", "Yehuda Katz", "André Arko", "Terence Lee"]
-  s.email       = ["carlhuda@engineyard.com"]
+  s.authors     = ["André Arko", "Terence Lee", "Carl Lerche", "Yehuda Katz"]
+  s.email       = ["andre@arko.net"]
   s.homepage    = "http://gembundler.com"
   s.summary     = %q{The best way to manage your application's dependencies}
   s.description = %q{Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably}
@@ -18,13 +18,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "bundler"
 
   s.add_development_dependency "ronn"
-  s.add_development_dependency "rspec", "2.0.0.rc"
+  s.add_development_dependency "rspec", "~> 2.0"
 
   # 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
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables        = %w(bundle)
-  s.default_executable = "bundle"
   s.require_paths      = ["lib"]
 end

data/lib/bundler.rb

@@ -9,6 +9,7 @@ end
 
 require 'yaml'
 require 'bundler/rubygems_ext'
+require 'bundler/rubygems_integration'
 require 'bundler/version'
 
 module Bundler
@@ -87,7 +88,6 @@ module Bundler
     end
 
     def bundle_path
-      # STDERR.puts settings.path
       @bundle_path ||= Pathname.new(settings.path).expand_path(root)
     end
 
@@ -140,11 +140,11 @@ module Bundler
     end
 
     def ruby_scope
-      "#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
+      "#{Bundler.rubygems.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
     end
 
     def user_bundle_path
-      Pathname.new(Gem.user_home).join(".bundler")
+      Pathname.new(Bundler.rubygems.user_home).join(".bundler")
     end
 
     def home
@@ -202,7 +202,7 @@ module Bundler
     end
 
     def requires_sudo?
-      return @requires_sudo if @checked_for_sudo
+      return @requires_sudo if defined?(@checked_for_sudo) && @checked_for_sudo
 
       path = bundle_path
       path = path.parent until path.exist?
@@ -261,14 +261,17 @@ module Bundler
       if settings[:disable_shared_gems]
         ENV['GEM_PATH'] = ''
         ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
-      elsif Gem.dir != bundle_path.to_s
-        paths = [Gem.dir, Gem.path].flatten.compact.uniq.reject{|p| p.empty? }
+      elsif Bundler.rubygems.gem_dir != bundle_path.to_s
+        possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
+        paths = possibles.flatten.compact.uniq.reject { |p| p.empty? }
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
         ENV["GEM_HOME"] = bundle_path.to_s
       end
 
-      FileUtils.mkdir_p bundle_path.to_s
-      Gem.clear_paths
+      # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)
+      FileUtils.mkdir_p bundle_path.to_s rescue nil
+
+      Bundler.rubygems.clear_paths
     end
 
     def upgrade_lockfile

data/lib/bundler/capistrano.rb

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

data/lib/bundler/cli.rb

@@ -4,9 +4,6 @@ require 'thor/actions'
 require 'rubygems/user_interaction'
 require 'rubygems/config_file'
 
-# Work around a RubyGems bug
-Gem.configuration
-
 module Bundler
   class CLI < Thor
     include Thor::Actions
@@ -16,7 +13,7 @@ module Bundler
       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
       Bundler.ui = UI::Shell.new(the_shell)
       Bundler.ui.debug! if options["verbose"]
-      Gem::DefaultUserInteraction.ui = UI::RGProxy.new(Bundler.ui)
+      Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
     end
 
     check_unknown_options! unless ARGV.include?("exec") || ARGV.include?("config")
@@ -46,7 +43,7 @@ module Bundler
 
         if have_groff? && root !~ %r{^file:/.+!/META-INF/jruby.home/.+}
           groff   = "groff -Wall -mtty-char -mandoc -Tascii"
-          pager   = ENV['MANPAGER'] || ENV['PAGER'] || 'less'
+          pager   = ENV['MANPAGER'] || ENV['PAGER'] || 'less -R'
 
           Kernel.exec "#{groff} #{root}/#{command} | #{pager}"
         else
@@ -162,6 +159,7 @@ module Bundler
       end
       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]
       ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
 
@@ -189,12 +187,19 @@ module Bundler
         Bundler.settings[:frozen] = '1'
       end
 
+      # When install is called with --no-deployment, disable deployment mode
+      if opts[:deployment] == false
+        Bundler.settings.delete(:frozen)
+        opts[:system] = true
+      end
+
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
       Bundler.settings[:path]   = nil if opts[:system]
       Bundler.settings[:path]   = "vendor/bundle" if opts[:deployment]
       Bundler.settings[:path]   = opts[:path] if opts[:path]
       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.ui.be_quiet! if opts[:quiet]
@@ -212,7 +217,7 @@ module Bundler
           "Use `bundle show [gemname]` to see where a bundled gem is installed."
       end
     rescue GemNotFound => e
-      if opts[:local]
+      if opts[:local] && Bundler.app_cache.exist?
         Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
       end
 
@@ -272,7 +277,7 @@ module Bundler
     def cache
       Bundler.definition.resolve_with_cache!
       Bundler.load.cache
-      Bundler.settings[:no_prune] = true if options[:no_prune]
+      Bundler.settings[:no_prune] = true if options["no-prune"]
       Bundler.load.lock
     rescue GemNotFound => e
       Bundler.ui.error(e.message)

data/lib/bundler/definition.rb

@@ -61,7 +61,7 @@ module Bundler
       @unlock[:gems] ||= []
       @unlock[:sources] ||= []
 
-      current_platform = Gem.platforms.map { |p| generic(p) }.compact.last
+      current_platform = Bundler.rubygems.platforms.map { |p| generic(p) }.compact.last
       @new_platform = !@platforms.include?(current_platform)
       @platforms |= [current_platform]
 
@@ -141,6 +141,10 @@ module Bundler
           @locked_specs
         else
           last_resolve = converge_locked_specs
+
+          # Record the specs available in each gem's source, so that those
+          # specs will be available later when the resolver knows where to
+          # look for that gemspec (or its dependencies)
           source_requirements = {}
           dependencies.each do |dep|
             next unless dep.source
@@ -225,7 +229,7 @@ module Bundler
 
       handled = []
       dependencies.
-        sort_by { |d| d.name }.
+        sort_by { |d| d.to_s }.
         each do |dep|
           next if handled.include?(dep.name)
           out << dep.to_lock
@@ -235,11 +239,17 @@ module Bundler
       out
     end
 
-    def ensure_equivalent_gemfile_and_lockfile
+    def ensure_equivalent_gemfile_and_lockfile(explicit_flag = false)
       changes = false
 
-      msg = "You have modified your Gemfile in development but did not check\n" \
-            "the resulting snapshot (Gemfile.lock) into version control"
+      msg = "You are trying to install in deployment mode after changing\n" \
+            "your Gemfile. Run `bundle install` elsewhere and add the\n" \
+            "updated Gemfile.lock to version control."
+
+      unless explicit_flag
+        msg += "\n\nIf this is a development machine, remove the Gemfile " \
+               "freeze \nby running `bundle install --no-deployment`."
+      end
 
       added =   []
       deleted = []
@@ -287,6 +297,7 @@ module Bundler
       msg << "\n\nYou have added to the Gemfile:\n"     << added.join("\n") if added.any?
       msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any?
       msg << "\n\nYou have changed in the Gemfile:\n"   << changed.join("\n") if changed.any?
+      msg << "\n"
 
       raise ProductionError, msg if added.any? || deleted.any? || changed.any?
     end
@@ -367,8 +378,10 @@ module Bundler
           # If the spec is no longer in the path source, unlock it. This
           # commonly happens if the version changed in the gemspec
           next unless other
+
+          deps2 = other.dependencies.select { |d| d.type != :development }
           # If the dependencies of the path source have changed, unlock it
-          next unless s.dependencies.sort == other.dependencies.sort
+          next unless s.dependencies.sort == deps2.sort
         end
 
         converged << s

data/lib/bundler/dependency.rb

@@ -72,7 +72,8 @@ module Bundler
       out = "  #{name}"
 
       unless requirement == Gem::Requirement.default
-        out << " (#{requirement.to_s})"
+        reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
+        out << " (#{reqs.join(', ')})"
       end
 
       out << '!' if source

data/lib/bundler/dsl.rb

@@ -76,18 +76,18 @@ module Bundler
     def source(source, options = {})
       case source
       when :gemcutter, :rubygems, :rubyforge then
-        rubygems_source "http://rubygems.org"
+        @rubygems_source.add_remote "http://rubygems.org"
         return
       when String
-        rubygems_source source
+        @rubygems_source.add_remote source
         return
-      end
-
-      @source = source
-      options[:prepend] ? @sources.unshift(@source) : @sources << @source
+      else
+        @source = source
+        options[:prepend] ? @sources.unshift(@source) : @sources << @source
 
-      yield if block_given?
-      @source
+        yield if block_given?
+        return @source
+      end
     ensure
       @source = nil
     end
@@ -183,7 +183,7 @@ module Bundler
     def _normalize_options(name, version, opts)
       _normalize_hash(opts)
 
-      invalid_keys = opts.keys - %w(group groups git path name branch ref tag require submodules platform platforms)
+      invalid_keys = opts.keys - %w(group groups git github path name branch ref tag require submodules platform platforms)
       if invalid_keys.any?
         plural = invalid_keys.size > 1
         message = "You passed #{invalid_keys.map{|k| ':'+k }.join(", ")} "
@@ -209,7 +209,11 @@ module Bundler
         raise DslError, "`#{p}` is not a valid platform. The available options are: #{VALID_PLATFORMS.inspect}"
       end
 
-      # Normalize git and path options
+      if github = opts.delete(:github)
+        github = "#{github}/#{github}" unless github.include?("/")
+        opts["git"] = "git://github.com/#{github}.git"
+      end
+
       ["git", "path"].each do |type|
         if param = opts[type]
           if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/

data/lib/bundler/index.rb

@@ -8,16 +8,18 @@ module Bundler
       i
     end
 
-    attr_reader :specs
+    attr_reader :specs, :sources
     protected   :specs
 
     def initialize
+      @sources = []
       @cache = {}
       @specs = Hash.new { |h,k| h[k] = [] }
     end
 
     def initialize_copy(o)
       super
+      @sources = @sources.dup
       @cache = {}
       @specs = Hash.new { |h,k| h[k] = [] }
 
@@ -34,13 +36,19 @@ module Bundler
     def search(query)
       case query
       when Gem::Specification, RemoteSpecification, LazySpecification then search_by_spec(query)
-      when String then @specs[query]
-      else search_by_dependency(query)
+      when String then specs_by_name(query)
+      when Gem::Dependency then search_by_dependency(query)
+      else
+        raise "You can't search for a #{query.inspect}."
       end
     end
 
+    def specs_by_name(name)
+      @specs[name]
+    end
+
     def search_for_all_platforms(dependency, base = [])
-      specs = @specs[dependency.name] + base
+      specs = specs_by_name(dependency.name) + base
 
       wants_prerelease = dependency.requirement.prerelease?
       only_prerelease  = specs.all? {|spec| spec.version.prerelease? }
@@ -54,15 +62,19 @@ module Bundler
     end
 
     def sources
-      @specs.values.map do |specs|
-        specs.map{|s| s.source.class }
+      specs.values.map do |specs|
+        specs.map{|s| s.source }
       end.flatten.uniq
     end
 
+    def source_types
+      sources.map{|s| s.class }.uniq
+    end
+
     alias [] search
 
     def <<(spec)
-      arr = @specs[spec.name]
+      arr = specs_by_name(spec.name)
 
       arr.delete_if do |s|
         same_version?(s.version, spec.version) && s.platform == spec.platform
@@ -73,7 +85,7 @@ module Bundler
     end
 
     def each(&blk)
-      @specs.values.each do |specs|
+      specs.values.each do |specs|
         specs.each(&blk)
       end
     end
@@ -96,7 +108,7 @@ module Bundler
   private
 
     def search_by_spec(spec)
-      @specs[spec.name].select do |s|
+      specs_by_name(spec.name).select do |s|
         same_version?(s.version, spec.version) && Gem::Platform.new(s.platform) == Gem::Platform.new(spec.platform)
       end
     end
@@ -114,12 +126,11 @@ module Bundler
 
     def search_by_dependency(dependency)
       @cache[dependency.hash] ||= begin
-        specs = @specs[dependency.name]
+        specs = specs_by_name(dependency.name)
+        found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) }
 
         wants_prerelease = dependency.requirement.prerelease?
         only_prerelease  = specs.all? {|spec| spec.version.prerelease? }
-        found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) }
-
         unless wants_prerelease || only_prerelease
           found.reject! { |spec| spec.version.prerelease? }
         end