tmptation 1.2 → 1.3

data/README.md

@@ -5,8 +5,8 @@ directories. Especially useful for use in tests.
 
 Features
 --------
-* garbage collection of all created tmp files and dirs
-* safe deletion - will refuse to delete non-tmp paths (where tmp within `Dir.tmpdir`)
+* easy garbage collection of all created tmp files and dirs with `.delete_all`
+* safe deletion - will refuse to delete non-tmp paths (as determined by `Dir.tmpdir`)
 
 Examples
 --------
@@ -42,7 +42,7 @@ They might be useful on their own. See the inline docs for more details.
 Protip
 ------
 
-If you use Tmptation in specs, add `TmpFile.delete_all` and `TmpDir.delete_all`
+If you use Tmptation in tests, add `TmpFile.delete_all` and `TmpDir.delete_all`
 to your global teardown method:
 
     class MiniTest::Unit::TestCase

data/lib/tmptation.rb

@@ -4,7 +4,7 @@ require 'tmpdir'
 require 'fileutils'
 
 module Tmptation
-  VERSION = 1.2
+  VERSION = 1.3
 
   # Adds a #safe_delete method that will delete the object's associated path
   # (either #path or #to_s, if it exists) only if it lives within the system's
@@ -168,7 +168,12 @@ module Tmptation
     #   prefix of directory name
     #
     def initialize(prefix='TmpDir-')
-      super(Pathname(Dir.mktmpdir(prefix)).expand_path)
+      # The `caller` lookup is used to determine if `::new` is being called
+      # from within `Pathname`. This is necessary since many `Pathname` methods
+      # call `self.class.new` internally, and these calls shouldn't create a
+      # new tmp dir. Not the cleanest approach, but allows keeping a simple and
+      # clean api.
+      caller[1].match(/pathname\.rb/) ? super : super(Pathname(Dir.mktmpdir(prefix)).expand_path)
     end
   end
 end

data/test/tmptation_test.rb

@@ -284,5 +284,18 @@ describe Tmptation::TmpDir do
       foo.rmdir if foo.exist?
     end
   end
+
+  it "should preserve existing Pathname behaviour" do
+    begin
+      foo = TmpDir.new('prefix-')
+
+      assert_equal Dir.tmpdir, foo.dirname.to_s
+      assert_match /^\//, foo.expand_path
+      assert_match /^\.\./, foo.relative_path_from(Pathname(Dir.pwd))
+      assert_match /^prefix-/, foo.basename
+    ensure
+      foo.rmdir if foo.exist?
+    end
+  end
 end
 

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Martin Aumont
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -07:00
+date: 2010-11-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency