isolate 3.0.1 → 3.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+=== 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:

data/lib/isolate.rb

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

data/lib/isolate/sandbox.rb

@@ -90,6 +90,9 @@ module Isolate
       legit     = legitimize!
       extra     = installed - legit
 
+      gem_dir = Gem.dir
+      extra.reject! { |s| s.base_dir != gem_dir }
+
       unless extra.empty?
         padding = Math.log10(extra.size).to_i + 1
         format  = "[%0#{padding}d/%s] Nuking %s."
@@ -103,7 +106,7 @@ module Isolate
                                    :version     => e.version,
                                    :ignore      => true,
                                    :executables => true,
-                                   :install_dir => path)
+                                   :install_dir => e.base_dir)
             uninstaller.uninstall
           end
         end
@@ -172,8 +175,11 @@ module Isolate
 
       ENV["ISOLATED"] = path
 
+      if system? then
+        Gem.path.unshift path # HACK: this is just wrong!
+        Gem.path.uniq!        # HACK: needed for the previous line :(
+      end
       Isolate.refresh
-      Gem.path.unshift path if system?
 
       @enabled = true
       fire :enabled

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,18 +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
+  def test_cleanup_all
+    with_env_setup do
+      s = sandbox :path => WITH_HOE, :install => true, :cleanup => true
 
-    assert_silent do
-      s.activate # no gems on purpose
+      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
+    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)
 
-    expected = [["hoe",       "2.3.3", WITH_HOE],
-                ["rake",      "0.8.7", WITH_HOE],
-                ["rubyforge", "1.0.4", WITH_HOE]]
+      s.gem "rake", "0.8.7"
 
-    assert_equal expected, Gem::Uninstaller.value
+      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
@@ -204,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
 
@@ -266,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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - John Barnette
@@ -37,7 +37,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-05-13 00:00:00 Z
+date: 2011-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest