bundler 0.4.1 → 0.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,16 +29,16 @@ files:
 - lib/bundler/cli.rb
 - lib/bundler/commands/bundle_command.rb
 - lib/bundler/commands/exec_command.rb
+- lib/bundler/dependency.rb
 - lib/bundler/dsl.rb
+- lib/bundler/environment.rb
 - lib/bundler/finder.rb
 - lib/bundler/gem_bundle.rb
 - lib/bundler/gem_ext.rb
-- lib/bundler/manifest.rb
-- lib/bundler/manifest_file.rb
+- lib/bundler/repository/directory_repository.rb
+- lib/bundler/repository/gem_repository.rb
 - lib/bundler/repository.rb
 - lib/bundler/resolver.rb
-- lib/bundler/runtime/dependency.rb
-- lib/bundler/runtime/dsl.rb
 - lib/bundler/runtime.rb
 - lib/bundler/source.rb
 - lib/bundler/templates/app_script.erb

data/lib/bundler/manifest.rb

@@ -1,136 +0,0 @@
-require "rubygems/source_index"
-
-module Bundler
-  class VersionConflict < StandardError; end
-
-  class Manifest
-    attr_reader :filename, :sources, :dependencies, :path
-
-    def initialize(filename, sources, dependencies, bindir, path, rubygems, system_gems)
-      @filename     = filename
-      @sources      = sources
-      @dependencies = dependencies
-      @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)
-      # Cleanup incase fetch was a no-op
-      repository.cleanup(gems)
-      create_environment_file(repository.path)
-      create_bundler_runtime
-      Bundler.logger.info "Done."
-    end
-
-    def gems
-      deps = dependencies
-      deps = deps.map { |d| d.to_gem_dependency }
-      Resolver.resolve(deps, repository.source_index)
-    end
-
-    def environments
-      envs = dependencies.map {|dep| Array(dep.only) + Array(dep.except) }.flatten
-      envs << "default"
-    end
-
-  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?
-
-      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
-
-      # 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
-      @gem_dependencies ||= dependencies.map { |d| d.to_gem_dependency }
-    end
-
-    def all_gems_installed?
-      downloaded_gems = {}
-
-      Dir[repository.path.join("cache", "*.gem")].each do |file|
-        file =~ /\/([^\/]+)-([\d\.]+)\.gem$/
-        name, version = $1, $2
-        downloaded_gems[name] = Gem::Version.new(version)
-      end
-
-      gem_dependencies.all? do |dep|
-        downloaded_gems[dep.name] &&
-        dep.version_requirements.satisfied_by?(downloaded_gems[dep.name])
-      end
-    end
-
-    def create_environment_file(path)
-      FileUtils.mkdir_p(path)
-
-      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
-
-    def load_paths_for_specs(specs)
-      load_paths = []
-      specs.each do |spec|
-        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 << gem_path.join(path).relative_path_from(@path).to_s
-        end
-      end
-      load_paths
-    end
-
-    def spec_files_for_specs(specs, path)
-      files = {}
-      specs.each do |s|
-        files[s.name] = File.join("specifications", "#{s.full_name}.gemspec")
-      end
-      files
-    end
-
-    def create_bundler_runtime
-      here  = Pathname.new(__FILE__).dirname
-      there = path.join("bundler")
-
-      Bundler.logger.info "Creating the bundler runtime"
-
-      FileUtils.rm_rf(there)
-      there.mkdir
-      FileUtils.cp(here.join("runtime.rb"), there)
-      FileUtils.cp_r(here.join("runtime"), there)
-    end
-  end
-end

data/lib/bundler/manifest_file.rb

@@ -1,89 +0,0 @@
-module Bundler
-  class DefaultManifestNotFound < StandardError; end
-
-  class ManifestFile
-    attr_reader :dependencies
-    attr_accessor :gem_path, :bindir, :rubygems, :system_gems
-
-    def self.load(filename = nil)
-      new(filename).load
-    end
-
-    def initialize(filename)
-      @filename        = filename
-      @default_sources = [Source.new("http://gems.rubyforge.org")]
-      @sources         = []
-      @dependencies    = []
-      @rubygems        = true
-      @system_gems     = true
-    end
-
-    def load
-      manifest
-      self
-    end
-
-    def manifest
-      @manifest ||= load_manifest
-    end
-
-    def install(update = false)
-      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
-        ENV["GEM_PATH"] = @gem_path
-      end
-      ENV["PATH"]     = "#{@bindir}:#{ENV["PATH"]}"
-      ENV["RUBYOPT"]  = "-r#{@gem_path}/environment #{ENV["RUBYOPT"]}"
-    end
-
-    def load_manifest
-      ManifestBuilder.load(self, filename)
-      Manifest.new(filename, sources, dependencies, bindir, gem_path, rubygems, system_gems)
-    end
-
-    def gem_path
-      @gem_path ||= root.join("vendor", "gems")
-    end
-
-    def bindir
-      @bindir ||= root.join("bin")
-    end
-
-    def root
-      filename.parent
-    end
-
-    def filename
-      Pathname.new(@filename ||= find_manifest_file)
-    end
-
-    def find_manifest_file
-      current = Pathname.new(Dir.pwd)
-
-      until current.root?
-        filename = current.join("Gemfile")
-        return filename if filename.exist?
-        current = current.parent
-      end
-
-      raise DefaultManifestNotFound
-    end
-  end
-end

data/lib/bundler/runtime/dsl.rb

@@ -1,44 +0,0 @@
-module Bundler
-  class ManifestFileNotFound < StandardError; end
-
-  def self.require(environment = nil)
-    ManifestBuilder.run(@gemfile, environment || :default)
-  end
-
-  class ManifestBuilder
-    def self.run(gemfile, environment)
-      unless File.exist?(gemfile)
-        raise ManifestFileNotFound, "#{gemfile.inspect} does not exist"
-      end
-
-      builder = new(environment)
-      builder.instance_eval(File.read(gemfile))
-      builder
-    end
-
-    def initialize(environment)
-      @environment = environment
-    end
-
-    def bundle_path(*) ; end
-
-    def bin_path(*) ; end
-
-    def disable_rubygems(*) ; end
-
-    def disable_system_gems(*) ; end
-
-    def source(*) ; end
-
-    def clear_sources(*) ; end
-
-    def gem(name, *args, &blk)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      version = args.last
-
-      dep = Dependency.new(name, options.merge(:version => version), &blk)
-      dep.require(@environment)
-      dep
-    end
-  end
-end