gren 0.0.1 → 0.0.2

data/bin/gren

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

data/lib/gren/cli.rb

@@ -4,13 +4,18 @@ require 'optparse'
 
 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, filePattern)
+    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
@@ -22,10 +27,13 @@ module Gren
       Find::find(@dir) { |fpath|
         if (File.file?(fpath) &&
             fileRegexp.match(fpath) &&
-            fpath !~ /\.svn/)       # .svnディレクトリは無視
+            fpath !~ /#{@fpathPattern}/)
+          # 行頭の./は削除
+          fpath.gsub!(/^.\//, "");
+
           # ファイルパスを表示
           if (@fpathDisp)
-            stdout.print "#{fpath}\n"
+            stdout.print "#{fpath}"
           end
 
           # 検索
@@ -33,10 +41,22 @@ module Gren
             file.each() { |line|
               line.chomp!
               if (patternRegexp.match(line))
-                stdout.print "#{fpath}:#{file.lineno}:#{line}\n"
+                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
@@ -51,37 +71,39 @@ module Gren
 
   class CLI
     def self.execute(stdout, arguments=[])
+      # オプション
       ignoreCase = false
       fpathDisp = false
 
       # オプション解析
-      opt = OptionParser.new("#{File.basename($0)} [option] pattern dir [file_pattern] [fpath]")
-      opt.on('-i', '大文字と小文字を無視する') {|v| ignoreCase = true}
-      opt.on('-d', '検索対象に含めたファイルを表示') {|v| fpathDisp = true}
+      opt = OptionParser.new("#{File.basename($0)} [option] pattern [dir] [file_pattern] [fpath]")
+      opt.on('-i', 'Ignore case.') {|v| ignoreCase = true}
+      opt.on('-f', 'The searched file name is displayed.') {|v| fpathDisp = true}
       opt.parse!(arguments)
 
       # 検索オブジェクトの生成
       findGrep = nil
 
-      if (ARGV.length == 2)
-        findGrep = FindGrep.new(arguments[0],
-                                arguments[1],
-                                '(\.cpp$)|(\.c$)|(\.h$)|(\.hpp$)|(\.csv$)|(makefile$)|(makefile\.[0-9A-Za-z]+$)|(\.mk$)|(\.rb$)|(\.ags$)')
-      elsif (arguments.length == 3)
-        findGrep = FindGrep.new(arguments[0],
-                                arguments[1],
-                                arguments[2])
+      case ARGV.length
+      when 1:
+          findGrep = FindGrep.new(arguments[0])
+      when 2:
+          findGrep = FindGrep.new(arguments[0], arguments[1])
+      when 3:
+          findGrep = FindGrep.new(arguments[0], arguments[1], arguments[2])
+      end
+      
+      if (findGrep)
+        # オプション設定
+        findGrep.ignoreCase = ignoreCase
+        findGrep.fpathDisp = fpathDisp
+        
+        # 検索
+        findGrep.searchAndPrint(stdout)
       else
         stdout.print opt.help
-        return
       end
 
-      # オプション設定
-      findGrep.ignoreCase = ignoreCase
-      findGrep.fpathDisp = fpathDisp
-
-      # 検索
-      findGrep.searchAndPrint(stdout)
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - ongaeshi