bundler 0.7.3.pre → 0.7.3.pre2

data/Rakefile

@@ -37,6 +37,19 @@ else
   end
 end
 
+namespace :spec do
+  file "tmp/rg_deps" do
+    repo = File.dirname(__FILE__) + '/tmp/rg_deps'
+    FileUtils.mkdir_p(repo)
+    p repo
+    ENV['GEM_HOME'], ENV['GEM_PATH'] = repo, repo
+    system "gem install builder --no-rdoc --no-ri"
+  end
+
+  desc "Do all setup needed to run the specs"
+  task :setup => "tmp/rg_deps"
+end
+
 begin
   require 'rake/gempackagetask'
 rescue LoadError

data/lib/bundler.rb

@@ -19,7 +19,7 @@ require "bundler/dependency"
 require "bundler/remote_specification"
 
 module Bundler
-  VERSION = "0.7.3.pre"
+  VERSION = "0.7.3.pre2"
 
   class << self
     attr_writer :logger

data/lib/bundler/bundle.rb

@@ -2,34 +2,86 @@ module Bundler
   class InvalidRepository < StandardError ; end
 
   class Bundle
-    attr_reader :path
+    attr_reader :gemfile, :environment
 
-    def initialize(path, bindir)
-      FileUtils.mkdir_p(path)
+    def self.load(gemfile = nil)
+      gemfile = Pathname.new(gemfile || default_gemfile).expand_path
 
-      @path = Pathname.new(path)
-      @bindir = Pathname.new(bindir)
+      unless gemfile.file?
+        raise ManifestFileNotFound, "Manifest file not found: #{gemfile.to_s.inspect}"
+      end
+
+      new(gemfile)
+    end
+
+    def self.default_gemfile
+      current = Pathname.new(Dir.pwd)
+
+      until current.root?
+        filename = current.join("Gemfile")
+        return filename if filename.exist?
+        current = current.parent
+      end
+
+      raise DefaultManifestNotFound
+    end
 
-      @cache_path = @path.join('cache')
-      @cache = GemDirectorySource.new(:location => @cache_path)
+    # TODO: passing in the filename is not good
+    def initialize(gemfile)
+      @gemfile = gemfile
+      @environment = Environment.new(self)
+      Dsl.evaluate(gemfile, self, @environment)
+
+      # path   = env.gem_path
+
+      FileUtils.mkdir_p(gem_path)
+
+      @cache_path = gem_path.join('cache')
+      @cache = GemDirectorySource.new(self, :location => @cache_path)
+
+      @specs_path = gem_path.join('specifications')
+      @gems_path  = gem_path.join('gems')
+    end
+
+    def root
+      gemfile.parent
+    end
 
-      @specs_path = @path.join('specifications')
-      @gems_path = @path.join('gems')
+    def path
+      @path ||= root.join("vendor/gems")
     end
 
-    def install(dependencies, sources, options = {})
+    def path=(path)
+      @path = (path.relative? ? root.join(path) : path).expand_path
+    end
+
+    def gem_path
+      path.join("#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}")
+    end
+
+    def bindir
+      @bindir ||= root.join("bin")
+    end
+
+    def bindir=(path)
+      @bindir = (path.relative? ? root.join(path) : path).expand_path
+    end
+
+    def install(options = {})
+      dependencies = @environment.dependencies
+      sources      = @environment.sources
+
+      # ========== from env
+      if only_envs = options[:only]
+        dependencies.reject! { |d| !only_envs.any? {|env| d.in?(env) } }
+      end
+      # ==========
+
       # TODO: clean this up
       sources.each do |s|
-        s.repository = self
         s.local = options[:cached]
       end
 
-      source_requirements = {}
-      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 = nil
@@ -43,7 +95,7 @@ module Bundler
       # or the user passed --update
       if options[:update] || !valid
         Bundler.logger.info "Calculating dependencies..."
-        bundle = Resolver.resolve(dependencies, [@cache] + sources, source_requirements)
+        bundle = Resolver.resolve(dependencies, [@cache] + sources)
         download(bundle, options)
         do_install(bundle, options)
         valid = bundle
