* lib/tempfile.rb (Tempfile.{lock,unlock}_tempfile): refactor.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 14 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ee09123e1..667859bcff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 25 07:12:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile.{lock,unlock}_tempfile): refactor.
+
 Tue May 24 17:30:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* spec/README: fix typo.
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 7191cdd654..94dd0ce532 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -132,7 +132,6 @@ class Tempfile < DelegateClass(File)
     ObjectSpace.define_finalizer(self, @clean_proc)
 
     create(basename, *rest) do |tmpname, n, opts|
-      lock = tmpname + '.lock'
       mode = File::RDWR|File::CREAT|File::EXCL
       perm = 0600
       if opts
@@ -142,12 +141,12 @@ class Tempfile < DelegateClass(File)
       else
         opts = perm
       end
-      self.class.mkdir(lock)
+      lock = self.class.lock_tempfile(tmpname)
       begin
         @data[1] = @tmpfile = File.open(tmpname, mode, opts)
         @data[0] = @tmpname = tmpname
       ensure
-        self.class.rmdir(lock)
+        self.class.unlock_tempfile(lock)
       end
       @mode = mode & ~(File::CREAT|File::EXCL)
       perm or opts.freeze
@@ -328,12 +327,16 @@ class Tempfile < DelegateClass(File)
 
     # :stopdoc:
 
-    def mkdir(*args)
-      Dir.mkdir(*args)
+    # makes lock for +tmpname+ and returns the lock.
+    def lock_tempfile(tmpname)
+      lock = tmpname + '.lock'
+      Dir.mkdir(lock)
+      lock
     end
 
-    def rmdir(*args)
-      Dir.rmdir(*args)
+    # unlock the lock made by _lock_tempfile_.
+    def unlock_tempfile(lock)
+      Dir.rmdir(lock)
     end
   end
 end