bundler 0.9.0 → 0.9.1.pre1

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems'
 
 module Bundler
-  VERSION = "0.9.0"
+  VERSION = "0.9.1.pre1"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
@@ -14,6 +14,7 @@ module Bundler
   autoload :Installer,           'bundler/installer'
   autoload :RemoteSpecification, 'bundler/remote_specification'
   autoload :Resolver,            'bundler/resolver'
+  autoload :Runtime,             'bundler/runtime'
   autoload :Settings,            'bundler/settings'
   autoload :Source,              'bundler/source'
   autoload :Specification,       'bundler/specification'
@@ -62,9 +63,14 @@ module Bundler
       load(gemfile).setup(*groups)
     end
 
+    def require(*groups)
+      gemfile = default_gemfile
+      load(gemfile).require(*groups)
+    end
+
     def load(gemfile = default_gemfile)
       root = Pathname.new(gemfile).dirname
-      Environment.new root, definition(gemfile)
+      Runtime.new root, definition(gemfile)
     end
 
     def definition(gemfile = default_gemfile)
@@ -125,4 +131,4 @@ module Bundler
       Gem.clear_paths
     end
   end
-end
+end

data/lib/bundler/cli.rb

@@ -56,6 +56,11 @@ module Bundler
 
     desc "lock", "Locks the bundle to the current set of dependencies, including all child dependencies."
     def lock
+      if File.exist?("#{Bundler.root}/Gemfile.lock")
+        Bundler.ui.info("The bundle is already locked, relocking.")
+        `rm #{Bundler.root}/Gemfile.lock`
+      end
+
       environment = Bundler.load
       environment.lock
     end

data/lib/bundler/dependency.rb

@@ -2,11 +2,15 @@ require 'rubygems/dependency'
 
 module Bundler
   class Dependency < Gem::Dependency
+    attr_reader :autorequire
+
     def initialize(name, version, options = {}, &blk)
       super(name, version)
 
-      @group  = options["group"] || :default
+      @groups = Array(options["group"] || :default)
       @source = options["source"]
+      @autorequire = options.include?("require") ? options['require'] || [] : [name]
+      @autorequire = [@autorequire] unless @autorequire.is_a?(Array)
     end
   end
-end
+end

data/lib/bundler/environment.rb

@@ -9,149 +9,23 @@ module Bundler
       @definition = definition
     end
 
-    def setup(*groups)
-      # Has to happen first
-      cripple_rubygems
-
-      # Activate the specs
-      specs_for(*groups).each do |spec|
-        Gem.loaded_specs[spec.name] = spec
-        $LOAD_PATH.unshift(*spec.load_paths)
-      end
-      self
-    end
-
-    def dependencies
-      @definition.actual_dependencies
-    end
-
-    def lock
-      Bundler.ui.info("The bundle is already locked, relocking.") if locked?
-      FileUtils.mkdir_p("#{root}/.bundle")
-      write_yml_lock
-      write_rb_lock
-      Bundler.ui.info("The bundle is now locked. Use `bundle show` to list the gems in the environment.")
-    end
-
-    def unlock
-      unless locked?
-        Bundler.ui.info("The bundle is not currently locked.")
-        return
-      end
-
-      FileUtils.rm_f("#{root}/.bundle/environment.rb")
-      FileUtils.rm_f("#{root}/Gemfile.lock")
-      Bundler.ui.info("The bundle is now unlocked. The dependencies may be changed.")
-    end
-
-    def locked?
-      File.exist?("#{root}/Gemfile.lock")
-    end
-
-    def specs_for(*groups)
-      return specs if groups.empty?
-
-      dependencies = @definition.actual_dependencies.select { |d| groups.include?(d.group) }
-      Resolver.resolve(dependencies, index)
-    end
-
-    def specs
-      @specs ||= begin
-        source_requirements = {}
-        dependencies.each do |dep|
-          next unless dep.source && dep.source.respond_to?(:local_specs)
-          source_requirements[dep.name] = dep.source.local_specs
-        end
-
-        Resolver.resolve(@definition.actual_dependencies, index, source_requirements)
-      end
-    end
-
-    alias gems specs
-
-    def index
-      @definition.local_index
-    end
-
-    def pack
-      pack_path = "#{root}/vendor/cache/"
-      FileUtils.mkdir_p(pack_path)
-
-      Bundler.ui.info "Copying .gem files into vendor/cache"
-      specs.each do |spec|
-        next unless spec.source.is_a?(Source::SystemGems) || spec.source.is_a?(Source::Rubygems)
-        possibilities = Gem.path.map { |p| "#{p}/cache/#{spec.full_name}.gem" }
-        cached_path = possibilities.find { |p| File.exist? p }
-        Bundler.ui.info "  * #{File.basename(cached_path)}"
-        next if File.expand_path(File.dirname(cached_path)) == File.expand_path(pack_path)
-        FileUtils.cp(cached_path, pack_path)
-      end
-    end
-
   private
 
-    def sources
-      @definition.sources
-    end
-
-    def load_paths
-      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, '-')
-      File.open("#{root}/.bundle/environment.rb", 'w') do |f|
-        f.puts erb.result(binding)
+    def group_specs(specs)
+      dependencies.each do |d|
+        spec = specs.find { |s| s.name == d.name }
+        group_spec(specs, spec, d.groups)
       end
+      specs
     end
 
-    def write_yml_lock
-      yml = details.to_yaml
-      File.open("#{root}/Gemfile.lock", 'w') do |f|
-        f.puts yml
+    def group_spec(specs, spec, groups)
+      spec.groups.concat(groups)
+      spec.groups.uniq!
+      spec.dependencies.select { |d| d.type != :development }.each do |d|
+        spec = specs.find { |s| s.name == d.name }
+        group_spec(specs, spec, groups)
       end
     end
-
-    def details
-      details = {}
-      details["sources"] = sources.map { |s| { s.class.name.split("::").last => s.options} }
-
-      details["specs"] = specs.map do |s|
-        options = {"version" => s.version.to_s}
-        options["source"] = sources.index(s.source) if sources.include?(s.source)
-        { s.name => options }
-      end
-
-      details["dependencies"] = dependencies.map { |d| {d.name => d.version_requirements.to_s} }
-      details
-    end
-
   end
-end
+end

data/lib/bundler/installer.rb

@@ -1,18 +1,11 @@
 require 'rubygems/dependency_installer'
 
 module Bundler
-  class Installer
+  class Installer < Environment
     def self.install(root, definition, options)
       new(root, definition).run(options)
     end
 
-    attr_reader :root
-
-    def initialize(root, definition)
-      @root = root
-      @definition = definition
-    end
-
     def run(options)
       if dependencies.empty?
         Bundler.ui.warn "The Gemfile specifies no dependencies"
@@ -82,23 +75,6 @@ module Bundler
       specs
     end
 
-    def group_specs(specs)
-      dependencies.each do |d|
-        spec = specs.find { |s| s.name == d.name }
-        group_spec(specs, spec, d.group)
-      end
-      specs
-    end
-
-    def group_spec(specs, spec, group)
-      spec.groups << group
-      spec.groups.uniq!
-      spec.dependencies.select { |d| d.type != :development }.each do |d|
-        spec = specs.find { |s| s.name == d.name }
-        group_spec(specs, spec, group)
-      end
-    end
-
     def ambiguous?(dep)
       dep.version_requirements.requirements.any? { |op,_| op != '=' }
     end

data/lib/bundler/rubygems.rb

@@ -17,6 +17,6 @@ module Gem
   end
 
   class Dependency
-    attr_accessor :source, :group
+    attr_accessor :source, :groups
   end
-end
+end

data/lib/bundler/runtime.rb

@@ -0,0 +1,189 @@
+module Bundler
+  class Runtime < Environment
+    def setup(*groups)
+      # Has to happen first
+      cripple_rubygems
+
+      # Activate the specs
+      specs_for(*groups).each do |spec|
+        Gem.loaded_specs[spec.name] = spec
+        $LOAD_PATH.unshift(*spec.load_paths)
+      end
+      self
+    end
+
+    def require(*groups)
+      groups = [:default] if groups.empty?
+      autorequires = autorequires_for_groups(*groups)
+      groups.each do |group|
+        (autorequires[group] || []).each do |path|
+          Kernel.require(path)
+        end
+      end
+    end
+
+    def dependencies
+      @definition.actual_dependencies
+    end
+
+    def lock
+      FileUtils.mkdir_p("#{root}/.bundle")
+      write_yml_lock
+      write_rb_lock
+      Bundler.ui.info("The bundle is now locked. Use `bundle show` to list the gems in the environment.")
+    end
+
+    def unlock
+      unless locked?
+        Bundler.ui.info("The bundle is not currently locked.")
+        return
+      end
+
+      FileUtils.rm_f("#{root}/.bundle/environment.rb")
+      FileUtils.rm_f("#{root}/Gemfile.lock")
+      Bundler.ui.info("The bundle is now unlocked. The dependencies may be changed.")
+    end
+
+    def lock
+      Bundler.ui.info("The bundle is already locked, relocking.") if locked?
+      sources.each { |s| s.lock if s.respond_to?(:lock) }
+      FileUtils.mkdir_p("#{root}/.bundle")
+      write_yml_lock
+      write_rb_lock
+      Bundler.ui.info("The bundle is now locked. Use `bundle show` to list the gems in the environment.")
+    end
+
+    def locked?
+      File.exist?("#{root}/Gemfile.lock")
+    end
+
+    def dependencies_for(*groups)
+      if groups.empty?
+        dependencies
+      else
+        dependencies.select { |d| (groups & d.groups).any? }
+      end
+    end
+
+    def specs_for(*groups)
+      if groups.empty?
+        specs
+      else
+        Resolver.resolve(dependencies_for(*groups), index)
+      end
+    end
+
+    def specs
+      @specs ||= begin
+        source_requirements = {}
+        dependencies.each do |dep|
+          next unless dep.source && dep.source.respond_to?(:local_specs)
+          source_requirements[dep.name] = dep.source.local_specs
+        end
+
+        Resolver.resolve(@definition.actual_dependencies, index, source_requirements)
+      end
+    end
+
+    alias gems specs
+
+    def index
+      @definition.local_index
+    end
+
+    def pack
+      pack_path = "#{root}/vendor/cache/"
+      FileUtils.mkdir_p(pack_path)
+
+      Bundler.ui.info "Copying .gem files into vendor/cache"
+      specs.each do |spec|
+        next unless spec.source.is_a?(Source::SystemGems) || spec.source.is_a?(Source::Rubygems)
+        possibilities = Gem.path.map { |p| "#{p}/cache/#{spec.full_name}.gem" }
+        cached_path = possibilities.find { |p| File.exist? p }
+        Bundler.ui.info "  * #{File.basename(cached_path)}"
+        next if File.expand_path(File.dirname(cached_path)) == File.expand_path(pack_path)
+        FileUtils.cp(cached_path, pack_path)
+      end
+    end
+
+  private
+
+    def sources
+      @definition.sources
+    end
+
+    def load_paths
+      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, '-')
+      File.open("#{root}/.bundle/environment.rb", 'w') do |f|
+        f.puts erb.result(binding)
+      end
+    end
+
+    def write_yml_lock
+      yml = details.to_yaml
+      File.open("#{root}/Gemfile.lock", 'w') do |f|
+        f.puts yml
+      end
+    end
+
+    def details
+      details = {}
+      details["sources"] = sources.map { |s| { s.class.name.split("::").last => s.options} }
+
+      details["specs"] = specs.map do |s|
+        options = {"version" => s.version.to_s}
+        options["source"] = sources.index(s.source) if sources.include?(s.source)
+        { s.name => options }
+      end
+
+      details["dependencies"] = @definition.dependencies.map { |d| {d.name => d.version_requirements.to_s} }
+      details
+    end
+
+    def autorequires_for_groups(*groups)
+      autorequires = Hash.new { |h,k| h[k] = [] }
+      @definition.dependencies.each do |dep|
+        dep.groups.each do |group|
+          autorequires[group].concat dep.autorequire
+        end
+      end
+
+      if groups.empty?
+        autorequires
+      else
+        groups.inject({}) { |h,g| h[g] = autorequires[g]; h }
+      end
+    end
+  end
+end

data/lib/bundler/source.rb

@@ -180,7 +180,7 @@ module Bundler
     end
 
     class Git < Path
-      attr_reader :uri, :ref
+      attr_reader :uri, :ref, :options
 
       def initialize(options)
         @options = options
@@ -194,10 +194,6 @@ module Bundler
         "#{@uri} (at #{ref})"
       end
 
-      def options
-        @options.merge("ref" => revision)
-      end
-
       def path
         Bundler.install_path.join("#{base_name}-#{uri_hash}-#{ref}")
       end
@@ -239,18 +235,16 @@ module Bundler
           Bundler.ui.debug "  * Already checked out revision: #{ref}"
         else
           Bundler.ui.debug "  * Checking out revision: #{ref}"
-          FileUtils.mkdir_p(path)
-          Dir.chdir(path) do
-            unless File.exist?(".git")
-              %x(git clone --no-checkout #{cache_path} #{path})
-            end
-            git "fetch --quiet"
-            git "reset --hard #{revision}"
-          end
+          checkout
           @installed = true
         end
       end
 
+      def lock
+        @ref = @options["ref"] = revision
+        checkout
+      end
+
     private
 
       def git(command)
@@ -284,6 +278,17 @@ module Bundler
         end
       end
 
+      def checkout
+        FileUtils.mkdir_p(path)
+        Dir.chdir(path) do
+          unless File.exist?(".git")
+            %x(git clone --no-checkout #{cache_path} #{path})
+          end
+          git "fetch --quiet"
+          git "reset --hard #{revision}"
+        end
+      end
+
       def revision
         @revision ||= in_cache { git("rev-parse #{ref}").strip }
       end

data/lib/bundler/templates/environment.erb

@@ -1,6 +1,19 @@
 # DO NOT MODIFY THIS FILE
 module Bundler
-<% load_paths.each do |path| -%>
-  $LOAD_PATH.unshift "<%= path %>"
-<% end -%>
-end
+  LOAD_PATHS = <%= load_paths.inspect %>
+  AUTOREQUIRES = <%= autorequires_for_groups.inspect %>
+
+  def self.setup(*groups)
+    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 }
+    end
+  end
+
+  # Setup bundle when it's required.
+  setup
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1.pre1
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -08:00
+date: 2010-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems.rb
+- lib/bundler/runtime.rb
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb
 - lib/bundler/source.rb
@@ -67,7 +68,7 @@ has_rdoc: true
 homepage: http://github.com/carlhuda/bundler
 licenses: []
 
-post_install_message: 
+post_install_message: Due to a rubygems bug, you must uninstall all older versions of bundler for 0.9 to work
 rdoc_options: []
 
 require_paths: