gren 0.1.0 → 0.1.1

data/History.txt

@@ -1,6 +1,17 @@
+=== 0.2.0 2010/08/xx
+
+!!!公開前に...
+  英語にする
+  文章を綺麗にする
+
+* --depth, --this で探索する階層数を指定出来るように
+* -sでサイレントモード、マッチした行のみを表示する
+* -f, --if, --idオプションを何個でも設定出来るように
+* -cで色付き表示
+
 === 0.1.0 2010/08/02
 
-* update README.rdoc.
+* Update README.doc (to English).
 
 === 0.0.6 2010/07/29
 

data/Rakefile

@@ -18,7 +18,9 @@ $hoe = Hoe.spec 'gren' do
   self.developer 'ongaeshi', 'ongaeshi0621@gmail.com'
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
-  # self.extra_deps         = [['activesupport','>= 2.0.2']]
+
+  # 必要とするgem
+  self.extra_deps         = [['termcolor','>= 1.2.0']]
 
   # 本来はnewgemの中で設定されるべき(後で報告した方がいいかも)
   self.extra_rdoc_files << "README.rdoc"

data/bin/gren

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

data/lib/gren/cli.rb

@@ -6,28 +6,25 @@ module Gren
   class CLI
     def self.execute(stdout, arguments=[])
       # オプション
-      option = FindGrep::Option.new(false, false, ".", nil, nil)
+      option = FindGrep::Option.new(".", -1, false, false, false, false, [], [], [])
 
       # オプション解析
-      opt = OptionParser.new("#{File.basename($0)} [option] pattern [dir]")
+      opt = OptionParser.new("#{File.basename($0)} [option] pattern")
+      opt.on('-d DIR', '--directory DIR', 'Start directory. (deafult:".")') {|v| option.directory = v}
+      opt.on('--depth DEPTH', 'Limit search depth. ') {|v| option.depth = v.to_i}
+      opt.on('--this', '"--depth 0"') {|v| option.depth = 0}
       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.on('-s', '--silent', 'Silent. Display match line only.') {|v| option.isSilent = true}
+      opt.on('--debug', 'Debug display.') {|v| option.debugMode = true}
+      opt.on('-c', 'Color highlight.') {|v| option.colorHighlight = true}
+      opt.on('-f REGEXP', '--file-regexp REGEXP', 'Search file regexp. (Enable multiple call)') {|v| option.filePatterns << v}
+      opt.on('--if REGEXP', '--ignore-file REGEXP', 'Ignore file pattern. (Enable multiple call)') {|v| option.ignoreFiles << v}
+      opt.on('--id REGEXP', '--ignore-dir REGEXP', 'Ignore dir pattern. (Enable multiple call)') {|v| option.ignoreDirs << v}
       opt.parse!(arguments)
 
       # 検索オブジェクトの生成
-      findGrep = nil
-
-      case ARGV.length
-      when 1:
-          findGrep = FindGrep.new(arguments[0], '.', option)
-      when 2:
-          findGrep = FindGrep.new(arguments[0], arguments[1], option)
-      end
-      
-      if (findGrep)
+      if (ARGV.size > 0)
+        findGrep = FindGrep.new(arguments, option)
         findGrep.searchAndPrint(stdout)
       else
         stdout.print opt.help

data/lib/gren/findgrep.rb

@@ -1,80 +1,122 @@
 # -*- coding: utf-8 -*-
 require 'find'
 require File.join(File.dirname(__FILE__), 'result')
+require 'rubygems'
+require 'termcolor'
 
 module Gren
   class FindGrep
     IGNORE_FILE = /(\A#.*#\Z)|(~\Z)|(\A\.#)/
     IGNORE_DIR = /(\A\.svn\Z)|(\A\.git\Z)|(\ACVS\Z)/
     
-    Option = Struct.new(:ignoreCase, :fpathDisp, :filePattern, :ignoreFile, :ignoreDir)
+    Option = Struct.new(:directory,
+                        :depth,
+                        :ignoreCase,
+                        :colorHighlight,
+                        :isSilent,
+                        :debugMode,
+                        :filePatterns,
+                        :ignoreFiles,
+                        :ignoreDirs)
     
-    def initialize(pattern, dir, option)
-      @pattern = pattern
-      @dir = dir
+    def initialize(patterns, option)
       @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)
+      @patternRegexps = strs2regs(patterns, @option.ignoreCase)
+      @filePatterns = strs2regs(option.filePatterns)
+      @ignoreFiles = strs2regs(option.ignoreFiles)
+      @ignoreDirs = strs2regs(option.ignoreDirs)
+      @result = Result.new(option.directory)
     end
 
-    def searchAndPrint(stdout)
-      Find::find(@dir) { |fpath|
-        fpath_disp = fpath.gsub(/^.\//, "")
-        
-        # 除外ディレクトリ
-        if ignoreDir?(fpath)
-          @result.prune_dirs << fpath_disp if (@option.fpathDisp)
-          Find.prune
-        end
+    def strs2regs(strs, ignore = false)
+      regs = []
 
-        # ファイルでなければ探索しない
-        next unless FileTest.file?(fpath)
+      strs.each do |v|
+        option = 0
+        option |= Regexp::IGNORECASE if (ignore)
+        regs << Regexp.new(v, option)
+      end
 
-        @result.count += 1
-        
-        # 読み込み不可ならば探索しない
-        unless FileTest.readable?(fpath)
-          @result.unreadable_files << fpath_disp if (@option.fpathDisp)
-          next
-        end
-        
-        @result.size += FileTest.size(fpath)
+      regs
+    end
 
-        # 除外ファイル
-        if ignoreFile?(fpath)
-          @result.ignore_files << fpath_disp if (@option.fpathDisp)
-          next
-        end
-        
-        @result.search_count += 1
-        @result.search_size += FileTest.size(fpath)
+    def searchAndPrint(stdout)
+      searchAndPrintIN(stdout, @option.directory, 0)
 
-        # 検索
-        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
+      unless (@option.isSilent)
+        if (@option.debugMode)
+          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
+
+        unless (@option.colorHighlight)
+          stdout.puts
+        else
+          stdout.puts TermColor.parse("<7>------------------------------------------------------------</7>")
+        end
+
+        @result.print(stdout)
       end
+    end
 
-      stdout.puts
-      @result.print(stdout)
+    def searchAndPrintIN(stdout, dir, depth)
+      if (@option.depth == -1 || depth > @option.depth)
+        return
+      end
+      
+      Dir.foreach(dir) do |name|
+        if name != '.' and name != '..' then
+          fpath = File.join(dir,name)
+          fpath_disp = fpath.gsub(/^.\//, "")
+          
+          # 除外ディレクトリ
+          if ignoreDir?(fpath)
+            @result.prune_dirs << fpath_disp if (@option.debugMode)
+            next;
+          end
+
+          # ファイルでなければ次のディレクトリへ
+          unless FileTest.file?(fpath)
+            searchAndPrintIN(stdout, fpath, depth + 1)
+            next;
+          end
+
+          @result.count += 1
+          
+          # 読み込み不可ならば探索しない
+          unless FileTest.readable?(fpath)
+            @result.unreadable_files << fpath_disp if (@option.debugMode)
+            next
+          end
+          
+          @result.size += FileTest.size(fpath)
+
+          # 除外ファイル
+          if ignoreFile?(fpath)
+            @result.ignore_files << fpath_disp if (@option.debugMode)
+            next
+          end
+          
+          @result.search_count += 1
+          @result.search_size += FileTest.size(fpath)
+
+          # 検索
+          searchMain(stdout, fpath, fpath_disp)
+        end
+      end
     end
+    private :searchAndPrintIN
 
     def print_fpaths(stdout, data)
       stdout.print data.join("\n")
@@ -84,46 +126,67 @@ module Gren
     end
     private :print_fpaths
 
-    def makePattenRegexp
-      option = 0
-      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)) ||
-       (@ignoreDir && @ignoreDir.match(File.basename(fpath))))
+      (IGNORE_DIR.match(File.basename(fpath)) || ignoreDirUser?(fpath))
     end
     private :ignoreDir?
 
+    def ignoreDirUser?(fpath)
+      @ignoreDirs.any? {|v| v.match File.basename(fpath) }
+    end
+    private :ignoreDirUser?
+
     def ignoreFile?(fpath)
-      !@fileRegexp.match(fpath) ||
+      !correctFileUser?(fpath) ||
       IGNORE_FILE.match(File.basename(fpath)) ||
-      (@ignoreFile && @ignoreFile.match(File.basename(fpath))) ||
+      ignoreFileUser?(fpath) ||
       binary?(fpath)
     end
     private :ignoreFile?
 
+    def correctFileUser?(fpath)
+      @filePatterns.empty? ||
+      @filePatterns.any? {|v| v.match File.basename(fpath) }
+    end
+    private :correctFileUser?
+
+    def ignoreFileUser?(fpath)
+      @ignoreFiles.any? {|v| v.match File.basename(fpath) }
+    end
+    private :ignoreFileUser?
+
     def binary?(file)
       s = File.read(file, 1024) or return false
       return s.index("\x00")
     end
 
     def searchMain(stdout, fpath, fpath_disp)
-      @result.search_files << fpath_disp if (@option.fpathDisp)
+      @result.search_files << fpath_disp if (@option.debugMode)
 
       open(fpath, "r") { |file|
         match_file = false
         file.each() { |line|
           line.chomp!
-          if (@patternRegexp.match(line))
-            stdout.puts "#{fpath_disp}:#{file.lineno}:#{line}"
+
+          result, match_datas = match?(line)
+
+          if ( result )
+            unless (@option.colorHighlight)
+              stdout.puts "#{fpath_disp}:#{file.lineno}:#{line}"
+            else
+              header = "#{fpath_disp}:#{file.lineno}"
+                
+              begin
+                stdout.puts TermColor.parse("<34>#{header}</34>:") + coloring(line, match_datas)
+              rescue REXML::ParseException
+                stdout.puts header + line
+              end
+            end
 
             unless match_file
               @result.match_file_count += 1
-              @result.match_files << fpath_disp if (@option.fpathDisp)
+              @result.match_files << fpath_disp if (@option.debugMode)
               match_file = true
             end
 
@@ -134,5 +197,20 @@ module Gren
     end
     private :searchMain
 
+    def match?(line)
+      match_datas = []
+      @patternRegexps.each {|v| match_datas << v.match(line)}
+      return match_datas.all?, match_datas
+    end
+    private :match?
+
+    def coloring(line, match_datas)
+      match_datas.each do |m|
+        line = line.split(m[0]).join(TermColor.parse("<42>#{m[0]}</42>"))
+      end
+      line
+    end
+    private :coloring
+
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,13 +14,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 +09:00
+date: 2010-08-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: termcolor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -30,11 +44,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,7 +58,7 @@ dependencies:
         - 1
         version: 2.6.1
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: gren is a next grep tool.
 email: 
 - ongaeshi0621@gmail.com