file-temp 1.1.4 → 1.1.5

data/CHANGES

@@ -1,3 +1,8 @@
+= 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

data/Rakefile

@@ -1,14 +1,9 @@
 require 'rake'
+require 'rake/clean'
 require 'rake/testtask'
 
-desc 'Remove all gem and archive files from the project'
-task :clean do
-  Dir['*.gem'].each{ |f| File.delete(f) }
-  Dir['*.tar'].each{ |f| File.delete(f) }
-  Dir['*.zip'].each{ |f| File.delete(f) }
-  Dir['*.gz'].each{ |f| File.delete(f) }
-  Dir['*.bz2'].each{ |f| File.delete(f) }
-end
+CLEAN.include('**/*.tar', '**/*.zip', '**/*.gz', '**/*.bz2')
+CLEAN.include('**/*.rbc', '**/*.gem')
 
 namespace 'gem' do
   desc 'Create the file-temp gem'

data/file-temp.gemspec

@@ -2,14 +2,13 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'file-temp'
-  spec.version   = '1.1.4'
+  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.has_rdoc  = true
   spec.files     = Dir['**/*'].delete_if{ |item| item.include?('git') }
 
   spec.extra_rdoc_files = ['CHANGES', 'README', 'MANIFEST']
@@ -17,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.8.6'
 
   spec.add_dependency('ffi', '>= 0.5.0')
-  spec.add_development_dependency('test-unit', '>= 2.0.3')
+  spec.add_development_dependency('test-unit', '>= 2.2.0')
 
   spec.description = <<-EOF
     The file-temp library provides an alternative approach to generating

data/lib/file/temp.rb

@@ -9,7 +9,7 @@ class File::Temp < File
   private
 
   # True if operating system is MS Windows
-  WINDOWS = Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i
+  WINDOWS = Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw|windows/i
 
   if WINDOWS
     ffi_lib 'msvcrt'
@@ -59,17 +59,19 @@ class File::Temp < File
   # :startdoc:
 
   # The version of the file-temp library.
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 
   if WINDOWS
     # The temporary directory used on MS Windows.
-    TMPDIR = ENV['TEMP'] || ENV['TMP'] || ENV['USERPROFILE'] || "C:\\Windows\\Temp"
+    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
 
-  public
+  # 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
@@ -87,7 +89,7 @@ class File::Temp < File
   # 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
@@ -106,7 +108,10 @@ class File::Temp < File
         else
           omask = umask(077)
         end
-        fd = mkstemp(File.join(TMPDIR, template))
+
+        @path = File.join(TMPDIR, template)
+        fd = mkstemp(@path)
+
         raise SystemCallError, 'mkstemp()' if fd < 0
       ensure
         WINDOWS ? _umask(omask) : umask(omask)
@@ -140,22 +145,26 @@ class File::Temp < File
   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. 
+    # 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
-      buf = 1.chr * 1024 
-
-      if GetTempPathA(buf.length, buf) == 0
-        raise SystemCallError, 'GetTempPath()'
-      end
-
-      file_name = buf[ /^[^\0]*/ ].chop # remove trailing slash
+      file_name = get_temp_path()
       buf = 1.chr * 1024
 
       if GetTempFileNameA(file_name, 'rb_', 0, buf) == 0
@@ -204,9 +213,9 @@ class File::Temp < File
       pmode = S_IREAD | S_IWRITE
 
       fd = _open(template, flags, pmode)
-      
+
       raise SystemCallError, 'mkstemp()' if fd < 0
-      
+
       fd
     end
   end

data/test/test_file_temp.rb

@@ -11,18 +11,20 @@ require 'test/unit'
 require 'file/temp'
 require 'rbconfig'
 
-class TC_File_Temp < Test::Unit::TestCase 
+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 Config::CONFIG['host_os'] =~ /mswin|win32|msdos|cygwin|mingw/i
+    @dir = @dir.tr("\\", "/") if WINDOWS
   end
 
   def test_file_temp_version
-    assert_equal('1.1.4', File::Temp::VERSION)
+    assert_equal('1.1.5', File::Temp::VERSION)
   end
 
   def test_file_temp_threaded
@@ -74,6 +76,21 @@ class TC_File_Temp < Test::Unit::TestCase
     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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: file-temp
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 -06:00
-default_executable: 
+date: 2011-07-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -42,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 2
+        - 2
         - 0
-        - 3
-        version: 2.0.3
+        version: 2.2.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"
@@ -68,7 +67,6 @@ files:
 - Rakefile
 - README
 - test/test_file_temp.rb
-has_rdoc: true
 homepage: http://www.rubyforge.org/projects/shards
 licenses: 
 - Artistic 2.0
@@ -100,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.3.7
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: An alternative way to generate temp files