isolate 2.0.0.pre.2 → 2.0.0.pre.3

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 2.0.0.pre.3 / 2010-05-09
+
+* Refactor cleanup. Fixes issue #24.
+* Fix Isolate::Events doco.
+* Clarify Rake task doco.
+* Update useful resources.
+
 === 2.0.0.pre.2 / 2010-05-07
 
 * Update docs.

data/README.rdoc

@@ -95,7 +95,9 @@ the top of your Rakefile. See the RDoc for details.
 
 == Rake
 
-Isolate provides a few useful Rake tasks.
+Isolate provides a few useful Rake tasks. If you're requiring
+<tt>isolate/now</tt>, you'll get them automatically when you run
+Rake. If not, you can include them by requiring <tt>isolate/rake</tt>.
 
 === isolate:env
 
@@ -161,8 +163,10 @@ public API, please see the RDoc.
 
 == Meta
 
-Bugs::  http://github.com/jbarnette/isolate/issues
-Email:: isolate@librelist.com
+RDoc::         http://rdoc.info/projects/jbarnette/isolate
+Bugs::         http://github.com/jbarnette/isolate/issues
+IRC::          #isolate on Freenode
+Mailing List:: isolate@librelist.com
 
 == License
 

data/lib/isolate.rb

@@ -8,7 +8,7 @@ module Isolate
 
   # Duh.
 
-  VERSION = "2.0.0.pre.2"
+  VERSION = "2.0.0.pre.3"
 
   # Disable Isolate. If a block is provided, isolation will be
   # disabled for the scope of the block.

data/lib/isolate/events.rb

@@ -2,9 +2,9 @@ module Isolate
 
   # A simple way to watch and extend the Isolate lifecycle.
   #
-  # Isolate::Events.watch Isolate::Sandbox, :initialized do |sandbox|
-  #   puts "A sandbox just got initialized: #{sandbox}"
-  # end
+  #    Isolate::Events.watch Isolate::Sandbox, :initialized do |sandbox|
+  #      puts "A sandbox just got initialized: #{sandbox}"
+  #    end
   #
   # Read the source for Isolate::Sandbox and Isolate::Entry to see
   # what sort of events are fired.

data/lib/isolate/sandbox.rb

@@ -80,16 +80,9 @@ module Isolate
     def cleanup # :nodoc:
       fire :cleaning
 
-      activated = Gem.loaded_specs.values.map { |s| s.full_name }
-      available = Gem.source_index.gems.values.sort
-
-      extra = available.reject do |spec|
-        active = activated.include? spec.full_name
-        entry  = entries.find { |e| e.matches_spec? spec }
-        system = !spec.loaded_from.include?(path)
-
-        active or entry or system
-      end
+      installed = index.gems.values.sort
+      legit     = legitimize!
+      extra     = installed - legit
 
       unless extra.empty?
         padding = Math.log10(extra.size).to_i + 1
@@ -216,6 +209,12 @@ module Isolate
       entry
     end
 
+    # A source index representing only isolated gems.
+
+    def index
+      @index ||= Gem::SourceIndex.from_gems_in File.join(path, "specifications")
+    end
+
     def install environment # :nodoc:
       fire :installing
 
@@ -233,6 +232,7 @@ module Isolate
           entry.install
         end
 
+        index.refresh!
         Gem.source_index.refresh!
       end
 
@@ -282,5 +282,27 @@ module Isolate
     def verbose?
       @options.fetch :verbose, true
     end
+
+    private
+
+    # Returns a list of Gem::Specification instances that 1. exist in
+    # the isolated gem path, and 2. are allowed to be there. Used in
+    # cleanup. It's only an external method 'cause recursion is
+    # easier.
+
+    def legitimize! deps = entries
+      [].tap do |specs|
+        deps.flatten.each do |dep|
+          spec = index.find_name(dep.name, dep.requirement).last
+
+          if spec
+            specs.concat legitimize!(spec.runtime_dependencies)
+            specs << spec
+          end
+        end
+
+        specs.uniq!
+      end
+    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  hash: 1923832045
+  hash: 1923832047
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - pre
-  - 2
-  version: 2.0.0.pre.2
+  - 3
+  version: 2.0.0.pre.3
 platform: ruby
 authors: 
 - John Barnette
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -07:00
+date: 2010-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency