bundler 1.0.3 → 1.0.5

data/.gitignore

@@ -1,12 +1,19 @@
+# system crap
 .DS_Store
 .*.swp
+
+# files created by running the specs
 tmp
+
+# built gems
 pkg
 *.gem
+
+# rubinius bytecode
 *.rbc
 
+# output from ronn
 lib/bundler/man
 
-man/*
-!man/*.ronn
-!man/index.txt
+# output from ci_reporter
+spec/reports

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## 1.0.5 (November 13, 2010)
+
+Bugfixes:
+
+  - Fix regression disabling all operations that employ sudo
+
+## 1.0.4 (November 12, 2010)
+
+Bugfixes:
+
+  - Expand relative :paths from Bundler.root (eg ./foogem)
+  - Allow git gems in --without groups while --frozen
+  - Allow gem :ref to be a symbol as well as a string
+  - Fix exception when Gemfile needs a newer Bundler version
+  - Explanation when the current Bundler version conflicts
+  - Explicit error message if Gemfile needs newer Bundler
+  - Ignore an empty string BUNDLE_GEMFILE
+  - Skeleton gemspec now works with older versions of git
+  - Fix shell quoting and ref fetching in GemHelper
+  - Disable colored output in --deployment
+  - Preserve line endings in lock file
+
+Features:
+
+  - Add support for 'mingw32' platform (aka RubyInstaller)
+  - Large speed increase when Gemfile.lock is already present
+  - Huge speed increase when many (100+) system gems are present
+  - Significant expansion of ISSUES, man pages, and docs site
+  - Remove Open3 from GemHelper (now it works on Windows™®©)
+  - Allow setting roles in built-in cap and vlad tasks
+
 ## 1.0.3 (October 15, 2010)
 
 Bugfixes:

data/ISSUES.md

@@ -6,7 +6,22 @@ Instructions for common Bundler use-cases can be found on the [Bundler documenta
 
 After reading the documentation, try these troubleshooting steps:
 
-    rm -rf ~/.bundle/ ~/.gem/ .bundle/ vendor/cache/ Gemfile.lock
+    # remove user-specific gems and git repos
+    rm -rf ~/.bundle/ ~/.gem/
+
+    # remove system-wide git repos and git checkouts
+    rm -rf $GEM_HOME/bundler/ $GEM_HOME/cache/bundler/
+
+    # remove project-specific settings and git repos
+    rm -rf .bundle/
+
+    # remove project-specific cached .gem files
+    rm -rf vendor/cache/
+
+    # remove the saved resolve of the Gemfile
+    rm -rf Gemfile.lock
+
+    # try to install one more time
     bundle install
 
 ## Reporting unresolved problems

data/LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2009 Engine Yard
+Portions copyright (c) 2010 Andre Arko
+Portions copyright (c) 2009 Engine Yard
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -9,20 +9,42 @@ end
 
 begin
   require 'rspec/core/rake_task'
-
-  task :clear_tmp do
-    FileUtils.rm_rf(File.expand_path("../tmp", __FILE__))
-  end
+  require 'ronn'
 
   desc "Run specs"
   RSpec::Core::RakeTask.new do |t|
     t.rspec_opts = %w(-fs --color)
     t.ruby_opts  = %w(-w)
   end
+  task :spec => "man:build"
+
+  begin
+    require 'ci/reporter/rake/rspec'
 
-  task :spec => :build
+    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"
+    end
+  end
 
   namespace :spec do
+    desc "Run the spec suite with the sudo tests"
+    task :sudo => ["set_sudo", "clean", "spec"]
+
     task :set_sudo do
       ENV['BUNDLER_SUDO_TESTS'] = '1'
     end
@@ -35,9 +57,6 @@ begin
       end
     end
 
-    desc "Run the spec suite with the sudo tests"
-    task :sudo => ["set_sudo", "clean", "spec"]
-
     namespace :rubygems do
       # Rubygems 1.3.5, 1.3.6, and HEAD specs
       rubyopt = ENV["RUBYOPT"]
@@ -89,8 +108,17 @@ begin
 
 rescue LoadError
   task :spec do
-    abort "Run `gem install rspec --pre` to be able to run specs"
+    abort "Run `rake spec:deps` to be able to run the specs"
   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"
+    end
+  end
+
 end
 
 namespace :man do
@@ -108,11 +136,11 @@ namespace :man do
       sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
     end
 
-    task :build_pages => "#{roff}.txt"
+    task :build_all_pages => "#{roff}.txt"
   end
 
   desc "Build the man pages"
-  task :build => "man:build_pages"
+  task :build => "man:build_all_pages"
 
   desc "Clean up from the built man pages"
   task :clean do
@@ -134,6 +162,4 @@ namespace :vendor do
   end
 end
 
-task :build => "man:build"
-
 task :default => :spec

data/bin/bundle

@@ -13,7 +13,7 @@ begin
   Bundler::CLI.start
 rescue Bundler::BundlerError => e
   Bundler.ui.error e.message
-  Bundler.ui.error e.backtrace.join("\n") if ENV["BUNDLE_DEBUG"]
+  Bundler.ui.debug e.backtrace.join("\n")
   exit e.status_code
 rescue Interrupt
   Bundler.ui.error "\nQuitting..."

data/lib/bundler.rb

@@ -47,9 +47,10 @@ module Bundler
 
 
   WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+  FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/
   NULL    = WINDOWS ? "NUL" : "/dev/null"
 
-
+  # Internal errors, should be rescued
   class VersionConflict  < BundlerError
     attr_reader :conflicts
 
@@ -61,7 +62,6 @@ module Bundler
     status_code(6)
   end
 
-  # Internal errors, should be rescued
   class InvalidSpecSet < StandardError; end
 
   class << self
@@ -192,11 +192,14 @@ module Bundler
     end
 
     def requires_sudo?
+      return @requires_sudo if @checked_for_sudo
+
       path = bundle_path
       path = path.parent until path.exist?
-      sudo_present = !`which sudo 2>#{NULL}`.empty?
+      sudo_present = !(`which sudo` rescue '').empty?
 
-      settings.allow_sudo? && !File.writable?(path) && sudo_present
+      @checked_for_sudo = true
+      @requires_sudo = settings.allow_sudo? && !File.writable?(path) && sudo_present
     end
 
     def mkdir_p(path)
@@ -262,21 +265,6 @@ module Bundler
       if lockfile.exist? && lockfile.read(3) == "---"
         Bundler.ui.warn "Detected Gemfile.lock generated by 0.9, deleting..."
         lockfile.rmtree
-        # lock = YAML.load_file(lockfile)
-        #
-        # source_uris = lock["sources"].map{|s| s["Rubygems"]["uri"] }
-        # sources = [Bundler::Source::Rubygems.new({"remotes" => source_uris})]
-        #
-        # deps = lock["dependencies"].map do |name, opts|
-        #   version = opts.delete("version")
-        #   Bundler::Dependency.new(name, version, opts)
-        # end
-        #
-        # definition = Bundler::Definition.new(nil, deps, sources, {})
-        #
-        # File.open(lockfile, 'w') do |f|
-        #   f.write definition.to_lock
-        # end
       end
     end
 

data/lib/bundler/capistrano.rb

@@ -6,6 +6,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 })
 end

data/lib/bundler/cli.rb

@@ -12,9 +12,9 @@ module Bundler
 
     def initialize(*)
       super
-      use_shell = options["no-color"] ? Thor::Shell::Basic.new : shell
-
-      Bundler.ui = UI::Shell.new(use_shell)
+      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)
     end
 
@@ -22,6 +22,7 @@ module Bundler
 
     default_task :install
     class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
+    class_option "verbose",  :type => :boolean, :banner => "Enable verbose output mode", :aliases => "-V"
 
     def help(cli = nil)
       case cli
@@ -162,8 +163,11 @@ module Bundler
       end
       opts[:without].map!{|g| g.to_sym }
 
-
       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
+      ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
+
+      # Just disable color in deployment mode
+      Bundler.ui.shell = Thor::Shell::Basic.new if opts[:deployment]
 
       if opts[:production]
         opts[:deployment] = true
@@ -499,8 +503,7 @@ module Bundler
   private
 
     def have_groff?
-      `which groff 2>#{NULL}`
-      $? == 0
+      !(`which groff` rescue '').empty?
     end
 
     def locate_gem(name)
@@ -511,5 +514,6 @@ module Bundler
       end
       spec.full_gem_path
     end
+
   end
 end

data/lib/bundler/definition.rb

@@ -14,10 +14,7 @@ module Bundler
         raise GemfileNotFound, "#{gemfile} not found"
       end
 
-      # TODO: move this back into DSL
-      builder = Dsl.new
-      builder.instance_eval(Bundler.read_file(gemfile.to_s), gemfile.to_s, 1)
-      builder.to_definition(lockfile, unlock)
+      Dsl.evaluate(gemfile, lockfile, unlock)
     end
 
 =begin
@@ -93,7 +90,8 @@ module Bundler
         specs = resolve.materialize(requested_dependencies)
 
         unless specs["bundler"].any?
-          bundler = index.search(Gem::Dependency.new('bundler', VERSION)).last
+          local = Bundler.settings[:frozen] ? rubygems_index : index
+          bundler = local.search(Gem::Dependency.new('bundler', VERSION)).last
           specs["bundler"] = bundler if bundler
         end
 
@@ -150,7 +148,9 @@ module Bundler
           end
 
           # Run a resolve against the locally available gems
-          last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve)
+          local = Resolver.resolve(expanded_dependencies,
+            index, source_requirements, last_resolve, unlocked?)
+          last_resolve.merge(local)
         end
       end
     end
@@ -163,6 +163,14 @@ module Bundler
       end
     end
 
+    def rubygems_index
+      @rubygems_index ||= Index.build do |idx|
+        @sources.find_all{|s| s.is_a?(Source::Rubygems) }.each do |s|
+          idx.use s.specs
+        end
+      end
+    end
+
     def no_sources?
       @sources.length == 1 && @sources.first.remotes.empty?
     end
@@ -181,9 +189,11 @@ module Bundler
         return
       end
 
-      File.open(file, 'wb') do |f|
-        f.puts contents
-      end
+      # Convert to \r\n if the existing lock has them
+      # i.e., Windows with `git config core.autocrlf=true`
+      contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match("\r\n")
+
+      File.open(file, 'wb'){|f| f.puts(contents) }
     end
 
     def to_lock
@@ -417,5 +427,9 @@ module Bundler
       groups.map! { |g| g.to_sym }
       dependencies.reject { |d| !d.should_include? || (d.groups & groups).empty? }
     end
+
+    def unlocked?
+      @lockfile_contents.empty?
+    end
   end
 end

data/lib/bundler/dependency.rb

@@ -16,7 +16,8 @@ module Bundler
       :mri_18  => Gem::Platform::RUBY,
       :mri_19  => Gem::Platform::RUBY,
       :jruby   => Gem::Platform::JAVA,
-      :mswin   => Gem::Platform::MSWIN
+      :mswin   => Gem::Platform::MSWIN,
+      :mingw   => Gem::Platform::MINGW
     }.freeze
 
     def initialize(name, version, options = {}, &blk)
@@ -108,7 +109,11 @@ module Bundler
     end
 
     def mswin?
-      # w0t?
+      Bundler::WINDOWS
+    end
+
+    def mingw?
+      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32"
     end
   end
 end

data/lib/bundler/deployment.rb

@@ -1,21 +1,37 @@
 module Bundler
   class Deployment
     def self.define_task(context, task_method = :task, opts = {})
+      if context.is_a?(Capistrano::Configuration)
+        context_name = "capistrano"
+        role_default = "{:except => {:no_release => true}}"
+      else
+        context_name = "vlad"
+        role_default = "[:app]"
+      end
+
+      roles = context.fetch(:bundle_roles, nil)
+      opts[:roles] = roles if roles
+
       context.send :namespace, :bundle do
         send :desc, <<-DESC
           Install the current Bundler environment. By default, gems will be \
           installed to the shared/bundle path. Gems in the development and \
           test group will not be installed. The install command is executed \
-          with the --deployment and --quiet flags. You can override any of \
-          these defaults by setting the variables shown below. If the bundle \
-          cmd cannot be found then you can override the bundle_cmd variable \
-          to specifiy which one it should use.
+          with the --deployment and --quiet flags. If the bundle cmd cannot \
+          be found then you can override the bundle_cmd variable to specifiy \
+          which one it should use.
+
+          You can override any of these defaults by setting the variables shown below.
+
+          N.B. bundle_roles must be defined before you require 'bundler/#{context_name}' \
+          in your deploy.rb file.
 
-            set :bundle_gemfile,      "Gemfile"
-            set :bundle_dir,          File.join(fetch(:shared_path), 'bundle')
-            set :bundle_flags,        "--deployment --quiet"
-            set :bundle_without,      [:development, :test]
-            set :bundle_cmd,          "bundle" # e.g. change to "/opt/ruby/bin/bundle"
+            set :bundle_gemfile,  "Gemfile"
+            set :bundle_dir,      File.join(fetch(:shared_path), 'bundle')
+            set :bundle_flags,    "--deployment --quiet"
+            set :bundle_without,  [:development, :test]
+            set :bundle_cmd,      "bundle" # e.g. "/opt/ruby/bin/bundle"
+            set :bundle_roles,    #{role_default} # e.g. [:app, :batch]
         DESC
         send task_method, :install, opts do
           bundle_cmd     = context.fetch(:bundle_cmd, "bundle")