isolate 3.1.0.pre.3 → 3.1.0

data.tar.gz.sig

@@ -0,0 +1,2 @@
+�C
+��X�x8�0i�ꃨ�Mg6�;�(o[\����CE�4������o�g���$:��u8\�e(Ƌ�[>	�?�Q'oZff�-�rX��2�gh(ɬZ`K�����W�ͫK<�g)�f��#˥7e���D��A	L�2������s<)U���U��R�g�fyTj�NH�@��D��/�]e�P�!8��y�������T�?����E#���N�{�`H0�P��� ��Z��Q�ӓ��

data/.autotest

@@ -1,5 +1,9 @@
+# -*- ruby -*-
+
 require "autotest/restart"
 
 Autotest.add_hook :initialize do |at|
   at.testlib = "minitest/autorun"
+  at.add_exception "tmp"
+  at.add_exception ".git"
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,45 @@
+=== 3.1.0 / 2011-05-19
+
+* 4 minor enhancements:
+
+  * Added ZenTest as a development dependency so rake multi works in isolation.
+  * Added rake task git:freshen to forcefully remove stale gems.
+  * Extracted remove from cleanup method so rake tasks can use remove.
+  * Switched to minitest plugin in hoe spec
+
+* 6 bug fixes:
+
+  * Fixed 1.9.x warnings
+  * Fixed a test broken only in isolation from hoe itself.
+  * Fixed an enumeration bug caused by my not running `rake multi` sooner. (Eric Wong)
+  * Fixed requirements in readme.
+  * Hoe plugin now properly adds development dependencies.
+  * Hoe plugin now properly uses (and possibly defines) the Isolate.sandbox.
+
+=== 3.0.2 / 2011-05-14
+
+* 3 bug fixes:
+
+  * Cleanup shouldn't try to uninstall specs outside of our sandbox.
+  * Pass spec.base_dir to the uninstaller during cleanup.
+  * We shouldn't manipulate Gem.path, but if we do, we should be smart/clean about it.
+
+=== 3.0.1 / 2011-05-11
+
+* 6 minor enhancements:
+
+  * Added Entry#to_s and #inspect to make it much more readable.
+  * Added Isolate.sandbox= and used it from Hoe::Isolate plugin.
+  * Deprecated Sandbox#index.
+  * Entry#specification now returns nil if it doesn't resolve to anything.
+  * Refactored Sandbox's default path so that tests won't collide with our Rakefile.
+  * We now require rubygems >= 1.8.2.
+
+* 2 bug fixes:
+
+  * Cleaned up all warnings caused by rubygems 1.8 deprecations.
+  * Fixed Sandbox#legitimize! to properly deal with Gem::Dependency.
+
 === 3.0.0 / 2010-10-19
 
 * Remove deprecated Isolate.{gems,instance} methods.

data/Manifest.txt

@@ -1,16 +1,12 @@
 .autotest
-.rvmrc
 CHANGELOG.rdoc
-Isolate
 Manifest.txt
 README.rdoc
 Rakefile
 lib/hoe/isolate.rb
 lib/isolate.rb
-lib/isolate/completely.rb
 lib/isolate/entry.rb
 lib/isolate/events.rb
-lib/isolate/installer.rb
 lib/isolate/now.rb
 lib/isolate/rake.rb
 lib/isolate/sandbox.rb
@@ -18,6 +14,7 @@ test/fixtures/blort-0.0.gem
 test/fixtures/isolate.rb
 test/fixtures/override.rb
 test/fixtures/override.rb.local
+test/fixtures/system/specifications/rcov-0.9.9.gemspec
 test/fixtures/with-hoe/specifications/hoe-2.3.3.gemspec
 test/fixtures/with-hoe/specifications/rake-0.8.7.gemspec
 test/fixtures/with-hoe/specifications/rubyforge-1.0.4.gemspec

data/README.rdoc

@@ -21,7 +21,7 @@ and is probably a better fit for you.
 
 == Requirements
 
-RubyGems 1.3.6 or better, Ruby 1.8.6 or better.
+RubyGems 1.8.2 or better, Ruby 1.8.7 or better.
 
 == Getting Started
 
@@ -83,7 +83,7 @@ your lib's development, runtime, and test dependencies without
 polluting your system RubyGems, and run your tests/specs in total
 isolation.
 
-Assuming you have a recent Hoe and isolate's installed, it's as simple
+Assuming you have a recent Hoe and Isolate is installed, it's as simple
 as putting:
 
     Hoe.plugin :isolate

data/Rakefile

@@ -1,20 +1,30 @@
-$:.unshift "./lib"
-require "isolate/now"
-
+require "rubygems"
 require "hoe"
 
+$:.unshift "lib"
+require "isolate/rake"
+
+# TODO: build sandboxing into rubygems and make it a first class citizen in Hoe
+Isolate.now! :system => false do
+  env "development" do
+    gem "hoe-seattlerb", "> 0"
+    gem "minitest",   "~> 2.1"
+    gem "hoe-doofus", "~> 1.0.0"
+    gem "hoe-git",    "~> 1.3"
+    gem "ZenTest",    "~> 4.5"
+  end
+end
+
 Hoe.plugins.delete :rubyforge
-Hoe.plugin :doofus, :git, :isolate
+Hoe.plugin :isolate, :doofus, :git, :minitest
 
 Hoe.spec "isolate" do
   developer "John Barnette", "code@jbarnette.com"
   developer "Ryan Davis",    "ryand-ruby@zenspider.com"
 
-  require_ruby_version     ">= 1.8.6"
-  require_rubygems_version ">= 1.3.6"
+  require_rubygems_version ">= 1.8.2"
 
   self.extra_rdoc_files = Dir["*.rdoc"]
   self.history_file     = "CHANGELOG.rdoc"
   self.readme_file      = "README.rdoc"
-  self.testlib          = :minitest
 end

data/lib/hoe/isolate.rb

@@ -28,9 +28,10 @@ class Hoe # :nodoc:
       Hoe.plugins.unshift Hoe.plugins.delete(:isolate)
 
       self.isolate_dir ||= "tmp/isolate"
-      @sandbox = ::Isolate::Sandbox.new
 
-      @sandbox.entries.each do |entry|
+      ::Isolate.sandbox ||= ::Isolate::Sandbox.new
+
+      ::Isolate.sandbox.entries.each do |entry|
         dep = [entry.name, *entry.requirement.as_list]
 
         if entry.environments.include? "development"
@@ -42,16 +43,22 @@ class Hoe # :nodoc:
     end
 
     def define_isolate_tasks # HACK
+      sandbox = ::Isolate.sandbox
 
       # reset, now that they've had a chance to change it
-      @sandbox.options :path => isolate_dir, :system => false
+      sandbox.options :path => isolate_dir, :system => false
+
+      self.extra_deps.each do |name, version|
+        sandbox.gem name, *Array(version)
+      end
 
-      # allows traditional extra{_dev}_deps calls to override
-      (self.extra_deps + self.extra_dev_deps).each do |name, version|
-        @sandbox.gem name, *Array(version)
+      self.extra_dev_deps.each do |name, version|
+        sandbox.env "development" do
+          sandbox.gem name, *Array(version)
+        end
       end
 
-      @sandbox.activate
+      sandbox.activate
     end
   end
 end

data/lib/isolate.rb

@@ -8,7 +8,7 @@ module Isolate
 
   # Duh.
 
-  VERSION = "3.1.0.pre.3"
+  VERSION = "3.1.0"
 
   # Disable Isolate. If a block is provided, isolation will be
   # disabled for the scope of the block.
@@ -34,6 +34,13 @@ module Isolate
     @@sandbox
   end
 
+  # Set the singleton. Intended for Hoe::Isolate and other tools that
+  # make their own.
+
+  def self.sandbox= o
+    @@sandbox = o
+  end
+
   # Declare an isolated RubyGems environment, installed in +path+. Any
   # block given will be <tt>instance_eval</tt>ed, see
   # Isolate::Sandbox#gem and Isolate::Sandbox#environment for the sort
@@ -70,10 +77,11 @@ module Isolate
   end
 
   # Poke RubyGems, since we've probably monkeyed with a bunch of paths
-  # and suchlike. Deprecated and scheduled for removal in v4.0.0.
+  # and suchlike. Clears paths, loaded specs, and source indexes.
 
   def self.refresh # :nodoc:
-    $stderr.puts "Deprecated, removal in v4.0.0. Use Gem.refresh."
-    Gem.refresh
+    Gem.loaded_specs.clear
+    Gem.clear_paths
+    Gem::Specification.reset
   end
 end

data/lib/isolate/entry.rb

@@ -1,5 +1,4 @@
 require "isolate/events"
-require "isolate/installer"
 require "rubygems"
 require "rubygems/command"
 require "rubygems/dependency_installer"
@@ -68,7 +67,9 @@ module Isolate
 
     def activate
       fire :activating, :activated do
-        Gem.activate name, *requirement.as_list
+        spec = self.specification
+        raise Gem::LoadError, "Couldn't resolve: #{self}" unless spec
+        spec.activate
       end
     end
 
@@ -80,7 +81,12 @@ module Isolate
 
       begin
         fire :installing, :installed do
-          installer = Isolate::Installer.new @sandbox
+
+          installer =
+            Gem::DependencyInstaller.new(:development   => false,
+                                         :generate_rdoc => false,
+                                         :generate_ri   => false,
+                                         :install_dir   => @sandbox.path)
 
           Gem.sources += Array(options[:source]) if options[:source]
           Gem::Command.build_args = Array(options[:args]) if options[:args]
@@ -106,10 +112,12 @@ module Isolate
       name == spec.name and requirement.satisfied_by? spec.version
     end
 
-    # The Gem::Specification for this entry.
+    # The Gem::Specification for this entry or nil if it isn't resolveable.
 
     def specification
-      Gem.source_index.find_name(name, requirement).first
+      Gem::Specification.find_by_name(name, requirement)
+    rescue Gem::LoadError
+      nil
     end
 
     # Updates this entry's environments, options, and
@@ -125,5 +133,11 @@ module Isolate
 
       self
     end
+
+    def to_s
+      "Entry[#{name.inspect}, #{requirement.to_s.inspect}]"
+    end
+
+    alias :inspect :to_s
   end
 end

data/lib/isolate/rake.rb

@@ -1,3 +1,5 @@
+require "isolate"
+
 namespace :isolate do
   desc "Show current isolated environment."
   task :env do
@@ -48,22 +50,14 @@ namespace :isolate do
 
   desc "Which isolated gems have updates available?"
   task :stale do
-    require "rubygems/source_index"
-    require "rubygems/spec_fetcher"
-
-    index    = Gem::SourceIndex.new
     outdated = []
+    sandbox  = Isolate.sandbox
+    outdated = sandbox.entries.reject { |entry| entry.specification }
 
-    Isolate.sandbox.entries.each do |entry|
-      if entry.specification
-        index.add_spec entry.specification
-      else
-        outdated << entry
-      end
-    end
-
-    index.outdated.each do |name|
-      outdated << Isolate.sandbox.entries.find { |e| e.name == name }
+    Gem::Specification.outdated.each do |name|
+      entry = sandbox.entries.find { |e| e.name == name }
+      next unless entry
+      outdated << entry
     end
 
     outdated.sort_by { |e| e.name }.each do |entry|
@@ -75,4 +69,19 @@ namespace :isolate do
       puts "#{entry.name} (#{local} < #{remote})"
     end
   end
+
+  desc "Removes gems that have updates available"
+  task :freshen do
+    outdated = []
+    sandbox  = Isolate.sandbox
+    extra = sandbox.entries.reject { |entry| entry.specification }
+
+    Gem::Specification.outdated.each do |name|
+      entry = sandbox.entries.find { |e| e.name == name }
+      next unless entry
+      extra << entry.specification
+    end
+
+    sandbox.remove(*extra)
+  end
 end

data/lib/isolate/sandbox.rb

@@ -4,6 +4,7 @@ require "isolate/events"
 require "rbconfig"
 require "rubygems/defaults"
 require "rubygems/uninstaller"
+require "rubygems/deprecate"
 
 module Isolate
 
@@ -13,6 +14,8 @@ module Isolate
   class Sandbox
     include Events
 
+    DEFAULT_PATH = "tmp/isolate" # :nodoc:
+
     attr_reader :entries # :nodoc:
     attr_reader :environments # :nodoc:
     attr_reader :files # :nodoc:
@@ -83,26 +86,14 @@ module Isolate
     def cleanup # :nodoc:
       fire :cleaning
 
-      installed = index.gems.values.sort
+      installed = Gem::Specification.map.to_a
       legit     = legitimize!
       extra     = installed - legit
 
-      unless extra.empty?
-        padding = Math.log10(extra.size).to_i + 1
-        format  = "[%0#{padding}d/%s] Nuking %s."
+      gem_dir = Gem.dir
+      extra.reject! { |s| s.base_dir != gem_dir }
 
-        extra.each_with_index do |e, i|
-          log format % [i + 1, extra.size, e.full_name]
-
-          Gem::DefaultUserInteraction.use_ui Gem::SilentUI.new do
-            Gem::Uninstaller.new(e.name,
-                                 :version     => e.version,
-                                 :ignore      => true,
-                                 :executables => true,
-                                 :install_dir => path).uninstall
-          end
-        end
-      end
+      self.remove(*extra)
 
       fire :cleaned
     end
@@ -116,12 +107,11 @@ module Isolate
       fire :disabling
 
       ENV.replace @old_env
+      $LOAD_PATH.replace @old_load_path
 
       @enabled = false
 
-      Gem.clear_paths
-      Gem.refresh
-
+      Isolate.refresh
       fire :disabled
 
       begin; return yield ensure enable end if block_given?
@@ -133,20 +123,31 @@ module Isolate
       return self if enabled?
       fire :enabling
 
-      @old_env = ENV.to_hash
+      @old_env       = ENV.to_hash
+      @old_load_path = $LOAD_PATH.dup
+
+      path = self.path
+
+      FileUtils.mkdir_p path
+      ENV["GEM_HOME"] = path
 
       unless system?
+        isolate_lib = File.expand_path "../..", __FILE__
+
+        # manually deactivate pre-isolate gems... is this just for 1.9.1?
+        $LOAD_PATH.reject! do |p|
+          p != isolate_lib && Gem.path.any? { |gp| p.include?(gp) }
+        end
 
         # 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.
 
-        lib = File.expand_path "../..", __FILE__
-        dirname = Regexp.escape lib
-
-        unless ENV["RUBYOPT"] =~ /\s+-I\s*#{lib}\b/
-          ENV["RUBYOPT"] = "#{ENV['RUBYOPT']} -I#{lib}"
+        unless ENV["RUBYOPT"] =~ /\s+-I\s*#{Regexp.escape isolate_lib}\b/
+          ENV["RUBYOPT"] = "#{ENV['RUBYOPT']} -I#{isolate_lib}"
         end
+
+        ENV["GEM_PATH"] = path
       end
 
       bin = File.join path, "bin"
@@ -155,19 +156,13 @@ module Isolate
         ENV["PATH"] = [bin, ENV["PATH"]].join File::PATH_SEPARATOR
       end
 
-      paths = (ENV["GEM_PATH"] || "").split File::PATH_SEPARATOR
-      paths.push Gem.dir
-
-      paths.clear unless system?
-      paths.push path
-
-      Gem.clear_paths
-
-      ENV["GEM_HOME"] = path
-      ENV["GEM_PATH"] = paths.uniq.join File::PATH_SEPARATOR
       ENV["ISOLATED"] = path
 
-      Gem.refresh
+      if system? then
+        Gem.path.unshift path # HACK: this is just wrong!
+        Gem.path.uniq!        # HACK: needed for the previous line :(
+      end
+      Isolate.refresh
 
       @enabled = true
       fire :enabled
@@ -214,23 +209,19 @@ module Isolate
       fire :installing
 
       installable = entries.select do |e|
-        !Gem.available?(e.name, *e.requirement.as_list) &&
-          e.matches?(environment)
+        not e.specification && e.matches?(environment)
       end
 
       unless installable.empty?
         padding = Math.log10(installable.size).to_i + 1
         format  = "[%0#{padding}d/%s] Isolating %s (%s)."
 
-        FileUtils.mkdir_p path
-
         installable.each_with_index do |entry, i|
           log format % [i + 1, installable.size, entry.name, entry.requirement]
           entry.install
-
-          index.refresh!
-          Gem.source_index.refresh!
         end
+
+        Gem::Specification.reset
       end
 
       fire :installed
@@ -251,7 +242,6 @@ module Isolate
       $stderr.puts s if verbose?
     end
 
-
     def multiruby?
       @options.fetch :multiruby, true
     end
@@ -262,7 +252,7 @@ module Isolate
     end
 
     def path
-      base = @options.fetch :path, "tmp/isolate"
+      base = @options.fetch :path, DEFAULT_PATH
 
       unless @options.key?(:multiruby) && @options[:multiruby] == false
         suffix = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
@@ -272,6 +262,27 @@ module Isolate
       File.expand_path base
     end
 
+    def remove(*extra)
+      unless extra.empty?
+        padding = Math.log10(extra.size).to_i + 1
+        format  = "[%0#{padding}d/%s] Nuking %s."
+
+        extra.each_with_index do |e, i|
+          log format % [i + 1, extra.size, e.full_name]
+
+          Gem::DefaultUserInteraction.use_ui Gem::SilentUI.new do
+            uninstaller =
+              Gem::Uninstaller.new(e.name,
+                                   :version     => e.version,
+                                   :ignore      => true,
+                                   :executables => true,
+                                   :install_dir => e.base_dir)
+            uninstaller.uninstall
+          end
+        end
+      end
+    end
+
     def system?
       @options.fetch :system, true
     end
@@ -291,9 +302,20 @@ module Isolate
       specs = []
 
       deps.flatten.each do |dep|
-        spec = index.find_name(dep.name, dep.requirement).last
-
-        if spec
+        spec = case dep
+               when Gem::Dependency then
+                 begin
+                   dep.to_spec
+                 rescue Gem::LoadError
+                   nil
+                 end
+               when Isolate::Entry then
+                 dep.specification
+               else
+                 raise "unknown dep: #{dep.inspect}"
+               end
+
+        if spec then
           specs.concat legitimize!(spec.runtime_dependencies)
           specs << spec
         end
@@ -301,5 +323,8 @@ module Isolate
 
       specs.uniq
     end
+
+    extend Deprecate
+    deprecate :index, :none, 2011, 11
   end
 end

data/test/fixtures/system/specifications/rcov-0.9.9.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rcov}
+  s.version = "0.9.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Relevance}, %q{Chad Humphries (spicycode)}, %q{Aaron Bedra (abedra)}, %q{Jay McGaffigan(hooligan495)}, %q{Mauricio Fernandez}]
+  s.cert_chain = nil
+  s.date = %q{2009-12-28}
+  s.description = %q{rcov is a code coverage tool for Ruby. It is commonly used for viewing overall test unit coverage of target code.  It features fast execution (20-300 times faster than previous tools), multiple analysis modes, XHTML and several kinds of text reports, easy automation with Rake via a RcovTask, fairly accurate coverage information through code linkage inference using simple heuristics, colorblind-friendliness...}
+  s.email = %q{opensource@thinkrelevance.com}
+  s.executables = [%q{rcov}]
+  s.extensions = [%q{ext/rcovrt/extconf.rb}]
+  s.files = [%q{bin/rcov}, %q{ext/rcovrt/extconf.rb}]
+  s.homepage = %q{http://github.com/relevance/rcov}
+  s.rdoc_options = [%q{--title}, %q{rcov code coverage tool}]
+  s.require_paths = [%q{lib}]
+  s.required_ruby_version = Gem::Requirement.new("> 0.0.0")
+  s.rubygems_version = %q{1.8.2}
+  s.summary = %q{Code coverage analysis tool for Ruby}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 1
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/test/fixtures/with-hoe/specifications/hoe-2.3.3.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Davis"]
   s.date = %q{2009-08-07}
-  s.default_executable = %q{sow}
   s.description = %q{Hoe is a rake/rubygems helper for project Rakefiles. It helps generate
 rubygems and includes a dynamic plug-in system allowing for easy
 extensibility. Hoe ships with plug-ins for all your usual project

data/test/fixtures/with-hoe/specifications/rake-0.8.7.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim Weirich"]
   s.date = %q{2009-05-14}
-  s.default_executable = %q{rake}
   s.description = %q{Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.}
   s.email = %q{jim@weirichhouse.org}
   s.executables = ["rake"]

data/test/fixtures/with-hoe/specifications/rubyforge-1.0.4.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Davis", "Eric Hodel", "Ara T Howard"]
   s.date = %q{2009-07-21}
-  s.default_executable = %q{rubyforge}
   s.description = %q{A script which automates a limited set of rubyforge operations.
 
 * Run 'rubyforge help' for complete usage.

data/test/isolate/test.rb

@@ -1,10 +1,14 @@
 require "isolate"
 require "minitest/autorun"
 
+ENV.delete "RUBYOPT" # Rakefile uses isolate, so we don't want this
+
 module Isolate
+  Sandbox::DEFAULT_PATH.replace "tmp/test" # change isolate dir for testing
+
   class Test < MiniTest::Unit::TestCase
     def setup
-      Gem.refresh
+      Isolate.refresh
 
       @env = ENV.to_hash
       @lp  = $LOAD_PATH.dup
@@ -19,7 +23,7 @@ module Isolate
       $LOAD_PATH.replace @lp
       $LOADED_FEATURES.replace @lf
 
-      FileUtils.rm_rf "tmp/isolate"
+      FileUtils.rm_rf "tmp/test"
     end
   end
 end
@@ -42,7 +46,7 @@ end
 class Gem::Uninstaller
   extend BrutalStub
 
-  attr_reader :gem, :version, :gem_home
+  attr_reader :gem, :version
   alias old_uninstall uninstall
 
   def uninstall

data/test/test_isolate.rb

@@ -31,7 +31,10 @@ class TestIsolate < Isolate::Test
   def test_self_now!
     assert_nil Isolate.sandbox
 
-    Isolate.now! :path => WITH_HOE, :multiruby => false, :system => false do
+    Isolate.now!(:path      => WITH_HOE,
+                 :multiruby => false,
+                 :system    => false,
+                 :verbose   => false) do
       gem "hoe"
     end
 

data/test/test_isolate_entry.rb

@@ -5,7 +5,7 @@ class TestIsolateEntry < Isolate::Test
   def setup
     @sandbox = Object.new
     def @sandbox.environments; @e ||= [] end
-    def @sandbox.path; "tmp/gems" end
+    def @sandbox.path; "tmp/test" end
 
     super
   end

data/test/test_isolate_sandbox.rb

@@ -2,6 +2,7 @@ require "isolate/test"
 
 class TestIsolateSandbox < Isolate::Test
   WITH_HOE = "test/fixtures/with-hoe"
+  SYSTEM   = "test/fixtures/system"
 
   def setup
     @sandbox = sandbox
@@ -55,15 +56,72 @@ class TestIsolateSandbox < Isolate::Test
   # TODO: cleanup with 2 versions of same gem, 1 activated
   # TODO: install with 1 older version, 1 new gem to be installed
 
-  def test_cleanup
-    s = sandbox :path => WITH_HOE, :install => true, :cleanup => true
-    s.activate # no gems on purpose
+  def test_cleanup_all
+    with_env_setup do
+      s = sandbox :path => WITH_HOE, :install => true, :cleanup => true
 
-    expected = [["hoe",       "2.3.3", WITH_HOE],
-                ["rake",      "0.8.7", WITH_HOE],
-                ["rubyforge", "1.0.4", WITH_HOE]]
+      assert_silent do
+        s.activate # no gems on purpose
+      end
+
+      expected = [["hoe",       "2.3.3", WITH_HOE],
+                  ["rake",      "0.8.7", WITH_HOE],
+                  ["rubyforge", "1.0.4", WITH_HOE]]
 
-    assert_equal expected, Gem::Uninstaller.value
+      assert_equal expected, Gem::Uninstaller.value
+    end
+  end
+
+  def test_cleanup_all_system
+    with_env_setup do
+      s = sandbox(:path => WITH_HOE, :install => true, :cleanup => true,
+                  :system => true)
+
+      assert_silent do
+        s.activate # no gems on purpose
+      end
+
+      expected = [["hoe",       "2.3.3", WITH_HOE],
+                  ["rake",      "0.8.7", WITH_HOE],
+                  ["rubyforge", "1.0.4", WITH_HOE]]
+
+      assert_equal expected, Gem::Uninstaller.value.sort
+    end
+  end
+
+  def test_cleanup_partial
+    with_env_setup do
+      s = sandbox :path => WITH_HOE, :install => true, :cleanup => true
+
+      s.gem "rake", "0.8.7"
+
+      assert_silent do
+        s.activate
+      end
+
+      expected = [["hoe",       "2.3.3", WITH_HOE],
+                  ["rubyforge", "1.0.4", WITH_HOE]]
+
+      assert_equal expected, Gem::Uninstaller.value
+    end
+  end
+
+  def test_cleanup_partial_system
+    with_env_setup do
+      s = sandbox(:path => WITH_HOE, :install => true, :cleanup => true,
+                  :system => true)
+
+      s.gem "rake", "0.8.7"
+
+      assert_silent do
+        s.activate
+      end
+
+      expected = [["hoe",       "2.3.3", WITH_HOE],
+                  ["rubyforge", "1.0.4", WITH_HOE]]
+
+      assert_equal expected, Gem::Uninstaller.value.sort
+    end
   end
 
   def test_disable
@@ -88,8 +146,8 @@ class TestIsolateSandbox < Isolate::Test
   end
 
   def test_enable
-    refute_empty Gem.find_files("hoe.rb"),
-      "There's a hoe.rb somewhere in the current env."
+    refute_empty Gem.find_files("rake.rb"),
+      "There's a rake.rb somewhere in the current env."
 
     assert_same @sandbox, @sandbox.enable
 
@@ -113,6 +171,8 @@ class TestIsolateSandbox < Isolate::Test
   end
 
   def test_idempotent_rubyopt_env
+    assert_nil ENV["RUBYOPT"], "sanity check to make sure ENV isn't infecting"
+
     @sandbox.enable
     rubyopt = ENV["RUBYOPT"]
     @sandbox.disable
@@ -189,7 +249,7 @@ class TestIsolateSandbox < Isolate::Test
 
     assert_equal [], s.entries
     assert_equal [], s.environments
-    assert_match(/tmp\/isolate/, s.path)
+    assert_match(/tmp\/test/, s.path)
 
     assert s.cleanup?
     assert s.install?
@@ -199,9 +259,12 @@ class TestIsolateSandbox < Isolate::Test
   end
 
   def test_initialize_override_defaults
-    s = Isolate::Sandbox.new :path => "x", :cleanup => false,
-      :install => false, :system => false,
-      :verbose => false, :multiruby => false
+    s = Isolate::Sandbox.new(:path      => "x",
+                             :cleanup   => false,
+                             :install   => false,
+                             :system    => false,
+                             :verbose   => false,
+                             :multiruby => false)
 
     assert_equal File.expand_path("x"), s.path
 
@@ -243,11 +306,11 @@ class TestIsolateSandbox < Isolate::Test
 
     v = [Gem.ruby_engine, RbConfig::CONFIG["ruby_version"]].join "-"
     s = sandbox :multiruby => true
-    p = File.expand_path("tmp/isolate/#{v}")
+    p = File.expand_path("tmp/test/#{v}")
 
     assert_equal p, s.path
 
-    s = sandbox :path => "tmp/isolate/#{v}", :multiruby => false
+    s = sandbox :path => "tmp/test/#{v}", :multiruby => false
     assert_equal p, s.path
   end
 
@@ -261,15 +324,27 @@ class TestIsolateSandbox < Isolate::Test
       "#{name} is NOT a loaded gemspec, and it should be!"
   end
 
-  def sandbox *args, &block
-    opts = {
+  def sandbox opts = {}, &block
+    defaults = {
       :install   => false,
       :system    => false,
       :verbose   => false,
       :multiruby => false
     }
 
-    opts.merge! args.pop if Hash === args.last
-    Isolate::Sandbox.new opts, &block
+    Isolate::Sandbox.new defaults.merge(opts), &block
+  end
+
+  def with_env_setup
+    old_gem_path = ENV["GEM_PATH"]
+    old_gem_home = ENV["GEM_HOME"]
+    ENV["GEM_HOME"] = "test/fixtures/with-hoe"
+    ENV["GEM_PATH"] = "test/fixtures/system"
+    Gem.refresh
+
+    yield
+  ensure
+    ENV["GEM_PATH"] = old_gem_path
+    ENV["GEM_HOME"] = old_gem_home
   end
 end

metadata

@@ -1,85 +1,151 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 3
+  prerelease: 
   segments: 
   - 3
   - 1
   - 0
-  - pre
-  - 3
-  version: 3.1.0.pre.3
+  version: 3.1.0
 platform: ruby
 authors: 
 - John Barnette
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2010-10-22 00:00:00 -07:00
-default_executable: 
+date: 2011-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe-doofus
+  name: hoe-seattlerb
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">"
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe-git
+  name: minitest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
+        - 2
         - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: "2.1"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: hoe-doofus
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
-        - 7
-        - 2
-        version: 1.7.2
+        - 0
+        - 0
+        version: 1.0.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: hoe-git
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 4
+        - 5
+        version: "4.5"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
-        - 6
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
         - 2
-        version: 2.6.2
+        - 9
+        - 4
+        version: 2.9.4
   type: :development
-  version_requirements: *id004
+  version_requirements: *id007
 description: |-
   Isolate is a very simple RubyGems sandbox. It provides a way to
   express and automatically install your project's Gem dependencies.
@@ -96,18 +162,14 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .autotest
-- .rvmrc
 - CHANGELOG.rdoc
-- Isolate
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - lib/hoe/isolate.rb
 - lib/isolate.rb
-- lib/isolate/completely.rb
 - lib/isolate/entry.rb
 - lib/isolate/events.rb
-- lib/isolate/installer.rb
 - lib/isolate/now.rb
 - lib/isolate/rake.rb
 - lib/isolate/sandbox.rb
@@ -115,6 +177,7 @@ files:
 - test/fixtures/isolate.rb
 - test/fixtures/override.rb
 - test/fixtures/override.rb.local
+- test/fixtures/system/specifications/rcov-0.9.9.gemspec
 - test/fixtures/with-hoe/specifications/hoe-2.3.3.gemspec
 - test/fixtures/with-hoe/specifications/rake-0.8.7.gemspec
 - test/fixtures/with-hoe/specifications/rubyforge-1.0.4.gemspec
@@ -123,7 +186,7 @@ files:
 - test/test_isolate_entry.rb
 - test/test_isolate_events.rb
 - test/test_isolate_sandbox.rb
-has_rdoc: true
+- .gemtest
 homepage: http://github.com/jbarnette/isolate
 licenses: []
 
@@ -138,25 +201,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 8
-      - 6
-      version: 1.8.6
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 51
       segments: 
       - 1
-      - 3
-      - 6
-      version: 1.3.6
+      - 8
+      - 2
+      version: 1.8.2
 requirements: []
 
 rubyforge_project: isolate
-rubygems_version: 1.3.7
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Isolate is a very simple RubyGems sandbox

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm_gemset_create_on_use_flag=1
-rvm ruby-1.9.2@isolate

data/Isolate

@@ -1,5 +0,0 @@
-env :development do
-  gem "hoe-doofus", "1.0.0"
-  gem "hoe-git",    "1.3.0"
-  gem "minitest",   "1.7.2"
-end

data/lib/isolate/completely.rb

@@ -1,4 +0,0 @@
-require "isolate"
-require "isolate/rake" if defined?(Rake)
-
-Isolate.now! :system => false

data/lib/isolate/installer.rb

@@ -1,15 +0,0 @@
-require "rubygems/dependency_installer"
-
-module Isolate
-  class Installer < Gem::DependencyInstaller
-    def initialize sandbox
-      super :development => false,
-        :generate_rdoc   => false,
-        :generate_ri     => false,
-        :install_dir     => sandbox.path
-
-      # reset super's use of sandbox.path exclusively
-      @source_index = Gem.source_index
-    end
-  end
-end