diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/pathname.rb | 19 |
2 files changed, 14 insertions, 9 deletions
@@ -1,3 +1,7 @@ +Sun Oct 19 13:12:30 2003 Tanaka Akira <akr@m17n.org> + + * lib/pathname.rb (foreachline, dir_foreach): add obsolete warning. + Sun Oct 19 00:14:22 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * test/soap/calc/*, test/soap/helloworkd/*: changed port# of test diff --git a/lib/pathname.rb b/lib/pathname.rb index d104be6897..4822a4a172 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -302,9 +302,12 @@ class Pathname # This method is exist since 1.8.1. def each_line(*args, &block) IO.foreach(@path, *args, &block) end - # This method is obsoleted at 1.8.1. + # Pathname#foreachline is obsoleted at 1.8.1. # - alias foreachline each_line # compatibility to 1.8.0. obsoleted. + def foreachline(*args, &block) # compatibility to 1.8.0. obsoleted. + warn "Pathname#foreachline is obsoleted. Use Pathname#each_line." + each_line(*args, &block) + end def read(*args) IO.read(@path, *args) end def readlines(*args) IO.readlines(@path, *args) end @@ -402,9 +405,12 @@ class Pathname # This method is exist since 1.8.1. def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end - # This method is obsoleted at 1.8.1. + # Pathname#dir_foreach is obsoleted at 1.8.1. # - alias dir_foreach each_entry # compatibility to 1.8.0. obsoleted. + def dir_foreach(*args, &block) # compatibility to 1.8.0. obsoleted. + warn "Pathname#dir_foreach is obsoleted. Use Pathname#each_entry." + each_entry(*args, &block) + end def mkdir(*args) Dir.mkdir(@path, *args) end def opendir(&block) Dir.open(@path, &block) end @@ -531,11 +537,6 @@ if $0 == __FILE__ assert_equal(true, Pathname.new("///").root?) assert_equal(false, Pathname.new("").root?) assert_equal(false, Pathname.new("a").root?) - #assert_equal(true, Pathname.new(".").working_directory?) - #assert_equal(true, Pathname.new("./").working_directory?) - #assert_equal(true, Pathname.new(".//").working_directory?) - #assert_equal(false, Pathname.new("").working_directory?) - #assert_equal(false, Pathname.new("a").working_directory?) end def test_cleanpath |