diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/fileutils.rb | 16 | ||||
| -rw-r--r-- | lib/un.rb | 6 | ||||
| -rw-r--r-- | test/fileutils/test_fileutils.rb | 16 |
4 files changed, 40 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Jun 27 16:55:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/fileutils.rb (FileUtils#install): add owner and group + options. + Mon Jun 27 08:56:55 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * compile.c (ADD_TRACE): ignore trace instruction on non-positive diff --git a/lib/fileutils.rb b/lib/fileutils.rb index a7fca26dbb..d5bda95b58 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -754,9 +754,20 @@ module FileUtils # FileUtils.install 'ruby', '/usr/local/bin/ruby', :mode => 0755, :verbose => true # FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', :verbose => true # - def install(src, dest, mode: nil, preserve: nil, noop: nil, verbose: nil) - fu_output_message "install -c#{preserve && ' -p'}#{mode ? (' -m 0%o' % mode) : ''} #{[src,dest].flatten.join ' '}" if verbose + def install(src, dest, mode: nil, owner: nil, group: nil, preserve: nil, + noop: nil, verbose: nil) + if verbose + msg = +"install -c" + msg << ' -p' if preserve + msg << ' -m 0%o' % mode if mode + msg << " -o #{owner}" if owner + msg << " -g #{group}" if group + msg << ' ' << [src,dest].flatten.join(' ') + fu_output_message msg + end return if noop + uid = fu_get_uid(owner) + gid = fu_get_gid(group) fu_each_src_dest(src, dest) do |s, d| st = File.stat(s) unless File.exist?(d) and compare_file(s, d) @@ -764,6 +775,7 @@ module FileUtils copy_file s, d File.utime st.atime, st.mtime, d if preserve File.chmod mode, d if mode + File.chown uid, gid, d if uid or gid end end end @@ -189,13 +189,17 @@ end # -p apply access/modification times of SOURCE files to # corresponding destination files # -m set permission mode (as in chmod), instead of 0755 +# -o set owner user id, instead of the current owner +# -g set owner group id, instead of the current group # -v verbose # def install - setup("pm:") do |argv, options| + setup("pm:o:g:") do |argv, options| options[:mode] = (mode = options.delete :m) ? mode.oct : 0755 options[:preserve] = true if options.delete :p + (owner = options.delete :o) and options[:owner] = owner + (group = options.delete :g) and options[:group] = group dest = argv.pop argv = argv[0] if argv.size == 1 FileUtils.install argv, dest, options diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index f5ca9d21e2..63a4590cf0 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -968,6 +968,22 @@ class TestFileUtils < Test::Unit::TestCase } end + def test_install_owner_option + File.open('tmp/aaa', 'w') {|f| f.puts 'aaa' } + File.open('tmp/bbb', 'w') {|f| f.puts 'bbb' } + assert_nothing_raised { + install 'tmp/aaa', 'tmp/bbb', :owner => "nobody", :noop => true + } + end + + def test_install_group_option + File.open('tmp/aaa', 'w') {|f| f.puts 'aaa' } + File.open('tmp/bbb', 'w') {|f| f.puts 'bbb' } + assert_nothing_raised { + install 'tmp/aaa', 'tmp/bbb', :group => "nobody", :noop => true + } + end + def test_chmod check_singleton :chmod |