diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/pathname/lib/pathname.rb | 3 | ||||
| -rw-r--r-- | ext/pathname/pathname.c | 13 | ||||
| -rw-r--r-- | test/pathname/test_pathname.rb | 5 |
4 files changed, 23 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Sep 14 20:17:48 2010 Tanaka Akira <akr@fsij.org> + + * ext/pathname/pathname.c (path_s_getwd): Pathname.getwd and + Pathname.pwd translated from pathname.rb. + Tue Sep 14 05:13:04 2010 Tanaka Akira <akr@fsij.org> * ext/pathname/pathname.c (path_s_glob): Pathname.glob translated diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index e519dd56d2..0efb5d4eb0 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -485,9 +485,6 @@ end class Pathname # * Dir * - # See <tt>Dir.getwd</tt>. Returns the current working directory as a Pathname. - def Pathname.getwd() self.new(Dir.getwd) end - class << self; alias pwd getwd end # Return the entries (files and subdirectories) in the directory, each as a # Pathname object. diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index eca94b4d16..9370794a8c 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -847,6 +847,17 @@ path_s_glob(int argc, VALUE *argv, VALUE klass) } /* + * See <tt>Dir.getwd</tt>. Returns the current working directory as a Pathname. + */ +static VALUE +path_s_getwd(VALUE klass) +{ + VALUE str; + str = rb_funcall(rb_cDir, rb_intern("getwd"), 0); + return rb_class_new_instance(1, &str, klass); +} + +/* * == Pathname * * Pathname represents a pathname which locates a file in a filesystem. @@ -1100,4 +1111,6 @@ Init_pathname() rb_define_method(rb_cPathname, "writable_real?", path_writable_real_p, 0); rb_define_method(rb_cPathname, "zero?", path_zero_p, 0); rb_define_singleton_method(rb_cPathname, "glob", path_s_glob, -1); + rb_define_singleton_method(rb_cPathname, "getwd", path_s_getwd, 0); + rb_define_singleton_method(rb_cPathname, "pwd", path_s_getwd, 0); } diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index 340af2423d..5d22531885 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -1164,6 +1164,11 @@ class TestPathname < Test::Unit::TestCase assert_kind_of(Pathname, wd) end + def test_s_pwd + wd = Pathname.pwd + assert_kind_of(Pathname, wd) + end + def test_entries with_tmpchdir('rubytest-pathname') {|dir| open("a", "w") {} |