kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Merge fileutils-1.2.0 from ruby/fileutils.

Browse source 
It includes the following updates:

  * https://github.com/ruby/fileutils/pull/26
  * https://github.com/ruby/fileutils/pull/27
  * https://github.com/ruby/fileutils/pull/29
  * https://github.com/ruby/fileutils/pull/34

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2019-03-27 08:26:09 +00:00
parent c92c0a5935
commit 191b99c89d
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/fileutils.rb
View file

@ -114,12 +114,14 @@ module FileUtils
# #
# Changes the current directory to the directory +dir+. # Changes the current directory to the directory +dir+.
# #
# If this method is called with block, resumes to the old # If this method is called with block, resumes to the previous
# working directory after the block execution finished. # working directory after the block execution has finished.
# #
# FileUtils.cd('/', :verbose => true) # chdir and report it # FileUtils.cd('/') # change directory
# #
# FileUtils.cd('/') do # chdir # FileUtils.cd('/', :verbose => true) # change directory and report it
#
# FileUtils.cd('/') do # change directory
# # ... # do something # # ... # do something
# end # return to original directory # end # return to original directory
# #
@ -1080,11 +1082,6 @@ module FileUtils
end end
module_function :chown_R module_function :chown_R
begin
require 'etc'
rescue LoadError # rescue LoadError for miniruby
end
def fu_get_uid(user) #:nodoc: def fu_get_uid(user) #:nodoc:
return nil unless user return nil unless user
case user case user
@ -1093,6 +1090,7 @@ module FileUtils
when /\A\d+\z/ when /\A\d+\z/
user.to_i user.to_i
else else
require 'etc'
Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil
end end
end end
@ -1106,6 +1104,7 @@ module FileUtils
when /\A\d+\z/ when /\A\d+\z/
group.to_i group.to_i
else else
require 'etc'
Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil
end end
end end
@ -1275,8 +1274,15 @@ module FileUtils
def entries def entries
opts = {} opts = {}
opts[:encoding] = ::Encoding::UTF_8 if fu_windows? opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
Dir.children(path, opts)\
.map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) } files = if Dir.respond_to?(:children)
Dir.children(path, opts)
else
Dir.entries(path(), opts)
.reject {|n| n == '.' or n == '..' }
end
files.map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }
end end
def stat def stat

2
lib/fileutils/fileutils.gemspec
View file

@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.description = "Several file utility methods for copying, moving, removing, etc." s.description = "Several file utility methods for copying, moving, removing, etc."
s.require_path = %w{lib} s.require_path = %w{lib}
s.files = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "fileutils.gemspec", "lib/fileutils.rb", "lib/fileutils/version.rb"] s.files = ["LICENSE.txt", "README.md", "Rakefile", "fileutils.gemspec", "lib/fileutils.rb", "lib/fileutils/version.rb"]
s.required_ruby_version = ">= 2.3.0" s.required_ruby_version = ">= 2.3.0"
s.authors = ["Minero Aoki"] s.authors = ["Minero Aoki"]