bundler 1.0.18 → 1.0.19.rc

data/.travis.yml

@@ -0,0 +1,32 @@
+before_script:
+  - sudo apt-get install groff -y
+  - rake spec:deps
+
+script: rake spec:travis
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+
+env:
+  - RGV=v1.3.6
+  - RGV=v1.3.7
+  - RGV=v1.4.2
+  - RGV=v1.5.3
+  - RGV=v1.6.2
+  - RGV=v1.7.2
+  - RGV=v1.8.10
+  - RGV=master
+
+matrix:
+  exclude:
+    - rvm: 1.9.2
+      env: RGV=v1.3.6
+    - rvm: 1.9.2
+      env: RGV=v1.3.7
+    - rvm: 1.9.2
+      env: RGV=v1.4.2
+
+notifications:
+  email:
+    - travis-ci@andrearko.com

data/CHANGELOG.md

@@ -1,9 +1,24 @@
-## 1.0.18 (Aug 16, 2011)
+## 1.0.19.rc (September 13, 2011)
+
+Features:
+
+	- Compatability with Rubygems 1.8.10 installer changes
+	- Report gem installation failures clearly (@rwilcox, #1380)
+	- Useful error for cap and vlad on first deploy (@nexmat, @kirs)
+
+Bugfixes:
+
+	- `exec` now works when the command contains 'exec'
+  - Only touch lock after changes on Windows (@robertwahler, #1358)
+	- Keep load paths when #setup is called multiple times (@radsaq, #1379)
+
+## 1.0.18 (August 16, 2011)
 
 Bugfixes:
 
   - Fix typo in DEBUG_RESOLVER (@geemus)
   - Fixes rake 0.9.x warning (@mtylty, #1333)
+  - Fix `bundle cache` again for rubygems 1.3.x
 
 Features:
 
@@ -12,14 +27,14 @@ Features:
   - Make fetch_specs faster (@zeha, #1294)
   - Allow overriding development deps loaded by #gemspec (@lgierth, #1245)
 
-## 1.0.17 (Aug 8, 2011)
+## 1.0.17 (August 8, 2011)
 
 Bugfixes:
 
   - Fix rake issues with rubygems 1.3.x (#1342)
   - Fixed invalid byte sequence error while installing gem on Ruby 1.9 (#1341)
 
-## 1.0.16 (Aug 8, 2011)
+## 1.0.16 (August 8, 2011)
 
 Features:
 

data/Rakefile

@@ -2,6 +2,13 @@
 $:.unshift File.expand_path("../lib", __FILE__)
 require 'bundler/gem_tasks'
 
+def safe_task(&block)
+  yield
+  true
+rescue
+  false
+end
+
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
@@ -42,7 +49,7 @@ begin
     namespace :rubygems do
       # Rubygems specs by version
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.7).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.10).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -71,7 +78,7 @@ begin
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
         end
 
-        task rg => "clone_rubygems_#{rg}"
+        task rg => ["clone_rubygems_#{rg}", "man:build"]
         task "rubygems:all" => rg
       end
 
@@ -114,6 +121,22 @@ begin
       end
     end
 
+    desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
+    task "travis" do
+      rg = ENV['RGV'] || 'master'
+
+      puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
+      specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }
+
+      Rake::Task["spec:rubygems:#{rg}"].reenable
+
+      puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
+      sudos = safe_task { Rake::Task["spec:rubygems:#{rg}:sudo"].invoke }
+
+      unless specs && sudos
+        fail "Bundler tests failed, please review the log for more information"
+      end
+    end
   end
 
   namespace :man do

data/UPGRADING.md

@@ -33,7 +33,7 @@ your deploy.rb file to run Bundler automatically as part of deploying:
     require 'bundler/capistrano'
 
 For more details on deploying using bundler, see the documentation
-for the bundler cap task, and the [documentation on deploying](http://gembundler.com/v1.0/deploying.html).
+for the bundler cap task, and the [documentation on deploying](http://gembundler.com/deploying.html).
 
 
 ## Bundler 0.8 to 0.9 and above
@@ -100,4 +100,4 @@ Bundler 0.9 changes the following Bundler 0.8 Gemfile APIs:
    mode, where using system gems, this becomes
    `Bundler.setup(:multiple, :groups)`. If you don't
    specify any groups, this puts all groups on the load
-   path. In locked, mode, it becomes `require '.bundle/environment'`
+   path. In locked mode, it becomes `require '.bundle/environment'`

data/lib/bundler.rb

@@ -20,6 +20,7 @@ module Bundler
   autoload :Dsl,                 'bundler/dsl'
   autoload :Environment,         'bundler/environment'
   autoload :GemHelper,           'bundler/gem_helper'
+  autoload :GemInstaller,        'bundler/gem_installer'
   autoload :Graph,               'bundler/graph'
   autoload :Index,               'bundler/index'
   autoload :Installer,           'bundler/installer'
@@ -36,7 +37,7 @@ module Bundler
   autoload :UI,                  'bundler/ui'
 
   class BundlerError < StandardError
-    def self.status_code(code = nil)
+    def self.status_code(code)
       define_method(:status_code) { code }
     end
   end
@@ -44,6 +45,7 @@ module Bundler
   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 PathError        < BundlerError; status_code(13) ; end
   class GitError         < BundlerError; status_code(11) ; end
   class DeprecatedError  < BundlerError; status_code(12) ; end
@@ -111,8 +113,7 @@ module Bundler
         unloaded = groups - @completed_groups
         # Record groups that are now loaded
         @completed_groups = groups
-        # Load any groups that are not yet loaded
-        unloaded.any? ? load.setup(*unloaded) : load
+        unloaded.any? ? load.setup(*groups) : load
       end
     end
 

data/lib/bundler/cli.rb

@@ -335,7 +335,7 @@ module Bundler
       into the systemwide Rubygems repository.
     D
     def exec(*)
-      ARGV.delete("exec")
+      ARGV.shift # remove "exec"
 
       Bundler.setup
 

data/lib/bundler/definition.rb

@@ -180,6 +180,10 @@ module Bundler
     def lock(file)
       contents = to_lock
 
+      # 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")
+
       return if @lockfile_contents == contents
 
       if Bundler.settings[:frozen]
@@ -187,10 +191,6 @@ module Bundler
         return
       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
 

data/lib/bundler/deployment.rb

@@ -4,9 +4,11 @@ module Bundler
       if defined?(Capistrano) && context.is_a?(Capistrano::Configuration)
         context_name = "capistrano"
         role_default = "{:except => {:no_release => true}}"
+        error_type = ::Capistrano::CommandError
       else
         context_name = "vlad"
         role_default = "[:app]"
+        error_type = ::Rake::CommandFailedError
       end
 
       roles = context.fetch(:bundle_roles, false)
@@ -39,13 +41,16 @@ module Bundler
           bundle_dir     = context.fetch(:bundle_dir, File.join(context.fetch(:shared_path), 'bundle'))
           bundle_gemfile = context.fetch(:bundle_gemfile, "Gemfile")
           bundle_without = [*context.fetch(:bundle_without, [:development, :test])].compact
-
-          args = ["--gemfile #{File.join(context.fetch(:current_release), bundle_gemfile)}"]
+          current_release = context.fetch(:current_release)
+          if current_release.to_s.empty?
+            raise error_type.new("Cannot detect current release path - make sure you have deployed at least once.")
+          end
+          args = ["--gemfile #{File.join(current_release, bundle_gemfile)}"]
           args << "--path #{bundle_dir}" unless bundle_dir.to_s.empty?
           args << bundle_flags.to_s
           args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
 
-          run "cd #{context.fetch(:current_release)} && #{bundle_cmd} install #{args.join(' ')}"
+          run "cd #{current_release} && #{bundle_cmd} install #{args.join(' ')}"
         end
       end
     end

data/lib/bundler/gem_installer.rb

@@ -0,0 +1,9 @@
+require 'rubygems/installer'
+
+module Bundler
+  class GemInstaller < Gem::Installer
+    def check_executable_overwrite(filename)
+      # Bundler needs to install gems regardless of binstub overwriting
+    end
+  end
+end

data/lib/bundler/installer.rb

@@ -47,21 +47,7 @@ module Bundler
       # as dependencies might actually affect the installation of
       # the gem.
       specs.each do |spec|
-        spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
-
-        # unless requested_specs.include?(spec)
-        #   Bundler.ui.debug "  * Not in requested group; skipping."
-        #   next
-        # end
-
-        Bundler.rubygems.with_build_args [Bundler.settings["build.#{spec.name}"]] do
-          spec.source.install(spec)
-          Bundler.ui.debug "from #{spec.loaded_from} "
-        end
-
-        Bundler.ui.info ""
-        generate_bundler_executable_stubs(spec) if Bundler.settings[:bin]
-        FileUtils.rm_rf(Bundler.tmp)
+        install_gem_from_spec(spec)
       end
 
       lock
@@ -69,6 +55,30 @@ module Bundler
 
   private
 
+    def install_gem_from_spec(spec)
+      # Download the gem to get the spec, because some specs that are returned
+      # by rubygems.org are broken and wrong.
+      spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
+
+      # Fetch the build settings, if there are any
+      settings = Bundler.settings["build.#{spec.name}"]
+      Bundler.rubygems.with_build_args [settings] do
+        spec.source.install(spec)
+        Bundler.ui.debug "from #{spec.loaded_from} "
+      end
+
+      # newline after installing, some gems say "with native extensions"
+      Bundler.ui.info ""
+      generate_bundler_executable_stubs(spec) if Bundler.settings[:bin]
+      FileUtils.rm_rf(Bundler.tmp)
+    rescue Exception => e
+      Bundler.ui.warn "#{e.class}: #{e.message}"
+      msg = "An error occured while installing #{spec.name} (#{spec.version}),"
+      msg << " and Bundler cannot continue.\nMake sure that `gem install"
+      msg << " #{spec.name} -v '#{spec.version}'` succeeds before bundling."
+      raise Bundler::InstallError, msg
+    end
+
     def generate_bundler_executable_stubs(spec)
       bin_path = Bundler.bin_path
       template = File.read(File.expand_path('../templates/Executable', __FILE__))

data/lib/bundler/resolver.rb

@@ -413,7 +413,7 @@ module Bundler
           # If the origin is "bundler", the conflict is us
           if origin.name == "bundler"
             o << "  Current Bundler version:\n"
-            newer_bundler_required = requirement.requirement > Gem::Requirement.new(origin.version)
+            other_bundler_required = !requirement.requirement.satisfied_by?(origin.version)
           # If the origin is a LockfileParser, it does not respond_to :required_by
           elsif !origin.respond_to?(:required_by) || !(origin.required_by.first)
             o << "  In snapshot (Gemfile.lock):\n"
@@ -422,9 +422,9 @@ module Bundler
           o << gem_message(origin)
 
           # If the bundle wants a newer bundler than the running bundler, explain
-          if origin.name == "bundler" && newer_bundler_required
-            o << "Your version of Bundler is older than the one requested by the Gemfile.\n"
-            o << "Perhaps you need to update Bundler by running `gem install bundler`."
+          if origin.name == "bundler" && other_bundler_required
+            o << "This Gemfile requires a different version of Bundler.\n"
+            o << "Perhaps you need to update Bundler by running `gem install bundler`?"
           end
 
         # origin is nil if the required gem and version cannot be found in any of

data/lib/bundler/rubygems_integration.rb

@@ -205,7 +205,7 @@ module Bundler
       gem_class = (class << Gem ; self ; end)
       gem_class.send(:remove_method, :bin_path)
       gem_class.send(:define_method, :bin_path) do |name, *args|
-        exec_name, *reqs = args
+        exec_name = args.first
 
         if exec_name == 'bundle'
           return ENV['BUNDLE_BIN_PATH']
@@ -254,9 +254,14 @@ module Bundler
     # by monkeypatching it into the method in Rubygems 1.3.6 and 1.3.7.
     def backport_segment_generation
       Gem::Version.send(:define_method, :segments) do
-        @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
-          /^\d+$/ =~ s ? s.to_i : s
+        @segments_generated ||= false
+        unless @segments_generated
+          @segments ||= @version.scan(/[0-9a-z]+/i).map do |s|
+            /^\d+$/ =~ s ? s.to_i : s
+          end
         end
+        @segments_generated = true
+        @segments
       end
     end
 

data/lib/bundler/source.rb

@@ -97,7 +97,7 @@ module Bundler
                       :env_shebang         => true }
           options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty?
 
-          installer = Gem::Installer.new path, options
+          installer = Bundler::GemInstaller.new path, options
           installer.install
         end
 
@@ -385,7 +385,7 @@ module Bundler
         @local_specs ||= load_spec_files
       end
 
-      class Installer < Gem::Installer
+      class Installer < Bundler::GemInstaller
         def initialize(spec, options = {})
           @spec              = spec
           @bin_dir           = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Bundler.rubygems.gem_dir}/bin"

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.0.18" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.19.rc" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/simple_case_spec.rb

@@ -629,7 +629,7 @@ describe "bundle install with gem sources" do
           Current Bundler version:
             bundler (#{Bundler::VERSION})
         E
-      out.should == nice_error
+      out.should include(nice_error)
     end
 
     it "works for gems with multiple versions in its dependencies" do

data/spec/lock/lockfile_spec.rb

@@ -671,13 +671,18 @@ describe "the lockfile format" do
 
   end
 
-  context "line endings" do
+  describe "line endings" do
+    def set_lockfile_mtime_to_known_value
+      time = Time.local(2000, 1, 1, 0, 0, 0)
+      File.utime(time, time, bundled_app('Gemfile.lock'))
+    end
     before(:each) do
       build_repo2
       install_gemfile <<-G
         source "file://#{gem_repo2}"
         gem "rack"
       G
+      set_lockfile_mtime_to_known_value
     end
 
     it "generates Gemfile.lock with \\n line endings" do
@@ -685,22 +690,51 @@ describe "the lockfile format" do
       should_be_installed "rack 1.0"
     end
 
-    it "preserves Gemfile.lock \\n line endings" do
-      update_repo2
+    context "during updates" do
 
-      bundle "update"
-      File.read(bundled_app("Gemfile.lock")).should_not match("\r\n")
-      should_be_installed "rack 1.2"
+      it "preserves Gemfile.lock \\n line endings" do
+        update_repo2
+
+        lambda { bundle "update" }.should change { File.mtime(bundled_app('Gemfile.lock')) }
+        File.read(bundled_app("Gemfile.lock")).should_not match("\r\n")
+        should_be_installed "rack 1.2"
+      end
+
+      it "preserves Gemfile.lock \\n\\r line endings" do
+        update_repo2
+        win_lock = File.read(bundled_app("Gemfile.lock")).gsub(/\n/, "\r\n")
+        File.open(bundled_app("Gemfile.lock"), "wb"){|f| f.puts(win_lock) }
+        set_lockfile_mtime_to_known_value
+
+        lambda { bundle "update" }.should change { File.mtime(bundled_app('Gemfile.lock')) }
+        File.read(bundled_app("Gemfile.lock")).should match("\r\n")
+        should_be_installed "rack 1.2"
+      end
     end
 
-    it "preserves Gemfile.lock \\n\\r line endings" do
-      update_repo2
-      win_lock = File.read(bundled_app("Gemfile.lock")).gsub(/\n/, "\r\n")
-      File.open(bundled_app("Gemfile.lock"), "wb"){|f| f.puts(win_lock) }
+    context "when nothing changes" do
 
-      bundle "update"
-      File.read(bundled_app("Gemfile.lock")).should match("\r\n")
-      should_be_installed "rack 1.2"
+      it "preserves Gemfile.lock \\n line endings" do
+        lambda { ruby <<-RUBY
+                   require 'rubygems'
+                   require 'bundler'
+                   Bundler.setup
+                 RUBY
+               }.should_not change { File.mtime(bundled_app('Gemfile.lock')) }
+      end
+
+      it "preserves Gemfile.lock \\n\\r line endings" do
+        win_lock = File.read(bundled_app("Gemfile.lock")).gsub(/\n/, "\r\n")
+        File.open(bundled_app("Gemfile.lock"), "wb"){|f| f.puts(win_lock) }
+        set_lockfile_mtime_to_known_value
+
+        lambda { ruby <<-RUBY
+                   require 'rubygems'
+                   require 'bundler'
+                   Bundler.setup
+                 RUBY
+               }.should_not change { File.mtime(bundled_app('Gemfile.lock')) }
+      end
     end
   end
 end

data/spec/other/exec_spec.rb

@@ -33,6 +33,12 @@ describe "bundle exec" do
     out.should == "1.0.0"
   end
 
+  it "works when exec'ing something else" do
+    install_gemfile 'gem "rack"'
+    bundle "exec echo exec"
+    out.should == "exec"
+  end
+
   it "handles different versions in different bundles" do
     build_repo2 do
       build_gem "rack_two", "1.0.0" do |s|

data/spec/other/newgem_spec.rb

@@ -25,4 +25,22 @@ describe "bundle gem" do
   it "requires the version file" do
     bundled_app("test-gem/lib/test-gem.rb").read.should =~ /require "test-gem\/version"/
   end
+
+  it "runs rake without problems" do
+    system_gems ["rake-0.8.7"]
+
+    rakefile = <<-RAKEFILE
+      task :default do
+        puts 'SUCCESS'
+      end
+RAKEFILE
+    File.open(bundled_app("test-gem/Rakefile"), 'w') do |file|
+      file.puts rakefile
+    end
+
+    Dir.chdir(bundled_app("test-gem")) do
+      sys_exec("rake")
+      out.should include("SUCCESS")
+    end
+  end
 end

data/spec/runtime/setup_spec.rb

@@ -25,6 +25,7 @@ describe "Bundler.setup" do
     before(:each) do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
+        gem "yard"
         gem "rack", :group => :test
       G
     end
@@ -58,6 +59,24 @@ describe "Bundler.setup" do
       err.should eq("")
       out.should eq("1.0.0")
     end
+
+    it "leaves :default available if setup is called twice" do
+      ruby <<-RUBY
+        require 'rubygems'
+        require 'bundler'
+        Bundler.setup(:default)
+        Bundler.setup(:default, :test)
+
+        begin
+          require 'yard'
+          puts "WIN"
+        rescue LoadError
+          puts "FAIL"
+        end
+      RUBY
+      err.should eq("")
+      out.should match("WIN")
+    end
   end
 
   it "raises if the Gemfile was not yet installed" do

data/spec/update/gems_spec.rb

@@ -115,7 +115,8 @@ describe "bundle update when a gem depends on a newer version of bundler" do
 
   it "should explain that bundler conflicted" do
     bundle "update"
-    out.should_not =~ /In snapshot/
-    out.should =~ /Current Bundler version/
+    out.should_not =~ /in snapshot/i
+    out.should =~ /current Bundler version/i
+    out.should =~ /perhaps you need to update bundler/i
   end
 end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7712070
+  prerelease: true
   segments: 
   - 1
   - 0
-  - 18
-  version: 1.0.18
+  - 19
+  - rc
+  version: 1.0.19.rc
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -17,16 +19,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 -07:00
+date: 2011-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,9 +40,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -55,6 +61,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - ISSUES.md
 - LICENSE
@@ -72,6 +79,7 @@ files:
 - lib/bundler/dsl.rb
 - lib/bundler/environment.rb
 - lib/bundler/gem_helper.rb
+- lib/bundler/gem_installer.rb
 - lib/bundler/gem_tasks.rb
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
@@ -219,16 +227,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -237,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies