bundler 0.7.1 → 0.7.2

data/Rakefile

@@ -47,6 +47,12 @@ else
   end
 end
 
+desc "mount a ramdisk at ./tmp for faster specs"
+task :ramdisk do
+  sh 'diskutil erasevolume HFS+ "tmpbundler" `hdiutil attach -nomount ram://116543`'
+  File.symlink "/Volumes/tmpbundler", File.expand_path('../tmp', __FILE__)
+end
+
 desc "install the gem locally"
 task :install => [:package] do
   sh %{gem install pkg/#{spec.name}-#{spec.version}}

data/lib/bundler.rb

@@ -14,12 +14,12 @@ require "bundler/resolver"
 require "bundler/environment"
 require "bundler/dsl"
 require "bundler/cli"
-require "bundler/repository"
+require "bundler/bundle"
 require "bundler/dependency"
 require "bundler/remote_specification"
 
 module Bundler
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 
   class << self
     attr_writer :logger

data/lib/bundler/{repository.rb → bundle.rb}

@@ -1,7 +1,7 @@
 module Bundler
   class InvalidRepository < StandardError ; end
 
-  class Repository
+  class Bundle
     attr_reader :path
 
     def initialize(path, bindir)
@@ -160,6 +160,9 @@ module Bundler
         :bin_dir             => @bindir
       ))
       installer.install
+    rescue Gem::InstallError
+      cleanup_spec(spec)
+      raise
     ensure
       Gem::Command.build_args = []
     end
@@ -189,8 +192,7 @@ module Bundler
 
       to_delete.each do |spec|
         Bundler.logger.info "Deleting gem: #{spec.name} (#{spec.version})"
-        FileUtils.rm_rf(@path.join("specifications", "#{spec.full_name}.gemspec"))
-        FileUtils.rm_rf(@path.join("gems", spec.full_name))
+        cleanup_spec(spec)
         # Cleanup the bin directory
         spec.executables.each do |bin|
           next if valid_executables.include?(bin)
@@ -200,6 +202,11 @@ module Bundler
       end
     end
 
+    def cleanup_spec(spec)
+      FileUtils.rm_rf(@path.join("specifications", "#{spec.full_name}.gemspec"))
+      FileUtils.rm_rf(@path.join("gems", spec.full_name))
+    end
+
     def expand(options)
       each_repo do |repo|
         repo.expand(options)

data/lib/bundler/cli.rb

@@ -32,7 +32,7 @@ module Bundler
 
     def initialize(options)
       @options = options
-      @environment = Bundler::Environment.load(@options[:manifest])
+      @environment = Dsl.load_gemfile(@options[:manifest])
     end
 
     def bundle

data/lib/bundler/commands/bundle_command.rb

@@ -19,7 +19,7 @@ class Gem::Commands::BundleCommand < Gem::Command
       options[:cache] = gem
     end
 
-    add_option('--prune-cache', "Removes all .gem files from the bundle's cache") do
+    add_option('--prune-cache', "Removes all .gem files that are not a part of the bundle from the cache") do
       options[:prune] = true
     end
 

data/lib/bundler/dsl.rb

@@ -1,10 +1,36 @@
 module Bundler
   class ManifestFileNotFound < StandardError; end
+  class InvalidKey < StandardError; end
+  class DefaultManifestNotFound < StandardError; end
 
   class Dsl
-    def self.evaluate(environment, file)
+    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)
       builder.instance_eval(File.read(file.to_s), file.to_s, 1)
+      environment
     end
 
     def initialize(environment)
@@ -81,6 +107,11 @@ module Bundler
       options = args.last.is_a?(Hash) ? args.pop : {}
       version = args.last
 
+      keys = %w(vendored_at path only except git path bundle require_as tag branch ref).map(&:to_sym)
+      unless (invalid = options.keys - keys).empty?
+        raise InvalidKey, "Only #{keys.join(", ")} are valid options to #gem. You used #{invalid.join(", ")}"
+      end
+
       if path = options.delete(:vendored_at)
         options[:path] = path
         warn "The :vendored_at option is deprecated. Use :path instead.\nFrom #{caller[0]}"
@@ -104,12 +135,16 @@ module Bundler
 
   private
 
+    def _version?(version)
+      version && Gem::Version.new(version) rescue false
+    end
+
     def _handle_vendored_option(name, version, options)
       dir, path = _find_directory_source(options[:path])
 
       if dir
         dir.required_specs << name
-        dir.add_spec(path, name, version) if version
+        dir.add_spec(path, name, version) if _version?(version)
         dir
       else
         directory options[:path] do
@@ -147,7 +182,7 @@ module Bundler
         end
 
         source.required_specs << name
-        source.add_spec(Pathname.new(options[:path] || '.'), name, version) if version
+        source.add_spec(Pathname.new(options[:path] || '.'), name, version) if _version?(version)
         source
       else
         git(git, :ref => ref, :branch => branch) do

data/lib/bundler/environment.rb

@@ -1,7 +1,6 @@
 require "rubygems/source_index"
 
 module Bundler
-  class DefaultManifestNotFound < StandardError; end
   class InvalidCacheArgument < StandardError; end
   class SourceNotCached < StandardError; end
 
@@ -10,28 +9,6 @@ module Bundler
     attr_accessor :rubygems, :system_gems
     attr_writer :gem_path, :bindir
 
-    def self.load(file = nil)
-      gemfile = Pathname.new(file || default_manifest_file).expand_path
-
-      unless gemfile.file?
-        raise ManifestFileNotFound, "Manifest file not found: #{gemfile.to_s.inspect}"
-      end
-
-      new(gemfile)
-    end
-
-    def self.default_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
-
     def initialize(filename)
       @filename         = filename
       @default_sources  = default_sources
@@ -40,9 +17,6 @@ module Bundler
       @dependencies     = []
       @rubygems         = true
       @system_gems      = true
-
-      # Evaluate the Gemfile
-      Dsl.evaluate(self, filename)
     end
 
     def install(options = {})
@@ -171,7 +145,7 @@ module Bundler
     end
 
     def repository
-      @repository ||= Repository.new(gem_path, bindir)
+      @repository ||= Bundle.new(gem_path, bindir)
     end
 
     def gem_dependencies

data/lib/bundler/remote_specification.rb

@@ -32,7 +32,10 @@ module Bundler
     private
 
     def _remote_uri
-      "#{@source_uri}/quick/Marshal.4.8/#{@name}-#{@version}.gemspec.rz"
+      # "#{@source_uri}/quick/Marshal.4.8/#{@name}-#{@version}.gemspec.rz"
+      tuple = [@name, @version, @platform]
+      tuple = tuple - [nil, 'ruby', '']
+      "#{@source_uri}/quick/Marshal.4.8/#{tuple.join("-")}.gemspec.rz"
     end
 
     def _remote_specification

data/lib/bundler/resolver.rb

@@ -77,8 +77,9 @@ module Bundler
       sources.each do |source|
         source.gems.each do |name, specs|
           # Hack to work with a regular Gem::SourceIndex
-          [specs].flatten.compact.each do |spec|
-            next if @specs[spec.name].any? { |s| s.version == spec.version }
+          specs = [specs] unless specs.is_a?(Array)
+          specs.compact.each do |spec|
+            next if @specs[spec.name].any? { |s| s.version == spec.version && s.platform == spec.platform }
             @specs[spec.name] << spec
           end
         end
@@ -157,7 +158,8 @@ module Bundler
 
         if matching_versions.empty?
           if current.required_by.empty?
-            raise GemNotFound, "Could not find gem '#{current}' in any of the sources"
+            location = @by_gem[current.name] ? @by_gem[current.name] : "any of the sources"
+            raise GemNotFound, "Could not find gem '#{current}' in #{location}"
           end
           Bundler.logger.warn "Could not find gem '#{current}' (required by '#{current.required_by.last}') in any of the sources"
         end
@@ -221,13 +223,19 @@ module Bundler
 
     def search(dependency)
       @cache[dependency.hash] ||= begin
