summaryrefslogtreecommitdiff
path: root/lib/tempfile.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-24 22:12:20 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-24 22:12:20 +0000
commit9a7e295255a22d3c99f6358a26d7b849a94cf7f3 (patch)
treeec6b09346886734e389b373ec84de3aa7c0a5bbd /lib/tempfile.rb
parent18684395c6a05319f617f975f87c9b31b4a6d74a (diff)
* 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
Diffstat (limited to 'lib/tempfile.rb')
-rw-r--r--lib/tempfile.rb17
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 7191cdd..94dd0ce 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