tmptation 1.1 → 1.2

data/lib/tmptation.rb

@@ -4,7 +4,7 @@ require 'tmpdir'
 require 'fileutils'
 
 module Tmptation
-  VERSION = 1.1
+  VERSION = 1.2
 
   # 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
@@ -45,6 +45,8 @@ module Tmptation
         raise UnsafeDelete.new("refusing to remove non-tmp directory '#{path}'")
       end
       FileUtils.remove_entry_secure(path.to_s)
+    rescue Errno::ENOENT
+      # noop
     end
   end
 
@@ -111,6 +113,7 @@ module Tmptation
           instance.safe_delete
           instance.close
         end
+        instances.clear
       end
       alias -@ delete_all
     end
@@ -156,6 +159,7 @@ module Tmptation
       # Safe deletes and closes all instances
       def delete_all
         instances.each {|instance| instance.safe_delete }
+        instances.clear
       end
       alias -@ delete_all
     end

data/test/tmptation_test.rb

@@ -67,6 +67,14 @@ describe Tmptation::SafeDeletable do
     end
   end
 
+  it "should handle nonexistent entries" do
+    dir = Pathname(Dir.tmpdir).join("nonexistentdir-#{Time.now.to_f}")
+    dir.extend(SafeDeletable)
+
+    refute dir.exist?
+    dir.safe_delete #refute raises
+  end
+
   it "should use an object's #path if it exists" do
     begin
       file = Tempfile.new('safe_deletable')
@@ -187,6 +195,18 @@ describe Tmptation::TmpFile do
       foo.delete if foo.path.exist?
     end
   end
+
+  it "should clear the instance references" do
+    begin
+      foo = TmpFile.new
+      assert_equal [foo], TmpFile.instances
+
+      TmpFile.delete_all
+      assert_empty TmpFile.instances
+    ensure
+      foo.delete if foo.path.exist?
+    end
+  end
 end
 
 describe Tmptation::TmpDir do
@@ -252,5 +272,17 @@ describe Tmptation::TmpDir do
       foo.rmdir if foo.exist?
     end
   end
+
+  it "should clear the instance references" do
+    begin
+      foo = TmpDir.new
+      assert_equal [foo], TmpDir.instances
+
+      TmpDir.delete_all
+      assert_empty TmpDir.instances
+    ensure
+      foo.rmdir if foo.exist?
+    end
+  end
 end
 

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  version: "1.1"
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Martin Aumont