-        collection = @by_gem[dependency.name].gems if @by_gem[dependency.name]
-        collection ||= @specs
-        collection[dependency.name].select do |spec|
-          match = dependency =~ spec
-          match &= dependency.version_requirements.prerelease? if spec.version.prerelease?
-          match
-        end.sort_by {|s| s.version }
+        pinned = @by_gem[dependency.name].gems if @by_gem[dependency.name]
+        specs  = (pinned || @specs)[dependency.name]
+
+        wants_prerelease = dependency.version_requirements.prerelease?
+        only_prerelease  = specs.all? {|spec| spec.version.prerelease? }
+
+        found = specs.select { |spec| dependency =~ spec }
+
+        unless wants_prerelease || (pinned && only_prerelease)
+          found.reject! { |spec| spec.version.prerelease? }
+        end
+
+        found.sort_by {|s| [s.version, s.platform == 'ruby' ? "\0" : s.platform] }
       end
     end
   end

data/lib/bundler/source.rb

@@ -274,7 +274,7 @@ module Bundler
     end
 
     def to_s
-      "#{@name} (#{@version}) Located at: '#{location}'"
+      "directory: '#{location}'"
     end
 
     def download(spec)
@@ -322,5 +322,9 @@ module Bundler
     def download(spec)
       # Nothing needed here
     end
+
+    def to_s
+      "git: #{uri}"
+    end
   end
 end

data/lib/bundler/templates/app_script.erb

@@ -1,3 +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)) %>")
+require File.expand_path(File.join(File.dirname(__FILE__), "<%= path.join("environment").relative_path_from(Pathname.new(bin_dir)) %>"))
+load File.expand_path(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.erb

@@ -6,8 +6,17 @@ module Bundler
 <% unless options[:system_gems] -%>
   ENV["GEM_HOME"] = dir
   ENV["GEM_PATH"] = dir
+
+  # handle 1.9 where system gems are always on the load path
+  if defined?(::Gem)
+    $LOAD_PATH.reject! do |p|
+      p != File.dirname(__FILE__) &&
+        Gem.path.any? { |gp| p.include?(gp) }
+    end
+  end
+
 <% end -%>
-  ENV["PATH"]     = "#{dir}/<%= bindir %>:#{ENV["PATH"]}"
+  ENV["PATH"]     = "#{dir}/<%= bindir %><%= File::PATH_SEPARATOR %>#{ENV["PATH"]}"
   ENV["RUBYOPT"]  = "-r#{file} #{ENV["RUBYOPT"]}"
 
 <% load_paths.each do |load_path| -%>
@@ -121,6 +130,8 @@ end
 # Define all the Gem errors for gems that reference them.
 module Gem
   def self.ruby ; <%= Gem.ruby.inspect %> ; end
+  def self.dir ; @dir ||= File.dirname(File.expand_path(__FILE__)) ; end
+  class << self ; alias default_dir dir; alias path dir ; end
   class LoadError < ::LoadError; end
   class Exception < RuntimeError; end
   class CommandLineError < Exception; end

metadata

@@ -1,52 +1,52 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
-- Yehuda Katz
-- Carl Lerche
+  - Yehuda Katz
+  - Carl Lerche
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -08:00
+date: 2009-12-18 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: An easy way to vendor gem dependencies
 email: 
-- wycats@gmail.com
-- clerche@engineyard.com
+  - wycats@gmail.com
+  - clerche@engineyard.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
-- LICENSE
+  - README.markdown
+  - LICENSE
 files: 
-- LICENSE
-- README.markdown
-- Rakefile
-- 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/remote_specification.rb
-- lib/bundler/repository.rb
-- lib/bundler/resolver.rb
-- lib/bundler/runtime.rb
-- lib/bundler/source.rb
-- lib/bundler/templates/app_script.erb
-- lib/bundler/templates/environment.erb
-- lib/bundler.rb
-- lib/rubygems_plugin.rb
+  - LICENSE
+  - README.markdown
+  - Rakefile
+  - lib/bundler.rb
+  - lib/rubygems_plugin.rb
+  - lib/bundler/bundle.rb
+  - lib/bundler/cli.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/remote_specification.rb
+  - lib/bundler/resolver.rb
+  - lib/bundler/runtime.rb
+  - lib/bundler/source.rb
+  - lib/bundler/commands/bundle_command.rb
+  - lib/bundler/commands/exec_command.rb
+  - lib/bundler/templates/app_script.erb
+  - lib/bundler/templates/environment.erb
 has_rdoc: true
 homepage: http://github.com/wycats/bundler
 licenses: []
@@ -55,18 +55,18 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.3.5
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.5
   version: 
 requirements: []