nobu	2009-11-11 19:17:36 +0900 (Wed, 11 Nov 2009)

  New Revision: 25720

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25720

  Log:
    * lib/tempfile.rb (Tempfile#initialize): merge mode option.
    
    * lib/tmpdir.rb (Dir::Tmpname#create): splat options.

  Modified files:
    trunk/ChangeLog
    trunk/lib/tempfile.rb
    trunk/lib/tmpdir.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25719)
+++ ChangeLog	(revision 25720)
@@ -1,3 +1,9 @@
+Wed Nov 11 19:17:35 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/tempfile.rb (Tempfile#initialize): merge mode option.
+
+	* lib/tmpdir.rb (Dir::Tmpname#create): splat options.
+
 Wed Nov 11 12:54:02 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* hash.c (ruby_setenv): use ruby_strdup().
Index: lib/tempfile.rb
===================================================================
--- lib/tempfile.rb	(revision 25719)
+++ lib/tempfile.rb	(revision 25720)
@@ -133,9 +133,11 @@
 
     create(basename, *rest) do |tmpname, n, opts|
       lock = tmpname + '.lock'
+      mode = opts.delete(:mode) || 0
+      mode = File::RDWR|File::CREAT|File::EXCL|mode
       self.class.mkdir(lock)
       begin
-        @data[1] = @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600, *opts)
+        @data[1] = @tmpfile = File.open(tmpname, mode, 0600, *opts)
         @data[0] = @tmpname = tmpname
       ensure
         self.class.rmdir(lock)
Index: lib/tmpdir.rb
===================================================================
--- lib/tmpdir.rb	(revision 25719)
+++ lib/tmpdir.rb	(revision 25720)
@@ -152,7 +152,7 @@
       n = nil
       begin
         path = File.expand_path(make_tmpname(basename, n), tmpdir)
-        yield(path, n, opts)
+        yield(path, n, *opts)
       rescue Errno::EEXIST
         n ||= 0
         n += 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/