gren 0.0.3 → 0.0.4

data/Manifest.txt

@@ -6,6 +6,8 @@ Rakefile
 bin/gren
 lib/gren.rb
 lib/gren/cli.rb
+lib/gren/findgrep.rb
+lib/gren/result.rb
 script/console
 script/destroy
 script/generate

data/bin/gren

@@ -7,5 +7,5 @@ require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/gren")
 require "gren/cli"
 
-Version = "0.0.3"
+Version = "0.0.4"
 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.3'
+  VERSION = '0.0.4'
 end

data/lib/gren/cli.rb

@@ -1,74 +1,8 @@
 # -*- coding: utf-8 -*-
-require "find"
 require 'optparse'
+require File.join(File.dirname(__FILE__), 'findgrep')
 
 module Gren
-  class FindGrep
-    DEFAULT_DIR = '.'
-    DEFAULT_FILE_PATTERN = '(\.cpp$)|(\.c$)|(\.h$)|(\.hpp$)|(\.csv$)|(makefile$)|(makefile\.[0-9A-Za-z]+$)|(\.mk$)|(\.rb$)|(\.ags$)'
-    DEFAULT_FPATH_PATTERN = '(\.svn)|(\.git)|(CVS)'
-    
-    attr_writer :ignoreCase
-    attr_writer :fpathDisp
-    
-    def initialize(pattern, dir = DEFAULT_DIR, filePattern = DEFAULT_FILE_PATTERN, fpathPattern = DEFAULT_FPATH_PATTERN)
-      @pattern = pattern
-      @dir = dir
-      @filePattern = filePattern
-      @fpathPattern = fpathPattern
-      @ignoreCase = false
-      @fpathDisp = false
-    end
-
-    def searchAndPrint(stdout)
-      fileRegexp = Regexp.new(@filePattern)
-      patternRegexp = makePattenRegexp
-      
-      Find::find(@dir) { |fpath|
-        if (File.file?(fpath) &&
-            fileRegexp.match(fpath) &&
-            fpath !~ /#{@fpathPattern}/)
-          # 行頭の./は削除
-          fpath.gsub!(/^.\//, "");
-
-          # ファイルパスを表示
-          if (@fpathDisp)
-            stdout.print "#{fpath}"
-          end
-
-          # 検索
-          open(fpath, "r") { |file| 
-            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 == ".")
-                  break
-                end
-              end
-            }
-          }
-
-          # 改行
-          stdout.puts if (@fpathDisp)
-
-        end
-      }
-    end
-
-    def makePattenRegexp
-      option = 0
-      option |= Regexp::IGNORECASE if (@ignoreCase)
-      Regexp.new(@pattern, option)
-    end
-    private :makePattenRegexp
-  end
-
   class CLI
     def self.execute(stdout, arguments=[])
       # オプション
@@ -76,7 +10,7 @@ module Gren
       fpathDisp = false
 
       # オプション解析
-      opt = OptionParser.new("#{File.basename($0)} [option] pattern [dir] [file_pattern] [fpath]")
+      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.parse!(arguments)

data/lib/gren/findgrep.rb

@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+require 'find'
+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)/    
+    
+    attr_writer :ignoreCase
+    attr_writer :fpathDisp
+    
+    def initialize(pattern, dir = '.', filePattern = '.')
+      @pattern = pattern
+      @dir = dir
+      @fileRegexp = Regexp.new(filePattern)
+      @ignoreCase = false
+      @fpathDisp = false
+      @patternRegexp = makePattenRegexp
+      @result = Result.new(@dir)
+    end
+
+    def searchAndPrint(stdout)
+      Find::find(@dir) { |fpath|
+        # 除外ディレクトリ
+        Find.prune if ignoreDir?(fpath)
+
+        # ファイルでなければ探索しない
+        next unless FileTest.file?(fpath)
+
+        @result.count += 1
+        
+        # 読み込み不可ならば探索しない
+        next unless FileTest.readable?(fpath)
+        
+        @result.size += FileTest.size(fpath)
+
+        # 除外ファイル
+        next if ignoreFile?(fpath)
+        
+        @result.search_count += 1
+        @result.search_size += FileTest.size(fpath)
+
+        # 行頭の./は削除
+        fpath.gsub!(/^.\//, "");
+
+        # 検索
+        searchMain(stdout, fpath)
+      }
+      
+      @result.time_stop
+      stdout.puts
+      @result.print(stdout)
+    end
+
+    def makePattenRegexp
+      option = 0
+      option |= Regexp::IGNORECASE if (@ignoreCase)
+      Regexp.new(@pattern, option)
+    end
+    private :makePattenRegexp
+
+    def ignoreDir?(fpath)
+      FileTest.directory?(fpath) &&
+      IGNORE_DIR.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)
+    end
+    private :ignoreFile?
+
+    def binary?(file)
+      s = File.read(file, 1024) or return false
+      return s.index("\x00")
+    end
+
+    def searchMain(stdout, fpath)
+      # ファイルパスを表示
+      stdout.print "#{fpath}" if (@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
+
+            unless match_file
+              @result.match_file += 1
+              match_file = true
+            end
+
+            @result.match_count += 1
+          end
+        }
+      }
+
+      # 改行
+      stdout.puts if (@fpathDisp)
+    end
+    private :searchMain
+
+  end
+end

data/lib/gren/result.rb

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+require 'find'
+
+module Gren
+  class Result
+    attr_accessor :count
+    attr_accessor :search_count
+    attr_accessor :match_file
+    attr_accessor :match_count
+    attr_accessor :size
+    attr_accessor :search_size
+
+    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
+      @start_time = Time.now
+    end
+
+    def time_stop
+      @end_time = Time.now
+    end
+
+    def time
+      @end_time - @start_time 
+    end
+
+    def time_s
+      t = time.truncate
+      h = t / 3600
+      t = t % 3600
+      m = t / 60
+      t = t % 60
+      t += round(time - time.prec_i, 2)
+      
+      if (h > 0 && m > 0)
+        "#{h}h #{m}m #{t}s"
+      elsif (m > 0)
+        "#{m}m #{t}s"
+      else
+        "#{t}sec"
+      end
+    end
+
+    def round(n, d)
+      (n * 10 ** d).round / 10.0 ** d
+    end
+
+    def size_s(size)
+      tb = 1024 ** 4
+      gb = 1024 ** 3
+      mb = 1024 ** 2
+      kb = 1024
+
+      if (size >= tb)
+        round(size / tb.prec_f, 2).to_s + "TB"
+      elsif (size >= gb)
+        round(size / gb.prec_f, 2).to_s + "GB"
+      elsif (size >= mb)
+        round(size / mb.prec_f, 2).to_s + "MB"
+      elsif (size >= kb)
+        round(size / kb.prec_f, 2).to_s + "KB"
+      else
+        size.to_s + "Byte"
+      end
+    end
+
+    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"
+    end
+
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +09:00
+date: 2010-07-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,8 @@ files:
 - bin/gren
 - lib/gren.rb
 - lib/gren/cli.rb
+- lib/gren/findgrep.rb
+- lib/gren/result.rb
 - script/console
 - script/destroy
 - script/generate