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

[ruby/fileutils] Add mkdir_p to FileUtils.install

Browse Source 
(https://github.com/ruby/fileutils/pull/104)

* Add mkdir_p to FileUtils.install

* Adjust raise message.

* adjust raise language

* handle trailing slash in dest

* simplify

* Add tests
This commit is contained in:
Satadru Pramanik, DO, MPH, MEng 2023-02-09 22:37:26 -05:00 committed by git
parent 194520f80e
commit 94aed6ece5
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fileutils.rb
View File

@ -1642,7 +1642,13 @@ module FileUtils
st = File.stat(s) st = File.stat(s)
unless File.exist?(d) and compare_file(s, d) unless File.exist?(d) and compare_file(s, d)
remove_file d, true remove_file d, true
copy_file s, d if d.end_with?('/')
mkdir_p d
copy_file s, d + File.basename(s)
else
mkdir_p File.expand_path('..', d)
copy_file s, d
end
File.utime st.atime, st.mtime, d if preserve File.utime st.atime, st.mtime, d if preserve
File.chmod fu_mode(mode, st), d if mode File.chmod fu_mode(mode, st), d if mode
File.chown uid, gid, d if uid or gid File.chown uid, gid, d if uid or gid

8
test/fileutils/test_fileutils.rb
View File

@ -1237,6 +1237,14 @@ class TestFileUtils < Test::Unit::TestCase
install Pathname.new('tmp/a'), 'tmp/b' install Pathname.new('tmp/a'), 'tmp/b'
rm_f 'tmp/a'; touch 'tmp/a' rm_f 'tmp/a'; touch 'tmp/a'
install Pathname.new('tmp/a'), Pathname.new('tmp/b') install Pathname.new('tmp/a'), Pathname.new('tmp/b')
my_rm_rf 'tmp/new_dir_end_with_slash'
install Pathname.new('tmp/a'), 'tmp/new_dir_end_with_slash/'
my_rm_rf 'tmp/new_dir_end_with_slash'
my_rm_rf 'tmp/new_dir'
install Pathname.new('tmp/a'), 'tmp/new_dir/a'
my_rm_rf 'tmp/new_dir'
install Pathname.new('tmp/a'), 'tmp/new_dir/new_dir_end_with_slash/'
my_rm_rf 'tmp/new_dir'
rm_f 'tmp/a' rm_f 'tmp/a'
touch 'tmp/a' touch 'tmp/a'
touch 'tmp/b' touch 'tmp/b'