mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[ruby/tmpdir] Make Dir.tmpdir
more idiomatic and functional
Use `Enumerable#find` to iterate over the candidates, not `Enumerable.each`. (this makes the code more functional, and - IMO - slightly more idiomatic, as it avoids setting the "global" (by which I mean: non-local) `tmp` variable from inside the block) https://github.com/ruby/tmpdir/commit/d1f20ad694
This commit is contained in:
parent
ba15fb709b
commit
287c5da4aa
1 changed files with 2 additions and 4 deletions
|
@ -19,8 +19,7 @@ class Dir
|
|||
# Returns the operating system's temporary file path.
|
||||
|
||||
def self.tmpdir
|
||||
tmp = nil
|
||||
['TMPDIR', 'TMP', 'TEMP', ['system temporary path', @@systmpdir], ['/tmp']*2, ['.']*2].each do |name, dir = ENV[name]|
|
||||
tmp = ['TMPDIR', 'TMP', 'TEMP', ['system temporary path', @@systmpdir], ['/tmp']*2, ['.']*2].find do |name, dir = ENV[name]|
|
||||
next if !dir
|
||||
dir = File.expand_path(dir)
|
||||
stat = File.stat(dir) rescue next
|
||||
|
@ -32,8 +31,7 @@ class Dir
|
|||
when stat.world_writable? && !stat.sticky?
|
||||
warn "#{name} is world-writable: #{dir}"
|
||||
else
|
||||
tmp = dir
|
||||
break
|
||||
break dir
|
||||
end
|
||||
end
|
||||
raise ArgumentError, "could not find a temporary directory" unless tmp
|
||||
|
|
Loading…
Reference in a new issue