tidtools 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.5 2010/04/28
+
+* Windows環境の場合はSJISで入出力するように
+
 === 0.0.4 2010/04/27
 
 * 圧縮表示時に、十分に短ければ圧縮しないように

data/Manifest.txt

@@ -7,6 +7,7 @@ bin/tidgrep
 bin/twgrep
 lib/tidgrep/cli.rb
 lib/tidtools.rb
+lib/tidtools/platform.rb
 lib/tidtools/tiddle.rb
 lib/twgrep/cli.rb
 script/console

data/lib/tidgrep/cli.rb

@@ -1,33 +1,37 @@
 # -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), '../tidtools/tiddle')
+require File.join(File.dirname(__FILE__), '../tidtools/platform')
 require 'optparse'
+require 'kconv'
 
 module Tidgrep
-  # 圧縮表示時のパラメータ
-  MATCH_LINE_COMP_NUM = 5
+  class Tidgrep
+    # 圧縮表示時のパラメータ
+    MATCH_LINE_COMP_NUM = 5
 
-  MATCH_ONLY_TITLE_COMP_NUM = 5
+    MATCH_ONLY_TITLE_COMP_NUM = 5
 
-  MATCH_TIDDLE_LINE_NUM = 3
-  MATCH_TIDDLE_COMP_NUM = 5
+    MATCH_TIDDLE_LINE_NUM = 3
+    MATCH_TIDDLE_COMP_NUM = 5
 
-  MATCH_TWEET_LINE_NUM = 3
-  MATCH_TWEET_COMP_NUM = 5
+    MATCH_TWEET_LINE_NUM = 3
+    MATCH_TWEET_COMP_NUM = 5
 
-  class Tidgrep
-    def initialize(stdout, file_name, title, regexp_option, report, match_rule, is_comp, keywords)
+    def initialize(stdout, file_name, title, regexp_option, report, match_rule, is_comp, keywords, kcode)
+      @stdout = stdout
       @file_name = file_name
       @title = title
       @regexp_option = regexp_option
       @report = report
       @match_rule = match_rule
       @is_comp = is_comp
+      @kcode = kcode
 
       @title_regexp = @title && Regexp.new(@title, @regexp_option)
 
       @content_regexps = []
       keywords.each do |keyword|
-        @content_regexps << Regexp.new(keyword, @regexp_option)
+        @content_regexps << Regexp.new(self.kconv(keyword), @regexp_option)
       end
     end
 
@@ -43,6 +47,22 @@ module Tidgrep
       return true
     end
 
+    def kconv(str)
+      if (@kcode != Kconv::UTF8)
+        str.kconv(@kconv, Kconv::UTF8)
+      else
+        str
+      end
+    end
+
+    def print(msg)
+      @stdout.print self.kconv msg
+    end
+
+    def puts(msg)
+      @stdout.puts self.kconv msg
+    end
+
     def match_line
       tiddles = Tiddle.parse_sort_modified(@file_name)
 
@@ -244,6 +264,7 @@ module Tidgrep
       report = false 
       match_rule = "line"
       is_comp = false
+      kcode = Platform.get_shell_kcode
       
       opt = OptionParser.new('tidgrep [option] keyword')
       opt.on('-f FILE_NAME', '--filename FILE_NAME', 'TiddlyWiki file name') {|v| file_name = v }
@@ -261,7 +282,8 @@ module Tidgrep
                         report,
                         match_rule,
                         is_comp,
-                        arguments)
+                        arguments,
+                        kcode)
 
       unless obj.validOption?
         puts opt.help

data/lib/tidtools/platform.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+require 'kconv'
+
+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/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.4'
+  VERSION = '0.0.5'
 end

data/lib/twgrep/cli.rb

@@ -11,6 +11,7 @@ module Twgrep
       report = false 
       match_rule = "tweet"
       is_comp = false
+      kcode = Platform.get_shell_kcode
       
       opt = OptionParser.new('twgrep [option] keyword')
       opt.on('-f FILE_NAME', '--filename FILE_NAME', 'TiddlyWiki file name') {|v| file_name = v }
@@ -26,7 +27,8 @@ module Twgrep
                                  report,
                                  match_rule,
                                  is_comp,
-                                 arguments)
+                                 arguments,
+                                 kcode)
 
       unless obj.validOption? && arguments.size > 0
         puts opt.help

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +09:00
+date: 2010-04-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - bin/twgrep
 - lib/tidgrep/cli.rb
 - lib/tidtools.rb
+- lib/tidtools/platform.rb
 - lib/tidtools/tiddle.rb
 - lib/twgrep/cli.rb
 - script/console