isolate 1.6.1 → 1.7.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 1.7.0 / 2009-12-07
+
+* Activate gems even in passthrough mode.
+* hoe/isolate cleans up by default.
+* Isolate#activate cleans up. Isolate.activate is a simple front-end.
+
 === 1.6.1 / 2009-10-04
 
 * Simplify subshells.

data/lib/hoe/isolate.rb

@@ -28,10 +28,9 @@ class Hoe # :nodoc:
       self.isolate_dir ||= "tmp/gems"
     end
 
-    def define_isolate_tasks # :nodoc:
-      i = ::Isolate.new self.isolate_dir
+    def define_isolate_tasks # HACK
+      i = ::Isolate.new self.isolate_dir, :cleanup => true
 
-      # TODO: consider sneakily adding test lib deps if they don't exist
       (self.extra_deps + self.extra_dev_deps).each do |name, version|
         i.gem name, *Array(version)
       end

data/lib/isolate.rb

@@ -21,10 +21,9 @@ class Isolate
     end
   end
 
-  VERSION = "1.6.1" # :nodoc:
+  VERSION = "1.7.0" # :nodoc:
 
   attr_reader :entries # :nodoc:
-
   attr_reader :path # :nodoc:
 
   # Activate (and possibly install) gems for a specific
@@ -33,7 +32,6 @@ class Isolate
 
   def self.activate environment
     instance.activate environment
-    instance.cleanup if instance.cleanup?
   end
 
   # Declare an isolated RubyGems environment, installed in +path+. The
@@ -82,7 +80,6 @@ class Isolate
   end
 
   def activate environment = nil # :nodoc:
-    return self if passthrough?
     enable unless enabled?
 
     env = environment.to_s if environment
@@ -92,6 +89,8 @@ class Isolate
       Gem.activate e.name, *e.requirement.as_list if e.matches? env
     end
 
+    cleanup if cleanup?
+
     self
   end
 
@@ -126,8 +125,7 @@ class Isolate
   end
 
   def disable # :nodoc:
-    return self if passthrough?
-    return self unless enabled?
+    return self if passthrough? or not enabled?
 
     ENV["GEM_PATH"] = @old_gem_path
     ENV["GEM_HOME"] = @old_gem_home
@@ -139,11 +137,12 @@ class Isolate
     @enabled = false
 
     self.class.refresh
+
     self
   end
 
   def enable # :nodoc:
-    return self if passthrough? || enabled?
+    return self if passthrough? or enabled?
 
     @old_gem_path  = ENV["GEM_PATH"]
     @old_gem_home  = ENV["GEM_HOME"]
@@ -169,6 +168,7 @@ class Isolate
     self.class.refresh
 
     @enabled = true
+
     self
   end
 
@@ -197,17 +197,14 @@ class Isolate
     requirement = if requirements.empty? then
                     Gem::Requirement.default
                   else
-                    Gem::Requirement.new(requirements)
+                    Gem::Requirement.new requirements
                   end
 
     entry = Entry.new name, requirement, @environments,  options
 
     entries << entry
-    entry
-  end
 
-  def log s
-    $stderr.puts s if verbose?
+    entry
   end
 
   def install environment = nil # :nodoc:
@@ -243,6 +240,7 @@ class Isolate
     end
 
     Gem.source_index.refresh!
+
     self
   end
 
@@ -250,6 +248,10 @@ class Isolate
     @install
   end
 
+  def log s # :nodoc:
+    $stderr.puts s if verbose?
+  end
+
   def passthrough &block # :nodoc:
     @passthrough = yield
   end

data/test/test_isolate.rb

@@ -42,7 +42,7 @@ class TestIsolate < MiniTest::Unit::TestCase
   end
 
   def test_activate_environment
-    @isolate = Isolate.new WITH_HOE
+    @isolate = Isolate.new WITH_HOE, :verbose => false
     @isolate.gem "rubyforge"
 
     @isolate.environment "borg" do
@@ -99,7 +99,6 @@ class TestIsolate < MiniTest::Unit::TestCase
     @isolate = Isolate.new WITH_HOE, :verbose => false
     # no gems specified on purpose
     @isolate.activate
-    @isolate.cleanup
 
     expected = [["hoe",       "2.3.3", WITH_HOE],
                 ["rake",      "0.8.7", WITH_HOE],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors: 
 - John Barnette
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 -07:00
+date: 2009-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency