file-temp 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff786722d8fdd2d775c3bf89a93256c3e6cb52a73966d13aa5f5520c37c96ee
-  data.tar.gz: 57637cb99fbb42afa24779c95527faeedf0a0ff304fc0eba3de517912377459e
+  metadata.gz: 04ece0eed9e9cc0e3ee18ef8637623714efe6bc817abdfc8583f933042e05029
+  data.tar.gz: 67155b0989bf977750f52abde8b57411f49c0dce07cae2a51d616298d4bf85e5
 SHA512:
-  metadata.gz: 35e334372e93fec4e19687f353262910bc7b77e7ccde89d48f01c92f86c85e329efcc00363bc7689447b67230dce4b50047dc8390ab06586e99bdd5c9fef55a2
-  data.tar.gz: 7443857009f786d4c8d460a1e2d3924f5deb1d6074c5f5813c39a4138e40e8e88132a5ec36152718fba2484d234cdc9c40f73fb98a15694aafddda07e89480c0
+  metadata.gz: 249c699561ea25f3b427f7fc117c69d9ea848055e78063f87b99718786e4ad483f32c5e356dd836879a747b0d724c6dc2239f3c334d0ab0c71be7243bc7b823a
+  data.tar.gz: bf5db324f1069cfeed9a2930cf585edb3d2263c7634c9999c53c026f0ae09961055b03d51561cb5e9d045d4ed017dc2a528374c859f198492de8a1e604a9a0ca

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 1.7.3 - 23-Dec-2025
+* Internal refactoring, replace mktemp with mkstemp.
+* Internal refactoring, replace tmpnam with Ruby's SecureRandom.
+
 ## 1.7.2 - 11-Jul-2023
 * Fixed a bug in the Windows version where it would sometimes fail.
 * Dropped JRuby from the test matrix for now because of a bug.

data/README.md

@@ -62,7 +62,7 @@ should not see it.
 Apache-2.0
 
 ## Copyright
-(C) 2007-2023 Daniel J. Berger
+(C) 2007-2025 Daniel J. Berger
 All Rights Reserved
 
 ## Warranty

data/Rakefile

@@ -25,6 +25,14 @@ end
 RuboCop::RakeTask.new
 
 desc 'Run the test suite for the file-temp library'
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+  t.rspec_opts = '-f documentation -w'
+end
+
+# Clean up afterwards
+Rake::Task[:spec].enhance do
+  Rake::Task[:clean].invoke
+end
 
 task :default => :spec

data/file-temp.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'file-temp'
-  spec.version    = '1.7.2'
+  spec.version    = '1.7.3'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -25,7 +25,9 @@ Gem::Specification.new do |spec|
     'documentation_uri'     => 'https://github.com/djberg96/file-temp/wiki',
     'source_code_uri'       => 'https://github.com/djberg96/file-temp',
     'wiki_uri'              => 'https://github.com/djberg96/file-temp/wiki',
-    'rubygems_mfa_required' => 'true'
+    'rubygems_mfa_required' => 'true',
+    'github_repo'           => 'https://github.com/djberg96/file-temp',
+    'funding_uri'           => 'https://github.com/sponsors/djberg96'
   }
 
   spec.description = <<-EOF

data/lib/file/java/temp.rb

@@ -51,7 +51,7 @@ class File::Temp < File
     @file.deleteOnExit if delete
     options[:mode] ||= 'wb+'
 
-    path = @file.getName
+    path = @file.getAbsolutePath
     super(path, **options)
 
     @path = path unless delete

data/lib/file/temp.rb

@@ -2,7 +2,7 @@
 
 class File::Temp < File
   # The version of the file-temp library
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 end
 
 if RUBY_PLATFORM == 'java'

data/lib/file/unix/temp.rb

@@ -2,6 +2,7 @@
 
 require 'ffi'
 require 'tmpdir'
+require 'securerandom'
 
 # The File::Temp class encapsulates temporary files. It is a subclass of File.
 class File::Temp < File
@@ -16,11 +17,10 @@ class File::Temp < File
   attach_function :_fileno, :fileno, [:pointer], :int
   attach_function :strerror, [:int], :string
   attach_function :tmpfile, [], :pointer
-  attach_function :tmpnam, [:pointer], :string
-  attach_function :mktemp, [:pointer], :string
+  attach_function :mkstemp, [:pointer], :int
 
-  private_class_method :mktemp, :strerror, :tmpfile
-  private_class_method :tmpnam, :fclose, :_fileno
+  private_class_method :mkstemp, :strerror, :tmpfile
+  private_class_method :fclose, :_fileno
 
   public
 
@@ -42,7 +42,7 @@ class File::Temp < File
   #
   # 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.
+  # a unique filename. This template should end with 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.
   #
@@ -56,22 +56,32 @@ class File::Temp < File
   #
   def initialize(delete: true, template: 'rb_file_temp_XXXXXX', directory: TMPDIR, **options)
     @fptr = nil
+    temp_path = nil
 
     if delete
       @fptr = tmpfile()
       raise SystemCallError.new('tmpfile', FFI.errno) if @fptr.null?
       fd = _fileno(@fptr)
     else
+      unless template.is_a?(String)
+        raise TypeError, "template must be a String"
+      end
+
+      unless template.end_with?('XXXXXX')
+        raise ArgumentError, "template must end with 6 'X' characters"
+      end
+
       begin
         omask = File.umask(077)
-        ptr = FFI::MemoryPointer.from_string(template)
-        str = mktemp(ptr)
+        full_template = File.join(directory, template)
+        ptr = FFI::MemoryPointer.from_string(full_template)
+        fd = mkstemp(ptr)
 
-        if str.nil? || str.empty?
-          raise SystemCallError.new('mktemp', FFI.errno)
+        if fd < 0
+          raise SystemCallError.new('mkstemp', FFI.errno)
         end
 
-        @path = File.join(directory, ptr.read_string)
+        temp_path = ptr.read_string
       ensure
         File.umask(omask)
       end
@@ -79,11 +89,9 @@ class File::Temp < File
 
     options[:mode] ||= 'wb+'
 
-    if delete
-      super(fd, **options)
-    else
-      super(@path, **options)
-    end
+    super(fd, **options)
+
+    @path = temp_path
   end
 
   # The close method was overridden to ensure the internal file pointer that we
@@ -104,6 +112,6 @@ class File::Temp < File
   # Note that a file is not actually generated on the filesystem.
   #
   def self.temp_name
-    tmpnam(nil) << '.tmp'
+    File.join(TMPDIR, "tmp.#{SecureRandom.hex(8)}.tmp")
   end
 end

data/lib/file/windows/temp.rb

@@ -92,6 +92,14 @@ class File::Temp < File
       @fptr = tmpfile()
       fd = _fileno(@fptr)
     else
+      unless template.is_a?(String)
+        raise TypeError, "template must be a String"
+      end
+
+      unless template.end_with?('XXXXXX')
+        raise ArgumentError, "template must end with 6 'X' characters"
+      end
+
       begin
         omask = File.umask(077)
         ptr = FFI::MemoryPointer.from_string(template)

data/spec/file_temp_spec.rb

@@ -12,6 +12,7 @@ require 'file/temp'
 RSpec.describe File::Temp do
   let(:windows) { File::ALT_SEPARATOR }
   let(:osx) { RbConfig::CONFIG['host_os'] =~ /darwin/i }
+  let(:bsd) { RbConfig::CONFIG['host_os'] =~ /freebsd|dragonfly/i }
 
   before do
     @dir = File::Temp::TMPDIR
@@ -39,7 +40,7 @@ RSpec.describe File::Temp do
 
   context 'constants' do
     example 'library version is set to expected value' do
-      expect(File::Temp::VERSION).to eq('1.7.2')
+      expect(File::Temp::VERSION).to eq('1.7.3')
       expect(File::Temp::VERSION).to be_frozen
     end
 
@@ -104,8 +105,7 @@ RSpec.describe File::Temp do
     end
 
     example 'an error is raised if a custom template is invalid' do
-      skip 'skipped on OSX' if osx
-      expect{ described_class.new(:delete => false, :template => 'xx') }.to raise_error(Errno::EINVAL)
+      expect{ described_class.new(:delete => false, :template => 'xx') }.to raise_error(ArgumentError, /template must end with 6/)
     end
   end
 

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: file-temp
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +34,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2023-07-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -141,7 +140,8 @@ metadata:
   source_code_uri: https://github.com/djberg96/file-temp
   wiki_uri: https://github.com/djberg96/file-temp/wiki
   rubygems_mfa_required: 'true'
-post_install_message:
+  github_repo: https://github.com/djberg96/file-temp
+  funding_uri: https://github.com/sponsors/djberg96
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: An alternative way to generate temp files
 test_files: