summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/find.rb4
-rw-r--r--test/test_find.rb21
3 files changed, 29 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0627f85b8be..2d85d1fb44d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 2 11:15:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/find.rb (Find#find): add "ignore_error" keyword argument
+ defaulted to true. [ruby-core:51025] [Feature #7596]
+
Sun Mar 2 11:13:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/readline/extconf.rb (rl_hook_func_t): define as Function for
diff --git a/lib/find.rb b/lib/find.rb
index 6f3e4282edb..c5fd35b1d74 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -34,7 +34,7 @@ module Find
#
# See the +Find+ module documentation for an example.
#
- def find(*paths) # :yield: path
+ def find(*paths, ignore_error: true) # :yield: path
block_given? or return enum_for(__method__, *paths)
fs_encoding = Encoding.find("filesystem")
@@ -48,12 +48,14 @@ module Find
begin
s = File.lstat(file)
rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
+ raise unless ignore_error
next
end
if s.directory? then
begin
fs = Dir.entries(file, encoding: enc)
rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
+ raise unless ignore_error
next
end
fs.sort!
diff --git a/test/test_find.rb b/test/test_find.rb
index b9246510eda..8bd67829d37 100644
--- a/test/test_find.rb
+++ b/test/test_find.rb
@@ -100,6 +100,16 @@ class TestFind < Test::Unit::TestCase
a = []
Find.find(d) {|f| a << f }
assert_equal([d, dir], a)
+
+ a = []
+ Find.find(d, ignore_error: true) {|f| a << f }
+ assert_equal([d, dir], a)
+
+ a = []
+ assert_raise_with_message(Errno::EACCES, /#{Regexp.quote(dir)}/) do
+ Find.find(d, ignore_error: false) {|f| a << f }
+ end
+ assert_equal([d, dir], a)
ensure
File.chmod(0700, dir)
end
@@ -115,6 +125,17 @@ class TestFind < Test::Unit::TestCase
a = []
Find.find(d) {|f| a << f }
assert_equal([d, dir, file], a)
+
+ a = []
+ Find.find(d, ignore_error: true) {|f| a << f }
+ assert_equal([d, dir, file], a)
+
+ a = []
+ assert_raise_with_message(Errno::EACCES, /#{Regexp.quote(file)}/) do
+ Find.find(d, ignore_error: false) {|f| a << f }
+ end
+ assert_equal([d, dir, file], a)
+
skip "no meaning test on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
assert_raise(Errno::EACCES) { File.lstat(file) }
ensure