gren 0.3.2 → 1.0.0

data/gren.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gren/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "gren"
+  gem.version       = Gren::VERSION
+  gem.authors       = ["ongaeshi"]
+  gem.email         = ["ongaeshi0621@gmail.com"]
+  gem.description   = %q{gren is a next grep tool.}
+  gem.summary       = %q{gren is a next grep tool. The basis is find+grep.}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_dependency 'termcolor','>= 1.2.0'
+end

data/lib/gren.rb

@@ -1,6 +1,6 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require "gren/version"
+require "gren/cli"
 
 module Gren
-  VERSION = '0.3.2'
+  # Your code goes here...
 end

data/lib/gren/cli.rb

@@ -1,33 +1,36 @@
 # -*- coding: utf-8 -*-
 require 'optparse'
-require File.join(File.dirname(__FILE__), '../findgrep/findgrep')
+require 'gren/findgrep/findgrep'
 
 module Gren
   class CLI
     def self.execute(stdout, arguments=[])
       # オプション
-      option = FindGrep::FindGrep::DEFAULT_OPTION
+      option = FindGrep::FindGrep::create_default_option
+      option.isSilent = true
 
       # オプション解析
       opt = OptionParser.new("#{File.basename($0)} [option] pattern")
       opt.on('--not PATTERN', 'Keyword is not included.') {|v| option.keywordsNot << v}
       opt.on('--or PATTERN', 'Either of keyword is contained.') {|v| option.keywordsOr << v}
+      opt.on('-c', '--color', 'Color highlight.') {|v| option.colorHighlight = true}
+      opt.on('--cs', '--case-sensitive', 'Case sensitivity.') {|v| option.caseSensitive = true }
       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('-s', '--silent', 'Silent. Display match line only.') {|v| option.isSilent = true}
       opt.on('--debug', 'Debug display.') {|v| option.debugMode = true}
-      opt.on('-c', '--color', 'Color highlight.') {|v| option.colorHighlight = true}
+      opt.on('--depth DEPTH', 'Limit search depth. ') {|v| option.depth = v.to_i}
+      opt.on('-e ENCODE', '--encode ENCODE', 'Specify encode(none, auto, jis, sjis, euc, ascii, utf8, utf16). Default is "auto"') {|v| setupEncodeOption(option, v) }
       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('-i', '--ignore', 'Ignore case.') {|v| option.ignoreCase = true}
       opt.on('--id REGEXP', '--ignore-dir REGEXP', 'Ignore dir pattern. (Enable multiple call)') {|v| option.ignoreDirs << v}
-      opt.on('-e ENCODE', '--encode ENCODE', 'Specify encode(none, auto, jis, sjis, euc, ascii, utf8, utf16). Default is "auto"') {|v| setupEncodeOption(option, v) }
+      opt.on('--if REGEXP', '--ignore-file REGEXP', 'Ignore file pattern. (Enable multiple call)') {|v| option.ignoreFiles << v}
       opt.on('--no-snip', 'There being a long line, it does not snip.') {|v| option.noSnip = true }
+      opt.on('--silent', 'Silent. Display match line only.') {|v| option.isSilent = true}
+      opt.on('--this', '"--depth 0"') {|v| option.depth = 0}
+      opt.on('-v', '--verbose', 'Set the verbose level of output.') {|v| option.isSilent = false }
       opt.parse!(arguments)
 
       # 検索オブジェクトの生成
-      if (arguments.size > 0 || option.keywordsOr.size > 0)
+      if (arguments.size > 0 || option.keywordsOr.size > 0 || Util.pipe?($stdin))
         findGrep = FindGrep::FindGrep.new(arguments, option)
         findGrep.searchAndPrint(stdout)
       else

data/lib/{common → gren/common}/grensnip.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require File.join(File.dirname(__FILE__), 'string_snip')
+require 'gren/common/string_snip'
 
 class GrenSnip
   MAX_LINE_SIZE = 256

data/lib/{common → gren/common}/util.rb

@@ -2,13 +2,15 @@
 
 module Gren
   module Util
+    module_function
+
     def time_s(time)
       t = time.truncate
       h = t / 3600
       t = t % 3600
       m = t / 60
       t = t % 60
-      t += round(time - time.prec_i, 2)
+      t += round(time - time.to_i, 2)
       
       if (h > 0 && m > 0)
         "#{h}h #{m}m #{t}s"
@@ -18,12 +20,10 @@ module Gren
         "#{t}sec"
       end
     end
-    module_function :time_s
 
     def round(n, d)
       (n * 10 ** d).round / 10.0 ** d
     end
-    module_function :round
 
     def size_s(size)
       tb = 1024 ** 4
@@ -32,18 +32,17 @@ module Gren
       kb = 1024
 
       if (size >= tb)
-        round(size / tb.prec_f, 2).to_s + "TB"
+        round(size / tb.to_f, 2).to_s + "TB"
       elsif (size >= gb)
-        round(size / gb.prec_f, 2).to_s + "GB"
+        round(size / gb.to_f, 2).to_s + "GB"
       elsif (size >= mb)
-        round(size / mb.prec_f, 2).to_s + "MB"
+        round(size / mb.to_f, 2).to_s + "MB"
       elsif (size >= kb)
-        round(size / kb.prec_f, 2).to_s + "KB"
+        round(size / kb.to_f, 2).to_s + "KB"
       else
         size.to_s + "Byte"
       end
     end
-    module_function :size_s
 
     # アルファベットと演算子で表示する数を変える
     ALPHABET_DISP_NUM = 5
@@ -61,7 +60,6 @@ module Gren
         c = c.superclass
       end
     end
-    module_function :p_classtree
 
     def p_classtree_sub(c)
       # メソッドの一覧を得る
@@ -92,7 +90,15 @@ module Gren
       end
       puts
     end
-    module_function :p_classtree_sub
+
+    # StringIO patch
+    def pipe?(io)
+      io.instance_of?(IO) && File.pipe?(io)
+    end
+
+    def downcase?(str)
+      str == str.downcase
+    end
 
   end
 end

data/lib/{findgrep → gren/findgrep}/findgrep.rb

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 require 'find'
-require File.join(File.dirname(__FILE__), 'result')
+require 'gren/findgrep/result'
 require 'rubygems'
 require 'termcolor'
 require 'kconv'
-require File.join(File.dirname(__FILE__), '../common/platform')
-require File.join(File.dirname(__FILE__), '../common/grenfiletest')
-require File.join(File.dirname(__FILE__), '../common/grensnip')
-require 'groonga'
-require File.join(File.dirname(__FILE__), '../common/util')
+require 'gren/common/platform'
+require 'gren/common/grenfiletest'
+require 'gren/common/grensnip'
+require 'gren/common/util'
 include Gren
 require 'cgi'
 
@@ -19,6 +18,7 @@ module FindGrep
                         :directory,
                         :depth,
                         :ignoreCase,
+                        :caseSensitive,
                         :colorHighlight,
                         :isSilent,
                         :debugMode,
@@ -28,66 +28,47 @@ module FindGrep
                         :ignoreDirs,
                         :kcode,
                         :noSnip,
-                        :dbFile,
-                        :groongaOnly,
-                        :isMatchFile,
-                        :dispHtml)
-    
-    DEFAULT_OPTION = Option.new([],
-                                [],
-                                ".",
-                                -1,
-                                false,
-                                false,
-                                false,
-                                false,
-                                [],
-                                [],
-                                [],
-                                [],
-                                Platform.get_shell_kcode,
-                                false,
-                                nil,
-                                false,
-                                false,
-                                false)
+                        :isMatchFile)
+
+    def self.create_default_option
+      Option.new([],
+                 [],
+                 ".",
+                 -1,
+                 false,
+                 false,
+                 false,
+                 false,
+                 false,
+                 [],
+                 [],
+                 [],
+                 [],
+                 Kconv::UTF8, # Platform.get_shell_kcode,
+                 false,
+                 false)
+    end
     
     attr_reader :documents
     
     def initialize(patterns, option)
-      @patterns = patterns
-      @option = option
-      @patternRegexps = strs2regs(patterns, @option.ignoreCase)
-      @subRegexps = strs2regs(option.keywordsNot, @option.ignoreCase)
-      @orRegexps = strs2regs(option.keywordsOr, @option.ignoreCase)
-      @filePatterns = (!@option.dbFile) ? strs2regs(option.filePatterns) : []
-      @ignoreFiles = strs2regs(option.ignoreFiles)
-      @ignoreDirs = strs2regs(option.ignoreDirs)
-      @result = Result.new(option.directory)
-      open_database if (@option.dbFile)
+      @patterns       = patterns
+      @option         = option
+      @patternRegexps = strs2regs(patterns)
+      @subRegexps     = strs2regs(option.keywordsNot)
+      @orRegexps      = strs2regs(option.keywordsOr)
+      @filePatterns   = strs2regs(option.filePatterns)
+      @ignoreFiles    = strs2regs(option.ignoreFiles)
+      @ignoreDirs     = strs2regs(option.ignoreDirs)
+      @result         = Result.new(option.directory)
     end
 
-    def open_database()
-      # データベース開く
-      dbfile = Pathname(File.expand_path(@option.dbFile))
-      
-      if dbfile.exist?
-        Groonga::Database.open(dbfile.to_s)
-        puts "open    : #{dbfile} open."
-      else
-        raise "error    : #{dbfile.to_s} not found!!"
-      end
-      
-      # ドキュメントを取
-      @documents = Groonga::Context.default["documents"]
-    end
-
-    def strs2regs(strs, ignore = false)
+    def strs2regs(strs)
       regs = []
 
       strs.each do |v|
         option = 0
-        option |= Regexp::IGNORECASE if (ignore)
+        option |= Regexp::IGNORECASE if (@option.ignoreCase || (!@option.caseSensitive && Util::downcase?(v)))
         regs << Regexp.new(v, option)
       end
 
@@ -95,15 +76,15 @@ module FindGrep
     end
 
     def searchAndPrint(stdout)
-      unless (@option.dbFile)
+      unless Util.pipe?($stdin)
         searchFromDir(stdout, @option.directory, 0)
       else
-        searchFromDB(stdout, @option.directory)
+        searchData(stdout, $stdin.read.split("\n"), nil)
       end
 
       @result.time_stop
       
-      if (!@option.isSilent && !@option.dispHtml)
+      if !@option.isSilent
         if (@option.debugMode)
           stdout.puts
           stdout.puts "--- search --------"
@@ -128,56 +109,6 @@ module FindGrep
       end
     end
 
-    def searchFromDB(stdout, dir)
-      # 全てのパターンを検索
-      table = @documents.select do |record|
-        expression = nil
-
-        # キーワード
-        @patterns.each do |word|
-          sub_expression = record.content =~ word
-          if expression.nil?
-            expression = sub_expression
-          else
-            expression &= sub_expression
-          end
-        end
-        
-        # パス
-        @option.filePatterns.each do |word|
-          sub_expression = record.path =~ word
-          if expression.nil?
-            expression = sub_expression
-          else
-            expression &= sub_expression
-          end
-        end
-
-        # 拡張子(OR)
-        se = suffix_expression(record) 
-        expression &= se if (se)
-        
-        # 検索式
-        expression
-      end
-      
-      # タイムスタンプでソート
-      records = table.sort([{:key => "_score", :order => "descending"},
-                            {:key => "timestamp", :order => "descending"}])
-
-      # データベースにヒット
-      stdout.puts "Found   : #{records.size} records." unless (@option.dispHtml)
-
-      # 検索にヒットしたファイルを実際に検索
-      records.each do |record|
-        if (@option.groongaOnly)
-          searchGroongaOnly(stdout, record)
-        else
-          searchFile(stdout, record.path, record.path) if FileTest.exist?(record.path)
-        end
-      end
-    end
-
     def and_expression(key, list)
       sub = nil
       
@@ -303,21 +234,6 @@ module FindGrep
     end
     private :searchFile
 
-    def searchGroongaOnly(stdout, record)
-      file_size = record.content.size
-      
-      @result.count += 1
-      @result.size += file_size
-      
-      @result.search_count += 1
-      @result.search_size += file_size
-      
-      @result.search_files << record.path if (@option.debugMode)
-
-      searchData(stdout, record.content, record.path)
-    end
-    private :searchGroongaOnly
-
     def searchData(stdout, data, path)
       match_file = false
 
@@ -325,29 +241,17 @@ module FindGrep
         result, match_datas = match?(line)
 
         if ( result )
-          unless (@option.dispHtml)
-            header = "#{path}:#{index + 1}:"
-            line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
-
-            unless (@option.colorHighlight)
-              stdout.puts header + line
-            else
-              stdout.puts HighLine::BLUE + header + HighLine::CLEAR + GrenSnip::coloring(line, match_datas)
-            end
+          header = path ? "#{path}:#{index + 1}:" : ""
+          line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
+
+          unless (@option.colorHighlight)
+            stdout.puts header + line
           else
-            line_no = index + 1
-            line = GrenSnip::snip(line, match_datas) unless (@option.noSnip)
-            
-            stdout.puts <<EOF
-<h2><a href="../::view#{path}">#{path}</a></h2>
-<pre>
-#{line_no} : #{CGI.escapeHTML(line)}
-</pre>
-EOF
+            stdout.puts HighLine::BLUE + header + HighLine::CLEAR + GrenSnip::coloring(line, match_datas)
           end
 
           unless match_file
-            @result.match_file_count += 1
+             @result.match_file_count += 1
             @result.match_files << path if (@option.debugMode)
             match_file = true
             break if (@option.isMatchFile)

data/lib/{findgrep → gren/findgrep}/result.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'find'
-require File.join(File.dirname(__FILE__), '../common/util')
+require 'gren/common/util'
 include Gren
 
 module FindGrep

data/lib/gren/version.rb

@@ -0,0 +1,3 @@
+module Gren
+  VERSION = "1.0.0"
+end

data/test/data/aaa.txt

@@ -0,0 +1 @@
+aaa

data/test/data/abc.rb

@@ -0,0 +1,8 @@
+def abc
+  p <<EOF
+a
+bb
+cc
+abc
+EOF
+end