bundler 0.9.12 → 0.9.13

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems_ext'
 
 module Bundler
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'

data/lib/bundler/environment.rb

@@ -24,6 +24,10 @@ module Bundler
       end
     end
 
+    def specs
+      @specs ||= resolve_locally || resolve_remotely
+    end
+
   private
 
     def runtime_gems
@@ -36,6 +40,25 @@ module Bundler
       end
     end
 
+    def resolve(type, index)
+      source_requirements = {}
+      actual_dependencies.each do |dep|
+        next unless dep.source && dep.source.respond_to?(type)
+        source_requirements[dep.name] = dep.source.send(type)
+      end
+
+      # Run a resolve against the locally available gems
+      Resolver.resolve(actual_dependencies, index, source_requirements)
+    end
+
+    def resolve_locally
+      resolve(:local_specs, index)
+    end
+
+    def resolve_remotely
+      raise NotImplementedError
+    end
+
     def specs_for(groups)
       deps = dependencies.select { |d| (d.groups & groups).any? }
       # deps.any? ? specs.for(deps) : specs
@@ -72,11 +95,10 @@ module Bundler
           :name => s.name,
           :load_paths => s.load_paths
         }
-        if s.respond_to?(:virtual) && s.virtual
+        if s.respond_to?(:relative_loaded_from) && s.relative_loaded_from
           hash[:virtual_spec] = s.to_ruby
-        else
-          hash[:loaded_from] = s.loaded_from.to_s
         end
+        hash[:loaded_from] = s.loaded_from.to_s
         hash
       end
     end

data/lib/bundler/installer.rb

@@ -48,10 +48,6 @@ module Bundler
       @definition.actual_dependencies
     end
 
-    def specs
-      @specs ||= resolve_locally || resolve_remotely
-    end
-
   private
 
     def sources
@@ -62,14 +58,7 @@ module Bundler
       # Return unless all the dependencies have = version requirements
       return if actual_dependencies.any? { |d| ambiguous?(d) }
 
-      source_requirements = {}
-      actual_dependencies.each do |dep|
-        next unless dep.source && dep.source.respond_to?(:local_specs)
-        source_requirements[dep.name] = dep.source.local_specs
-      end
-
-      # Run a resolve against the locally available gems
-      specs = Resolver.resolve(actual_dependencies, index, source_requirements)
+      specs = super
 
       # Simple logic for now. Can improve later.
       specs.length == actual_dependencies.length && specs
@@ -78,16 +67,7 @@ module Bundler
     end
 
     def resolve_remotely
-      remote_index # trigger building the index
-      Bundler.ui.info "Resolving dependencies"
-      source_requirements = {}
-      actual_dependencies.each do |dep|
-        next unless dep.source
-        source_requirements[dep.name] = dep.source.specs
-      end
-
-      specs = Resolver.resolve(actual_dependencies, remote_index, source_requirements)
-      specs
+      resolve(:specs, remote_index)
     end
 
     def ambiguous?(dep)

data/lib/bundler/resolver.rb

@@ -63,7 +63,11 @@ module Bundler
     end
 
     def debug
-      puts yield if defined?($debug) && $debug
+      if ENV['DEBUG_RESOLVER']
+        debug_info = yield
+        debug_info = debug_info.inpsect unless debug_info.is_a?(String)
+        $stderr.puts debug_info
+      end
     end
 
     def resolve(reqs, activated)
@@ -71,7 +75,7 @@ module Bundler
       # gem dependencies have been resolved.
       throw :success, activated if reqs.empty?
 
