ruby-changes:1638
From: ko1@a...
Date: 21 Aug 2007 21:15:47 +0900
Subject: [ruby-changes:1638] akr - Ruby:r13129 (ruby_1_8, trunk): * lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
akr 2007-08-21 21:15:34 +0900 (Tue, 21 Aug 2007)
New Revision: 13129
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/lib/tmpdir.rb
trunk/ChangeLog
trunk/lib/tmpdir.rb
Log:
* lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/tmpdir.rb?r1=13129&r2=13128
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13129&r2=13128
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13129&r2=13128
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/tmpdir.rb?r1=13129&r2=13128
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13128)
+++ ChangeLog (revision 13129)
@@ -1,3 +1,7 @@
+Tue Aug 21 21:09:48 2007 Tanaka Akira <akr@f...>
+
+ * lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
+
Tue Aug 21 15:00:23 2007 Koichi Sasada <ko1@a...>
* st.c (st_clear): reset num_entries too.
Index: lib/tmpdir.rb
===================================================================
--- lib/tmpdir.rb (revision 13128)
+++ lib/tmpdir.rb (revision 13129)
@@ -48,14 +48,23 @@
# Dir.mktmpdir creates a temporary directory.
#
# The directory is created with 0700 permission.
- # The name of the directory is prefixed
- # with <i>prefix</i> argument.
- # If <i>prefix</i> is not given,
- # the prefix "d" is used.
#
+ # The prefix and suffix of the name of the directory is specified by
+ # the optional first argument, <i>prefix_suffix</i>.
+ # - If it is not specified or nil, "d" is used as the prefix and no suffix is used.
+ # - If it is a string, it is used as the prefix and no suffix is used.
+ # - If it is an array, first element is used as the prefix and second element is used as a suffix.
+ #
+ # Dir.mktmpdir {|dir| dir is ".../d..." }
+ # Dir.mktmpdir("foo") {|dir| dir is ".../foo..." }
+ # Dir.mktmpdir(["foo", "bar"]) {|dir| path is ".../foo...bar" }
+ #
# The directory is created under Dir.tmpdir or
# the optional second argument <i>tmpdir</i> if non-nil value is given.
#
+ # Dir.mktmpdir {|dir| dir is "#{Dir.tmpdir}/d..." }
+ # Dir.mktmpdir(nil, "/var/tmp") {|dir| dir is "/var/tmp/d..." }
+ #
# If a block is given,
# it is yielded with the path of the directory.
# The directory and its contents are removed
@@ -80,13 +89,27 @@
# FileUtils.remove_entry_secure dir
# end
#
- def Dir.mktmpdir(prefix="d", tmpdir=nil)
+ def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+ case prefix_suffix
+ when nil
+ prefix = "d"
+ suffix = ""
+ when String
+ prefix = prefix_suffix
+ suffix = ""
+ when Array
+ prefix = prefix_suffix[0]
+ suffix = prefix_suffix[1]
+ else
+ raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+ end
tmpdir ||= Dir.tmpdir
t = Time.now.strftime("%Y%m%d")
n = nil
begin
path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
path << "-#{n}" if n
+ path << suffix
Dir.mkdir(path, 0700)
rescue Errno::EEXIST
n ||= 0
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 13128)
+++ ruby_1_8/ChangeLog (revision 13129)
@@ -1,3 +1,7 @@
+Tue Aug 21 21:09:48 2007 Tanaka Akira <akr@f...>
+
+ * lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
+
Tue Aug 21 13:57:04 2007 Nobuyoshi Nakada <nobu@r...>
* hash.c (st_foreach_func, rb_foreach_func): typedefed.
Index: ruby_1_8/lib/tmpdir.rb
===================================================================
--- ruby_1_8/lib/tmpdir.rb (revision 13128)
+++ ruby_1_8/lib/tmpdir.rb (revision 13129)
@@ -48,14 +48,23 @@
# Dir.mktmpdir creates a temporary directory.
#
# The directory is created with 0700 permission.
- # The name of the directory is prefixed
- # with <i>prefix</i> argument.
- # If <i>prefix</i> is not given,
- # the prefix "d" is used.
#
+ # The prefix and suffix of the name of the directory is specified by
+ # the optional first argument, <i>prefix_suffix</i>.
+ # - If it is not specified or nil, "d" is used as the prefix and no suffix is used.
+ # - If it is a string, it is used as the prefix and no suffix is used.
+ # - If it is an array, first element is used as the prefix and second element is used as a suffix.
+ #
+ # Dir.mktmpdir {|dir| dir is ".../d..." }
+ # Dir.mktmpdir("foo") {|dir| dir is ".../foo..." }
+ # Dir.mktmpdir(["foo", "bar"]) {|dir| path is ".../foo...bar" }
+ #
# The directory is created under Dir.tmpdir or
# the optional second argument <i>tmpdir</i> if non-nil value is given.
#
+ # Dir.mktmpdir {|dir| dir is "#{Dir.tmpdir}/d..." }
+ # Dir.mktmpdir(nil, "/var/tmp") {|dir| dir is "/var/tmp/d..." }
+ #
# If a block is given,
# it is yielded with the path of the directory.
# The directory and its contents are removed
@@ -80,13 +89,27 @@
# FileUtils.remove_entry_secure dir
# end
#
- def Dir.mktmpdir(prefix="d", tmpdir=nil)
+ def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+ case prefix_suffix
+ when nil
+ prefix = "d"
+ suffix = ""
+ when String
+ prefix = prefix_suffix
+ suffix = ""
+ when Array
+ prefix = prefix_suffix[0]
+ suffix = prefix_suffix[1]
+ else
+ raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+ end
tmpdir ||= Dir.tmpdir
t = Time.now.strftime("%Y%m%d")
n = nil
begin
path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
path << "-#{n}" if n
+ path << suffix
Dir.mkdir(path, 0700)
rescue Errno::EEXIST
n ||= 0
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml