tidtools 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.6 2010/04/29
+
+* SJISでの出力機能にバグがあったのを修正
+
 === 0.0.5 2010/04/28
 
 * Windows環境の場合はSJISで入出力するように

data/bin/tidgrep

@@ -9,7 +9,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../lib/tidtools")
 require "tidgrep/cli"
 
 # バージョン番号
-Version = "0.0.3"
+Version = "0.0.4"
 
 # コマンドの実行
 Tidgrep::CLI.execute(STDOUT, ARGV)

data/lib/tidgrep/cli.rb

@@ -31,7 +31,7 @@ module Tidgrep
 
       @content_regexps = []
       keywords.each do |keyword|
-        @content_regexps << Regexp.new(self.kconv(keyword), @regexp_option)
+        @content_regexps << Regexp.new(kcode2utf(keyword), @regexp_option)
       end
     end
 
@@ -47,20 +47,28 @@ module Tidgrep
       return true
     end
 
-    def kconv(str)
+    def kcode2utf(str)
       if (@kcode != Kconv::UTF8)
-        str.kconv(@kconv, Kconv::UTF8)
+        str.kconv(Kconv::UTF8, @kcode)
+      else
+        str
+      end
+    end
+
+    def utf2kcode(str)
+      if (@kcode != Kconv::UTF8)
+        str.kconv(@kcode, Kconv::UTF8)
       else
         str
       end
     end
 
     def print(msg)
-      @stdout.print self.kconv msg
+      @stdout.print utf2kcode(msg)
     end
 
     def puts(msg)
-      @stdout.puts self.kconv msg
+      @stdout.puts utf2kcode(msg)
     end
 
     def match_line

data/lib/tidtools.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Tidtools
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tidtools
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,51 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +09:00
+date: 2010-04-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 2
         version: 0.8.2
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
         version: 2.0.4
-  type: :development
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
-  type: :development
-  version_requirements: *id003
+    version: 
 description: FIX (describe your package)
 email: 
 - ongaeshi@example.com
@@ -105,20 +88,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: tidtools
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: FIX (describe your package)