gren 1.0.0 → 1.0.1

data/HISTORY.ja.md

@@ -1,3 +1,9 @@
+# 1.0.1 2013/04/08
+
+* 一部ファイルを検索時にエンコードエラーが出る問題を修正
+* 入力文字列、標準入力もエンコード変換するように
+* Windowsプラットフォームの時はpipe?を無効に(cygwin対策)
+
 # 1.0.0 2013/04/06
 
 * gren

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 1.0.1 2013/04/08
+
+* Fix encoding error
+* Encode input string & stdin
+* Disable pipe? in Windows environment (because cygwin)
+
 # 1.0.0 2013/04/06
 
 * gren

data/gren.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   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.homepage      = "http://gren.ongaeshi.me"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/gren/common/grenfiletest.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module GrenFileTest
-  IGNORE_FILE = /(\A#.*#\Z)|(~\Z)|(\A\.#)|(\.d\Z)|(\.map\Z)|(\.MAP\Z)/
+  IGNORE_FILE = /(\A#.*#\Z)|(~\Z)|(\A\.#)|(\.d\Z)|(\.map\Z)|(\.MAP\Z)|(\.xbm\Z)|(\.ppm\Z)|(\.ai\Z)|(\.png\Z)|(\.webarchive\Z)/
   IGNORE_DIR = /(\A\.svn\Z)|(\A\.git\Z)|(\ACVS\Z)/
 
   def self.ignoreDir?(fpath)

data/lib/gren/common/util.rb

@@ -93,12 +93,16 @@ module Gren
 
     # StringIO patch
     def pipe?(io)
-      io.instance_of?(IO) && File.pipe?(io)
+      !Platform.windows_os? && io.instance_of?(IO) && File.pipe?(io)
     end
 
     def downcase?(str)
       str == str.downcase
     end
 
+    def ruby19?
+      RUBY_VERSION >= '1.9.0'
+    end
+
   end
 end

data/lib/gren/findgrep/findgrep.rb

@@ -69,7 +69,7 @@ module FindGrep
       strs.each do |v|
         option = 0
         option |= Regexp::IGNORECASE if (@option.ignoreCase || (!@option.caseSensitive && Util::downcase?(v)))
-        regs << Regexp.new(v, option)
+        regs << Regexp.new(FindGrep::convline(v, @option.kcode), option)
       end
 
       regs
@@ -79,7 +79,11 @@ module FindGrep
       unless Util.pipe?($stdin)
         searchFromDir(stdout, @option.directory, 0)
       else
-        searchData(stdout, $stdin.read.split("\n"), nil)
+        begin
+          searchData(stdout, FindGrep::convline($stdin.read, @option.kcode).split($/), nil)
+        rescue ArgumentError
+          stdout.puts "invalid byte sequence : $stdin"
+        end
       end
 
       @result.time_stop
@@ -109,37 +113,7 @@ module FindGrep
       end
     end
 
-    def and_expression(key, list)
-      sub = nil
-      
-      list.each do |word|
-        e = key =~ word
-        if sub.nil?
-          sub = e
-        else
-          sub &= e
-        end
-      end
-
-      sub
-    end
-
-    def suffix_expression(record)
-      sub = nil
-      
-      @option.suffixs.each do |word|
-        e = record.suffix =~ word
-        if sub.nil?
-          sub = e
-        else
-          sub |= e
-        end
-      end
-
-      sub
-    end
-    private :suffix_expression
-      
+    private
 
     def searchFromDir(stdout, dir, depth)
       if (@option.depth != -1 && depth > @option.depth)
@@ -229,7 +203,11 @@ module FindGrep
       @result.search_files << fpath_disp if (@option.debugMode)
 
       open(fpath, "r") do |file|
-        searchData(stdout, file2data(file), fpath_disp)
+        begin
+          searchData(stdout, file2data(file), fpath_disp)
+        rescue ArgumentError
+          stdout.puts "invalid byte sequence : #{fpath}"
+        end
       end
     end
     private :searchFile
@@ -264,20 +242,37 @@ module FindGrep
     private :searchData
 
     def file2data(file)
-        data = file.read
+      FindGrep::file2lines(file, @option.kcode)
+    end
+    
+    def self.file2lines(file, kcode)
+      convline(file.read, kcode).split($/)
+    end
 
-        if (@option.kcode != Kconv::NOCONV)
-          file_kcode = Kconv::guess(data)
+    def self.convline(line, kcode)
+      if Util::ruby19?
+        # @memo ファイルエンコーディングに相違が起きている可能性があるため対策
+        #       本当はファイルを開く時にエンコーディングを指定するのが正しい
 
-          if (file_kcode != @option.kcode)
-#            puts "encode!! #{fpath} : #{@option.kcode} <- #{file_kcode}"
-            data = data.kconv(@option.kcode, file_kcode)
+        # 方法1 : 強制的にバイナリ化
+        # line.force_encoding("Binary")
+        # line = line.kconv(kcode)
+        
+        # 方法2 : 入力エンコーディングを強制的に指定
+        line.kconv(kcode, Kconv::guess(line))
+      else
+        if (kcode != Kconv::NOCONV)
+          file_kcode = Kconv::guess(line)
+
+          if (file_kcode != kcode)
+            # puts "encode!! #{fpath} : #{kcode} <- #{file_kcode}"
+            line = line.kconv(kcode, file_kcode)
           end
         end
-
-        data = data.split("\n");
+        
+        line
+      end
     end
-    private :file2data
 
     def match?(line)
       match_datas = []

data/lib/gren/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gren
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolor
-  requirement: &2152930480 !ruby/object:Gem::Requirement
+  requirement: &2157299740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152930480
+  version_requirements: *2157299740
 description: gren is a next grep tool.
 email:
 - ongaeshi0621@gmail.com
@@ -60,7 +60,7 @@ files:
 - test/test_gren_util.rb
 - test/test_helper.rb
 - test/test_string_snip.rb
-homepage: ''
+homepage: http://gren.ongaeshi.me
 licenses: []
 post_install_message: 
 rdoc_options: []