gren 0.1.2 → 0.1.3

data/History.txt

@@ -1,9 +1,21 @@
 === 0.2.0 2010/08/xx
 
+Commin soon!! 
+
 !!!公開前に...
   英語にする
   文章を綺麗にする
 
+=== 0.1.3 2010/08/13
+
+* 含まれない検索、OR検索に対応
+  * --subで指定したキーワードは''含まれない''
+  * --orで指定したキーワードは''いずれかを含む''
+
+* 自動エンコードに対応
+  * ファイルの文字コードがばらばらでも、自動的にシェルで使用している文字コードにあわせてくれるようにした
+  * -e, --encode ENCODE              Specify encode(none, auto, jis, sjis, euc, ascii, utf8, utf16). Default is "auto"
+
 === 0.1.2 2010/08/05
 
 * Bug fix.
@@ -11,7 +23,7 @@
 
 === 0.1.1 2010/08/04
 
-* --depth, --this で探索する階層数を指定出来るように
+* --depth, --this(== "--depth 0")、探索する階層数を指定出来るように
 * -sでサイレントモード、マッチした行のみを表示する
 * -f, --if, --idオプションを何個でも設定出来るように
 * -cで色付き表示

data/Manifest.txt

@@ -1,16 +1,18 @@
-History.txt
-Manifest.txt
-PostInstall.txt
-README.rdoc
-Rakefile
-bin/gren
-lib/gren.rb
-lib/gren/cli.rb
-lib/gren/findgrep.rb
-lib/gren/result.rb
-script/console
-script/destroy
-script/generate
-test/test_gren.rb
-test/test_gren_cli.rb
-test/test_helper.rb
+History.txt
+Manifest.txt
+PostInstall.txt
+README.rdoc
+Rakefile
+bin/gren
+lib/gren.rb
+lib/gren/cli.rb
+lib/gren/findgrep.rb
+lib/gren/result.rb
+lib/platform.rb
+rake_rdoc_custom.rb
+script/console
+script/destroy
+script/generate
+test/test_gren.rb
+test/test_gren_cli.rb
+test/test_helper.rb

data/bin/gren

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

data/lib/gren/cli.rb

@@ -6,24 +6,27 @@ module Gren
   class CLI
     def self.execute(stdout, arguments=[])
       # オプション
-      option = FindGrep::Option.new(".", -1, false, false, false, false, [], [], [])
+      option = FindGrep::DEFAULT_OPTION
 
       # オプション解析
       opt = OptionParser.new("#{File.basename($0)} [option] pattern")
+      opt.on('--sub PATTERN', 'Keyword is not included.') {|v| option.keywordsSub << v}
+      opt.on('--or PATTERN', 'Either of keyword is contained.') {|v| option.keywordsOr << v}
       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 highlight.') {|v| option.colorHighlight = true}
+      opt.on('-c', '--color', '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.on('-e ENCODE', '--encode ENCODE', 'Specify encode(none, auto, jis, sjis, euc, ascii, utf8, utf16). Default is "auto"') {|v| setupEncodeOption(option, v) }
       opt.parse!(arguments)
 
       # 検索オブジェクトの生成
-      if (ARGV.size > 0)
+      if (arguments.size > 0 || option.keywordsOr.size > 0)
         findGrep = FindGrep.new(arguments, option)
         findGrep.searchAndPrint(stdout)
       else
@@ -31,5 +34,31 @@ module Gren
       end
 
     end
+
+    def self.setupEncodeOption(option, encode)
+      case encode.downcase
+      when 'none'
+        option.kcode = Kconv::NOCONV
+      when 'auto'
+        option.kcode = Platform.get_shell_kcode
+      when 'jis'
+        option.kcode = Kconv::JIS
+      when 'sjis'
+        option.kcode = Kconv::SJIS
+      when 'euc'
+        option.kcode = Kconv::EUC
+      when 'ascii'
+        option.kcode = Kconv::ASCII
+      when 'utf8'
+        option.kcode = Kconv::UTF8
+      when 'utf16'
+        option.kcode = Kconv::UTF16
+      else
+        puts "Invalid encode."
+        puts "  none, auto, jis, sjis, euc, ascii, utf8, utf16"
+        exit(-1)
+      end
+    end
+    
   end
 end

data/lib/gren/findgrep.rb

@@ -3,13 +3,17 @@ require 'find'
 require File.join(File.dirname(__FILE__), 'result')
 require 'rubygems'
 require 'termcolor'
+require 'kconv'
+require File.join(File.dirname(__FILE__), '../platform')
 
 module Gren
   class FindGrep
     IGNORE_FILE = /(\A#.*#\Z)|(~\Z)|(\A\.#)/
     IGNORE_DIR = /(\A\.svn\Z)|(\A\.git\Z)|(\ACVS\Z)/
     
-    Option = Struct.new(:directory,
+    Option = Struct.new(:keywordsSub,
+                        :keywordsOr,
+                        :directory,
                         :depth,
                         :ignoreCase,
                         :colorHighlight,
@@ -17,11 +21,27 @@ module Gren
                         :debugMode,
                         :filePatterns,
                         :ignoreFiles,
-                        :ignoreDirs)
+                        :ignoreDirs,
+                        :kcode)
+
+    DEFAULT_OPTION = Option.new([],
+                                [],
+                                ".",
+                                -1,
+                                false,
+                                false,
+                                false,
+                                false,
+                                [],
+                                [],
+                                [],
+                                Platform.get_shell_kcode)
     
     def initialize(patterns, option)
       @option = option
       @patternRegexps = strs2regs(patterns, @option.ignoreCase)
+      @subRegexps = strs2regs(option.keywordsSub, @option.ignoreCase)
+      @orRegexps = strs2regs(option.keywordsOr, @option.ignoreCase)
       @filePatterns = strs2regs(option.filePatterns)
       @ignoreFiles = strs2regs(option.ignoreFiles)
       @ignoreDirs = strs2regs(option.ignoreDirs)
@@ -165,16 +185,15 @@ module Gren
 
       open(fpath, "r") { |file|
         match_file = false
-        file.each() { |line|
-          line.chomp!
 
+        file2data(file).each_with_index { |line, index|
           result, match_datas = match?(line)
 
           if ( result )
             unless (@option.colorHighlight)
-              stdout.puts "#{fpath_disp}:#{file.lineno}:#{line}"
+              stdout.puts "#{fpath_disp}:#{index + 1}:#{line}"
             else
-              header = "#{fpath_disp}:#{file.lineno}"
+              header = "#{fpath_disp}:#{index + 1}"
                 
               begin
                 stdout.puts TermColor.parse("<34>#{header}</34>:") + coloring(line, match_datas)
@@ -196,10 +215,37 @@ module Gren
     end
     private :searchFile
 
+    def file2data(file)
+        data = file.read
+
+        if (@option.kcode != Kconv::NOCONV)
+          file_kcode = Kconv::guess(data)
+
+          if (file_kcode != @option.kcode)
+#            puts "encode!! #{fpath} : #{@option.kcode} <- #{file_kcode}"
+            data = data.kconv(@option.kcode, file_kcode)
+          end
+        end
+
+        data = data.split("\n");
+    end
+    private :file2data
+
     def match?(line)
       match_datas = []
       @patternRegexps.each {|v| match_datas << v.match(line)}
-      return match_datas.all?, match_datas
+
+      sub_matchs = []
+      @subRegexps.each {|v| sub_matchs << v.match(line)}
+
+      or_matchs = []
+      @orRegexps.each {|v| or_matchs << v.match(line)}
+
+      result = match_datas.all? && !sub_matchs.any? && (or_matchs.empty? || or_matchs.any?)
+      result_match = match_datas + or_matchs
+      result_match.delete(nil)
+
+      return result, result_match
     end
     private :match?
 

data/lib/platform.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+require 'kconv'
+
+# LinuxやBSD等にも対応予定(その場合のエンコードって何が適切なんだろ？EUC?UTF8?)
+class Platform
+  def self.windows_os?
+    RUBY_PLATFORM =~ /mswin(?!ce)|mingw|cygwin|bccwin/
+  end
+
+  def self.get_shell_kcode
+    if windows_os?
+      Kconv::SJIS
+    else
+      Kconv::UTF8
+    end
+  end
+end

data/rake_rdoc_custom.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+require 'rake'
+require 'rake/rdoctask'
+
+# RDocの文字コードをutf8に
+Rake::RDocTask.class_eval { 
+  alias :_option_list :option_list
+  def option_list
+    _option_list + ['-c', 'utf8']
+  end  
+}
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 +09:00
+date: 2010-08-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id003
 description: gren is a next grep tool.
@@ -82,6 +82,8 @@ files:
 - lib/gren/cli.rb
 - lib/gren/findgrep.rb
 - lib/gren/result.rb
+- lib/platform.rb
+- rake_rdoc_custom.rb
 - script/console
 - script/destroy
 - script/generate