From 2768ca8b909896c1b980c8f8b227d15a638dc250 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 19 Oct 2003 04:14:40 +0000 Subject: * lib/pathname.rb (foreachline, dir_foreach): add obsolete warning. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/pathname.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'lib/pathname.rb') 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 -- cgit v1.2.3