bundler 0.3.1 → 0.4.0

data/README.markdown

@@ -2,6 +2,7 @@
 
     Github:       http://github.com/wycats/bundler
     Mailing list: http://groups.google.com/group/ruby-bundler
+    IRC:          #carlhuda on freenode
 
 ## Intro
 
@@ -110,7 +111,7 @@ run it with the `gem exec` command. For example:
 Yet another way is to manually require the environment file first. This is
 located in `[bundle_path]/environments/default.rb`. For example:
 
-    ruby -r vendor/gems/environments/default.rb my_ruby_script.rb
+    ruby -r vendor/gems/environment.rb my_ruby_script.rb
 
 ### Using Bundler with Rails today
 
@@ -134,7 +135,7 @@ to follow.
 
 * At the top of `config/boot.rb`, add the following line:
 
-        require File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environments', 'default'))
+        require File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment'))
 
 In theory, this should be enough to get going.
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 
 spec = Gem::Specification.new do |s|
   s.name    = "bundler"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
   s.author  = "Yehuda Katz"
   s.email   = "wycats@gmail.com"
   s.homepage = "http://github.com/wycats/bundler"
@@ -16,6 +16,8 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.markdown", "LICENSE"]
 
+  s.required_rubygems_version = ">= 1.3.5"
+
   s.require_path = 'lib'
   s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("lib/**/*")
 end

data/lib/bundler.rb

@@ -14,7 +14,7 @@ require "bundler/resolver"
 require "bundler/manifest_file"
 require "bundler/manifest"
 require "bundler/dependency"
-require "bundler/runtime"
+require "bundler/dsl"
 require "bundler/cli"
 require "bundler/repository"
 

data/lib/bundler/cli.rb

@@ -4,6 +4,21 @@ module Bundler
   class CLI
     def self.run(command, options = {})
       new(options).run(command)
+    rescue DefaultManifestNotFound => e
+      Bundler.logger.error "Could not find a Gemfile to use"
+      exit 2
+    rescue InvalidEnvironmentName => e
+      Bundler.logger.error "Gemfile error: #{e.message}"
+      exit
+    rescue InvalidRepository => e
+      Bundler.logger.error e.message
+      exit
+    rescue VersionConflict => e
+      Bundler.logger.error e.message
+      exit
+    rescue GemNotFound => e
+      Bundler.logger.error e.message
+      exit
     end
 
     def initialize(options)
@@ -22,21 +37,7 @@ module Bundler
     end
 
     def run(command)
-
       send(command)
-
-    rescue DefaultManifestNotFound => e
-      Bundler.logger.error "Could not find a Gemfile to use"
-      exit 2
-    rescue InvalidEnvironmentName => e
-      Bundler.logger.error "Gemfile error: #{e.message}"
-      exit
-    rescue InvalidRepository => e
-      Bundler.logger.error e.message
-      exit
-    rescue VersionConflict => e
-      Bundler.logger.error e.message
-      exit
     end
 
   end

data/lib/bundler/dependency.rb

@@ -4,7 +4,7 @@ module Bundler
   class Dependency
     attr_reader :name, :version, :require_as, :only, :except
 
-    def initialize(name, options = {})
+    def initialize(name, options = {}, &block)
       options.each do |k, v|
         options[k.to_s] = v
       end
@@ -14,6 +14,7 @@ module Bundler
       @require_as = Array(options["require_as"] || name)
       @only       = Array(options["only"]).map {|e| e.to_s } if options["only"]
       @except     = Array(options["except"]).map {|e| e.to_s } if options["except"]
+      @block      = block
 
       if (@only && @only.include?("rubygems")) || (@except && @except.include?("rubygems"))
         raise InvalidEnvironmentName, "'rubygems' is not a valid environment name"
@@ -32,6 +33,16 @@ module Bundler
       to_gem_dependency.to_s
     end
 
+    def require(environment)
+      return unless in?(environment)
+
+      @require_as.each do |file|
+        super(file)
+      end
+
+      @block.call if @block
+    end
+
     def to_gem_dependency
       @gem_dep ||= Gem::Dependency.new(name, version)
     end

data/lib/bundler/dsl.rb

@@ -0,0 +1,61 @@
+module Bundler
+  class ManifestFileNotFound < StandardError; end
+
+  class ManifestBuilder
+    def self.build(manifest_file, string)
+      builder = new(manifest_file)
+      builder.instance_eval(string)
+      builder
+    end
+
+    def self.load(manifest_file, filename)
+      unless File.exist?(filename)
+        raise ManifestFileNotFound, "#{filename.inspect} does not exist"
+      end
+      string = File.read(filename)
+      build(manifest_file, string)
+    end
+
+    def initialize(manifest_file)
+      @manifest_file  = manifest_file
+    end
+
+    def bundle_path(path)
+      path = Pathname.new(path)
+      @manifest_file.gem_path = (path.relative? ?
+        @manifest_file.root.join(path) : path).expand_path
+    end
+
+    def bin_path(path)
+      path = Pathname.new(path)
+      @manifest_file.bindir = (path.relative? ?
+        @manifest_file.root.join(path) : path).expand_path
+    end
+
+    def disable_rubygems
+      @manifest_file.rubygems = false
+    end
+
+    def disable_system_gems
+      @manifest_file.system_gems = false
+    end
+
+    def source(source)
+      source = Source.new(source)
+      unless @manifest_file.sources.include?(source)
+        @manifest_file.add_source(source)
+      end
+    end
+
+    def clear_sources
+      @manifest_file.clear_sources
+    end
+
+    def gem(name, *args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      version = args.last
+
+      @manifest_file.dependencies << Dependency.new(name, options.merge(:version => version))
+    end
+  end
+end

data/lib/bundler/finder.rb

@@ -18,23 +18,6 @@ module Bundler
       @sources = sources
     end
 
-    # Figures out the best possible configuration of gems that satisfies
-    # the list of passed dependencies and any child dependencies without
-    # causing any gem activation errors.
-    #
-    # ==== Parameters
-    # *dependencies<Gem::Dependency>:: The list of dependencies to resolve
-    #
-    # ==== Returns
-    # <GemBundle>,nil:: If the list of dependencies can be resolved, a
-    #   collection of gemspecs is returned. Otherwise, nil is returned.
-    def resolve(*dependencies)
-      Bundler.logger.info "Calculating dependencies..."
-
-      resolved = Resolver.resolve(dependencies, self)
-      resolved && GemBundle.new(resolved)
-    end
-
     # Searches for a gem that matches the dependency
     #
     # ==== Parameters

data/lib/bundler/gem_ext.rb

@@ -2,8 +2,8 @@ module Gem
   class Installer
     def app_script_text(bin_file_name)
       path = @gem_home
-      template = File.read(File.join(File.dirname(__FILE__), "templates", "app_script.rb"))
-      erb = ERB.new(template)
+      template = File.read(File.join(File.dirname(__FILE__), "templates", "app_script.erb"))
+      erb = ERB.new(template, nil, '-')
       erb.result(binding)
     end
   end
@@ -15,5 +15,10 @@ module Gem
       source = Bundler::Source.new(source) unless source.is_a?(Bundler::Source)
       @source = source
     end
+
+    # Hack to fix github's strange marshal file
+    def specification_version
+      @specification_version && @specification_version.to_i
+    end
   end
 end

data/lib/bundler/manifest.rb

@@ -4,43 +4,33 @@ module Bundler
   class VersionConflict < StandardError; end
 
   class Manifest
-    attr_reader :sources, :dependencies, :path
+    attr_reader :filename, :sources, :dependencies, :path
 
-    def initialize(sources, dependencies, bindir, repository_path, rubygems, system_gems)
+    def initialize(filename, sources, dependencies, bindir, path, rubygems, system_gems)
+      @filename     = filename
       @sources      = sources
       @dependencies = dependencies
-      @bindir       = bindir
-      @repository   = Repository.new(repository_path)
+      @bindir       = bindir || repository.path.join("bin")
+      @path         = path
       @rubygems     = rubygems
       @system_gems  = system_gems
     end
 
     def install(update)
       fetch(update)
-      @repository.install_cached_gems(:bin_dir => @bindir || @repository.path.join("bin"))
-      cleanup_removed_gems
-      create_environment_files(@repository.path.join("environments"))
+      repository.install_cached_gems(:bin_dir => @bindir)
+      # Cleanup incase fetch was a no-op
+      repository.cleanup(gems)
+      create_environment_file(repository.path)
       Bundler.logger.info "Done."
     end
 
-    def activate(environment = "default")
-      require @repository.path.join("environments", "#{environment}.rb")
+    def gems
+      deps = dependencies
+      deps = deps.map { |d| d.to_gem_dependency }
+      Resolver.resolve(deps, repository.source_index)
     end
 
-    def require_all
-      dependencies.each do |dep|
-        dep.require_as.each {|file| require file }
-      end
-    end
-
-    def gems_for(environment = nil)
-      deps     = dependencies
-      deps     = deps.select { |d| d.in?(environment) } if environment
-      deps     = deps.map { |d| d.to_gem_dependency }
-      Resolver.resolve(deps, @repository.source_index)
-    end
-    alias gems gems_for
-
     def environments
       envs = dependencies.map {|dep| Array(dep.only) + Array(dep.except) }.flatten
       envs << "default"
@@ -48,16 +38,28 @@ module Bundler
 
   private
 
+    def finder
+      @finder ||= Finder.new(*sources)
+    end
+
+    def repository
+      @repository ||= Repository.new(@path, @bindir)
+    end
+
     def fetch(update)
       return unless update || !all_gems_installed?
 
-      finder = Finder.new(*sources)
-      unless bundle = finder.resolve(*gem_dependencies)
+      unless bundle = Resolver.resolve(gem_dependencies, finder)
         gems = @dependencies.map {|d| "  #{d.to_s}" }.join("\n")
         raise VersionConflict, "No compatible versions could be found for:\n#{gems}"
       end
 
-      bundle.download(@repository)
+      # Cleanup here to remove any gems that could cause problem in the expansion
+      # phase
+      #
+      # TODO: Try to avoid double cleanup
+      repository.cleanup(bundle)
+      bundle.download(repository)
     end
 
     def gem_dependencies
@@ -67,7 +69,7 @@ module Bundler
     def all_gems_installed?
       downloaded_gems = {}
 
-      Dir[@repository.path.join("cache", "*.gem")].each do |file|
+      Dir[repository.path.join("cache", "*.gem")].each do |file|
         file =~ /\/([^\/]+)-([\d\.]+)\.gem$/
         name, version = $1, $2
         downloaded_gems[name] = Gem::Version.new(version)
@@ -79,36 +81,18 @@ module Bundler
       end
     end
 
-    def cleanup_removed_gems
-      glob = gems.map { |g| g.full_name }.join(',')
-      base = @repository.path.join("{cache,specifications,gems}")
-
-      (Dir[base.join("*")] - Dir[base.join("{#{glob}}{.gemspec,.gem,}")]).each do |file|
-        Bundler.logger.info "Deleting gem: #{File.basename(file, ".gem")}" if File.basename(file) =~ /\.gem$/
-        FileUtils.rm_rf(file)
-      end
-
-      glob = gems.map { |g| g.executables }.flatten.join(',')
-      (Dir[@bindir.join("*")] - Dir[@bindir.join("{#{glob}}")]).each do |file|
-        Bundler.logger.info "Deleting bin file: #{File.basename(file)}"
-        FileUtils.rm_rf(file)
-      end
-    end
-
-    def create_environment_files(path)
+    def create_environment_file(path)
       FileUtils.mkdir_p(path)
-      environments.each do |environment|
-        specs = gems_for(environment)
-        files = spec_files_for_specs(specs, path)
-        load_paths = load_paths_for_specs(specs)
-        create_environment_file(path, environment, files, load_paths)
-      end
-    end
 
-    def create_environment_file(path, environment, spec_files, load_paths)
-      File.open(path.join("#{environment}.rb"), "w") do |file|
-        template = File.read(File.join(File.dirname(__FILE__), "templates", "environment.rb"))
-        erb = ERB.new(template)
+      specs      = gems
+      spec_files = spec_files_for_specs(specs, path)
+      load_paths = load_paths_for_specs(specs)
+      bindir     = @bindir.relative_path_from(path).to_s
+      filename   = @filename.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
@@ -116,9 +100,13 @@ module Bundler
     def load_paths_for_specs(specs)
       load_paths = []
       specs.each do |spec|
-        load_paths << File.join(spec.full_gem_path, spec.bindir) if spec.bindir
+        gem_path = Pathname.new(spec.full_gem_path)
+
+        if spec.bindir
+          load_paths << gem_path.join(spec.bindir).relative_path_from(@path).to_s
+        end
         spec.require_paths.each do |path|
-          load_paths << File.join(spec.full_gem_path, path)
+          load_paths << gem_path.join(path).relative_path_from(@path).to_s
         end
       end
       load_paths
@@ -127,7 +115,7 @@ module Bundler
     def spec_files_for_specs(specs, path)
       files = {}
       specs.each do |s|
-        files[s.name] = path.join("..", "specifications", "#{s.full_name}.gemspec").expand_path
+        files[s.name] = File.join("specifications", "#{s.full_name}.gemspec")
       end
       files
     end

data/lib/bundler/manifest_file.rb

@@ -2,7 +2,7 @@ module Bundler
   class DefaultManifestNotFound < StandardError; end
 
   class ManifestFile
-    attr_reader :sources, :dependencies
+    attr_reader :dependencies
     attr_accessor :gem_path, :bindir, :rubygems, :system_gems
 
     def self.load(filename = nil)
@@ -10,11 +10,12 @@ module Bundler
     end
 
     def initialize(filename)
-      @filename      = filename
-      @sources       = [Source.new("http://gems.rubyforge.org")]
-      @dependencies  = []
-      @rubygems      = true
-      @system_gems   = true
+      @filename        = filename
+      @default_sources = [Source.new("http://gems.rubyforge.org")]
+      @sources         = []
+      @dependencies    = []
+      @rubygems        = true
+      @system_gems     = true
     end
 
     def load
@@ -30,6 +31,19 @@ module Bundler
       manifest.install(update)
     end
 
+    def sources
+      @sources + @default_sources
+    end
+
+    def add_source(source)
+      @sources << source
+    end
+
+    def clear_sources
+      @sources.clear
+      @default_sources.clear
+    end
+
     def setup_environment
       unless @system_gems
         ENV["GEM_HOME"] = @gem_path
@@ -41,7 +55,7 @@ module Bundler
 
     def load_manifest
       ManifestBuilder.load(self, filename)
-      Manifest.new(sources, dependencies, bindir, gem_path, rubygems, system_gems)
+      Manifest.new(filename, sources, dependencies, bindir, gem_path, rubygems, system_gems)
     end
 
     def gem_path

data/lib/bundler/repository.rb

@@ -5,8 +5,9 @@ module Bundler
 
     attr_reader :path
 
-    def initialize(path)
-      @path = Pathname.new(path)
+    def initialize(path, bindir = nil)
+      @path   = Pathname.new(path)
+      @bindir = Pathname.new(bindir) || @path.join("bin")
       unless valid?
         raise InvalidRepository, "'#{path}' is not a valid gem repository"
       end
@@ -19,7 +20,7 @@ module Bundler
     end
 
     def valid?
-      (Dir[@path.join("*")] - Dir[@path.join("{cache,doc,gems,environments,specifications}")]).empty?
+      (Dir[@path.join("*")] - Dir[@path.join("{cache,doc,gems,environment.rb,specifications}")]).empty?
     end
 
     def download(spec)
@@ -54,6 +55,25 @@ module Bundler
       end
     end
 
+    def cleanup(gems)
+      glob = gems.map { |g| g.full_name }.join(',')
+      base = path.join("{cache,specifications,gems}")
+
+      (Dir[base.join("*")] - Dir[base.join("{#{glob}}{.gemspec,.gem,}")]).each do |file|
+        if File.basename(file) =~ /\.gem$/
+          name = File.basename(file, '.gem')
+          Bundler.logger.info "Deleting gem: #{name}"
+        end
+        FileUtils.rm_rf(file)
+      end
+
+      glob = gems.map { |g| g.executables }.flatten.join(',')
+      (Dir[@bindir.join("*")] - Dir[@bindir.join("{#{glob}}")]).each do |file|
+        Bundler.logger.info "Deleting bin file: #{File.basename(file)}"
+        FileUtils.rm_rf(file)
+      end
+    end
+
   private
 
     def cache_path

data/lib/bundler/resolver.rb

@@ -19,18 +19,31 @@ module Gem
 end
 
 module Bundler
+  class GemNotFound < StandardError; end
 
   class Resolver
 
     attr_reader :errors
 
+    # Figures out the best possible configuration of gems that satisfies
+    # the list of passed dependencies and any child dependencies without
+    # causing any gem activation errors.
+    #
+    # ==== Parameters
+    # *dependencies<Gem::Dependency>:: The list of dependencies to resolve
+    #
+    # ==== 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, index = Gem.source_index)
+      Bundler.logger.info "Calculating dependencies..."
+
       resolver = new(index)
       result = catch(:success) do
         resolver.resolve(requirements, {})
         nil
       end
-      result && result.values
+      result && GemBundle.new(result.values)
     end
 
     def initialize(index)
@@ -88,6 +101,13 @@ module Bundler
         # TODO: Warn / error when no matching versions are found.
         matching_versions = @index.search(current)
 
+        if matching_versions.empty?
+          if current.required_by.empty?
+            raise GemNotFound, "Could not find gem '#{current}' in any of the sources"
+          end
+          Bundler.logger.warn "Could not find gem '#{current}' (required by '#{current.required_by.last}') in any of the sources"
+        end
+
         matching_versions.reverse_each do |spec|
           conflict = resolve_requirement(spec, current, reqs.dup, activated.dup)
           conflicts << conflict if conflict

data/lib/bundler/runtime.rb

@@ -1,61 +1,46 @@
+require "bundler/dependency"
+
 module Bundler
   class ManifestFileNotFound < StandardError; end
 
-  class ManifestBuilder
-    def self.build(manifest_file, string)
-      builder = new(manifest_file)
-      builder.instance_eval(string)
-      builder
-    end
+  def self.require(environment = nil)
+    ManifestBuilder.run(@gemfile, environment || :default)
+  end
 
-    def self.load(manifest_file, filename)
-      unless File.exist?(filename)
-        raise ManifestFileNotFound, "#{filename.inspect} does not exist"
+  class ManifestBuilder
+    def self.run(gemfile, environment)
+      unless File.exist?(gemfile)
+        raise ManifestFileNotFound, "#{gemfile.inspect} does not exist"
       end
-      string = File.read(filename)
-      build(manifest_file, string)
-    end
 
-    def initialize(manifest_file)
-      @manifest_file = manifest_file
+      builder = new(environment)
+      builder.instance_eval(File.read(gemfile))
+      builder
     end
 
-    def bundle_path(path)
-      path = Pathname.new(path)
-      @manifest_file.gem_path = (path.relative? ?
-        @manifest_file.root.join(path) : path).expand_path
+    def initialize(environment)
+      @environment = environment
     end
 
-    def bin_path(path)
-      path = Pathname.new(path)
-      @manifest_file.bindir = (path.relative? ?
-        @manifest_file.root.join(path) : path).expand_path
-    end
+    def bundle_path(*) ; end
 
-    def disable_rubygems
-      @manifest_file.rubygems = false
-    end
+    def bin_path(*) ; end
 
-    def disable_system_gems
-      @manifest_file.system_gems = false
-    end
+    def disable_rubygems(*) ; end
 
-    def source(source)
-      source = Source.new(source)
-      unless @manifest_file.sources.include?(source)
-        @manifest_file.sources << source
-      end
-    end
+    def disable_system_gems(*) ; end
 
-    def sources
-      @manifest_file.sources
-    end
+    def source(*) ; end
+
+    def clear_sources(*) ; end
 
-    def gem(name, *args)
+    def gem(name, *args, &blk)
       options = args.last.is_a?(Hash) ? args.pop : {}
       version = args.last
 
-      @manifest_file.dependencies << Dependency.new(name, options.merge(:version => version))
+      dep = Dependency.new(name, options.merge(:version => version), &blk)
+      dep.require(@environment)
+      dep
     end
   end
-end
+end

data/lib/bundler/templates/app_script.erb

@@ -0,0 +1,3 @@
+<%= shebang bin_file_name %>
+require File.join(File.dirname(__FILE__), "<%= path.join("environment").relative_path_from(Pathname.new(bin_dir)) %>")
+load File.join(File.dirname(__FILE__), "<%= path.join("gems", @spec.full_name, @spec.bindir, bin_file_name).relative_path_from(Pathname.new(bin_dir)) %>")

data/lib/bundler/templates/{environment.rb → environment.erb}

@@ -1,30 +1,30 @@
-<% unless @system_gems %>
-ENV["GEM_HOME"] = "<%= @repository.path %>"
-ENV["GEM_PATH"] = "<%= @repository.path %>"
-<% end %>
-ENV["PATH"]     = "<%= @bindir %>:#{ENV["PATH"]}"
-ENV["RUBYOPT"]  = "-r#{__FILE__} #{ENV["RUBYOPT"]}"
+module Bundler
+  dir = File.dirname(__FILE__)
 
-<% load_paths.each do |load_path| %>
-$LOAD_PATH.unshift "<%= load_path %>"
-<% end %>
+<% unless @system_gems -%>
+  ENV["GEM_HOME"] = dir
+  ENV["GEM_PATH"] = dir
+<% end -%>
+  ENV["PATH"]     = "#{dir}/<%= bindir %>:#{ENV["PATH"]}"
+  ENV["RUBYOPT"]  = "-r#{__FILE__} #{ENV["RUBYOPT"]}"
 
-<% if @rubygems %>
-require "rubygems"
+<% load_paths.each do |load_path| -%>
+  $LOAD_PATH.unshift "#{dir}/<%= load_path %>"
+<% end -%>
 
-module Bundler
+  @gemfile = "#{dir}/<%= filename %>"
+
+<% if @rubygems -%>
+  require "rubygems"
 
   @bundled_specs = {}
-  <% spec_files.each do |name, path| %>
-  @bundled_specs["<%= name %>"] = eval(File.read("<%= path %>"))
-  @bundled_specs["<%= name %>"].loaded_from = "<%= path %>"
-  <% end %>
+<% spec_files.each do |name, path| -%>
+  @bundled_specs["<%= name %>"] = eval(File.read("#{dir}/<%= path %>"))
+  @bundled_specs["<%= name %>"].loaded_from = "#{dir}/<%= path %>"
+<% end -%>
 
   def self.add_specs_to_loaded_specs
     Gem.loaded_specs.merge! @bundled_specs
-    if Gem.respond_to?(:loaded_stacks)
-      @bundled_specs.keys.each { |name| Gem.loaded_stacks[name] = [] }
-    end
   end
 
   def self.add_specs_to_index
@@ -35,18 +35,19 @@ module Bundler
 
   add_specs_to_loaded_specs
   add_specs_to_index
+<% end -%>
 end
 
+<% if @rubygems -%>
 module Gem
   def source_index.refresh!
     super
     Bundler.add_specs_to_index
   end
 end
-
-<% else %>
-
+<% else -%>
 $" << "rubygems.rb"
+
 module Kernel
   def gem(*)
     # Silently ignore calls to gem, since, in theory, everything
@@ -78,5 +79,6 @@ module Gem
   class VerificationError < Exception; end
   class SystemExitException < SystemExit; end
 end
+<% end -%>
 
-<% end %>
+require "bundler/runtime"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-02 00:00:00 -07:00
+date: 2009-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/bundler/commands/bundle_command.rb
 - lib/bundler/commands/exec_command.rb
 - lib/bundler/dependency.rb
+- lib/bundler/dsl.rb
 - lib/bundler/finder.rb
 - lib/bundler/gem_bundle.rb
 - lib/bundler/gem_ext.rb
@@ -39,9 +40,8 @@ files:
 - lib/bundler/resolver.rb
 - lib/bundler/runtime.rb
 - lib/bundler/source.rb
-- lib/bundler/templates/app_script.rb
-- lib/bundler/templates/environment.rb
-- lib/bundler/templates/rubygems.rb
+- lib/bundler/templates/app_script.erb
+- lib/bundler/templates/environment.erb
 - lib/bundler.rb
 - lib/rubygems_plugin.rb
 has_rdoc: true
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.5
   version: 
 requirements: []
 

data/lib/bundler/templates/app_script.rb

@@ -1,3 +0,0 @@
-<%= shebang bin_file_name %>
-require "<%= path.join("environments", "default") %>"
-load "<%= path.join("gems", @spec.full_name, @spec.bindir, bin_file_name) %>"

data/lib/bundler/templates/rubygems.rb

@@ -1,5 +0,0 @@
-$:.delete File.expand_path(File.dirname(__FILE__))
-load "rubygems.rb"
-if defined?(Bundler) && Bundler.respond_to?(:rubygems_required)
-  Bundler.rubygems_required
-end