bundler 1.1.pre.7 → 1.1.pre.8

data/CHANGELOG.md

@@ -1,8 +1,18 @@
+## 1.1.pre.8 (Aug 13, 2011)
+
+Bugfixes:
+
+  - Fix `bundle check` to not print fatal error message (@cldwalker, #1347)
+  - Fix require_sudo when Gem.bindir isn't writeable (#1352)
+  - Fix not asking Gemcutter API for dependency chain of git gems in --deployment (#1254)
+  - Fix `install --binstubs` when using --path (#1332)
+
 ## 1.1.pre.7 (Aug 8, 2011)
 
 Bugfixes:
 
   - Fixed invalid byte sequence error while installing gem on Ruby 1.9 (#1341)
+  - Fixed exception when sudo was needed to install gems (@spastorino)
 
 ## 1.1.pre.6 (Aug 8, 2011)
 
@@ -90,6 +100,20 @@ Removed:
   - Removed bundle install --production
   - Removed bundle install --disable-shared-gems
 
+## 1.0.18 (Aug 13, 2011)
+
+Bugfixes:
+
+  - Fix typo in DEBUG_RESOLVER (@geemus)
+  - Fixes rake 0.9.x warning (@mtylty, #1333)
+
+Features:
+
+  - Run the bundle install earlier in a Capistrano deployment (@cgriego, #1300)
+  - Support hidden gemspec (@trans, @cldwalker, #827)
+  - Make fetch_specs faster (@zeha, #1294)
+  - Allow overriding development deps loaded by #gemspec (@lgierth, #1245)
+
 ## 1.0.17 (Aug 8, 2011)
 
 Bugfixes:

data/bin/bundle

@@ -19,6 +19,8 @@ rescue Interrupt => e
   Bundler.ui.error "\nQuitting..."
   Bundler.ui.debug e.backtrace.join("\n")
   exit 1
+rescue SystemExit => e
+  exit e.status
 rescue Exception => e
   Bundler.ui.error "Unfortunately, a fatal error has occurred. " +
     "Please report this error to the Bundler issue tracker at " +

data/lib/bundler.rb

@@ -223,9 +223,12 @@ module Bundler
       path = bundle_path
       path = path.parent until path.exist?
       sudo_present = !(`which sudo` rescue '').empty?
+      bin_dir = Pathname.new(Bundler.rubygems.gem_bindir)
+      bin_dir = bin_dir.parent until bin_dir.exist?
 
       @checked_for_sudo = true
-      @requires_sudo = settings.allow_sudo? && !File.writable?(path) && sudo_present
+      can_write_gems = !File.writable?(path) || !File.writable?(bin_dir)
+      @requires_sudo = settings.allow_sudo? && can_write_gems && sudo_present
     end
 
     def mkdir_p(path)

data/lib/bundler/capistrano.rb

@@ -5,7 +5,7 @@
 require 'bundler/deployment'
 
 Capistrano::Configuration.instance(:must_exist).load do
-  after "deploy:update_code", "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/dependency.rb

@@ -24,7 +24,8 @@ module Bundler
     }.freeze
 
     def initialize(name, version, options = {}, &blk)
-      super(name, version)
+      type = options["type"] || :runtime
+      super(name, version, type)
 
       @autorequire = nil
       @groups      = Array(options["group"] || :default).map { |g| g.to_sym }

data/lib/bundler/dsl.rb

@@ -22,7 +22,7 @@ module Bundler
 
     def gemspec(opts = nil)
       path              = opts && opts[:path] || '.'
-      name              = opts && opts[:name] || '*'
+      name              = opts && opts[:name] || '{,*}'
       development_group = opts && opts[:development_group] || :development
       path              = File.expand_path(path, Bundler.default_gemfile.dirname)
       gemspecs = Dir[File.join(path, "#{name}.gemspec")]
@@ -34,7 +34,7 @@ module Bundler
         gem spec.name, :path => path
         group(development_group) do
           spec.development_dependencies.each do |dep|
-            gem dep.name, *dep.requirement.as_list
+            gem dep.name, *(dep.requirement.as_list + [:type => :development])
           end
         end
       when 0
@@ -57,20 +57,34 @@ module Bundler
 
       dep = Dependency.new(name, version, options)
 
+      # if there's already a dependency with this name we try to prefer one
       if current = @dependencies.find { |d| d.name == dep.name }
         if current.requirement != dep.requirement
-          raise DslError, "You cannot specify the same gem twice with different version requirements. " \
-                          "You specified: #{current.name} (#{current.requirement}) and " \
-                          "#{dep.name} (#{dep.requirement})"
+          if current.type == :development
+            @dependencies.delete current
+          elsif dep.type == :development
+            return
+          else
+            raise DslError, "You cannot specify the same gem twice with different version requirements. " \
+                            "You specified: #{current.name} (#{current.requirement}) and " \
+                            "#{dep.name} (#{dep.requirement})"
+          end
         end
 
         if current.source != dep.source
-          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}"
+          if current.type == :development
+            @dependencies.delete current
+          elsif dep.type == :development
+            return
+          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}"
+          end
         end
       end
-      @dependencies << Dependency.new(name, version, options)
+
+      @dependencies << dep
     end
 
     def source(source, options = {})
@@ -177,7 +191,7 @@ module Bundler
     def _normalize_options(name, version, opts)
       _normalize_hash(opts)
 
-      invalid_keys = opts.keys - %w(group groups git github 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 type)
       if invalid_keys.any?
         plural = invalid_keys.size > 1
         message = "You passed #{invalid_keys.map{|k| ':'+k }.join(", ")} "

data/lib/bundler/endpoint_specification.rb

@@ -22,20 +22,37 @@ module Bundler
     # needed for standalone, load required_paths from local gemspec
     # after the gem in installed
     def require_paths
-      if _local_specification
+      if @remote_specification
+        @remote_specification.require_paths
+      elsif _local_specification
         _local_specification.require_paths
       else
         super
       end
     end
 
+    # needed for binstubs
+    def executables
+      if @remote_specification
+        @remote_specification.executables
+      elsif _local_specification
+        _local_specification.executables
+      else
+        super
+      end
+    end
+
     def _local_specification
       eval(File.read(local_specification_path)) if @loaded_from && File.exists?(local_specification_path)
     end
 
+    def __swap__(spec)
+      @remote_specification = spec
+    end
+
     private
     def local_specification_path
-      "#{installation_path}/specifications/#{full_name}.gemspec"
+      "#{base_dir}/specifications/#{full_name}.gemspec"
     end
   end
 end

data/lib/bundler/gem_helper.rb

@@ -16,7 +16,7 @@ module Bundler
     def initialize(base, name = nil)
       Bundler.ui = UI::Shell.new(Thor::Base.shell.new)
       @base = base
-      gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "*.gemspec")]
+      gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "{,*}.gemspec")]
       raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1
       @spec_path = gemspecs.first
       @gemspec = Bundler.load_gemspec(@spec_path)

data/lib/bundler/index.rb

@@ -90,10 +90,13 @@ module Bundler
       dependency_names.select{|name| specs_by_name(name).empty? }
     end
 
-    def use(other)
+    def use(other, override_dupes = false)
       return unless other
       other.each do |s|
-        next if search_by_spec(s).any?
+        if (dupes = search_by_spec(s)) && dupes.any?
+          next unless override_dupes
+          @specs[s.name] -= dupes
+        end
         @specs[s.name] << s
       end
       self

data/lib/bundler/resolver.rb

@@ -145,7 +145,7 @@ module Bundler
     def debug
       if ENV['DEBUG_RESOLVER']
         debug_info = yield
-        debug_info = debug_info.inpsect unless debug_info.is_a?(String)
+        debug_info = debug_info.inspect unless debug_info.is_a?(String)
         $stderr.puts debug_info
       end
     end

data/lib/bundler/rubygems_integration.rb

@@ -260,8 +260,21 @@ module Bundler
       end
     end
 
+    # This backports base_dir which replaces installation path
+    # Rubygems 1.8+
+    def backport_base_dir
+      Gem::Specification.send(:define_method, :base_dir) do
+        installation_path
+      end
+    end
+
     # Rubygems 1.4 through 1.6
     class Legacy < RubygemsIntegration
+      def initialize
+        super
+        backport_base_dir
+      end
+
       def stub_rubygems(specs)
         stub_source_index137(specs)
       end

data/lib/bundler/source.rb

@@ -149,11 +149,17 @@ module Bundler
       end
 
       def fetch_specs
-        Index.build do |idx|
-          idx.use installed_specs
-          idx.use cached_specs if @allow_cached || @allow_remote
-          idx.use remote_specs if @allow_remote
+        # remote_specs usually generates a way larger Index than the other
+        # sources, and large_idx.use small_idx is way faster than
+        # small_idx.use large_idx.
+        if @allow_remote
+          idx = remote_specs.dup
+        else
+          idx = Index.new
         end
+        idx.use(cached_specs, :override_dupes) if @allow_cached || @allow_remote
+        idx.use(installed_specs, :override_dupes)
+        idx
       end
 
       def installed_specs
@@ -256,7 +262,7 @@ module Bundler
       attr_writer   :name
       attr_accessor :version
 
-      DEFAULT_GLOB = "{,*/}*.gemspec"
+      DEFAULT_GLOB = "{,*,*/*}.gemspec"
 
       def initialize(options)
         @options = options

data/lib/bundler/spec_set.rb

@@ -79,9 +79,10 @@ module Bundler
 
     def materialize(deps, missing_specs = nil)
       materialized = self.for(deps, [], false, true).to_a
+      deps = materialized.map {|s| s.name }.uniq
       materialized.map! do |s|
         next s unless s.is_a?(LazySpecification)
-        s.source.dependency_names = deps.map {|d| d.name } if s.source.respond_to?(:dependency_names=)
+        s.source.dependency_names = deps if s.source.respond_to?(:dependency_names=)
         spec = s.__materialize__
         if missing_specs
           missing_specs << s unless spec

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.1.pre.7" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.pre.8" unless defined?(::Bundler::VERSION)
 end

data/lib/bundler/vlad.rb

@@ -4,6 +4,8 @@
 # include the vlad:bundle:install task in your vlad:deploy task.
 require 'bundler/deployment'
 
+include Rake::DSL if defined? Rake::DSL
+
 namespace :vlad do
   Bundler::Deployment.define_task(Rake::RemoteTask, :remote_task, :roles => :app)
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -69,19 +69,39 @@ describe "gemcutter's dependency API" do
   end
 
   it "handles git dependencies that are in rubygems" do
-      build_git "foo" do |s|
-        s.executables = "foobar"
-        s.add_dependency "rails", "2.3.2"
+    build_git "foo" do |s|
+      s.executables = "foobar"
+      s.add_dependency "rails", "2.3.2"
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      git "file:///#{lib_path('foo-1.0')}" do
+        gem 'foo'
       end
+    G
 
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        git "#{lib_path('foo-1.0')}" do
-          gem 'foo'
-        end
-      G
+    bundle :install, :artifice => "endpoint"
 
-      should_be_installed("rails 2.3.2")
+    should_be_installed("rails 2.3.2")
+  end
+
+  it "handles git dependencies that are in rubygems using --deployment" do
+    build_git "foo" do |s|
+      s.executables = "foobar"
+      s.add_dependency "rails", "2.3.2"
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      gem 'foo', :git => "file:///#{lib_path('foo-1.0')}"
+    G
+
+    bundle :install, :artifice => "endpoint"
+
+    bundle "install --deployment", :artifice => "endpoint"
+
+    should_be_installed("rails 2.3.2")
   end
 
   it "falls back when the API errors out" do
@@ -206,4 +226,48 @@ describe "gemcutter's dependency API" do
     bundle :install, :artifice => "endpoint_api_missing"
     should_be_installed "foo 1.0"
   end
+
+  it "fetches again when more dependencies are found in subsequent sources using --deployment" do
+    build_repo2 do
+      build_gem "back_deps" do |s|
+        s.add_dependency "foo"
+      end
+      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      source "#{source_uri}/extra"
+      gem "back_deps"
+    G
+
+    bundle :install, :artifice => "endpoint_extra"
+
+    bundle "install --deployment", :artifice => "endpoint_extra"
+    should_be_installed "back_deps 1.0"
+  end
+
+  it "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
+    sys_exec "mkdir -p #{system_gem_path("bin")}"
+    sudo "chown -R root #{system_gem_path("bin")}"
+
+    gemfile <<-G
+        source "#{source_uri}"
+        gem "rails"
+    G
+    bundle :install, :artifice => "endpoint"
+    should_be_installed "rails 2.3.2"
+  end
+
+  it "installs the binstubs" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle "install --binstubs", :artifice => "endpoint"
+
+    gembin "rackup"
+    out.should == "1.0.0"
+  end
 end

data/spec/install/gemspec_spec.rb

@@ -22,6 +22,23 @@ describe "bundle install from an existing gemspec" do
     should_be_installed "bar-dev 1.0.0", :groups => :development
   end
 
+  it "that is hidden should install runtime and development dependencies" do
+    build_lib("foo", :path => tmp.join("foo")) do |s|
+      s.write("Gemfile", "source :rubygems\ngemspec")
+      s.add_dependency "bar", "=1.0.0"
+      s.add_development_dependency "bar-dev", '=1.0.0'
+    end
+    FileUtils.mv tmp.join('foo', 'foo.gemspec'), tmp.join('foo', '.gemspec')
+
+    install_gemfile <<-G
+      source "file://#{gem_repo2}"
+      gemspec :path => '#{tmp.join("foo")}'
+    G
+
+    should_be_installed "bar 1.0.0"
+    should_be_installed "bar-dev 1.0.0", :groups => :development
+  end
+
   it "should handle a list of requirements" do
     build_gem "baz", "1.0", :to_system => true
     build_gem "baz", "1.1", :to_system => true

data/spec/other/check_spec.rb

@@ -179,6 +179,12 @@ describe "bundle check" do
     out.should include("Could not locate Gemfile")
   end
 
+  it "does not output fatal error message" do
+    bundle :check, :exitstatus => true
+    @exitstatus.should eq(10)
+    out.should_not include("Unfortunately, a fatal error has occurred. ")
+  end
+
   it "should not crash when called multiple times on a new machine" do
     gemfile <<-G
       gem 'rails', '3.0.0.beta3'

data/spec/other/gem_helper_spec.rb

@@ -10,6 +10,14 @@ describe "Bundler::GemHelper tasks" do
       helper.gemspec.name.should == 'test'
     end
 
+    it "interpolates the name for a hidden gemspec" do
+      bundle 'gem test'
+      app = bundled_app("test")
+      FileUtils.mv app.join('test.gemspec'), app.join('.gemspec')
+      helper = Bundler::GemHelper.new(app.to_s)
+      helper.gemspec.name.should == 'test'
+    end
+
     it "should fail when there is no gemspec" do
       bundle 'gem test'
       app = bundled_app("test")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 1923831887
+  hash: 1923831889
   prerelease: true
   segments: 
   - 1
   - 1
   - pre
-  - 7
-  version: 1.1.pre.7
+  - 8
+  version: 1.1.pre.8
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 -05:00
+date: 2011-08-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency