isolate 1.0.1 → 1.0.2

data/CHANGELOG.rdoc

@@ -1,8 +1,17 @@
-=== 1.0.0 / 2009-09-21
+=== 1.0.2 / 2009-09-21
 
-* Birthday!
+* Fix some README typos.
+* Add Entry#matches? to encapsulate activation and installation decisions.
+* Remove block form of Isolate#enable, it's unused.
+* Properly instance_eval Isolate#environment blocks.
+* Reset stubs properly after tests (Random test order FTFW).
 
 === 1.0.1 / 2009-09-21
 
 * Doco updates. [Review by Evan]
 * Don't modify Entry#options on install. [Review by Evan]
+
+=== 1.0.0 / 2009-09-21
+
+* Birthday!
+

data/README.rdoc

@@ -30,7 +30,7 @@ YMMV, but I haven't tried Isolate with anything older than RubyGems
 
 === Defining Your Isolated Environment
 
-It'spretty easy: <tt>gem</tt> is similar to RubyGems' method of the
+It's pretty easy: <tt>gem</tt> is similar to RubyGems' method of the
 same name. Version specifiers are optional, and any hash args tacked
 on to the end are passed through to Gem::DependencyInstaller as flags.
 

data/lib/isolate.rb

@@ -6,8 +6,15 @@ require "rubygems/requirement"
 # rationale, limitations, and examples.
 
 class Isolate
-  Entry   = Struct.new :name, :requirement, :environments,  :options # :nodoc:
-  VERSION = "1.0.1" # :nodoc:
+
+  # :nodoc:
+  class Entry < Struct.new(:name, :requirement, :environments, :options)
+    def matches? environment
+      environments.empty? || environments.include?(environment)
+    end
+  end
+
+  VERSION = "1.0.2" # :nodoc:
 
   attr_reader :entries # :nodoc:
 
@@ -70,9 +77,7 @@ class Isolate
     install environment if install?
 
     entries.each do |e|
-      if e.environments.empty? || e.environments.include?(env)
-        Gem.activate e.name, *e.requirement.as_list
-      end
+      Gem.activate e.name, *e.requirement.as_list if e.matches? env
     end
 
     self
@@ -93,7 +98,7 @@ class Isolate
     self
   end
 
-  def enable &block # :nodoc:
+  def enable # :nodoc:
     return self if enabled?
 
     @old_gem_path  = ENV["GEM_PATH"]
@@ -113,7 +118,6 @@ class Isolate
     self.class.refresh
 
     @enabled = true
-    begin; yield; ensure disable end if block_given?
     self
   end
 
@@ -128,7 +132,7 @@ class Isolate
     @environments.concat environments.map { |e| e.to_s }
 
     begin
-      yield
+      instance_eval(&block)
     ensure
       @environments = old
     end
@@ -155,8 +159,7 @@ class Isolate
     env = environment.to_s if environment
 
     installable = entries.select do |e|
-      !Gem.available?(e.name, *e.requirement.as_list) &&
-        (env.nil? || e.environments.include?(env))
+      !Gem.available?(e.name, *e.requirement.as_list) && e.matches?(env)
     end
 
     installable.each_with_index do |e, i|

data/test/test_isolate.rb

@@ -11,6 +11,7 @@ class TestIsolate < MiniTest::Unit::TestCase
   def teardown
     @isolate.disable
     Isolate.instance.disable if Isolate.instance
+    Gem::DependencyInstaller.reset_last_install
     FileUtils.rm_rf "tmp/gems"
   end
 
@@ -42,7 +43,7 @@ class TestIsolate < MiniTest::Unit::TestCase
     @isolate.gem "rubyforge"
 
     @isolate.environment "borg" do
-      @isolate.gem "hoe"
+      gem "hoe"
     end
 
     @isolate.activate
@@ -56,7 +57,7 @@ class TestIsolate < MiniTest::Unit::TestCase
     @isolate.gem "rubyforge"
 
     @isolate.environment "borg" do
-      @isolate.gem "hoe"
+      gem "hoe"
     end
 
     @isolate.activate "borg"
@@ -76,6 +77,14 @@ class TestIsolate < MiniTest::Unit::TestCase
       Gem::DependencyInstaller.last_install
   end
 
+  def test_activate_install_environment
+    @isolate = Isolate.new "tmp/gems", :install => true
+    @isolate.environment(:nope) { gem "foo" }
+
+    @isolate.activate
+    assert_nil Gem::DependencyInstaller.last_install
+  end
+
   def test_activate_ret
     assert_equal @isolate, @isolate.activate
   end
@@ -117,17 +126,6 @@ class TestIsolate < MiniTest::Unit::TestCase
     assert_equal [@isolate.path], Gem.path
   end
 
-  def test_enable_block
-    path = Gem.path.dup
-    refute_equal [@isolate.path], Gem.path
-
-    @isolate.enable do
-      assert_equal [@isolate.path], Gem.path
-    end
-
-    assert_equal path, Gem.path
-  end
-
   def test_enable_ret
     assert_equal @isolate, @isolate.enable
   end
@@ -136,10 +134,10 @@ class TestIsolate < MiniTest::Unit::TestCase
     @isolate.gem "none"
 
     @isolate.environment "test", "ci" do
-      @isolate.gem "test-ci"
+      gem "test-ci"
 
-      @isolate.environment "production" do
-        @isolate.gem "test-ci-production"
+      environment "production" do
+        gem "test-ci-production"
       end
     end
 
@@ -188,6 +186,7 @@ end
 class Gem::DependencyInstaller
   @@last_install = nil
   def self.last_install; @@last_install end
+  def self.reset_last_install; @@last_install = nil end
 
   alias old_install install
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - John Barnette