file-temp 1.1.5 → 1.2.0

data/CHANGES

@@ -1,43 +1,50 @@
-= 1.1.5 - 17-Jul-2011
-* Now stores file path information if the file is retained on the filesystem.
-  Thanks go to joerixaop for the patch.
-* The TMPDIR fallback determination on Windows is no longer hard coded.
-
-= 1.1.4 - 16-Sep-2010
-* The File::Temp.temp_name method has been altered on Unix systems. It
-  no longer prefixes TMPDIR to the name since it was redundant and could
-  generate a bogus path.
-* Set the license to Artistic 2.0.
-* Set the test task as the default Rake task.
-
-= 1.1.3 - 14-Sep-2010
-* Fixed potential libc linker failure.
-
-= 1.1.2 - 28-Apr-2010
-* Explicitly link against libc for Unix versions.
-* Refactored the Rakefile. An old install task was removed and the gem
-  related tasks were placed under the 'gem' namespace.
-
-= 1.1.1 - 24-Oct-2009
-* Removed the 'use' library as a dependency.
-
-= 1.1.0 - 21-Oct-2009
-* Now pure Ruby, using FFI.
-* Fixed RF Bug #26757 - FILE pointer leak. Thanks go to Eric Wong for the spot.
-* Renamed and refactored the test file slightly.
-* Updated the gemspec.
-
-= 1.0.0 - 12-Apr-2008
-* Added security via umask().
-* Version bump to 1.0.0.
-
-= 0.1.2 - 6-Jun-2007
-* Gemspec fix (forgot the temp.h file - oops).
-* Added an extra test.
- 
-= 0.1.1 - 2-Jun-2007
-* Core code and test case now work properly on MS Windows.
-* Now uses MS VC++ 8 functions when available (tmpfile_s, _sopen_s).
-
-= 0.1.0 - 1-Jun-2007
-* Initial release.
+= 1.2.0 - 10-Apr-2012
+* Removed the old FileTemp alias for File::Temp. It was deprecated and
+  has now been officially removed.
+* Some refactoring of the custom internal Windows functions.
+* Nicer error handling if certain FFI functions fail.
+* Made the FFI functions private.
+
+= 1.1.5 - 17-Jul-2011
+* Now stores file path information if the file is retained on the filesystem.
+  Thanks go to joerixaop for the patch.
+* The TMPDIR fallback determination on Windows is no longer hard coded.
+
+= 1.1.4 - 16-Sep-2010
+* The File::Temp.temp_name method has been altered on Unix systems. It
+  no longer prefixes TMPDIR to the name since it was redundant and could
+  generate a bogus path.
+* Set the license to Artistic 2.0.
+* Set the test task as the default Rake task.
+
+= 1.1.3 - 14-Sep-2010
+* Fixed potential libc linker failure.
+
+= 1.1.2 - 28-Apr-2010
+* Explicitly link against libc for Unix versions.
+* Refactored the Rakefile. An old install task was removed and the gem
+  related tasks were placed under the 'gem' namespace.
+
+= 1.1.1 - 24-Oct-2009
+* Removed the 'use' library as a dependency.
+
+= 1.1.0 - 21-Oct-2009
+* Now pure Ruby, using FFI.
+* Fixed RF Bug #26757 - FILE pointer leak. Thanks go to Eric Wong for the spot.
+* Renamed and refactored the test file slightly.
+* Updated the gemspec.
+
+= 1.0.0 - 12-Apr-2008
+* Added security via umask().
+* Version bump to 1.0.0.
+
+= 0.1.2 - 6-Jun-2007
+* Gemspec fix (forgot the temp.h file - oops).
+* Added an extra test.
+ 
+= 0.1.1 - 2-Jun-2007
+* Core code and test case now work properly on MS Windows.
+* Now uses MS VC++ 8 functions when available (tmpfile_s, _sopen_s).
+
+= 0.1.0 - 1-Jun-2007
+* Initial release.

data/MANIFEST

@@ -1,7 +1,7 @@
-* CHANGES
-* MANIFEST
-* README
-* Rakefile
-* file-temp.gemspec
-* lib/file/temp.rb
+* CHANGES
+* MANIFEST
+* README
+* Rakefile
+* file-temp.gemspec
+* lib/file/temp.rb
 * test/test_file_temp.rb

data/README

@@ -1,61 +1,56 @@
-== Description
-   The file-temp library is an alternate way to handle tempfile generation.
-
-== Requirements
-   ffi 0.5.0 or later
-
-== Synopsis
-   require 'file/temp'
-
-   fh = File::Temp.new
-   fh.puts "hello"
-   fh.close # => Tempfile automatically deleted
-
-   fh = File::Temp.new(false)
-   fh.puts "world"
-   fh.close # => Tempfile still on your filesystem
-
-== Installation
-=== Rubygems
-   gem install file-temp
-   
-=== Standard Installation
-   rake test (optional)
-   rake install
-
-== Motivation
-   Ruby's tempfile.rb is overwrought and susceptible to race conditions. This
-   This library uses your system's native tmpfile() or mkstemp() functions
-   instead of trying to handle race conditions manually via pure Ruby.
-   
-   This library is also more secure because it restricts file permission via
-   umask() for files created with mkstemp().
-
-   Finally, this library subclasses the File class. This means you get almost
-   exactly the same interface as the File class. The only difference is the
-   constructor.
-
-== JRuby
-   As of JRuby 1.4.0 this library will not work with JRuby because it does
-   not support low level systems programming.
-
-== MS Windows
-   You may need to use the mingw build in order to use this library.
-
-== License
-   Artistic 2.0
-
-== Copyright
-   (C) 2007-2009 Daniel J. Berger
-   All Rights Reserved
-
-== Warranty
-   This library is provided "as is" and without any express or
-   implied warranties, including, without limitation, the implied
-   warranties of merchantability and fitness for a particular purpose.
-
-== Author
-   Daniel J. Berger
-
-== See also
-   tmpfile(), mkstemp(), tmpnam()
+== Description
+   The file-temp library is an alternate way to handle tempfile generation.
+
+== Requirements
+   ffi 0.5.0 or later
+
+== Installation
+   gem install file-temp
+
+== Synopsis
+   require 'file/temp'
+
+   fh = File::Temp.new
+   fh.puts "hello"
+   fh.close # => Tempfile automatically deleted
+
+   fh = File::Temp.new(false)
+   fh.puts "world"
+   fh.close # => Tempfile still on your filesystem
+
+== Motivation
+   Ruby's tempfile.rb is overwrought and susceptible to race conditions. This
+   This library uses your system's native tmpfile() or mkstemp() functions
+   instead of trying to handle race conditions manually via pure Ruby.
+   
+   This library is also more secure because it restricts file permission via
+   umask() for files created with mkstemp().
+
+   Finally, this library subclasses the File class. This means you get almost
+   exactly the same interface as the File class. The only difference is the
+   constructor.
+
+== JRuby
+   I'm afraid this library will not work with JRuby due to limitations
+   of JRuby itself.
+
+== MS Windows
+   You may need to use the mingw build in order to use this library.
+
+== License
+   Artistic 2.0
+
+== Copyright
+   (C) 2007-2012 Daniel J. Berger
+   All Rights Reserved
+
+== Warranty
+   This library is provided "as is" and without any express or
+   implied warranties, including, without limitation, the implied
+   warranties of merchantability and fitness for a particular purpose.
+
+== Author
+   Daniel J. Berger
+
+== See also
+   tmpfile(), mkstemp(), tmpnam()

data/Rakefile

@@ -1,61 +1,61 @@
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-
-CLEAN.include('**/*.tar', '**/*.zip', '**/*.gz', '**/*.bz2')
-CLEAN.include('**/*.rbc', '**/*.gem')
-
-namespace 'gem' do
-  desc 'Create the file-temp gem'
-  task :create => [:clean] do
-    spec = eval(IO.read('file-temp.gemspec'))
-    Gem::Builder.new(spec).build
-  end
-
-  desc 'Install the file-temp gem'
-  task :install => [:create] do
-     file = Dir["*.gem"].first
-     sh "gem install #{file}"
-  end
-end
-
-# Export the contents of the library to an archive. Note that this requires
-# presence of the .gitattributes file in order to prevent the .git contents
-# from being included.
-#
-# It also appears that I must add a trailing slash to the prefix manually.
-# As of git 1.6.4.3 it does not automaticaly add it, despite what the docs
-# say.
-#
-namespace 'export' do
-  spec = eval(IO.read('file-temp.gemspec'))
-  file = 'file-temp-' + spec.version.to_s
-  pref = file + '/' # Git does not add the trailing slash, despite what the docs say.
-
-  desc 'Export to a .tar.gz file'
-  task :gzip => [:clean] do
-    file += '.tar'
-    sh "git archive --prefix #{pref} --output #{file} master"
-    sh "gzip #{file}"
-  end
-
-  desc 'Export to a .tar.bz2 file'
-  task :bzip2 => [:clean] do
-    file += '.tar'
-    sh "git archive --prefix #{pref} --output #{file} master"
-    sh "bzip2 -f #{file}"
-  end
-
-  desc 'Export to a .zip file'
-  task :zip => [:clean] do
-    file += '.zip'
-    sh "git archive --prefix #{pref} --output #{file} --format zip master"
-  end
-end
-
-Rake::TestTask.new do |t|
-  t.verbose = true
-  t.warning = true
-end
-
-task :default => :test
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+
+CLEAN.include('**/*.tar', '**/*.zip', '**/*.gz', '**/*.bz2')
+CLEAN.include('**/*.rbc', '**/*.gem')
+
+namespace 'gem' do
+  desc 'Create the file-temp gem'
+  task :create => [:clean] do
+    spec = eval(IO.read('file-temp.gemspec'))
+    Gem::Builder.new(spec).build
+  end
+
+  desc 'Install the file-temp gem'
+  task :install => [:create] do
+     file = Dir["*.gem"].first
+     sh "gem install #{file}"
+  end
+end
+
+# Export the contents of the library to an archive. Note that this requires
+# presence of the .gitattributes file in order to prevent the .git contents
+# from being included.
+#
+# It also appears that I must add a trailing slash to the prefix manually.
+# As of git 1.6.4.3 it does not automaticaly add it, despite what the docs
+# say.
+#
+namespace 'export' do
+  spec = eval(IO.read('file-temp.gemspec'))
+  file = 'file-temp-' + spec.version.to_s
+  pref = file + '/' # Git does not add the trailing slash, despite what the docs say.
+
+  desc 'Export to a .tar.gz file'
+  task :gzip => [:clean] do
+    file += '.tar'
+    sh "git archive --prefix #{pref} --output #{file} master"
+    sh "gzip #{file}"
+  end
+
+  desc 'Export to a .tar.bz2 file'
+  task :bzip2 => [:clean] do
+    file += '.tar'
+    sh "git archive --prefix #{pref} --output #{file} master"
+    sh "bzip2 -f #{file}"
+  end
+
+  desc 'Export to a .zip file'
+  task :zip => [:clean] do
+    file += '.zip'
+    sh "git archive --prefix #{pref} --output #{file} --format zip master"
+  end
+end
+
+Rake::TestTask.new do |t|
+  t.verbose = true
+  t.warning = true
+end
+
+task :default => :test

data/file-temp.gemspec

@@ -1,26 +1,26 @@
-require 'rubygems'
-
-Gem::Specification.new do |spec|
-  spec.name      = 'file-temp'
-  spec.version   = '1.1.5'
-  spec.author    = 'Daniel J. Berger'
-  spec.license   = 'Artistic 2.0'
-  spec.email     = 'djberg96@gmail.com'
-  spec.homepage  = 'http://www.rubyforge.org/projects/shards'
-  spec.summary   = 'An alternative way to generate temp files'
-  spec.test_file = 'test/test_file_temp.rb'
-  spec.files     = Dir['**/*'].delete_if{ |item| item.include?('git') }
-
-  spec.extra_rdoc_files = ['CHANGES', 'README', 'MANIFEST']
-  spec.rubyforge_project = 'shards'
-  spec.required_ruby_version = '>= 1.8.6'
-
-  spec.add_dependency('ffi', '>= 0.5.0')
-  spec.add_development_dependency('test-unit', '>= 2.2.0')
-
-  spec.description = <<-EOF
-    The file-temp library provides an alternative approach to generating
-    temporary files. Features included improved security, a superior
-    interface, and better support for MS Windows.
-  EOF
-end
+require 'rubygems'
+
+Gem::Specification.new do |spec|
+  spec.name      = 'file-temp'
+  spec.version   = '1.2.0'
+  spec.author    = 'Daniel J. Berger'
+  spec.license   = 'Artistic 2.0'
+  spec.email     = 'djberg96@gmail.com'
+  spec.homepage  = 'http://www.rubyforge.org/projects/shards'
+  spec.summary   = 'An alternative way to generate temp files'
+  spec.test_file = 'test/test_file_temp.rb'
+  spec.files     = Dir['**/*'].delete_if{ |item| item.include?('git') }
+
+  spec.extra_rdoc_files = ['CHANGES', 'README', 'MANIFEST']
+  spec.rubyforge_project = 'shards'
+  spec.required_ruby_version = '>= 1.8.6'
+
+  spec.add_dependency('ffi', '>= 1.0.0')
+  spec.add_development_dependency('test-unit', '>= 2.4.0')
+
+  spec.description = <<-EOF
+    The file-temp library provides an alternative approach to generating
+    temporary files. Features included improved security, a superior
+    interface, and better support for MS Windows.
+  EOF
+end

data/lib/file/temp.rb

@@ -1,225 +1,254 @@
-require 'rbconfig'
-require 'ffi'
-
-class File::Temp < File
-  extend FFI::Library
-
-  # :stopdoc:
-
-  private
-
-  # True if operating system is MS Windows
-  WINDOWS = Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw|windows/i
-
-  if WINDOWS
-    ffi_lib 'msvcrt'
-
-    attach_function '_close', [:int], :int
-    attach_function 'fclose', [:pointer], :int
-    attach_function '_fdopen', [:int, :string], :pointer
-    attach_function '_fileno', [:pointer], :int
-    attach_function '_mktemp', [:string], :string
-    attach_function '_open', [:string, :int, :int], :int
-    attach_function '_open_osfhandle', [:long, :int], :int
-    attach_function 'tmpnam', [:string], :string
-    attach_function '_umask', [:int], :int
-
-    ffi_lib 'kernel32'
-
-    attach_function 'CloseHandle', [:long], :bool
-    attach_function 'CreateFileA', [:string, :ulong, :ulong, :pointer, :ulong, :ulong, :ulong], :long
-    attach_function 'DeleteFileA', [:string], :bool
-    attach_function 'GetTempPathA', [:long, :string], :long
-    attach_function 'GetTempFileNameA', [:string, :string, :uint, :pointer], :uint
-
-    S_IWRITE      = 128
-    S_IREAD       = 256
-    BINARY        = 0x8000
-    SHORT_LIVED   = 0x1000
-    GENERIC_READ  = 0x80000000
-    GENERIC_WRITE = 0x40000000
-    CREATE_ALWAYS = 2
-
-    FILE_ATTRIBUTE_NORMAL     = 0x00000080
-    FILE_FLAG_DELETE_ON_CLOSE = 0x04000000
-    INVALID_HANDLE_VALUE      = -1
-  else
-    ffi_lib FFI::Library::LIBC
-
-    attach_function 'fileno', [:pointer], :int
-    attach_function 'mkstemp', [:string], :int
-    attach_function 'umask', [:int], :int
-    attach_function 'tmpfile', [], :pointer
-    attach_function 'fclose', [:pointer], :int
-    attach_function 'tmpnam', [:string], :string
-  end
-
-  public
-
-  # :startdoc:
-
-  # The version of the file-temp library.
-  VERSION = '1.1.5'
-
-  if WINDOWS
-    # The temporary directory used on MS Windows.
-    TMPDIR = ENV['TEMP'] || ENV['TMP'] || ENV['USERPROFILE'] || get_temp_path()
-  else
-    # The temporary directory used on Unix.
-    TMPDIR = ENV['TEMP'] || ENV['TMP'] || ENV['TMPDIR'] || '/tmp'
-  end
-
-  # The name of the file. This is only retained if the first argument to the
-  # constructor is false.
-  attr_reader :path
-
-  # Creates a new, anonymous, temporary file in your File::Temp::TMPDIR
-  # directory
-  #
-  # If the +delete+ option is set to true (the default) then the temporary file
-  # will be deleted automatically as soon as all references to it are closed.
-  # Otherwise, the file will live on in your File::Temp::TMPDIR path.
-  #
-  # If the +delete+ option is set to false, then the file is not deleted. In
-  # addition, you can supply a string +template+ that the system replaces with
-  # a unique filename. This template should end with 3 to 6 'X' characters.
-  # The default template is 'rb_file_temp_XXXXXX'. In this case the temporary
-  # file lives in the directory where it was created.
-  #
-  # The +template+ argument is ignored if the +delete+ argument is true.
-  #
-  # Example:
-  #
-  #    fh = File::Temp.new(true, 'rb_file_temp_XXXXXX') => file
-  #    fh.puts 'hello world'
-  #    fh.close
-  #
-  def initialize(delete = true, template = 'rb_file_temp_XXXXXX')
-    @fptr = nil
-
-    if delete
-      @fptr = tmpfile()
-      fd = WINDOWS ? _fileno(@fptr) : fileno(@fptr)
-    else
-      begin
-        if WINDOWS
-          template = _mktemp(template)
-          omask = _umask(077)
-        else
-          omask = umask(077)
-        end
-
-        @path = File.join(TMPDIR, template)
-        fd = mkstemp(@path)
-
-        raise SystemCallError, 'mkstemp()' if fd < 0
-      ensure
-        WINDOWS ? _umask(omask) : umask(omask)
-      end
-    end
-
-    super(fd, 'wb+')
-  end
-
-  # The close method was overridden to ensure the internal file pointer we
-  # created in the constructor is closed. It is otherwise identical to the
-  # File#close method.
-  #
-  def close
-    super
-    fclose(@fptr) if @fptr
-  end
-
-  # Generates a unique file name.
-  #
-  # Note that a file is not actually generated on the filesystem.
-  #
-  def self.temp_name
-    if WINDOWS
-      TMPDIR + tmpnam(nil) << '.tmp'
-    else
-      tmpnam(nil) << '.tmp'
-    end
-  end
-
-  private
-
-  if WINDOWS
-    def get_temp_path
-      buf = 1.chr * 1024
-
-      if GetTempPathA(buf.length, buf) == 0
-        raise SystemCallError, 'GetTempPath()'
-      end
-
-      buf[ /^[^\0]*/ ].chop # remove trailing slash
-    end
-
-    # The version of tmpfile() implemented by Microsoft is unacceptable.
-    # It attempts to write to C:\ (root) instead of a temporary directory.
-    # This is not only bad behavior, it won't work on Windows 7 and later
-    # without admin rights due to security restrictions.
-    #
-    # This is a custom implementation based on some code from the Cairo
-    # project.
-    #
-    def tmpfile
-      file_name = get_temp_path()
-      buf = 1.chr * 1024
-
-      if GetTempFileNameA(file_name, 'rb_', 0, buf) == 0
-        raise SystemCallError, 'GetTempFileName()'
-      end
-
-      file_name = buf[ /^[^\0]*/ ]
-
-      handle = CreateFileA(
-        file_name,
-        GENERIC_READ | GENERIC_WRITE,
-        0,
-        nil,
-        CREATE_ALWAYS,
-        FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE,
-        0
-      )
-
-      if handle == INVALID_HANDLE_VALUE
-        DeleteFileA(file_name)
-        raise SystemCallError, 'CreateFile()'
-      end
-
-      fd = _open_osfhandle(handle, 0)
-
-      if fd < 0
-        CloseHandle(handle)
-        raise SystemCallError, 'open_osfhandle()'
-      end
-
-      fp = _fdopen(fd, 'w+b')
-
-      if fp.nil?
-        _close(fd)
-        raise SystemCallError, 'fdopen()'
-      end
-
-      fp
-    end
-
-    # The MS C runtime does not define a mkstemp() function, so we've
-    # created one here.
-    #
-    def mkstemp(template)
-      flags = RDWR | BINARY | CREAT | EXCL | SHORT_LIVED
-      pmode = S_IREAD | S_IWRITE
-
-      fd = _open(template, flags, pmode)
-
-      raise SystemCallError, 'mkstemp()' if fd < 0
-
-      fd
-    end
-  end
-end
-
-# For backwards compatability
-FileTemp = File::Temp
+require 'ffi'
+require 'tmpdir'
+
+class File::Temp < File
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+
+  # :stopdoc:
+
+  private
+
+  if File::ALT_SEPARATOR
+    attach_function :_close, [:int], :int
+    attach_function :fclose, [:pointer], :int
+    attach_function :_fdopen, [:int, :string], :pointer
+    attach_function :_fileno, [:pointer], :int
+    attach_function :_mktemp_s, [:pointer, :size_t], :int
+    attach_function :_open, [:string, :int, :int], :int
+    attach_function :_open_osfhandle, [:long, :int], :int
+    attach_function :tmpnam, [:string], :string
+
+    ffi_lib :kernel32
+
+    attach_function :CloseHandle, [:long], :bool
+    attach_function :CreateFileA, [:string, :ulong, :ulong, :pointer, :ulong, :ulong, :ulong], :long
+    attach_function :DeleteFileA, [:string], :bool
+    attach_function :FormatMessageA, [:long, :long, :long, :long, :pointer, :long, :pointer], :long
+    attach_function :GetLastError, [], :int
+    attach_function :GetTempPathA, [:long, :pointer], :long
+    attach_function :GetTempFileNameA, [:string, :string, :uint, :pointer], :uint
+
+    private_class_method :_close, :_fdopen, :_mktemp_s, :_open, :_open_osfhandle
+    private_class_method :CloseHandle, :CreateFileA, :DeleteFileA, :FormatMessageA
+    private_class_method :GetLastError, :GetTempPathA, :GetTempFileNameA
+
+    S_IWRITE      = 128
+    S_IREAD       = 256
+    BINARY        = 0x8000
+    SHORT_LIVED   = 0x1000
+    GENERIC_READ  = 0x80000000
+    GENERIC_WRITE = 0x40000000
+    CREATE_ALWAYS = 2
+
+    FORMAT_MESSAGE_FROM_SYSTEM    = 0x00001000
+    FORMAT_MESSAGE_ARGUMENT_ARRAY = 0x00002000
+
+    FILE_ATTRIBUTE_NORMAL     = 0x00000080
+    FILE_FLAG_DELETE_ON_CLOSE = 0x04000000
+    INVALID_HANDLE_VALUE      = -1
+  else
+    attach_function :fclose, [:pointer], :int
+    attach_function :_fileno, :fileno, [:pointer], :int
+    attach_function :mkstemp, [:string], :int
+    attach_function :strerror, [:int], :string
+    attach_function :tmpfile, [], :pointer
+    attach_function :tmpnam, [:string], :string
+
+    private_class_method :mkstemp, :strerror, :tmpfile
+  end
+
+  private_class_method :fclose, :_fileno, :tmpnam
+
+  public
+
+  # :startdoc:
+
+  # The version of the file-temp library.
+  VERSION = '1.2.0'
+
+  # The temporary directory used on MS Windows or Unix.
+  if File::ALT_SEPARATOR
+    TMPDIR = ENV['TEMP'] || ENV['TMP'] || ENV['USERPROFILE'] || Dir.tmpdir
+  else
+    TMPDIR = ENV['TEMP'] || ENV['TMP'] || ENV['TMPDIR'] || Dir.tmpdir
+  end
+
+  # The name of the file. This is only retained if the first argument to the
+  # constructor is false.
+  attr_reader :path
+
+  # Creates a new, anonymous, temporary file in your File::Temp::TMPDIR
+  # directory
+  #
+  # If the +delete+ option is set to true (the default) then the temporary file
+  # will be deleted automatically as soon as all references to it are closed.
+  # Otherwise, the file will live on in your File::Temp::TMPDIR path.
+  #
+  # If the +delete+ option is set to false, then the file is not deleted. In
+  # addition, you can supply a string +template+ that the system replaces with
+  # a unique filename. This template should end with 3 to 6 'X' characters.
+  # The default template is 'rb_file_temp_XXXXXX'. In this case the temporary
+  # file lives in the directory where it was created.
+  #
+  # The +template+ argument is ignored if the +delete+ argument is true.
+  #
+  # Example:
+  #
+  #    fh = File::Temp.new(true, 'rb_file_temp_XXXXXX') => file
+  #    fh.puts 'hello world'
+  #    fh.close
+  #
+  def initialize(delete = true, template = 'rb_file_temp_XXXXXX')
+    @fptr = nil
+
+    if delete
+      @fptr = tmpfile()
+      fd = _fileno(@fptr)
+    else
+      begin
+        omask = File.umask(077)
+
+        if File::ALT_SEPARATOR
+          ptr = FFI::MemoryPointer.from_string(template.dup)
+
+          if _mktemp_s(ptr, ptr.size) != 0
+            raise SystemCallError, '_mktemp_s function failed: ' + get_error
+          end
+
+          template = ptr.read_string
+        end
+
+        @path = File.join(TMPDIR, template)
+        fd = mkstemp(@path)
+
+        if fd < 0
+          raise SystemCallError, 'mkstemp function failed: ' + get_error
+        end
+      ensure
+        File.umask(omask)
+      end
+    end
+
+    super(fd, 'wb+')
+  end
+
+  # The close method was overridden to ensure the internal file pointer we
+  # created in the constructor is closed. It is otherwise identical to the
+  # File#close method.
+  #
+  def close
+    super
+    fclose(@fptr) if @fptr
+  end
+
+  # Generates a unique file name.
+  #
+  # Note that a file is not actually generated on the filesystem.
+  #
+  def self.temp_name
+    if File::ALT_SEPARATOR
+      TMPDIR + tmpnam(nil) << '.tmp'
+    else
+      tmpnam(nil) << '.tmp'
+    end
+  end
+
+  private
+
+  def get_error
+    if File::ALT_SEPARATOR
+      errno  = GetLastError()
+      buffer = FFI::MemoryPointer.new(:char, 512)
+      flags  = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY
+
+      FormatMessageA(flags, 0, errno, 0, buffer, buffer.size, nil)
+
+      buffer.read_string
+    else
+      strerror(FFI.errno)
+    end
+  end
+
+  if File::ALT_SEPARATOR
+
+    # Simple wrapper around the GetTempPath function.
+    #
+    def get_temp_path
+      buf = FFI::MemoryPointer.new(:char, 1024)
+
+      if GetTempPathA(buf.size, buf) == 0
+        raise SystemCallError, 'GetTempPathA function failed: ' + get_error
+      end
+
+      buf.read_string.chop # remove trailing slash
+    end
+
+    # The version of tmpfile() implemented by Microsoft is unacceptable.
+    # It attempts to write to C:\ (root) instead of a temporary directory.
+    # This is not only bad behavior, it won't work on Windows 7 and later
+    # without admin rights due to security restrictions.
+    #
+    # This is a custom implementation based on some code from the Cairo
+    # project.
+    #
+    def tmpfile
+      file_name = get_temp_path()
+      buf = FFI::MemoryPointer.new(:char, 1024)
+
+      if GetTempFileNameA(file_name, 'rb_', 0, buf) == 0
+        raise SystemCallError, 'GetTempFileNameA function failed: ' + get_error
+      end
+
+      file_name = buf.read_string
+
+      handle = CreateFileA(
+        file_name,
+        GENERIC_READ | GENERIC_WRITE,
+        0,
+        nil,
+        CREATE_ALWAYS,
+        FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE,
+        0
+      )
+
+      if handle == INVALID_HANDLE_VALUE
+        DeleteFileA(file_name)
+        raise SystemCallError, 'CreateFileA function failed: ' + get_error
+      end
+
+      fd = _open_osfhandle(handle, 0)
+
+      if fd < 0
+        CloseHandle(handle)
+        raise SystemCallError, '_open_osfhandle function failed: ' + get_error
+      end
+
+      fp = _fdopen(fd, 'w+b')
+
+      if fp.nil?
+        _close(fd)
+        CloseHandle(handle)
+        raise SystemCallError, 'fdopen function failed: ' + get_error
+      end
+
+      fp
+    end
+
+    # The MS C runtime does not define a mkstemp() function, so we've
+    # created one here.
+    #
+    def mkstemp(template)
+      flags = RDWR | BINARY | CREAT | EXCL | SHORT_LIVED
+      pmode = S_IREAD | S_IWRITE
+
+      fd = _open(template, flags, pmode)
+
+      if fd < 0
+        raise SystemCallError, '_open function failed: ' + get_error
+      end
+
+      fd
+    end
+  end
+end

data/test/test_file_temp.rb

@@ -1,108 +1,120 @@
-######################################################################
-# test_file_temp.rb
-#
-# Test suite for the file-temp library. These tests should be run
-# via the 'rake test' task.
-######################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
-require 'file/temp'
-require 'rbconfig'
-
-class TC_File_Temp < Test::Unit::TestCase
-  WINDOWS = Config::CONFIG['host_os'] =~ /mswin|win32|msdos|cygwin|mingw|windows/i
-
-  def setup
-    @dir = File::Temp::TMPDIR
-    @template = 'file-temp-test-XXXXX'
-    @fh = nil
-
-    # Because Dir[] doesn't work right with backslashes
-    @dir = @dir.tr("\\", "/") if WINDOWS
-  end
-
-  def test_file_temp_version
-    assert_equal('1.1.5', File::Temp::VERSION)
-  end
-
-  def test_file_temp_threaded
-    threads = []
-    assert_nothing_raised{ 100.times{ threads << Thread.new{ File::Temp.new }}}
-    assert_nothing_raised{ threads.join }
-  end
-
-  def test_file_temp_tmpdir
-    assert_not_nil(File::Temp::TMPDIR)
-    assert_kind_of(String, File::Temp::TMPDIR)
-  end
-
-  def test_file_temp_auto_delete
-    assert_nothing_raised{ @fh = File::Temp.new }
-    assert_nothing_raised{ @fh.print "hello" }
-    assert_nothing_raised{ @fh.close }
-  end
-
-  def test_file_temp_no_delete
-    assert_nothing_raised{ @fh = File::Temp.new(false) }
-    assert_nothing_raised{ @fh.print "hello" }
-    assert_nothing_raised{ @fh.close }
-    assert_true(Dir["#{@dir}/rb_file_temp*"].length == 1)
-  end
-
-  def test_file_temp_no_delete_with_template
-    assert_nothing_raised{ File::Temp.new(false, 'temp_foo_XXXXXX').close }
-    assert_true(Dir["#{@dir}/temp_foo*"].length >= 1)
-  end
-
-  def test_file_temp_no_delete_with_block
-    assert_nothing_raised{ File::Temp.open(false, 'temp_foo_XXXXXX'){ |fh| fh.puts "hello" } }
-    assert_true(Dir["#{@dir}/temp_foo*"].length >= 1)
-  end
-
-  def test_file_temp_expected_errors
-    assert_raise(TypeError, ArgumentError){ @fh = File::Temp.new(false, 1) }
-    assert_raise(ArgumentError){ @fh = File::Temp.new(true, 'temp_bar_XXXXX', 1) }
-  end
-
-  def test_file_temp_name_basic_functionality
-    assert_respond_to(File::Temp, :temp_name)
-    assert_nothing_raised{ File::Temp.temp_name }
-    assert_kind_of(String, File::Temp.temp_name)
-  end
-
-  def test_file_temp_name
-    assert_equal('.tmp', File.extname(File::Temp.temp_name))
-  end
-
-  def test_file_temp_path_basic_functionality
-    temp = File::Temp.new
-    assert_respond_to(temp, :path)
-  end
-
-  def test_file_temp_path_is_nil_if_delete_option_is_true
-    temp = File::Temp.new
-    assert_nil(temp.path)
-  end
-
-  def test_file_temp_path_is_not_nil_if_delete_option_is_false
-    temp = File::Temp.new(false)
-    assert_not_nil(temp.path)
-  end
-
-  def teardown
-    @dir = nil
-    @template = nil
-    @fh.close if @fh && !@fh.closed?
-    @fh = nil
-
-    Dir["temp_*"].each{ |f| File.delete(f) }
-    Dir["rb_file_temp_*"].each{ |f| File.delete(f) }
-
-    Dir.chdir(File::Temp::TMPDIR) do
-      Dir["temp_*"].each{ |f| File.delete(f) }
-      Dir["rb_file_temp_*"].each{ |f| File.delete(f) }
-    end
-  end
-end
+######################################################################
+# test_file_temp.rb
+#
+# Test suite for the file-temp library. These tests should be run
+# via the 'rake test' task.
+######################################################################
+require 'rubygems'
+require 'test-unit'
+require 'file/temp'
+
+class TC_File_Temp < Test::Unit::TestCase
+  WINDOWS = File::ALT_SEPARATOR
+
+  def setup
+    @dir = File::Temp::TMPDIR
+    @template = 'file-temp-test-XXXXX'
+    @fh = nil
+
+    # Because Dir[] doesn't work right with backslashes
+    @dir = @dir.tr("\\", "/") if WINDOWS
+  end
+
+  def test_file_temp_version
+    assert_equal('1.2.0', File::Temp::VERSION)
+  end
+
+  def test_file_temp_threaded
+    threads = []
+    assert_nothing_raised{ 100.times{ threads << Thread.new{ File::Temp.new }}}
+    assert_nothing_raised{ threads.join }
+  end
+
+  def test_file_temp_tmpdir
+    assert_not_nil(File::Temp::TMPDIR)
+    assert_kind_of(String, File::Temp::TMPDIR)
+  end
+
+  def test_file_temp_auto_delete
+    assert_nothing_raised{ @fh = File::Temp.new }
+    assert_nothing_raised{ @fh.print "hello" }
+    assert_nothing_raised{ @fh.close }
+  end
+
+  def test_file_temp_no_delete
+    assert_nothing_raised{ @fh = File::Temp.new(false) }
+    assert_nothing_raised{ @fh.print "hello" }
+    assert_nothing_raised{ @fh.close }
+    assert_true(Dir["#{@dir}/rb_file_temp*"].length == 1)
+  end
+
+  def test_file_temp_no_delete_with_template
+    assert_nothing_raised{ File::Temp.new(false, 'temp_foo_XXXXXX').close }
+    assert_true(Dir["#{@dir}/temp_foo*"].length >= 1)
+  end
+
+  def test_file_temp_no_delete_with_block
+    assert_nothing_raised{ File::Temp.open(false, 'temp_foo_XXXXXX'){ |fh| fh.puts "hello" } }
+    assert_true(Dir["#{@dir}/temp_foo*"].length >= 1)
+  end
+
+  def test_file_temp_expected_errors
+    assert_raise(TypeError, ArgumentError){ @fh = File::Temp.new(false, 1) }
+    assert_raise(ArgumentError){ @fh = File::Temp.new(true, 'temp_bar_XXXXX', 1) }
+  end
+
+  def test_file_temp_name_basic_functionality
+    assert_respond_to(File::Temp, :temp_name)
+    assert_nothing_raised{ File::Temp.temp_name }
+    assert_kind_of(String, File::Temp.temp_name)
+  end
+
+  def test_file_temp_name
+    assert_equal('.tmp', File.extname(File::Temp.temp_name))
+  end
+
+  def test_file_temp_path_basic_functionality
+    @fh = File::Temp.new
+    assert_respond_to(@fh, :path)
+  end
+
+  def test_file_temp_path_is_nil_if_delete_option_is_true
+    @fh = File::Temp.new
+    assert_nil(@fh.path)
+  end
+
+  def test_file_temp_path_is_not_nil_if_delete_option_is_false
+    @fh = File::Temp.new(false)
+    assert_not_nil(@fh.path)
+  end
+
+  def test_ffi_functions_are_private
+    methods = File::Temp.methods(false).map{ |e| e.to_s }
+    assert_false(methods.include?('_fileno'))
+    assert_false(methods.include?('mkstemp'))
+    assert_false(methods.include?('_umask'))
+    assert_false(methods.include?('fclose'))
+    assert_false(methods.include?('strerror'))
+    assert_false(methods.include?('tmpnam'))
+    assert_false(methods.include?('CloseHandle'))
+    assert_false(methods.include?('CreateFileA'))
+    assert_false(methods.include?('DeleteFileA'))
+    assert_false(methods.include?('GetTempPathA'))
+    assert_false(methods.include?('GetTempFileNameA'))
+  end
+
+  def teardown
+    @dir = nil
+    @template = nil
+    @fh.close if @fh && !@fh.closed?
+    @fh = nil
+
+    Dir["temp_*"].each{ |f| File.delete(f) }
+    Dir["rb_file_temp_*"].each{ |f| File.delete(f) }
+
+    Dir.chdir(File::Temp::TMPDIR) do
+      Dir["temp_*"].each{ |f| File.delete(f) }
+      Dir["rb_file_temp_*"].each{ |f| File.delete(f) }
+    end
+  end
+end

metadata

@@ -1,65 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: file-temp
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
 platform: ruby
-authors: 
+authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &22367490 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *22367490
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &22367140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :development
-  version_requirements: *id002
-description: "    The file-temp library provides an alternative approach to generating\n    temporary files. Features included improved security, a superior\n    interface, and better support for MS Windows.\n"
+  prerelease: false
+  version_requirements: *22367140
+description: ! "    The file-temp library provides an alternative approach to generating\n
+  \   temporary files. Features included improved security, a superior\n    interface,
+  and better support for MS Windows.\n"
 email: djberg96@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
-files: 
+files:
 - CHANGES
 - file-temp.gemspec
 - lib/file/temp.rb
@@ -68,39 +52,29 @@ files:
 - README
 - test/test_file_temp.rb
 homepage: http://www.rubyforge.org/projects/shards
-licenses: 
+licenses:
 - Artistic 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shards
-rubygems_version: 1.8.3
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An alternative way to generate temp files
-test_files: 
+test_files:
 - test/test_file_temp.rb