@@ -52,6 +104,8 @@ module Bundler
       generate_bins(valid, options)
       cleanup(valid, options)
       configure(valid, options)
+
+      Bundler.logger.info "Done."
     end
 
     def cache(*gemfiles)
@@ -62,9 +116,23 @@ module Bundler
       end
     end
 
-    def prune(dependencies, sources)
+    def list_outdated(options={})
+      outdated_gems = source_index.outdated.sort
+
+      if outdated_gems.empty?
+        Bundler.logger.info "All gems are up to date."
+      else
+        Bundler.logger.info "Outdated gems:"
+        outdated_gems.each do |name|
+          Bundler.logger.info " * #{name}"
+        end
+      end
+    end
+
+    def prune(options = {})
+      dependencies, sources = @environment.gem_dependencies, @environment.sources
+
       sources.each do |s|
-        s.repository = self
         s.local = true
       end
 
@@ -80,12 +148,15 @@ module Bundler
       end
     end
 
-    def gems
-      source_index.gems.values
+    def list(options = {})
+      Bundler.logger.info "Currently bundled gems:"
+      gems.each do |spec|
+        Bundler.logger.info " * #{spec.name} (#{spec.version})"
+      end
     end
 
-    def outdated_gems
-      source_index.outdated.sort
+    def gems
+      source_index.gems.values
     end
 
     def source_index
@@ -98,6 +169,15 @@ module Bundler
       @repos[type].download_path_for
     end
 
+    def setup_environment
+      unless @environment.system_gems
+        ENV["GEM_HOME"] = gem_path
+        ENV["GEM_PATH"] = gem_path
+      end
+      ENV["PATH"]     = "#{bindir}:#{ENV["PATH"]}"
+      ENV["RUBYOPT"]  = "-r#{gem_path}/environment #{ENV["RUBYOPT"]}"
+    end
+
   private
 
     def only_local(sources)
@@ -106,14 +186,14 @@ module Bundler
 
     def download(bundle, options)
       bundle.sort_by {|s| s.full_name.downcase }.each do |spec|
-        next if options[:no_bundle].include?(spec.name)
+        next if spec.no_bundle?
         spec.source.download(spec)
       end
     end
 
     def do_install(bundle, options)
       bundle.each do |spec|
-        next if options[:no_bundle].include?(spec.name)
+        next if spec.no_bundle?
         spec.loaded_from = @specs_path.join("#{spec.full_name}.gemspec")
         # Do nothing if the gem is already expanded
         next if @gems_path.join(spec.full_name).directory?
@@ -129,10 +209,10 @@ module Bundler
 
     def generate_bins(bundle, options)
       bundle.each do |spec|
-        next if options[:no_bundle].include?(spec.name)
+        next if spec.no_bundle?
         # HAX -- Generate the bin
-        bin_dir = @bindir
-        path    = @path
+        bin_dir = bindir
+        path    = gem_path
         gems_path = @gems_path
         installer = Gem::Installer.allocate
         installer.instance_eval do
@@ -158,11 +238,11 @@ module Bundler
       end
 
       installer = Gem::Installer.new(gemfile, options.merge(
-        :install_dir         => @path,
+        :install_dir         => gem_path,
         :ignore_dependencies => true,
         :env_shebang         => true,
         :wrappers            => true,
-        :bin_dir             => @bindir
+        :bin_dir             => bindir
       ))
       installer.install
     rescue Gem::InstallError
@@ -202,7 +282,7 @@ module Bundler
         spec.executables.each do |bin|
           next if valid_executables.include?(bin)
           Bundler.logger.info "Deleting bin file: #{bin}"
-          FileUtils.rm_rf(@bindir.join(bin))
+          FileUtils.rm_rf(bindir.join(bin))
         end
       end
     end
@@ -219,48 +299,17 @@ module Bundler
     end
 
     def configure(specs, options)
-      FileUtils.mkdir_p(path)
-      generate_environment(specs, options)
-      generate_environment_picker
-    end
-
-    def generate_environment_picker
-      FileUtils.cp("#{File.dirname(__FILE__)}/templates/environment_picker.erb", path.join("../../environment.rb"))
-    end
-
-    def generate_environment(specs, options)
-      load_paths = load_paths_for_specs(specs, options)
-      bindir     = @bindir.relative_path_from(path).to_s
-      filename   = options[:manifest].relative_path_from(path).to_s
-
-      File.open(path.join("environment.rb"), "w") do |file|
-        template = File.read(File.join(File.dirname(__FILE__), "templates", "environment.erb"))
-        erb = ERB.new(template, nil, '-')
-        file.puts erb.result(binding)
-      end
-    end
+      FileUtils.mkdir_p(gem_path)
 
-    def load_paths_for_specs(specs, options)
-      load_paths = []
-      specs.each do |spec|
-        next if options[:no_bundle].include?(spec.name)
-        gem_path = Pathname.new(spec.full_gem_path)
-        if spec.bindir && gem_path.join(spec.bindir).exist?
-          load_paths << load_path_for(gem_path, spec.bindir)
-        end
-        spec.require_paths.each do |path|
-          load_paths << load_path_for(gem_path, path)
-        end
+      File.open(gem_path.join("environment.rb"), "w") do |file|
+        file.puts @environment.environment_rb(specs, options)
       end
-      load_paths
-    end
 
-    def load_path_for(gem_path, path)
-      gem_path.join(path).relative_path_from(@path).to_s
+      generate_environment_picker
     end
 
-    def spec_file_for(spec)
-      spec.loaded_from.relative_path_from(@path).to_s
+    def generate_environment_picker
+      FileUtils.cp("#{File.dirname(__FILE__)}/templates/environment_picker.erb", path.join("environment.rb"))
     end
 
     def require_code(file, dep)

data/lib/bundler/cli.rb

@@ -32,31 +32,49 @@ module Bundler
 
     def initialize(options)
       @options = options
-      @environment = Dsl.load_gemfile(@options[:manifest])
+      @bundle = Bundle.load(@options[:manifest])
     end
 
     def bundle
-      @environment.install(@options)
+      @bundle.install(@options)
     end
 
     def cache
-      @environment.cache(@options)
+      gemfile = @options[:cache]
+
+      if File.extname(gemfile) == ".gem"
+        if !File.exist?(gemfile)
+          raise InvalidCacheArgument, "'#{gemfile}' does not exist."
+        end
+        @bundle.cache(gemfile)
+      elsif File.directory?(gemfile) || gemfile.include?('/')
+        if !File.directory?(gemfile)
+          raise InvalidCacheArgument, "'#{gemfile}' does not exist."
+        end
+        gemfiles = Dir["#{gemfile}/*.gem"]
+        if gemfiles.empty?
+          raise InvalidCacheArgument, "'#{gemfile}' contains no gemfiles"
+        end
+        @bundle.cache(*gemfiles)
+      else
+        raise InvalidCacheArgument, "w0t? '#{gemfile}' means nothing to me."
+      end
     end
 
     def prune
-      @environment.prune(@options)
+      @bundle.prune(@options)
     end
 
     def list
-      @environment.list(@options)
+      @bundle.list(@options)
     end
 
     def list_outdated
-      @environment.list_outdated(@options)
+      @bundle.list_outdated(@options)
     end
 
     def exec
-      @environment.setup_environment
+      @bundle.setup_environment
       # w0t?
       super(*$command)
     end

data/lib/bundler/dependency.rb

@@ -1,7 +1,7 @@
 module Bundler
   class InvalidEnvironmentName < StandardError; end
 
-  class Dependency
+  class Dependency < Gem::Dependency
     attr_reader :name, :version, :require_as, :only, :except
     attr_accessor :source
 
@@ -10,8 +10,8 @@ module Bundler
         options[k.to_s] = v
       end
 
-      @name       = name
-      @version    = options["version"] || ">= 0"
+      super(name, options["version"] || ">= 0")
+
       @require_as = options["require_as"]
       @only       = options["only"]
       @except     = options["except"]
@@ -31,10 +31,6 @@ module Bundler
       true
     end
 
-    def to_s
-      to_gem_dependency.to_s
-    end
-
     def require_env(environment)
       return unless in?(environment)
 
@@ -51,8 +47,8 @@ module Bundler
       @block.call if @block
     end
 
-    def to_gem_dependency
-      @gem_dep ||= Gem::Dependency.new(name, version)
+    def no_bundle?
+      source == SystemGemSource.instance
     end
 
     def ==(o)
@@ -60,5 +56,7 @@ module Bundler
         [o.name, o.version, o.require_as, o.only, o.except]
     end
 
+    alias version version_requirements
+
   end
 end

data/lib/bundler/dsl.rb

@@ -4,36 +4,14 @@ module Bundler
   class DefaultManifestNotFound < StandardError; end
 
   class Dsl
-    def self.load_gemfile(file)
-      gemfile = Pathname.new(file || default_gemfile).expand_path
-
-      unless gemfile.file?
-        raise ManifestFileNotFound, "Manifest file not found: #{gemfile.to_s.inspect}"
-      end
-
-      evaluate(gemfile)
-    end
-
-    def self.default_gemfile
-      current = Pathname.new(Dir.pwd)
-
-      until current.root?
-        filename = current.join("Gemfile")
-        return filename if filename.exist?
-        current = current.parent
-      end
-
-      raise DefaultManifestNotFound
-    end
-
-    def self.evaluate(file)
-      environment = Environment.new(file)
-      builder = new(environment)
+    def self.evaluate(file, bundle, environment)
+      builder = new(bundle, environment)
       builder.instance_eval(File.read(file.to_s), file.to_s, 1)
       environment
     end
 
-    def initialize(environment)
+    def initialize(bundle, environment)
+      @bundle = bundle
       @environment = environment
       @directory_sources = []
       @git_sources = {}
@@ -41,15 +19,11 @@ module Bundler
     end
 
     def bundle_path(path)
-      path = Pathname.new(path)
-      @environment.gem_path = (path.relative? ?
-        @environment.root.join(path) : path).expand_path
+      @bundle.path = Pathname.new(path)
     end
 
     def bin_path(path)
-      path = Pathname.new(path)
-      @environment.bindir = (path.relative? ?
-        @environment.root.join(path) : path).expand_path
+      @bundle.bindir = Pathname.new(path)
     end
 
     def disable_rubygems
@@ -61,7 +35,7 @@ module Bundler
     end
 
     def source(source)
-      source = GemSource.new(:uri => source)
+      source = GemSource.new(@bundle, :uri => source)
       unless @environment.sources.include?(source)
         @environment.add_source(source)
       end
@@ -81,7 +55,7 @@ module Bundler
 
     def directory(path, options = {})
       raise DirectorySourceError, "cannot nest calls to directory or git" if @directory || @git
-      @directory = DirectorySource.new(options.merge(:location => path))
+      @directory = DirectorySource.new(@bundle, options.merge(:location => path))
       @directory_sources << @directory
       @environment.add_priority_source(@directory)
       retval = yield if block_given?
@@ -91,7 +65,7 @@ module Bundler
 
     def git(uri, options = {})
       raise DirectorySourceError, "cannot nest calls to directory or git" if @directory || @git
-      @git = GitSource.new(options.merge(:uri => uri))
+      @git = GitSource.new(@bundle, options.merge(:uri => uri))
       @git_sources[uri] = @git
       @environment.add_priority_source(@git)
       retval = yield if block_given?
@@ -123,7 +97,7 @@ module Bundler
       dep = Dependency.new(name, options.merge(:version => version))
 
       if options.key?(:bundle) && !options[:bundle]
-        dep.source = SystemGemSource.instance
+        dep.source = SystemGemSource.new(@bundle)
       elsif @git || options[:git]
         dep.source = _handle_git_option(name, version, options)
       elsif @directory || options[:path]
@@ -158,7 +132,7 @@ module Bundler
         return @directory, Pathname.new(path || '')
       end
 
-      path = @environment.filename.dirname.join(path)
+      path = @bundle.gemfile.dirname.join(path)
 
       @directory_sources.each do |s|
         if s.location.expand_path.to_s < path.expand_path.to_s

data/lib/bundler/environment.rb

@@ -5,16 +5,11 @@ module Bundler
   class SourceNotCached < StandardError; end
 
   class Environment
-    attr_reader :filename, :dependencies
+    attr_reader   :dependencies
     attr_accessor :rubygems, :system_gems
-    attr_writer :gem_path, :bindir
 
-    def self.default_gem_path(root)
-      Pathname.new("#{root}/vendor/gems/#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}")
-    end
-
-    def initialize(filename)
-      @filename         = filename
+    def initialize(bundle)
+      @bundle = bundle # TODO: remove this
       @default_sources  = default_sources
       @sources          = []
       @priority_sources = []
@@ -23,110 +18,22 @@ module Bundler
       @system_gems      = true
     end
 
-    def install(options = {})
-      if only_envs = options[:only]
-        dependencies.reject! { |d| !only_envs.any? {|env| d.in?(env) } }
-      end
-
-      no_bundle = dependencies.map do |dep|
-        dep.source == SystemGemSource.instance && dep.name
-      end.compact
-
-      update = options[:update]
-      cached = options[:cached]
-
-      repository.install(dependencies, sources,
-        :rubygems      => rubygems,
-        :system_gems   => system_gems,
-        :manifest      => filename,
-        :update        => options[:update],
-        :cached        => options[:cached],
-        :build_options => options[:build_options],
-        :no_bundle     => no_bundle
-      )
-      Bundler.logger.info "Done."
-    end
-
-    def cache(options = {})
-      gemfile = options[:cache]
-
-      if File.extname(gemfile) == ".gem"
-        if !File.exist?(gemfile)
-          raise InvalidCacheArgument, "'#{gemfile}' does not exist."
-        end
-        repository.cache(gemfile)
-      elsif File.directory?(gemfile) || gemfile.include?('/')
-        if !File.directory?(gemfile)
-          raise InvalidCacheArgument, "'#{gemfile}' does not exist."
-        end
-        gemfiles = Dir["#{gemfile}/*.gem"]
-        if gemfiles.empty?
-          raise InvalidCacheArgument, "'#{gemfile}' contains no gemfiles"
-        end
-        repository.cache(*gemfiles)
-      else
-        local = Gem::SourceIndex.from_installed_gems.find_name(gemfile).last
-
-        if !local
-          raise InvalidCacheArgument, "w0t? '#{gemfile}' means nothing to me."
-        end
-
-        gemfile = Pathname.new(local.loaded_from)
-        gemfile = gemfile.dirname.join('..', 'cache', "#{local.full_name}.gem").expand_path
-        repository.cache(gemfile)
-      end
-    end
-
-    def prune(options = {})
-      repository.prune(gem_dependencies, sources)
-    end
+    def environment_rb(specs, options)
+      load_paths = load_paths_for_specs(specs, options)
+      bindir     = @bundle.bindir.relative_path_from(@bundle.gem_path).to_s
+      filename   = @bundle.gemfile.relative_path_from(@bundle.gem_path).to_s
 
-    def list(options = {})
-      Bundler.logger.info "Currently bundled gems:"
-      repository.gems.each do |spec|
-        Bundler.logger.info " * #{spec.name} (#{spec.version})"
-      end
-    end
-
-    def list_outdated(options={})
-      outdated_gems = repository.outdated_gems
-      if outdated_gems.empty?
-        Bundler.logger.info "All gems are up to date."
-      else
-        Bundler.logger.info "Outdated gems:"
-        outdated_gems.each do |name|
-          Bundler.logger.info " * #{name}"
-        end
-      end
-    end
-
-    def setup_environment
-      unless system_gems
-        ENV["GEM_HOME"] = gem_path
-        ENV["GEM_PATH"] = gem_path
-      end
-      ENV["PATH"]     = "#{bindir}:#{ENV["PATH"]}"
-      ENV["RUBYOPT"]  = "-r#{gem_path}/environment #{ENV["RUBYOPT"]}"
+      template = File.read(File.join(File.dirname(__FILE__), "templates", "environment.erb"))
+      erb = ERB.new(template, nil, '-')
+      erb.result(binding)
     end
 
     def require_env(env = nil)
       dependencies.each { |d| d.require_env(env) }
     end
 
-    def root
-      filename.parent
-    end
-
-    def gem_path
-      @gem_path ||= self.class.default_gem_path(root)
-    end
-
-    def bindir
-      @bindir ||= root.join("bin")
-    end
-
     def sources
-      @priority_sources + @sources + @default_sources
+      @priority_sources + @sources + @default_sources + [SystemGemSource.new(@bundle)]
     end
 
     def add_source(source)
@@ -142,18 +49,39 @@ module Bundler
       @default_sources.clear
     end
 
+    def gem_dependencies
+      @gem_dependencies ||= dependencies.map { |d| d.to_gem_dependency }
+    end
+
+    alias rubygems? rubygems
+    alias system_gems? system_gems
+
   private
 
     def default_sources
-      [GemSource.new(:uri => "http://gems.rubyforge.org"), SystemGemSource.instance]
+      [GemSource.new(@bundle, :uri => "http://gems.rubyforge.org")]
+    end
+
+    def load_paths_for_specs(specs, options)
+      load_paths = []
+      specs.each do |spec|
+        next if spec.no_bundle?
+        full_gem_path = Pathname.new(spec.full_gem_path)
+
+        load_paths << load_path_for(full_gem_path, spec.bindir) if spec.bindir
+        spec.require_paths.each do |path|
+          load_paths << load_path_for(full_gem_path, path)
+        end
+      end
+      load_paths
     end
 
-    def repository
-      @repository ||= Bundle.new(gem_path, bindir)
+    def load_path_for(gem_path, path)
+      gem_path.join(path).relative_path_from(@bundle.gem_path).to_s
     end
 
-    def gem_dependencies
-      @gem_dependencies ||= dependencies.map { |d| d.to_gem_dependency }
+    def spec_file_for(spec)
+      spec.loaded_from.relative_path_from(@bundle.gem_path).to_s
     end
   end
 end

data/lib/bundler/gem_ext.rb

@@ -11,8 +11,9 @@ module Gem
   end
 
   class Specification
-    attr_accessor :source
-    attr_accessor :location
+    attr_accessor :source, :location, :no_bundle
+
+    alias no_bundle? no_bundle
 
     remove_method(:specification_version) if method_defined?(:specification_version)
 

data/lib/bundler/resolver.rb

@@ -36,7 +36,14 @@ module Bundler
     # ==== Returns
     # <GemBundle>,nil:: If the list of dependencies can be resolved, a
     #   collection of gemspecs is returned. Otherwise, nil is returned.
-    def self.resolve(requirements, sources, source_requirements = {})
+    def self.resolve(requirements, sources)
+      source_requirements = {}
+
+      requirements.each do |r|
+        next unless r.source
+        source_requirements[r.name] = r.source
+      end
+
       resolver = new(sources, source_requirements)
       result = catch(:success) do
         resolver.resolve(requirements, {})
@@ -54,6 +61,7 @@ module Bundler
         # a smaller index in the array.
         ordered = []
         result.values.each do |spec1|
+          spec1.no_bundle = true if source_requirements[spec1.name] == SystemGemSource.instance
           index = nil
           place = ordered.detect do |spec2|
             spec1.dependencies.any? { |d| d.name == spec2.name }

data/lib/bundler/source.rb

@@ -4,9 +4,12 @@ module Bundler
   # Represents a source of rubygems. Initially, this is only gem repositories, but
   # eventually, this will be git, svn, HTTP
   class Source
-    attr_accessor :repository, :local
+    attr_accessor :local
+    attr_reader   :bundle
 
-    def initialize(options) ; end
+    def initialize(bundle, options)
+      @bundle = bundle
+    end
 
   private
 
@@ -23,7 +26,8 @@ module Bundler
   class GemSource < Source
     attr_reader :uri
 
-    def initialize(options)
+    def initialize(bundle, options)
+      super
       @uri = options[:uri]
       @uri = URI.parse(@uri) unless @uri.is_a?(URI)
       raise ArgumentError, "The source must be an absolute URI" unless @uri.absolute?
@@ -50,7 +54,7 @@ module Bundler
     def download(spec)
       Bundler.logger.info "Downloading #{spec.full_name}.gem"
 
-      destination = repository.path
+      destination = bundle.gem_path
 
       unless destination.writable?
         raise RubygemsRetardation, "destination: #{destination} is not writable"
@@ -99,10 +103,15 @@ module Bundler
   class SystemGemSource < Source
 
     def self.instance
-      @instance ||= new({})
+      @instance
+    end
+
+    def self.new(*args)
+      @instance ||= super
     end
 
-    def initialize(options)
+    def initialize(bundle, options = {})
+      super
       @source = Gem::SourceIndex.from_installed_gems
     end
 
@@ -125,7 +134,7 @@ module Bundler
     def download(spec)
       gemfile = Pathname.new(spec.loaded_from)
       gemfile = gemfile.dirname.join('..', 'cache', "#{spec.full_name}.gem")
-      repository.cache(gemfile)
+      bundle.cache(gemfile)
     end
 
   private
@@ -135,7 +144,8 @@ module Bundler
   class GemDirectorySource < Source
     attr_reader :location
 
-    def initialize(options)
+    def initialize(bundle, options)
+      super
       @location = options[:location]
     end
 
@@ -177,7 +187,8 @@ module Bundler
   class DirectorySource < Source
     attr_reader :location, :specs, :required_specs
 
-    def initialize(options)
+    def initialize(bundle, options)
+      super
       if options[:location]
         @location = Pathname.new(options[:location]).expand_path
       end
@@ -289,7 +300,7 @@ module Bundler
   class GitSource < DirectorySource
     attr_reader :ref, :uri, :branch
 
-    def initialize(options)
+    def initialize(bundle, options)
       super
       @uri = options[:uri]
       @branch = options[:branch] || 'master'
@@ -298,7 +309,7 @@ module Bundler
 
     def location
       # TMP HAX to get the *.gemspec reading to work
-      repository.path.join('dirs', File.basename(@uri, '.git'))
+      bundle.gem_path.join('dirs', File.basename(@uri, '.git'))
     end
 
     def gems

data/lib/bundler/templates/environment.erb

@@ -3,7 +3,7 @@ module Bundler
  file = File.expand_path(__FILE__)
  dir = File.dirname(file)
 
-<% unless options[:system_gems] -%>
+<% unless system_gems? -%>
   ENV["GEM_HOME"] = dir
   ENV["GEM_PATH"] = dir
 
@@ -25,12 +25,12 @@ module Bundler
 
   @gemfile = "#{dir}/<%= filename %>"
 
-<% if options[:rubygems] -%>
+<% if rubygems? -%>
   require "rubygems" unless respond_to?(:gem) # 1.9 already has RubyGems loaded
 
   @bundled_specs = {}
 <% specs.each do |spec| -%>
-<% if options[:no_bundle].include?(spec.name) -%>
+<% if spec.no_bundle? -%>
   gem "<%= spec.name %>", "<%= spec.version %>"
 <% else -%>
 <% path = spec_file_for(spec) -%>
@@ -108,7 +108,7 @@ module Bundler
   end
 end
 
-<% if options[:rubygems] -%>
+<% if rubygems? -%>
 module Gem
   @loaded_stacks = Hash.new { |h,k| h[k] = [] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.7.3.pre
+  version: 0.7.3.pre2
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 -08:00
+date: 2010-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: []