1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/tmpdir] Move private constants under Dir::Tmpname module

Browse Source 
Including `TMPDIR_CANDIDATES` extracted from `Dir.tmpdir` invariant.

https://github.com/ruby/tmpdir/commit/d219ee273f
This commit is contained in:
Nobuyoshi Nakada 2024-04-08 16:04:49 +09:00 committed by git
parent 0769a48a21
commit a3991599fa
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/tmpdir.rb
View File

@ -16,10 +16,6 @@ class Dir
# Class variables are inaccessible from non-main Ractor. # Class variables are inaccessible from non-main Ractor.
# And instance variables too, in Ruby 3.0. # And instance variables too, in Ruby 3.0.
# System-wide temporary directory path
SYSTMPDIR = (defined?(Etc.systmpdir) ? Etc.systmpdir.freeze : '/tmp')
private_constant :SYSTMPDIR
## ##
# Returns the operating system's temporary file path. # Returns the operating system's temporary file path.
# #
@ -27,7 +23,7 @@ class Dir
# Dir.tmpdir # => "/tmp" # Dir.tmpdir # => "/tmp"
def self.tmpdir def self.tmpdir
['TMPDIR', 'TMP', 'TEMP', ['system temporary path', SYSTMPDIR], ['/tmp']*2, ['.']*2].find do |name, dir| Tmpname::TMPDIR_CANDIDATES.find do |name, dir|
unless dir unless dir
next if !(dir = ENV[name] rescue next) or dir.empty? next if !(dir = ENV[name] rescue next) or dir.empty?
end end
@ -126,6 +122,18 @@ class Dir
module Tmpname # :nodoc: module Tmpname # :nodoc:
module_function module_function
# System-wide temporary directory path
systmpdir = (defined?(Etc.systmpdir) ? Etc.systmpdir.freeze : '/tmp')
# Temporary directory candidates consisting of environment variable
# names or description and path pairs.
TMPDIR_CANDIDATES = [
'TMPDIR', 'TMP', 'TEMP',
['system temporary path', systmpdir],
%w[/tmp /tmp],
%w[. .],
].each(&:freeze).freeze
def tmpdir def tmpdir
Dir.tmpdir Dir.tmpdir
end end