isolate 2.0.0.pre.0 → 2.0.0.pre.1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 2.0.0.pre.1 / 2010-05-02
+
+* Don't provide a special way to set path, options is enough.
+* Deprecate and warn for Isolate.instance.
+* Allow :multiruby option to be overridden in .local files.
+
 === 2.0.0.pre.0 / 2010-04-27
 
 * Remove cache thawing until I fix RubyGems.

data/lib/isolate.rb

@@ -8,7 +8,7 @@ module Isolate
 
   # Duh.
 
-  VERSION = "2.0.0.pre.0"
+  VERSION = "2.0.0.pre.1"
 
   # Disable Isolate. If a block is provided, isolation will be
   # disabled for the scope of the block.
@@ -28,6 +28,13 @@ module Isolate
     now! options.merge(:path => path), &block
   end
 
+  def self.instance
+    warn "Isolate.instance is deprecated, use Isolate.sandbox instead.\n" +
+         "Isolate.instance will be removed in v3.0."
+
+    sandbox
+  end
+
   @@sandbox = nil
 
   def self.sandbox

data/lib/isolate/sandbox.rb

@@ -1,6 +1,7 @@
 require "fileutils"
 require "isolate/entry"
 require "rbconfig"
+require "rubygems/defaults"
 require "rubygems/uninstaller"
 
 module Isolate
@@ -19,8 +20,6 @@ module Isolate
       @files        = []
       @options      = options
 
-      path options.fetch(:path, "tmp/isolate")
-
       file, local = nil
 
       unless FalseClass === options[:file]
@@ -225,24 +224,21 @@ module Isolate
     def multiruby?
       @options.fetch :multiruby, true
     end
+
     def options options = nil
       @options.merge! options if options
       @options
     end
 
-    def path path = nil
-      if path
-        unless @options.key?(:multiruby) && @options[:multiruby] == false
-          suffix = RbConfig::CONFIG.
-            values_at("ruby_install_name", "ruby_version").join "-"
-
-          path = File.join(path, suffix) unless path =~ /#{suffix}/
-        end
+    def path
+      base = @options.fetch :path, "tmp/isolate"
 
-        @path = File.expand_path path
+      unless @options.key?(:multiruby) && @options[:multiruby] == false
+        suffix = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
+        base   = File.join(base, suffix) unless base =~ /#{suffix}/
       end
 
-      @path
+      File.expand_path base
     end
 
     def system?

data/test/test_isolate_sandbox.rb

@@ -236,12 +236,12 @@ class TestIsolateSandbox < Isolate::Test
 
   def test_path
     s = sandbox :multiruby => false do
-      path "tmp/foo"
+      options :path => "tmp/foo"
     end
 
     assert_equal File.expand_path("tmp/foo"), s.path
 
-    v = RbConfig::CONFIG.values_at("ruby_install_name", "ruby_version").join "-"
+    v = [Gem.ruby_engine, RbConfig::CONFIG["ruby_version"]].join "-"
     s = sandbox :multiruby => true
     p = File.expand_path("tmp/isolate/#{v}")
 

metadata

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