file-temp 0.1.0 → 0.1.1

data/CHANGES

@@ -1,2 +1,6 @@
+= 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
+* Initial release.

data/README

@@ -34,7 +34,7 @@
    not going to waste time with it.
 
 = Future Plans
-   I plan on adding MS Windows support in the next release.
+   I plan on adding a pure Ruby version for MS Windows eventually.
 
 = License
    Ruby's

data/ext/extconf.rb

@@ -1,6 +1,9 @@
 require 'mkmf'
 dir_config('tmpfile')
 
+have_func('tmpfile_s')
+have_func('_sopen_s')
+
 unless have_func('tmpfile')
    raise 'This library is not supported on your platform. Aborting'
 end

data/ext/temp.c

@@ -1,16 +1,20 @@
 #include <ruby.h>
 #include <stdio.h>
 
+#ifdef HAVE__SOPEN_S
+#include <share.h>
+#endif
+
 #ifndef HAVE_MKSTEMP
 #include <fcntl.h>
 #include <temp.h>
 #endif
 
-#ifdef HAVE__SOPEN_S
-#include <share.h>
+#ifndef P_tmpdir
+#define P_tmpdir "/tmp"
 #endif
 
-#define VERSION "0.1.0"
+#define VERSION "0.1.1"
 
 VALUE cFileTemp;
 
@@ -35,7 +39,7 @@ VALUE cFileTemp;
  * The +template+ argument is ignored if the +delete+ argument is true.
  */
 static VALUE tempfile_init(int argc, VALUE* argv, VALUE self){
-   VALUE v_args[1];
+   VALUE v_args[2];
    VALUE v_delete;
    VALUE v_template;
 
@@ -45,15 +49,21 @@ static VALUE tempfile_init(int argc, VALUE* argv, VALUE self){
       v_delete = Qtrue;
 
    if(RTEST(v_delete)){
+#ifdef HAVE_TMPFILE_S
+      FILE* fptr;
+
+      if(tmpfile_s(&fptr))
+         rb_sys_fail("tmpfile_s()");
+#else
       FILE* fptr = tmpfile();
       if(!fptr)
          rb_sys_fail("tmpfile()");
+#endif
       
       v_args[0] = INT2FIX(fileno(fptr));
    }
    else{
       int fd;
-      char buf[L_tmpnam];
       
       if(NIL_P(v_template))
          v_template = rb_str_new2("rb_file_temp_XXXXXX");
@@ -64,11 +74,12 @@ static VALUE tempfile_init(int argc, VALUE* argv, VALUE self){
          rb_sys_fail("mkstemp()");
 
       v_args[0] = INT2FIX(fd);
-      v_args[0] = INT2FIX(fd);
    }
 
+   /* This bit of explicitness is necessary for MS Windows */
+   v_args[1] = rb_str_new2("wb");
 
-   return rb_call_super(1, v_args);
+   return rb_call_super(2, v_args);
 }
 
 /* 

data/test/tc_file_temp.rb

@@ -14,13 +14,15 @@ class TC_File_Temp < Test::Unit::TestCase
    end
 
    def test_file_temp_version
-      assert_equal('0.1.0', FileTemp::VERSION)
+      assert_equal('0.1.1', FileTemp::VERSION)
    end
 
    def test_file_temp_tmpdir
       assert_not_nil(FileTemp::TMPDIR)
       assert_kind_of(String, FileTemp::TMPDIR)
-      assert_equal(true, ['/tmp', '/var/tmp/'].include?(FileTemp::TMPDIR))
+      unless RUBY_PLATFORM.match('mswin')
+         assert_equal(true, ['/tmp', '/var/tmp/'].include?(FileTemp::TMPDIR))
+      end
    end
 
    def test_file_temp_auto_delete
@@ -37,17 +39,17 @@ class TC_File_Temp < Test::Unit::TestCase
    end
 
    def test_file_temp_no_delete_with_template
-      assert_nothing_raised{ FileTemp.new(false, 'temp_foo_XXXXX') }
+      assert_nothing_raised{ @fh = FileTemp.new(false, 'temp_foo_XXXXX') }
       assert_equal(true, Dir["temp_foo*"].length == 1)
    end
 
    def test_file_temp_expected_errors
-      assert_raises(ArgumentError){ FileTemp.new(true, 'temp_bar_XXXXX', 1) }
+      assert_raises(ArgumentError){ @fh = FileTemp.new(true, 'temp_bar_XXXXX', 1) }
    end
 
    def teardown
       @template = nil
-      @fh.close if @fh rescue nil # Ignore closed streams
+      @fh.close if @fh && !@fh.closed?
       @fh = nil
       Dir["temp_*"].each{ |f| File.delete(f) }
       Dir["rb_file_temp_*"].each{ |f| File.delete(f) }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: file-temp
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-06-01 00:00:00 -06:00
+  version: 0.1.1
+date: 2007-06-02 00:00:00 -06:00
 summary: An alternative way to generate tempfiles
 require_paths: 
 - lib