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

Delegates 3 arguments for Pathname.glob.

Browse Source 
Thanks for the patch by pocke (Masataka Kuwabara) [Feature #14405].
This commit is contained in:
Tanaka Akira 2019-07-14 17:39:21 +09:00
parent 61577fa53b
commit 4d9504fe13
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/pathname/pathname.c
View File

@ -1092,10 +1092,10 @@ s_glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
static VALUE static VALUE
path_s_glob(int argc, VALUE *argv, VALUE klass) path_s_glob(int argc, VALUE *argv, VALUE klass)
{ {
VALUE args[2]; VALUE args[3];
int n; int n;
n = rb_scan_args(argc, argv, "11", &args[0], &args[1]); n = rb_scan_args(argc, argv, "12", &args[0], &args[1], &args[2]);
if (rb_block_given_p()) { if (rb_block_given_p()) {
return rb_block_call(rb_cDir, id_glob, n, args, s_glob_i, klass); return rb_block_call(rb_cDir, id_glob, n, args, s_glob_i, klass);
} }

11
test/pathname/test_pathname.rb
View File

@ -1251,6 +1251,17 @@ class TestPathname < Test::Unit::TestCase
} }
end end
def test_s_glob_3args
with_tmpchdir('rubytest-pathname') {|dir|
open("f", "w") {|f| f.write "abc" }
Dir.chdir("/") {
assert_equal(
[Pathname("."), Pathname(".."), Pathname("f")],
Pathname.glob("*", File::FNM_DOTMATCH, base: dir).sort)
}
}
end
def test_s_getwd def test_s_getwd
wd = Pathname.getwd wd = Pathname.getwd
assert_kind_of(Pathname, wd) assert_kind_of(Pathname, wd)