From 850df4b8e730905439bb3e33be746eda64d4e2a5 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 22 Dec 2008 02:35:37 +0000 Subject: [PATCH] * lib/rake.rb (Rake::FileList#egrep): change open mode to "rb", i.e. default to binary. [ruby-dev:37385] * lib/rake.rb (Rake::FileList#egrep): allow specifying reading encoding, e.g. FileList['*.rb'].egrep(/require/, encoding: "ascii-8bit") git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ lib/rake.rb | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f23954b819..aa514e7528 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,15 @@ Sat Dec 20 18:28:26 2008 Nobuyoshi Nakada * win32/win32.c (has_redirection): supports environment variables references. +Sat Dec 20 15:34:36 2008 Yukihiro Matsumoto + + * lib/rake.rb (Rake::FileList#egrep): change open mode to "rb", + i.e. default to binary. [ruby-dev:37385] + + * lib/rake.rb (Rake::FileList#egrep): allow specifying reading + encoding, e.g. FileList['*.rb'].egrep(/require/, encoding: + "ascii-8bit") + Sat Dec 20 10:59:16 2008 Yuki Sonoda (Yugui) * lib/irb/locale.rb (IRB::Locale#initialize) diff --git a/lib/rake.rb b/lib/rake.rb index 480068be7a..63412b1531 100755 --- a/lib/rake.rb +++ b/lib/rake.rb @@ -1477,9 +1477,9 @@ module Rake # name, line number, and the matching line of text. If no block is given, # a standard emac style file:linenumber:line message will be printed to # standard out. - def egrep(pattern) + def egrep(pattern, *opt) each do |fn| - open(fn) do |inf| + open(fn, "rb", *opt) do |inf| count = 0 inf.each do |line| count += 1