bundler 1.0.17 → 1.0.18

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.0.18 (Aug 16, 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/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 = {})
@@ -183,7 +197,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 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/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)
@@ -41,7 +41,7 @@ module Bundler
 
     def build_gem
       file_name = nil
-      sh("gem build '#{spec_path}'") { |out, code|
+      sh("gem build -V '#{spec_path}'") { |out, code|
         raise out unless out[/Successfully/]
         file_name = File.basename(built_gem_path)
         FileUtils.mkdir_p(File.join(base, 'pkg'))

data/lib/bundler/index.rb

@@ -78,10 +78,13 @@ module Bundler
       end
     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/source.rb

@@ -158,11 +158,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
@@ -280,7 +286,7 @@ module Bundler
       attr_writer   :name
       attr_accessor :version
 
-      DEFAULT_GLOB = "{,*/}*.gemspec"
+      DEFAULT_GLOB = "{,*,*/*}.gemspec"
 
       def initialize(options)
         @options = options

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.17" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.18" 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/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/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,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 53
   prerelease: false
   segments: 
   - 1
   - 0
-  - 17
-  version: 1.0.17
+  - 18
+  version: 1.0.18
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,18 +17,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 -05:00
+date: 2011-08-16 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"
@@ -39,11 +36,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -200,22 +195,20 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle-exec
 - lib/bundler/man/bundle
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
+- lib/bundler/man/bundle-exec
+- lib/bundler/man/bundle-exec.txt
 - lib/bundler/man/bundle-install
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/bundle-benchmark
+- lib/bundler/man/bundle-install.txt
 - lib/bundler/man/bundle-package
+- lib/bundler/man/bundle-package.txt
 - lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
-- lib/bundler/man/bundle-benchmark.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/gemfile.5.txt
 has_rdoc: true
 homepage: http://gembundler.com
 licenses: []
@@ -226,20 +219,16 @@ 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
@@ -248,9 +237,65 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: []
-
+test_files: 
+- spec/cache/gems_spec.rb
+- spec/cache/git_spec.rb
+- spec/cache/path_spec.rb
+- spec/cache/platform_spec.rb
+- spec/install/deploy_spec.rb
+- spec/install/deprecated_spec.rb
+- spec/install/gems/c_ext_spec.rb
+- spec/install/gems/env_spec.rb
+- spec/install/gems/flex_spec.rb
+- spec/install/gems/groups_spec.rb
+- spec/install/gems/packed_spec.rb
+- spec/install/gems/platform_spec.rb
+- spec/install/gems/resolving_spec.rb
+- spec/install/gems/simple_case_spec.rb
+- spec/install/gems/sudo_spec.rb
+- spec/install/gems/win32_spec.rb
+- spec/install/gemspec_spec.rb
+- spec/install/git_spec.rb
+- spec/install/invalid_spec.rb
+- spec/install/path_spec.rb
+- spec/install/upgrade_spec.rb
+- spec/lock/git_spec.rb
+- spec/lock/lockfile_spec.rb
+- spec/other/check_spec.rb
+- spec/other/config_spec.rb
+- spec/other/console_spec.rb
+- spec/other/exec_spec.rb
+- spec/other/ext_spec.rb
+- spec/other/gem_helper_spec.rb
+- spec/other/help_spec.rb
+- spec/other/init_spec.rb
+- spec/other/newgem_spec.rb
+- spec/other/open_spec.rb
+- spec/other/show_spec.rb
+- spec/quality_spec.rb
+- spec/resolver/basic_spec.rb
+- spec/resolver/platform_spec.rb
+- spec/runtime/executable_spec.rb
+- spec/runtime/load_spec.rb
+- spec/runtime/platform_spec.rb
+- spec/runtime/require_spec.rb
+- spec/runtime/setup_spec.rb
+- spec/runtime/with_clean_env_spec.rb
+- spec/spec_helper.rb
+- spec/support/builders.rb
+- spec/support/helpers.rb
+- spec/support/indexes.rb
+- spec/support/matchers.rb
+- spec/support/path.rb
+- spec/support/platforms.rb
+- spec/support/ruby_ext.rb
+- spec/support/rubygems_ext.rb
+- spec/support/rubygems_hax/platform.rb
+- spec/support/sudo.rb
+- spec/update/gems_spec.rb
+- spec/update/git_spec.rb
+- spec/update/source_spec.rb