Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3991 from rubygems/fileutils_double_load
Fix fileutils double load when using `bundler/inline` (cherry picked from commit 6ebda1d)
- Loading branch information
1 parent
61f05bf
commit 0581728
Showing
12 changed files
with
226 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,154 @@ | ||
# frozen_string_literal: true | ||
# | ||
# tmpdir - retrieve temporary directory path | ||
# | ||
# $Id$ | ||
# | ||
|
||
require_relative '../../fileutils/lib/fileutils' | ||
begin | ||
require 'etc.so' | ||
rescue LoadError # rescue LoadError for miniruby | ||
end | ||
|
||
class Bundler::Dir < Dir | ||
|
||
@systmpdir ||= defined?(Etc.systmpdir) ? Etc.systmpdir : '/tmp' | ||
|
||
## | ||
# 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]| | ||
next if !dir | ||
dir = File.expand_path(dir) | ||
stat = File.stat(dir) rescue next | ||
case | ||
when !stat.directory? | ||
warn "#{name} is not a directory: #{dir}" | ||
when !stat.writable? | ||
warn "#{name} is not writable: #{dir}" | ||
when stat.world_writable? && !stat.sticky? | ||
warn "#{name} is world-writable: #{dir}" | ||
else | ||
tmp = dir | ||
break | ||
end | ||
end | ||
raise ArgumentError, "could not find a temporary directory" unless tmp | ||
tmp | ||
end | ||
|
||
# Bundler::Dir.mktmpdir creates a temporary directory. | ||
# | ||
# The directory is created with 0700 permission. | ||
# Application should not change the permission to make the temporary directory accessible from other users. | ||
# | ||
# The prefix and suffix of the name of the directory is specified by | ||
# the optional first argument, <i>prefix_suffix</i>. | ||
# - If it is not specified or nil, "d" is used as the prefix and no suffix is used. | ||
# - If it is a string, it is used as the prefix and no suffix is used. | ||
# - If it is an array, first element is used as the prefix and second element is used as a suffix. | ||
# | ||
# Bundler::Dir.mktmpdir {|dir| dir is ".../d..." } | ||
# Bundler::Dir.mktmpdir("foo") {|dir| dir is ".../foo..." } | ||
# Bundler::Dir.mktmpdir(["foo", "bar"]) {|dir| dir is ".../foo...bar" } | ||
# | ||
# The directory is created under Bundler::Dir.tmpdir or | ||
# the optional second argument <i>tmpdir</i> if non-nil value is given. | ||
# | ||
# Bundler::Dir.mktmpdir {|dir| dir is "#{Bundler::Dir.tmpdir}/d..." } | ||
# Bundler::Dir.mktmpdir(nil, "/var/tmp") {|dir| dir is "/var/tmp/d..." } | ||
# | ||
# If a block is given, | ||
# it is yielded with the path of the directory. | ||
# The directory and its contents are removed | ||
# using Bundler::FileUtils.remove_entry before Bundler::Dir.mktmpdir returns. | ||
# The value of the block is returned. | ||
# | ||
# Bundler::Dir.mktmpdir {|dir| | ||
# # use the directory... | ||
# open("#{dir}/foo", "w") { ... } | ||
# } | ||
# | ||
# If a block is not given, | ||
# The path of the directory is returned. | ||
# In this case, Bundler::Dir.mktmpdir doesn't remove the directory. | ||
# | ||
# dir = Bundler::Dir.mktmpdir | ||
# begin | ||
# # use the directory... | ||
# open("#{dir}/foo", "w") { ... } | ||
# ensure | ||
# # remove the directory. | ||
# Bundler::FileUtils.remove_entry dir | ||
# end | ||
# | ||
def self.mktmpdir(prefix_suffix=nil, *rest, **options) | ||
base = nil | ||
path = Tmpname.create(prefix_suffix || "d", *rest, **options) {|p, _, _, d| | ||
base = d | ||
mkdir(p, 0700) | ||
} | ||
if block_given? | ||
begin | ||
yield path.dup | ||
ensure | ||
unless base | ||
stat = File.stat(File.dirname(path)) | ||
if stat.world_writable? and !stat.sticky? | ||
raise ArgumentError, "parent directory is world writable but not sticky" | ||
end | ||
end | ||
Bundler::FileUtils.remove_entry path | ||
end | ||
else | ||
path | ||
end | ||
end | ||
|
||
module Tmpname # :nodoc: | ||
module_function | ||
|
||
def tmpdir | ||
Bundler::Dir.tmpdir | ||
end | ||
|
||
UNUSABLE_CHARS = [File::SEPARATOR, File::ALT_SEPARATOR, File::PATH_SEPARATOR, ":"].uniq.join("").freeze | ||
|
||
class << (RANDOM = Random.new) | ||
MAX = 36**6 # < 0x100000000 | ||
def next | ||
rand(MAX).to_s(36) | ||
end | ||
end | ||
private_constant :RANDOM | ||
|
||
def create(basename, tmpdir=nil, max_try: nil, **opts) | ||
origdir = tmpdir | ||
tmpdir ||= tmpdir() | ||
n = nil | ||
prefix, suffix = basename | ||
prefix = (String.try_convert(prefix) or | ||
raise ArgumentError, "unexpected prefix: #{prefix.inspect}") | ||
prefix = prefix.delete(UNUSABLE_CHARS) | ||
suffix &&= (String.try_convert(suffix) or | ||
raise ArgumentError, "unexpected suffix: #{suffix.inspect}") | ||
suffix &&= suffix.delete(UNUSABLE_CHARS) | ||
begin | ||
t = Time.now.strftime("%Y%m%d") | ||
path = "#{prefix}#{t}-#{$$}-#{RANDOM.next}"\ | ||
"#{n ? %[-#{n}] : ''}#{suffix||''}" | ||
path = File.join(tmpdir, path) | ||
yield(path, n, opts, origdir) | ||
rescue Errno::EEXIST | ||
n ||= 0 | ||
n += 1 | ||
retry if !max_try or n < max_try | ||
raise "cannot generate temporary name using `#{basename}' under `#{tmpdir}'" | ||
end | ||
path | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# frozen_string_literal: true | ||
|
||
module Bundler; end | ||
require_relative "vendor/tmpdir/lib/tmpdir" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,6 @@ | |
#++ | ||
|
||
require 'rubygems/exceptions' | ||
require 'fileutils' | ||
require_relative 'openssl' | ||
|
||
## | ||
|