gren 0.0.4 → 0.0.5

data/bin/gren

@@ -7,5 +7,5 @@ require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/gren")
 require "gren/cli"
 
-Version = "0.0.4"
+Version = "0.0.5"
 Gren::CLI.execute(STDOUT, ARGV)

data/lib/gren.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Gren
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/gren/cli.rb

@@ -6,13 +6,15 @@ module Gren
   class CLI
     def self.execute(stdout, arguments=[])
       # オプション
-      ignoreCase = false
-      fpathDisp = false
+      option = FindGrep::Option.new(false, false, ".", nil, nil)
 
       # オプション解析
-      opt = OptionParser.new("#{File.basename($0)} [option] pattern [dir] [filename_regexp]")
-      opt.on('-i', 'Ignore case.') {|v| ignoreCase = true}
-      opt.on('-f', 'The searched file name is displayed.') {|v| fpathDisp = true}
+      opt = OptionParser.new("#{File.basename($0)} [option] pattern [dir]")
+      opt.on('-i', '--ignore', 'Ignore case.') {|v| option.ignoreCase = true}
+      opt.on('-l', '--listing', 'The searched file name is displayed.') {|v| option.fpathDisp = true}
+      opt.on('-f REGEXP', '--file-regexp REGEXP', 'Search file regexp. (default: ".")') {|v| option.filePattern = v}
+      opt.on('--if REGEXP', '--ignore-file REGEXP', 'Ignore file pattern.') {|v| option.ignoreFile = v}
+      opt.on('--id REGEXP', '--ignore-dir REGEXP', 'Ignore dir pattern.') {|v| option.ignoreDir = v}
       opt.parse!(arguments)
 
       # 検索オブジェクトの生成
@@ -20,19 +22,12 @@ module Gren
 
       case ARGV.length
       when 1:
-          findGrep = FindGrep.new(arguments[0])
+          findGrep = FindGrep.new(arguments[0], '.', option)
       when 2:
-          findGrep = FindGrep.new(arguments[0], arguments[1])
-      when 3:
-          findGrep = FindGrep.new(arguments[0], arguments[1], arguments[2])
+          findGrep = FindGrep.new(arguments[0], arguments[1], option)
       end
       
       if (findGrep)
-        # オプション設定
-        findGrep.ignoreCase = ignoreCase
-        findGrep.fpathDisp = fpathDisp
-        
-        # 検索
         findGrep.searchAndPrint(stdout)
       else
         stdout.print opt.help

data/lib/gren/findgrep.rb

@@ -4,27 +4,31 @@ require File.join(File.dirname(__FILE__), 'result')
 
 module Gren
   class FindGrep
-#    DEFAULT_FPATH_PATTERN = '(\.svn)|(\.git)|(CVS)|(\.o$)|(\.lo$)|(\.la$)|(^#.*#$)|(~$)|(^.#)|(^\.DS_Store$)|(\.bak$)|(\.BAK$)'
     IGNORE_FILE = /(\A#.*#\Z)|(~\Z)|(\A\.#)/
-    IGNORE_DIR = /(\A\.svn\Z)|(\A\.git\Z)|(\ACVS\Z)/    
+    IGNORE_DIR = /(\A\.svn\Z)|(\A\.git\Z)|(\ACVS\Z)/
     
-    attr_writer :ignoreCase
-    attr_writer :fpathDisp
+    Option = Struct.new(:ignoreCase, :fpathDisp, :filePattern, :ignoreFile, :ignoreDir)
     
-    def initialize(pattern, dir = '.', filePattern = '.')
+    def initialize(pattern, dir, option)
       @pattern = pattern
       @dir = dir
-      @fileRegexp = Regexp.new(filePattern)
-      @ignoreCase = false
-      @fpathDisp = false
+      @option = option
+      @fileRegexp = Regexp.new(option.filePattern)
       @patternRegexp = makePattenRegexp
+      @ignoreFile = Regexp.new(option.ignoreFile) if option.ignoreFile
+      @ignoreDir = Regexp.new(option.ignoreDir) if option.ignoreDir
       @result = Result.new(@dir)
     end
 
     def searchAndPrint(stdout)
       Find::find(@dir) { |fpath|
+        fpath_disp = fpath.gsub(/^.\//, "")
+        
         # 除外ディレクトリ
-        Find.prune if ignoreDir?(fpath)
+        if ignoreDir?(fpath)
+          @result.prune_dirs << fpath_disp if (@option.fpathDisp)
+          Find.prune
+        end
 
         # ファイルでなければ探索しない
         next unless FileTest.file?(fpath)
@@ -32,50 +36,73 @@ module Gren
         @result.count += 1
         
         # 読み込み不可ならば探索しない
-        next unless FileTest.readable?(fpath)
+        unless FileTest.readable?(fpath)
+          @result.unreadable_files << fpath_disp if (@option.fpathDisp)
+          next
+        end
         
         @result.size += FileTest.size(fpath)
 
         # 除外ファイル
-        next if ignoreFile?(fpath)
+        if ignoreFile?(fpath)
+          @result.ignore_files << fpath_disp if (@option.fpathDisp)
+          next
+        end
         
         @result.search_count += 1
         @result.search_size += FileTest.size(fpath)
 
-        # 行頭の./は削除
-        fpath.gsub!(/^.\//, "");
-
         # 検索
-        searchMain(stdout, fpath)
+        searchMain(stdout, fpath, fpath_disp)
       }
       
       @result.time_stop
+      
+      if (@option.fpathDisp)
+        stdout.puts
+        stdout.puts "--- search --------"
+        print_fpaths stdout, @result.search_files
+        stdout.puts "--- match --------"
+        print_fpaths stdout, @result.match_files
+        stdout.puts "--- ignore-file --------"
+        print_fpaths stdout, @result.ignore_files
+        stdout.puts "--- ignore-dir --------"
+        print_fpaths stdout, @result.prune_dirs
+        stdout.puts "--- unreadable --------"
+        print_fpaths stdout, @result.unreadable_files
+      end
+
       stdout.puts
       @result.print(stdout)
     end
 
+    def print_fpaths(stdout, data)
+      stdout.print data.join("\n")
+      stdout.puts if data.count > 0
+      stdout.puts "total: #{data.count}"
+      stdout.puts
+    end
+    private :print_fpaths
+
     def makePattenRegexp
       option = 0
-      option |= Regexp::IGNORECASE if (@ignoreCase)
+      option |= Regexp::IGNORECASE if (@option.ignoreCase)
       Regexp.new(@pattern, option)
     end
     private :makePattenRegexp
 
     def ignoreDir?(fpath)
       FileTest.directory?(fpath) &&
-      IGNORE_DIR.match(File.basename(fpath))
+      (IGNORE_DIR.match(File.basename(fpath)) ||
+       (@ignoreDir && @ignoreDir.match(File.basename(fpath))))
     end
     private :ignoreDir?
 
-    def readFile?(fpath)
-      @fileRegexp.match(fpath) &&        
-      !IGNORE_FILE.match(File.basename(fpath)) &&
-      !binary?(fpath)
-    end
-    private :readFile?
-
     def ignoreFile?(fpath)
-      !readFile?(fpath)
+      !@fileRegexp.match(fpath) ||
+      IGNORE_FILE.match(File.basename(fpath)) ||
+      (@ignoreFile && @ignoreFile.match(File.basename(fpath))) ||
+      binary?(fpath)
     end
     private :ignoreFile?
 
@@ -84,26 +111,19 @@ module Gren
       return s.index("\x00")
     end
 
-    def searchMain(stdout, fpath)
-      # ファイルパスを表示
-      stdout.print "#{fpath}" if (@fpathDisp)
+    def searchMain(stdout, fpath, fpath_disp)
+      @result.search_files << fpath_disp if (@option.fpathDisp)
 
       open(fpath, "r") { |file|
         match_file = false
         file.each() { |line|
           line.chomp!
           if (@patternRegexp.match(line))
-            if (!@fpathDisp)
-              stdout.print "#{fpath}:#{file.lineno}:#{line}\n"
-            else
-              # 隠しコマンド
-              #   patternに"."を渡した時はFound patternを表示しない
-              #   ファイル名一覧を取得する時等に便利
-              stdout.print " ........ Found pattern." unless (@pattern == ".")
-            end
+            stdout.puts "#{fpath_disp}:#{file.lineno}:#{line}"
 
             unless match_file
-              @result.match_file += 1
+              @result.match_file_count += 1
+              @result.match_files << fpath_disp if (@option.fpathDisp)
               match_file = true
             end
 
@@ -111,9 +131,6 @@ module Gren
           end
         }
       }
-
-      # 改行
-      stdout.puts if (@fpathDisp)
     end
     private :searchMain
 

data/lib/gren/result.rb

@@ -5,15 +5,22 @@ module Gren
   class Result
     attr_accessor :count
     attr_accessor :search_count
-    attr_accessor :match_file
+    attr_accessor :match_file_count
     attr_accessor :match_count
     attr_accessor :size
     attr_accessor :search_size
+    
+    attr_accessor :search_files
+    attr_accessor :match_files
+    attr_accessor :unreadable_files
+    attr_accessor :prune_dirs
+    attr_accessor :ignore_files
 
     def initialize(start_dir)
       @start_dir = File.expand_path(start_dir)
-      @count, @search_count, @match_file, @match_count, @size, @search_size = 0, 0, 0, 0, 0, 0
+      @count, @search_count, @match_file_count, @match_count, @size, @search_size = 0, 0, 0, 0, 0, 0
       @start_time = Time.now
+      @search_files, @match_files, @unreadable_files, @prune_dirs, @ignore_files  = [], [], [], [], []
     end
 
     def time_stop
@@ -67,7 +74,7 @@ module Gren
     def print(stdout)
       stdout.puts "dir   : #{@start_dir} (#{time_s})"
       stdout.puts "files : #{@search_count} in #{@count} (#{size_s(@search_size)} in #{size_s(@size)})"
-      stdout.puts "match : #{@match_file} files, #{match_count} match"
+      stdout.puts "match : #{@match_file_count} files, #{match_count} hit"
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - ongaeshi