-      debug { STDIN.gets ; print "\e[2J\e[f" ; "==== Iterating ====\n\n" }
+      debug { 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:

data/lib/bundler/runtime.rb

@@ -75,18 +75,6 @@ module Bundler
       end
     end
 
-    def specs
-      @specs ||= begin
-        source_requirements = {}
-        actual_dependencies.each do |dep|
-          next unless dep.source && dep.source.respond_to?(:local_specs)
-          source_requirements[dep.name] = dep.source.local_specs
-        end
-
-        Resolver.resolve(@definition.actual_dependencies, index, source_requirements)
-      end
-    end
-
     alias gems specs
 
     def cache

data/lib/bundler/shared_helpers.rb

@@ -126,7 +126,9 @@ module Bundler
           exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"
         end
 
-        File.join(spec.full_gem_path, spec.bindir, exec_name)
+        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
+        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
+        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
       end
     end
 

data/lib/bundler/source.rb

@@ -155,7 +155,6 @@ module Bundler
             s.version  = Gem::Version.new(options["version"])
             s.summary  = "Fake gemspec for #{options["name"]}"
             s.relative_loaded_from = "#{options["name"]}.gemspec"
-            s.virtual  = true
           end
         end
       end
@@ -316,17 +315,17 @@ module Bundler
       def cache
         if cache_path.exist?
           Bundler.ui.info "Updating #{uri}"
-          in_cache { git "fetch --quiet '#{uri}' master:master" }
+          in_cache { git %|fetch --quiet "#{uri}" master:master| }
         else
           Bundler.ui.info "Fetching #{uri}"
           FileUtils.mkdir_p(cache_path.dirname)
-          git "clone '#{uri}' '#{cache_path}' --bare --no-hardlinks"
+          git %|clone "#{uri}" "#{cache_path}" --bare --no-hardlinks|
         end
       end
 
       def checkout
         unless File.exist?(path.join(".git"))
-          git "clone --no-checkout '#{cache_path}' '#{path}'"
+          git %|clone --no-checkout "#{cache_path}" "#{path}"|
         end
         Dir.chdir(path) do
           git "fetch --quiet"

data/lib/bundler/spec_set.rb

@@ -36,7 +36,7 @@ module Bundler
       return if specs[current.name]
       specs[current.name] = true
       current.dependencies.each do |dep|
-        next unless dep.type == :runtime
+        next if dep.type == :development
         append_subgraph(specs, lookup[dep.name])
       end
     end

data/lib/bundler/specification.rb

@@ -1,6 +1,6 @@
 module Bundler
   class Specification < Gem::Specification
-    attr_accessor :relative_loaded_from, :virtual
+    attr_accessor :relative_loaded_from
 
     def self.from_gemspec(gemspec)
       spec = allocate

data/lib/bundler/templates/environment.erb

@@ -1,7 +1,7 @@
 # DO NOT MODIFY THIS FILE
 
 require 'digest/sha1'
-require "rubygems"
+require 'rubygems'
 
 <%= shared_helpers %>
 
@@ -14,11 +14,11 @@ module Bundler
     <%= spec.inspect %>,
     <% end -%>
   ].map do |hash|
-    if hash[:loaded_from]
+    if hash[:virtual_spec]
+      spec = eval(hash[:virtual_spec], binding, "<virtual spec for '#{hash[:name]}'>")
+    else
       dir = File.dirname(hash[:loaded_from])
       spec = Dir.chdir(dir){ eval(File.read(hash[:loaded_from]), binding, hash[:loaded_from]) }
-    else
-      spec = eval(hash[:virtual_spec], binding, "<virtual spec for '#{hash[:name]}'>")
     end
     spec.loaded_from = hash[:loaded_from]
     spec.require_paths = hash[:load_paths]
@@ -27,6 +27,15 @@ module Bundler
 
   extend SharedHelpers
 
+  def self.configure_gem_path_and_home(specs)
+    # Fix paths, so that Gem.source_index and such will work
+    paths = specs.map{|s| s.installation_path }
+    paths.flatten!; paths.compact!; paths.uniq!; paths.reject!{|p| p.empty? }
+    ENV['GEM_PATH'] = paths.join(File::PATH_SEPARATOR)
+    ENV['GEM_HOME'] = paths.first
+    Gem.clear_paths
+  end
+
   def self.match_fingerprint
     print = Digest::SHA1.hexdigest(File.read(File.expand_path('../../Gemfile', __FILE__)))
     unless print == FINGERPRINT
@@ -38,6 +47,7 @@ module Bundler
     match_fingerprint
     clean_load_path
     cripple_rubygems(SPECS)
+    configure_gem_path_and_home(SPECS)
     SPECS.each do |spec|
       Gem.loaded_specs[spec.name] = spec
       $LOAD_PATH.unshift(*spec.require_paths)

data/lib/bundler/ui.rb

@@ -17,8 +17,8 @@ module Bundler
         @shell = shell
       end
 
-      # TODO: Add debug mode
       def debug(msg)
+        @shell.say(msg) if ENV['DEBUG']
       end
 
       def info(msg)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 12
-  version: 0.9.12
+  - 13
+  version: 0.9.13
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,10 +16,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -07:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: 
 email: 
 - carlhuda@engineyard.com