milkode 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/milkode/findgrep/findgrep.rb

@@ -479,25 +479,37 @@ EOF
     private :searchData
 
     def file2data(file)
+      FindGrep::file2lines(file, @option.kcode)
+    end
+    private :file2data
+    
+    def self.file2lines(file, kcode)
       data = file.read
       
       unless Milkode::Util::ruby19?
-        if (@option.kcode != Kconv::NOCONV)
+        if (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)
+          if (file_kcode != kcode)
+            # puts "encode!! #{fpath} : #{kcode} <- #{file_kcode}"
+            data = data.kconv(kcode, file_kcode)
           end
         end
       else
-        data = data.kconv(@option.kcode)
+        # @memo ファイルエンコーディングに相違が起きている可能性があるため対策
+        #       本当はファイルを開く時にエンコーディングを指定するのが正しい
+
+        # 方法1 : 強制的にバイナリ化
+        # data.force_encoding("Binary")
+        # data = data.kconv(kcode)
+        
+        # 方法2 : 入力エンコーディングを強制的に指定
+        data = data.kconv(kcode, Kconv::guess(data))
       end
 
-      data = data.split("\n");
+      data = data.split($/)
     end
-    private :file2data
-
+    
     def match?(line)
       match_datas = []
       @patternRegexps.each {|v| match_datas << v.match(line)}

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-04-05}
+  s.date = %q{2012-04-17}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -107,6 +107,7 @@ Gem::Specification.new do |s|
     "test/test_database.rb",
     "test/test_dbdir.rb",
     "test/test_dir.rb",
+    "test/test_findgrep.rb",
     "test/test_gren_util.rb",
     "test/test_helper.rb",
     "test/test_ignore_checker.rb",

data/test/test_findgrep.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/04/15
+
+require 'test_helper'
+require 'file_assert'
+require 'milkode/findgrep/findgrep'
+
+module FindGrep
+  class TestFindGrep < Test::Unit::TestCase
+    def test_basic
+
+      # 外部エンコーディング
+      # p Encoding.default_external
+      # p $stdout.external_encoding
+      # 内部エンコーディング
+      # p Encoding.default_internal
+      # p $stdout.internal_encoding
+
+      # Kconv::NOCONV
+      # Kconv::SJIS
+      # Kconv::UTF8
+
+      Dir.chdir(File.join(File.dirname(__FILE__))) do
+        File.open('data/.gitignore') do |f|
+          assert_equal '#*.swp', FindGrep::file2lines(f, Kconv::UTF8)[-1]
+        end
+
+        File.open('data/a_project/cdstk.rb') do |f|
+          # assert_equal 'end', FindGrep::file2lines(f, Kconv::UTF8)[-1]
+          assert_equal 'end', FindGrep::file2lines(f, Kconv::SJIS)[-1]
+        end
+      end
+    end
+  end
+end
+
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-05 00:00:00 +09:00
+date: 2012-04-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -324,6 +324,7 @@ files:
 - test/test_database.rb
 - test/test_dbdir.rb
 - test/test_dir.rb
+- test/test_findgrep.rb
 - test/test_gren_util.rb
 - test/test_helper.rb
 - test/test_ignore_checker.rb