isolate 1.9.3 → 1.10.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.10.0 / 2010-03-15
+
+* Speculative now! shortcut.
+
 === 1.9.3 / 2010-02-24
 
 * Passing <tt>:file => true</tt> to Isolate.gems will try +Isolate+

data/lib/isolate.rb

@@ -8,7 +8,7 @@ require "rubygems/requirement"
 
 class Isolate
 
-  VERSION = "1.9.3" # :nodoc:
+  VERSION = "1.10.0" # :nodoc:
 
   # An isolated Gem, with requirement, environment restrictions, and
   # installation options. Internal use only.
@@ -46,7 +46,12 @@ class Isolate
   #
   # Option defaults:
   #
-  #    { :cleanup => true, :install => true, :verbose => true }
+  #    {
+  #      :cleanup => true,
+  #      :install => true,
+  #      :system  => false,
+  #      :verbose => true
+  #    }
 
   def self.gems path, options = {}, &block
     @@instance = new path, options, &block
@@ -59,6 +64,10 @@ class Isolate
     @@instance
   end
 
+  def self.now! #:nodoc:
+    gems "tmp/gems", :file => true, :system => true
+  end
+
   # Poke RubyGems, we've probably monkeyed with a bunch of paths and
   # suchlike. Clears paths, loaded specs, and source indexes.
 
@@ -78,6 +87,7 @@ class Isolate
     @path         = File.expand_path path
 
     @install      = options.fetch :install, true
+    @system       = options.fetch :system,  false
     @verbose      = options.fetch :verbose, true
     @cleanup      = @install && options.fetch(:cleanup, true)
 
@@ -114,9 +124,11 @@ class Isolate
 
   def cleanup # :nodoc:
     activated = Gem.loaded_specs.values.map { |s| s.full_name }
-    extra     = Gem.source_index.gems.values.sort.reject { |spec|
-      activated.include? spec.full_name or
-        entries.any? { |e| e.matches_spec? spec }
+
+    extra = Gem.source_index.gems.values.sort.reject { |spec|
+      !spec.loaded_from.include?(path) or
+        activated.include? spec.full_name or
+          entries.any? { |e| e.matches? spec }
     }
 
     return if extra.empty?
@@ -168,22 +180,27 @@ class Isolate
     @old_ruby_opt  = ENV["RUBYOPT"]
     @old_load_path = $LOAD_PATH.dup
 
-    $LOAD_PATH.reject! do |p|
-      p != File.dirname(__FILE__) &&
-        Gem.path.any? { |gp| p.include?(gp) }
-    end
+    ENV["GEM_HOME"] = path
 
-    # HACK: Gotta keep isolate explicitly in the LOAD_PATH in
-    # subshells, and the only way I can think of to do that is by
-    # abusing RUBYOPT.
+    unless system?
+      $LOAD_PATH.reject! do |p|
+        p != File.dirname(__FILE__) &&
+          Gem.path.any? { |gp| p.include?(gp) }
+      end
 
-    ENV["RUBYOPT"]  = "#{ENV['RUBYOPT']} -I#{File.dirname(__FILE__)}"
-    ENV["GEM_PATH"] = ENV["GEM_HOME"] = path
+      # HACK: Gotta keep isolate explicitly in the LOAD_PATH in
+      # subshells, and the only way I can think of to do that is by
+      # abusing RUBYOPT.
+
+      ENV["RUBYOPT"]  = "#{ENV['RUBYOPT']} -I#{File.dirname(__FILE__)}"
+      ENV["GEM_PATH"] = path
+    end
 
     bin = File.join path, "bin"
     ENV["PATH"] = [bin, ENV["PATH"]].join File::PATH_SEPARATOR
 
     self.class.refresh
+    Gem.path.unshift path if system?
 
     @enabled = true
 
@@ -268,6 +285,10 @@ class Isolate
     $stderr.puts s if verbose?
   end
 
+  def system? # :nodoc:
+    @system
+  end
+
   def verbose? # :nodoc:
     @verbose
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 9
-  - 3
-  version: 1.9.3
+  - 10
+  - 0
+  version: 1.10.0
 platform: ruby
 authors: 
 - John Barnette
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -08:00
+date: 2010-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency