bundler 0.9.17 → 0.9.18

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.9.18 (April 8, 2010)
+
+Features:
+
+  - console command that runs irb with bundle (and optional group) already loaded
+
+Bugfixes:
+
+  - Bundler.setup now fully disables system gems, even when unlocked (#266, #246)
+    - fixes Yard, which found plugins in Gem.source_index that it could not load
+    - makes behaviour of `Bundler.require` consistent between locked and unlocked loads
+
 ## 0.9.17 (April 7, 2010)
 
 Features:

data/lib/bundler.rb

@@ -66,7 +66,17 @@ module Bundler
     end
 
     def setup(*groups)
-      load.setup(*groups)
+      if groups.empty? || @all_groups_loaded
+        # Load all groups, but only once
+        @all_groups_loaded ||= load.setup
+      else
+        # Figure out which groups haven't been loaded yet
+        unloaded = groups - (@completed_groups || [])
+        # Record groups that are now loaded
+        @completed_groups = groups | (@completed_groups || [])
+        # Load any groups that are not yet loaded
+        unloaded.any? ? load.setup(*unloaded) : load
+      end
     end
 
     def require(*groups)
@@ -74,17 +84,19 @@ module Bundler
     end
 
     def load
-      if current_env_file?
-        SharedHelpers.gem_loaded = true
-        Kernel.require env_file
-        Bundler
-      else
-        runtime
+      @load ||= begin
+        if current_env_file?
+          SharedHelpers.gem_loaded = true
+          Kernel.require env_file
+          Bundler
+        else
+          runtime
+        end
       end
     end
 
     def runtime
-      Runtime.new(root, definition)
+      @runtime ||= Runtime.new(root, definition)
     end
 
     def definition
@@ -133,16 +145,16 @@ module Bundler
       ENV.replace(bundled_env.to_hash)
     end
 
-  private
-
     def default_gemfile
       SharedHelpers.default_gemfile
     end
 
+  private
+
     def configure_gem_home_and_path
       if settings[:disable_shared_gems]
-        ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
         ENV['GEM_PATH'] = ''
+        ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
       else
         paths = [Gem.dir, Gem.path].flatten.compact.uniq.reject{|p| p.empty? }
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)

data/lib/bundler/cli.rb

@@ -190,6 +190,16 @@ module Bundler
       end
     end
 
+    desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
+    def console(group = nil)
+      require 'bundler/setup'
+      group ? Bundler.require(:default, group) : Bundler.require
+      ARGV.clear
+
+      require 'irb'
+      IRB.start
+    end
+
     desc "version", "Prints the bundler's version information"
     def version
       Bundler.ui.info "Bundler version #{Bundler::VERSION}"

data/lib/bundler/runtime.rb

@@ -15,11 +15,10 @@ module Bundler
       # Has to happen first
       clean_load_path
 
-      unloaded = groups - (@loaded_groups || [])
-      @loaded_groups = groups | (@loaded_groups || [])
-      specs = unloaded.any? ? specs_for(unloaded) : requested_specs
+      specs = groups.any? ? specs_for(groups) : requested_specs
 
       cripple_rubygems(specs)
+      replace_rubygems_paths
 
       # Activate the specs
       specs.each do |spec|
@@ -128,5 +127,18 @@ module Bundler
       end
       details
     end
+
+    def replace_rubygems_paths
+      Gem.instance_eval do
+        def path
+          [Bundler.bundle_path.to_s]
+        end
+
+        def source_index
+          @source_index ||= Gem::SourceIndex.from_installed_gems
+        end
+      end
+    end
+
   end
 end

data/lib/bundler/shared_helpers.rb

@@ -72,12 +72,12 @@ module Bundler
       reverse_rubygems_kernel_mixin
 
       executables = specs.map { |s| s.executables }.flatten
+      Gem.source_index # ensure RubyGems is fully loaded
 
-     :: Kernel.class_eval do
+     ::Kernel.class_eval do
         private
         def gem(*) ; end
       end
-      Gem.source_index # ensure RubyGems is fully loaded
 
       ::Kernel.send(:define_method, :gem) do |dep, *reqs|
         if executables.include? File.basename(caller.first.split(':').first)

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.17"
+  VERSION = "0.9.18"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 17
-  version: 0.9.17
+  - 18
+  version: 0.9.18
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
+date: 2010-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency