bundler 0.7.0 → 0.7.1

data/README.markdown

@@ -175,6 +175,7 @@ will be compiled for the target platform without requiring that the
 Assuming a Rails app with Bundler's standard setup, add something like
 this to your top-level `.gitignore` to only keep the cache:
 
+    bin/*
     vendor/gems/*
     !vendor/gems/cache/
 

data/lib/bundler.rb

@@ -19,7 +19,7 @@ require "bundler/dependency"
 require "bundler/remote_specification"
 
 module Bundler
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 
   class << self
     attr_writer :logger

data/lib/bundler/dependency.rb

@@ -2,7 +2,8 @@ module Bundler
   class InvalidEnvironmentName < StandardError; end
 
   class Dependency
-    attr_reader :name, :version, :require_as, :only, :except, :bundle
+    attr_reader :name, :version, :require_as, :only, :except
+    attr_accessor :source
 
     def initialize(name, options = {}, &block)
       options.each do |k, v|
@@ -14,7 +15,7 @@ module Bundler
       @require_as = options["require_as"]
       @only       = options["only"]
       @except     = options["except"]
-      @bundle     = options.key?("bundle") ? options["bundle"] : true
+      @source     = options["source"]
       @block      = block
 
       if (@only && @only.include?("rubygems")) || (@except && @except.include?("rubygems"))

data/lib/bundler/dsl.rb

@@ -58,8 +58,9 @@ module Bundler
       @directory = DirectorySource.new(options.merge(:location => path))
       @directory_sources << @directory
       @environment.add_priority_source(@directory)
-      yield if block_given?
+      retval = yield if block_given?
       @directory = nil
+      retval
     end
 
     def git(uri, options = {})
@@ -67,8 +68,9 @@ module Bundler
       @git = GitSource.new(options.merge(:uri => uri))
       @git_sources[uri] = @git
       @environment.add_priority_source(@git)
-      yield if block_given?
+      retval = yield if block_given?
       @git = nil
+      retval
     end
 
     def clear_sources
@@ -90,11 +92,11 @@ module Bundler
       dep = Dependency.new(name, options.merge(:version => version))
 
       if options.key?(:bundle) && !options[:bundle]
-        # We're using system gems for this one
+        dep.source = SystemGemSource.instance
       elsif @git || options[:git]
-        _handle_git_option(name, version, options)
+        dep.source = _handle_git_option(name, version, options)
       elsif @directory || options[:path]
-        _handle_vendored_option(name, version, options)
+        dep.source = _handle_vendored_option(name, version, options)
       end
 
       @environment.dependencies << dep
@@ -108,6 +110,7 @@ module Bundler
       if dir
         dir.required_specs << name
         dir.add_spec(path, name, version) if version
+        dir
       else
         directory options[:path] do
           _handle_vendored_option(name, version, {})
@@ -145,6 +148,7 @@ module Bundler
 
         source.required_specs << name
         source.add_spec(Pathname.new(options[:path] || '.'), name, version) if version
+        source
       else
         git(git, :ref => ref, :branch => branch) do
           _handle_git_option(name, version, options)

data/lib/bundler/environment.rb

@@ -50,12 +50,14 @@ module Bundler
         dependencies.reject! { |d| !only_envs.any? {|env| d.in?(env) } }
       end
 
-      no_bundle = dependencies.map { |dep| !dep.bundle && dep.name }.compact
+      no_bundle = dependencies.map do |dep|
+        dep.source == SystemGemSource.instance && dep.name
+      end.compact
 
       update = options[:update]
       cached = options[:cached]
 
-      repository.install(gem_dependencies, sources,
+      repository.install(dependencies, sources,
         :rubygems      => rubygems,
         :system_gems   => system_gems,
         :manifest      => filename,

data/lib/bundler/repository.rb

@@ -21,13 +21,15 @@ module Bundler
       end
 
       source_requirements = {}
-      options[:no_bundle].each do |name|
-        source_requirements[name] = SystemGemSource.instance
+      dependencies = dependencies.map do |dep|
+        source_requirements[dep.name] = dep.source if dep.source
+        dep.to_gem_dependency
       end
 
       # Check to see whether the existing cache meets all the requirements
       begin
-        valid = Resolver.resolve(dependencies, [source_index], source_requirements)
+        valid = nil
+        # valid = Resolver.resolve(dependencies, [source_index], source_requirements)
       rescue Bundler::GemNotFound
       end
 

data/lib/bundler/resolver.rb

@@ -85,11 +85,17 @@ module Bundler
       end
     end
 
+    def debug
+      puts yield if defined?($debug) && $debug
+    end
+
     def resolve(reqs, activated)
       # If the requirements are empty, then we are in a success state. Aka, all
       # gem dependencies have been resolved.
       throw :success, activated if reqs.empty?
 
+      debug { STDIN.gets ; print "\e[2J\e[f" ; "==== Iterating ====\n\n" }
+
       # Sort dependencies so that the ones that are easiest to resolve are first.
       # Easiest to resolve is defined by:
       #   1) Is this gem already activated?
@@ -98,23 +104,33 @@ module Bundler
       reqs = reqs.sort_by do |a|
         [ activated[a.name] ? 0 : 1,
           a.version_requirements.prerelease? ? 0 : 1,
+          @errors[a.name]   ? 0 : 1,
           activated[a.name] ? 0 : search(a).size ]
       end
 
+      debug { "Activated:\n" + activated.values.map { |a| "  #{a.name} (#{a.version})" }.join("\n") }
+      debug { "Requirements:\n" + reqs.map { |r| "  #{r.name} (#{r.version_requirements})"}.join("\n") }
+
       activated = activated.dup
       # Pull off the first requirement so that we can resolve it
       current   = reqs.shift
 
+      debug { "Attempting:\n  #{current.name} (#{current.version_requirements})"}
+
       # Check if the gem has already been activated, if it has, we will make sure
       # that the currently activated gem satisfies the requirement.
       if existing = activated[current.name]
         if current.version_requirements.satisfied_by?(existing.version)
+          debug { "    * [SUCCESS] Already activated" }
           @errors.delete(existing.name)
           # Since the current requirement is satisfied, we can continue resolving
           # the remaining requirements.
           resolve(reqs, activated)
         else
+          debug { "    * [FAIL] Already activated" }
           @errors[existing.name] = [existing, current]
+          debug { current.required_by.map {|d| "      * #{d.name} (#{d.version_requirements})" }.join("\n") }
+          # debug { "    * All current conflicts:\n" + @errors.keys.map { |c| "      - #{c}" }.join("\n") }
           # Since the current requirement conflicts with an activated gem, we need
           # to backtrack to the current requirement's parent and try another version
           # of it (maybe the current requirement won't be present anymore). If the
@@ -123,6 +139,7 @@ module Bundler
           parent = current.required_by.last || existing.required_by.last
           # We track the spot where the current gem was activated because we need
           # to keep a list of every spot a failure happened.
+          debug { "    -> Jumping to: #{parent.name}" }
           throw parent.name, existing.required_by.last.name
         end
       else
@@ -158,6 +175,7 @@ module Bundler
           # the conflicting gem, hopefully finding a combination that activates correctly.
           @stack.reverse_each do |savepoint|
             if conflicts.include?(savepoint)
+              debug { "    -> Jumping to: #{savepoint}" }
               throw savepoint
             end
           end
@@ -172,11 +190,16 @@ module Bundler
       spec.required_by << requirement
 
       activated[spec.name] = spec
+      debug { "  Activating: #{spec.name} (#{spec.version})" }
+      debug { spec.required_by.map { |d| "    * #{d.name} (#{d.version_requirements})" }.join("\n") }
 
       # Now, we have to loop through all child dependencies and add them to our
       # array of requirements.
+      debug { "    Dependencies"}
       spec.dependencies.each do |dep|
         next if dep.type == :development
+        debug { "    * #{dep.name} (#{dep.version_requirements})" }
+        dep.required_by.replace(requirement.required_by)
         dep.required_by << requirement
         reqs << dep
       end
@@ -208,4 +231,4 @@ module Bundler
       end
     end
   end
-end
+end

data/lib/bundler/source.rb

@@ -214,7 +214,7 @@ module Bundler
     def locate_gemspecs
       Dir["#{location}/#{@glob}"].inject({}) do |specs, file|
         file = Pathname.new(file)
-        if spec = eval(File.read(file)) and validate_gemspec(file.dirname, spec)
+        if spec = eval(File.read(file)) # and validate_gemspec(file.dirname, spec)
           spec.location = file.dirname.expand_path
           specs[spec.full_name] = spec
         end
@@ -237,8 +237,8 @@ module Bundler
           #   raise DirectorySourceError, "The location you specified for #{spec.name}" \
           #     " is '#{spec.location}'. The gemspec was found at '#{existing.location}'."
           end
-        elsif !validate_gemspec(spec.location, spec)
-          raise "Your gem definition is not valid: #{spec}"
+        # elsif !validate_gemspec(spec.location, spec)
+        #   raise "Your gem definition is not valid: #{spec}"
         else
           specs[spec.full_name] = spec
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -08:00
+date: 2009-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: []