bundler 0.9.2 → 0.9.3

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems'
 
 module Bundler
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
@@ -106,9 +106,11 @@ module Bundler
       @settings ||= Settings.new(root)
     end
 
-  private
-
     def default_gemfile
+      if ENV['BUNDLE_GEMFILE']
+        return Pathname.new(ENV['BUNDLE_GEMFILE'])
+      end
+
       current = Pathname.new(Dir.pwd)
 
       until current.root?
@@ -120,6 +122,8 @@ module Bundler
       raise GemfileNotFound, "The default Gemfile was not found"
     end
 
+  private
+
     def configure_gem_home_and_path
       if path = settings[:path]
         ENV['GEM_HOME'] = File.expand_path(path, root)

data/lib/bundler/cli.rb

@@ -93,11 +93,22 @@ module Bundler
     desc "exec", "Run the command in context of the bundle"
     def exec(*)
       ARGV.delete('exec')
-      ENV["RUBYOPT"] = %W(
-        -I#{File.expand_path('../..', __FILE__)}
-        -rbundler/setup
-        #{ENV["RUBYOPT"]}
-      ).compact.join(' ')
+
+      # Set PATH
+      paths = (ENV['PATH'] || "").split(File::PATH_SEPARATOR)
+      paths.unshift "#{Bundler.bundle_path}/bin"
+      ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
+
+      # Set BUNDLE_GEMFILE
+      ENV['BUNDLE_GEMFILE'] = Bundler.default_gemfile
+
+      # Set RUBYOPT
+      rubyopt = [ENV["RUBYOPT"]].compact
+      rubyopt.unshift "-rbundler/setup"
+      rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
+      ENV["RUBYOPT"] = rubyopt.join(' ')
+
+      # Run
       Kernel.exec *ARGV
     end
 

data/lib/bundler/definition.rb

@@ -19,7 +19,7 @@ module Bundler
       # TODO: Switch to using equivalent?
       hash = Digest::SHA1.hexdigest(File.read("#{Bundler.root}/Gemfile"))
       unless locked_definition.hash == hash
-        raise GemfileError, "You changed your Gemfile after locking. Please relock using `gem lock`"
+        raise GemfileError, "You changed your Gemfile after locking. Please relock using `bundle lock`"
       end
 
       locked_definition

data/lib/bundler/installer.rb

@@ -21,7 +21,9 @@ module Bundler
           Bundler.ui.debug "  * Not in requested group; skipping."
           next
         end
+
         spec.source.install(spec)
+
         Bundler.ui.info ""
       end
 

data/lib/bundler/resolver.rb

@@ -148,8 +148,23 @@ module Bundler
 
         if matching_versions.empty?
           if current.required_by.empty?
+            if current.source
+              name = current.name
+              versions = @source_requirements[name][name].map { |s| s.version }
+              message  = "Could not find gem '#{current}' in #{current.source}.\n"
+              if versions.any?
+                message << "Source contains '#{current.name}' at: #{versions.join(', ')}"
+              else
+                message << "Source does not contain any versions of '#{current}'"
+              end
+
+              raise GemNotFound, message
+            else
+              raise GemNotFound, "Could not find gem '#{current}' in any of the sources."
+            end
             location = current.source ? current.source.to_s : "any of the sources"
-            raise GemNotFound, "Could not find gem '#{current}' in #{location}"
+            raise GemNotFound, "Could not find gem '#{current}' in #{location}.\n" \
+              "Source contains fo"
           else
             @errors[current.name] = [nil, current]
           end

data/lib/bundler/runtime.rb

@@ -1,13 +1,17 @@
-require "digest/md5"
+require "digest/sha1"
 
 module Bundler
   class Runtime < Environment
     def setup(*groups)
       # Has to happen first
-      cripple_rubygems
+      clean_load_path
+
+      specs = specs_for(*groups)
+
+      cripple_rubygems(specs)
 
       # Activate the specs
-      specs_for(*groups).each do |spec|
+      specs.each do |spec|
         Gem.loaded_specs[spec.name] = spec
         $LOAD_PATH.unshift(*spec.load_paths)
       end
@@ -118,32 +122,6 @@ module Bundler
       specs.map { |s| s.load_paths }.flatten
     end
 
-    def cripple_rubygems
-      # handle 1.9 where system gems are always on the load path
-      if defined?(::Gem)
-        me = File.expand_path("../../", __FILE__)
-        $LOAD_PATH.reject! do |p|
-          p != File.dirname(__FILE__) &&
-            Gem.path.any? { |gp| p.include?(gp) }
-        end
-        $LOAD_PATH.unshift me
-        $LOAD_PATH.uniq!
-      end
-
-      # Disable rubygems' gem activation system
-      ::Kernel.class_eval do
-        if private_method_defined?(:gem_original_require)
-          alias rubygems_require require
-          alias require gem_original_require
-        end
-
-        undef gem
-        def gem(*)
-          # Silently ignore calls to gem
-        end
-      end
-    end
-
     def write_rb_lock
       template = File.read(File.expand_path("../templates/environment.erb", __FILE__))
       erb = ERB.new(template, nil, '-')
@@ -161,7 +139,7 @@ module Bundler
 
     def details
       details = {}
-      details["hash"] = Digest::SHA1.hexdigest(File.read("#{root}/Gemfile"))
+      details["hash"] = gemfile_fingerprint
       details["sources"] = sources.map { |s| { s.class.name.split("::").last => s.options} }
 
       details["specs"] = specs.map do |s|
@@ -174,6 +152,10 @@ module Bundler
       details
     end
 
+    def gemfile_fingerprint
+      Digest::SHA1.hexdigest(File.read("#{root}/Gemfile"))
+    end
+
     def autorequires_for_groups(*groups)
       autorequires = Hash.new { |h,k| h[k] = [] }
       @definition.dependencies.each do |dep|
@@ -188,5 +170,92 @@ module Bundler
         groups.inject({}) { |h,g| h[g] = autorequires[g]; h }
       end
     end
+
+    def clean_load_path
+      # handle 1.9 where system gems are always on the load path
+      if defined?(::Gem)
+        me = File.expand_path("../../", __FILE__)
+        $LOAD_PATH.reject! do |p|
+          p != File.dirname(__FILE__) &&
+            Gem.path.any? { |gp| p.include?(gp) }
+        end
+        $LOAD_PATH.unshift me
+        $LOAD_PATH.uniq!
+      end
+    end
+
+    def reverse_rubygems_kernel_mixin
+      # Disable rubygems' gem activation system
+      ::Kernel.class_eval do
+        if private_method_defined?(:gem_original_require)
+          alias rubygems_require require
+          alias require gem_original_require
+        end
+
+        undef gem
+      end
+    end
+
+    def cripple_rubygems(specs)
+      reverse_rubygems_kernel_mixin
+
+      executables = specs.map { |s| s.executables }.flatten
+
+      ::Kernel.send(:define_method, :gem) do |dep, *reqs|
+        if executables.include? File.basename(caller.first.split(':').first)
+          return
+        end
+        opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
+
+        unless dep.respond_to?(:name) && dep.respond_to?(:version_requirements)
+          dep = Gem::Dependency.new(dep, reqs)
+        end
+
+        spec = specs.find  { |s| s.name == dep.name }
+
+        if spec.nil?
+          e = Gem::LoadError.new "#{dep} is not part of the bundle. Add it to Gemfile."
+          e.name = dep.name
+          e.version_requirement = dep.version_requirements
+          raise e
+        elsif dep !~ spec
+          e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. " \
+                                 "Make sure all dependencies are added to Gemfile."
+          e.name = dep.name
+          e.version_requirement = dep.version_requirements
+          raise e
+        end
+
+        true
+      end
+
+      # === Following hacks are to improve on the generated bin wrappers ===
+
+      # Yeah, talk about a hack
+      source_index_class = (class << Gem::SourceIndex ; self ; end)
+      source_index_class.send(:define_method, :from_gems_in) do |*args|
+        source_index = Gem::SourceIndex.new
+        source_index.add_specs *specs
+        source_index
+      end
+
+      # OMG more hacks
+      gem_class = (class << Gem ; self ; end)
+      gem_class.send(:define_method, :bin_path) do |name, *args|
+        exec_name, *reqs = args
+
+        spec = nil
+
+        if exec_name
+          spec = specs.find { |s| s.executables.include?(exec_name) }
+          spec or raise Gem::Exception, "can't find executable #{exec_name}"
+        else
+          spec = specs.find  { |s| s.name == name }
+          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)
+      end
+    end
   end
 end

data/lib/bundler/source.rb

@@ -30,8 +30,11 @@ module Bundler
         gem_path  = Gem::RemoteFetcher.fetcher.download(spec, uri, destination)
         Bundler.ui.debug "  * Installing"
         installer = Gem::Installer.new gem_path,
-          :install_dir => Gem.dir,
-          :ignore_dependencies => true
+          :install_dir         => Gem.dir,
+          :ignore_dependencies => true,
+          :wrappers            => true,
+          :env_shebang         => true,
+          :bin_dir             => "#{Gem.dir}/bin"
 
         installer.install
       end
@@ -115,8 +118,11 @@ module Bundler
 
         Bundler.ui.debug "  * Installing from pack"
         installer = Gem::Installer.new "#{@path}/#{spec.full_name}.gem",
-          :install_dir => Gem.dir,
-          :ignore_dependencies => true
+          :install_dir         => Gem.dir,
+          :ignore_dependencies => true,
+          :wrappers            => true,
+          :env_shebang         => true,
+          :bin_dir             => "#{Gem.dir}/bin"
 
         installer.install
       end
@@ -173,10 +179,29 @@ module Bundler
 
       def install(spec)
         Bundler.ui.debug "  * Using path #{path}"
+        generate_bin(spec)
       end
 
       alias specs local_specs
 
+    private
+
+      def generate_bin(spec)
+        # HAX -- Generate the bin
+        bin_dir = "#{Gem.dir}/bin"
+        gem_dir = spec.full_gem_path
+        installer = Gem::Installer.allocate
+        installer.instance_eval do
+          @spec     = spec
+          @bin_dir  = bin_dir
+          @gem_dir  = gem_dir
+          @wrappers = true
+          @env_shebang = false
+          @format_executable = false
+        end
+        installer.generate_bin
+      end
+
     end
 
     class Git < Path
@@ -238,6 +263,7 @@ module Bundler
           checkout
           @installed = true
         end
+        generate_bin(spec)
       end
 
       def lock

data/lib/bundler/templates/environment.erb

@@ -1,16 +1,27 @@
+require 'digest/sha1'
+
 # DO NOT MODIFY THIS FILE
 module Bundler
+  FINGERPRINT = <%= gemfile_fingerprint.inspect %>
   LOAD_PATHS = <%= load_paths.inspect %>
   AUTOREQUIRES = <%= autorequires_for_groups.inspect %>
 
+  def self.match_fingerprint
+    print = Digest::SHA1.hexdigest(File.read(File.expand_path('../../Gemfile', __FILE__)))
+    unless print == FINGERPRINT
+      abort 'Gemfile changed since you last locked. Please `bundle lock` to relock.'
+    end
+  end
+
   def self.setup(*groups)
+    match_fingerprint
     LOAD_PATHS.each { |path| $LOAD_PATH.unshift path }
   end
 
   def self.require(*groups)
     groups = [:default] if groups.empty?
     groups.each do |group|
-      AUTOREQUIRES[group].each { |file| Kernel.require file }
+      (AUTOREQUIRES[group] || []).each { |file| Kernel.require file }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -08:00
+date: 2010-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: []