tidtools 0.0.8 → 0.0.9

data/History.txt

@@ -1,3 +1,17 @@
+=== 0.0.9 2010/06/20
+
+* デフォルトで検索する環境変数の名前を変更
+  * TIDGREP_PATH → TIDDLYWIKI_PATHS
+
+* TiddlyWiki検索対象を複数個指定可能に
+  * -fオプション、環境変数TIDDLYWIKI_PATHS、どちらでも空白で複数のファイルをつなげることが出来るようになった
+  * -nオプションを使うことで、ファイルリストの中から一つを検索対象に絞り込むことも可能
+
+* twgrepに-tオプションを追加、タイトルによる絞り込みを可能に
+  * デフォルトは "Tweet"
+
+* 古いバージョンのTiddlyWiki(GTDStyleWiki等)で、改行コードが正しく認識されないバグを修正
+
 === 0.0.8 2010/05/19
 
 * Manifest.txt更新忘れ
@@ -31,6 +45,5 @@
 
 === 0.0.1 2010-04-23
 
-* 1 major enhancement:
-  * Initial release
+* ファーストリリース
 

data/Manifest.txt

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

data/bin/tidgrep

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

data/bin/twgrep

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

data/lib/tidgrep/cli.rb

@@ -1,272 +1,12 @@
 # -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), '../tidtools/tiddle')
-require File.join(File.dirname(__FILE__), '../tidtools/platform')
+require File.join(File.dirname(__FILE__), '../tidgrep/tidgrep')
 require 'optparse'
-require 'kconv'
 
 module Tidgrep
-  class Tidgrep
-    # 圧縮表示時のパラメータ
-    MATCH_LINE_COMP_NUM = 5
-
-    MATCH_ONLY_TITLE_COMP_NUM = 5
-
-    MATCH_TIDDLE_LINE_NUM = 3
-    MATCH_TIDDLE_COMP_NUM = 5
-
-    MATCH_TWEET_LINE_NUM = 3
-    MATCH_TWEET_COMP_NUM = 5
-
-    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(kcode2utf(keyword), @regexp_option)
-      end
-    end
-
-    def validOption?
-      return false if !@file_name
-      return @title || @content_regexps.size > 0
-    end
-
-    def match?(target)
-      @content_regexps.each do |content_regexp|
-        return false if content_regexp !~ target
-      end
-      return true
-    end
-
-    def kcode2utf(str)
-      if (@kcode != 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 utf2kcode(msg)
-    end
-
-    def puts(msg)
-      @stdout.puts utf2kcode(msg)
-    end
-
-    def match_line
-      tiddles = Tiddle.parse_sort_modified(@file_name)
-
-      match_lines = 0
-      search_lines = 0
-      match_tiddles = 0
-
-      is_limit = false
-
-      tiddles.each do |tiddle|
-        next if (@title && tiddle.title !~ @title_regexp)
-        is_match_tiddle = false
-        line_no = 1
-
-        tiddle.content.each_line do |line|
-          if (match? line)
-            match_lines += 1
-
-            unless is_limit
-              puts "#{tiddle.title}:#{line_no}:#{line}"
-
-              if (@is_comp && match_lines >= MATCH_LINE_COMP_NUM)
-                is_limit = true
-                print ".\n.\n"
-              end
-            end
-              
-
-            unless is_match_tiddle
-              match_tiddles += 1
-              is_match_tiddle = true
-            end
-          end
-          line_no += 1
-          search_lines += 1
-        end
-      end
-
-      if (@report)
-        puts "------------------------------"
-        puts "search lines : #{search_lines}"
-        puts "match lines : #{match_lines}"
-        puts "total tiddles : #{tiddles.size}"
-        puts "match tiddles : #{match_tiddles}"
-      end
-    end
-
-    def match_only_title
-      tiddles = Tiddle.parse_sort_modified(@file_name)
-
-      match_tiddles = 0
-
-      is_limit = false
-
-      tiddles.each do |tiddle|
-        next if (@title && tiddle.title !~ @title_regexp)
-
-        match_tiddles += 1
-
-        unless is_limit
-          puts tiddle.title
-
-          if (@is_comp && match_tiddles >= MATCH_ONLY_TITLE_COMP_NUM)
-            is_limit = true
-            print ".\n.\n"
-          end
-        end
-      end
-
-      if (@report)
-        puts "------------------------------"
-        puts "total tiddles : #{tiddles.size}"
-        puts "match tiddles : #{match_tiddles}"
-      end
-    end
-
-    def match_tiddle
-      tiddles = Tiddle.parse_sort_modified(@file_name)
-
-      search_tiddles = 0
-      match_tiddles = 0
-
-      is_limit = false
-
-      tiddles.each do |tiddle|
-        next if (@title && tiddle.title !~ @title_regexp)
-        search_tiddles += 1
-
-        if (match? tiddle.content)
-          match_tiddles += 1
-
-          unless is_limit
-            puts "--- #{tiddle.title} --------------------"
-
-            unless @is_comp
-              puts tiddle.content
-            else
-              tiddle_a = tiddle.content.split(/\n/)
-
-              if (tiddle_a.size <= MATCH_TIDDLE_LINE_NUM)
-                print tiddle.content
-              else
-                print tiddle_a[0..(MATCH_TIDDLE_LINE_NUM - 1)].join("\n") + "\n.\n"
-              end
-            end
-
-            if (@is_comp && match_tiddles >= MATCH_TIDDLE_COMP_NUM)
-              is_limit = true
-              print ".\n.\n"
-            end
-          end
-        end
-      end
-
-      if (@report)
-        puts "------------------------------"
-        puts "total tiddles : #{tiddles.size}"
-        puts "search tiddles : #{search_tiddles}"
-        puts "match tiddles : #{match_tiddles}"
-      end
-    end
-
-    def match_tweet
-      tiddles = Tiddle.parse_sort_modified(@file_name)
-
-      search_tweets = 0
-      match_tweets = 0
-
-      is_limit = false
-
-      tiddles.each do |tiddle|
-        next if (@title && tiddle.title !~ @title_regexp)
-        is_match_tiddle = false
-
-        tweets = tiddle.content.split(/^----+\n/)
-        search_tweets += tweets.size
-
-        tweets.each do |tweet|
-          if (match? tweet)
-            match_tweets += 1
-            unless is_limit
-              unless is_match_tiddle
-                puts "--- #{tiddle.title} --------------------"
-                is_match_tiddle = true
-              else
-                puts "----\n"
-              end
-
-              unless @is_comp
-                print tweet
-              else
-                tweet_a = tweet.split(/\n/)
-                
-                if (tweet_a.size <= MATCH_TWEET_LINE_NUM)
-                  print tweet
-                else
-                  print tweet_a[0..(MATCH_TWEET_LINE_NUM - 1)].join("\n") + "\n.\n"
-                end
-              end
-              
-              if (@is_comp && match_tweets >= MATCH_TWEET_COMP_NUM)
-                is_limit = true
-                print ".\n.\n"
-              end
-            end
-          end
-        end
-      end
-
-      if (@report)
-        puts "------------------------------"
-        puts "search tweets : #{search_tweets}"
-        puts "match tweets : #{match_tweets}"
-      end
-    end
-
-    def execute
-      if (@content_regexps.size > 0) 
-        case @match_rule
-        when "line"
-          match_line
-        when "tiddle"
-          match_tiddle
-        when "tweet"
-          match_tweet
-        end
-      else
-        match_only_title
-      end
-    end
-
-  end
-
   class CLI
     def self.execute(stdout, arguments=[])
-      file_name = ENV['TIDGREP_PATH']
+      file_names = ENV['TIDDLYWIKI_PATHS'].split
+      file_no = 0
       title = nil
       regexp_option = 0
       report = false 
@@ -275,7 +15,8 @@ module Tidgrep
       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 }
+      opt.on('-f TIDDLYWIKI_PATHS', '--filename TIDDLYWIKI_PATHS', 'TiddlyWiki path names') {|v| file_names = v.split }
+      opt.on('-n SELECT_NO', '--fileno SELECT_NO', 'file select number. (0 is all. 1,2,3,4.. is select only one.)') {|v| file_no = v.to_i }
       opt.on('-t TITLE', '--title TITLE', 'match title') {|v| title = v }
       opt.on('-i', '--ignore', 'ignore case') {|v| regexp_option |= Regexp::IGNORECASE }
       opt.on('-r', '--report', 'disp report') {|v| report = true }
@@ -284,7 +25,8 @@ module Tidgrep
       opt.parse!(arguments)
 
       obj = Tidgrep.new(stdout,
-                        file_name,
+                        file_names,
+                        file_no,
                         title,
                         regexp_option,
                         report,

data/lib/tidgrep/tidgrep.rb

@@ -0,0 +1,281 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), '../tidtools/tiddle')
+require File.join(File.dirname(__FILE__), '../tidtools/platform')
+require 'kconv'
+
+module Tidgrep
+  class Tidgrep
+    # 圧縮表示時のパラメータ
+    MATCH_LINE_COMP_NUM = 5
+
+    MATCH_ONLY_TITLE_COMP_NUM = 5
+
+    MATCH_TIDDLE_LINE_NUM = 3
+    MATCH_TIDDLE_COMP_NUM = 5
+
+    MATCH_TWEET_LINE_NUM = 3
+    MATCH_TWEET_COMP_NUM = 5
+
+    def initialize(stdout, file_names, file_no, title, regexp_option, report, match_rule, is_comp, keywords, kcode)
+      @stdout = stdout
+      @file_names = file_names
+      @file_no = file_no
+      @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(kcode2utf(keyword), @regexp_option)
+      end
+    end
+
+    def validOption?
+      return false if @file_names.empty?
+      return @title || @content_regexps.size > 0
+    end
+
+    def match?(target)
+      @content_regexps.each do |content_regexp|
+        return false if content_regexp !~ target
+      end
+      return true
+    end
+
+    def kcode2utf(str)
+      if (@kcode != 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 utf2kcode(msg)
+    end
+
+    def puts(msg)
+      @stdout.puts utf2kcode(msg)
+    end
+
+    def create_tiddles
+      tiddles = []
+      
+      if (@file_no <= 0)
+        @file_names.each do |file_name|
+          tiddles.concat Tiddle.parse_sort_modified(file_name)
+        end
+      elsif (@file_no <= @file_names.size)
+        tiddles.concat Tiddle.parse_sort_modified(@file_names[@file_no - 1])        
+      end
+
+      tiddles
+    end
+    private :create_tiddles
+
+    def match_line
+      tiddles = create_tiddles
+
+      match_lines = 0
+      search_lines = 0
+      match_tiddles = 0
+
+      is_limit = false
+
+      tiddles.each do |tiddle|
+        next if (@title && tiddle.title !~ @title_regexp)
+        is_match_tiddle = false
+        line_no = 1
+
+        tiddle.content.each_line do |line|
+          if (match? line)
+            match_lines += 1
+
+            unless is_limit
+              puts "#{tiddle.title}:#{line_no}:#{line}"
+
+              if (@is_comp && match_lines >= MATCH_LINE_COMP_NUM)
+                is_limit = true
+                print ".\n.\n"
+              end
+            end
+              
+
+            unless is_match_tiddle
+              match_tiddles += 1
+              is_match_tiddle = true
+            end
+          end
+          line_no += 1
+          search_lines += 1
+        end
+      end
+
+      if (@report)
+        puts "------------------------------"
+        puts "search lines : #{search_lines}"
+        puts "match lines : #{match_lines}"
+        puts "total tiddles : #{tiddles.size}"
+        puts "match tiddles : #{match_tiddles}"
+      end
+    end
+
+    def match_only_title
+      tiddles = create_tiddles
+
+      match_tiddles = 0
+
+      is_limit = false
+
+      tiddles.each do |tiddle|
+        next if (@title && tiddle.title !~ @title_regexp)
+
+        match_tiddles += 1
+
+        unless is_limit
+          puts tiddle.title
+
+          if (@is_comp && match_tiddles >= MATCH_ONLY_TITLE_COMP_NUM)
+            is_limit = true
+            print ".\n.\n"
+          end
+        end
+      end
+
+      if (@report)
+        puts "------------------------------"
+        puts "total tiddles : #{tiddles.size}"
+        puts "match tiddles : #{match_tiddles}"
+      end
+    end
+
+    def match_tiddle
+      tiddles = create_tiddles
+
+      search_tiddles = 0
+      match_tiddles = 0
+
+      is_limit = false
+
+      tiddles.each do |tiddle|
+        next if (@title && tiddle.title !~ @title_regexp)
+        search_tiddles += 1
+
+        if (match? tiddle.content)
+          match_tiddles += 1
+
+          unless is_limit
+            puts "--- #{tiddle.title} --------------------"
+
+            unless @is_comp
+              puts tiddle.content
+            else
+              tiddle_a = tiddle.content.split(/\n/)
+
+              if (tiddle_a.size <= MATCH_TIDDLE_LINE_NUM)
+                print tiddle.content
+              else
+                print tiddle_a[0..(MATCH_TIDDLE_LINE_NUM - 1)].join("\n") + "\n.\n"
+              end
+            end
+
+            if (@is_comp && match_tiddles >= MATCH_TIDDLE_COMP_NUM)
+              is_limit = true
+              print ".\n.\n"
+            end
+          end
+        end
+      end
+
+      if (@report)
+        puts "------------------------------"
+        puts "total tiddles : #{tiddles.size}"
+        puts "search tiddles : #{search_tiddles}"
+        puts "match tiddles : #{match_tiddles}"
+      end
+    end
+
+    def match_tweet
+      tiddles = create_tiddles
+
+      search_tweets = 0
+      match_tweets = 0
+
+      is_limit = false
+
+      tiddles.each do |tiddle|
+        next if (@title && tiddle.title !~ @title_regexp)
+        is_match_tiddle = false
+
+        tweets = tiddle.content.split(/^----+\n/)
+        search_tweets += tweets.size
+
+        tweets.each do |tweet|
+          if (match? tweet)
+            match_tweets += 1
+            unless is_limit
+              unless is_match_tiddle
+                puts "--- #{tiddle.title} --------------------"
+                is_match_tiddle = true
+              else
+                puts "----\n"
+              end
+
+              unless @is_comp
+                print tweet
+              else
+                tweet_a = tweet.split(/\n/)
+                
+                if (tweet_a.size <= MATCH_TWEET_LINE_NUM)
+                  print tweet
+                else
+                  print tweet_a[0..(MATCH_TWEET_LINE_NUM - 1)].join("\n") + "\n.\n"
+                end
+              end
+              
+              if (@is_comp && match_tweets >= MATCH_TWEET_COMP_NUM)
+                is_limit = true
+                print ".\n.\n"
+              end
+            end
+          end
+        end
+      end
+
+      if (@report)
+        puts "------------------------------"
+        puts "search tweets : #{search_tweets}"
+        puts "match tweets : #{match_tweets}"
+      end
+    end
+
+    def execute
+      if (@content_regexps.size > 0) 
+        case @match_rule
+        when "line"
+          match_line
+        when "tiddle"
+          match_tiddle
+        when "tweet"
+          match_tweet
+        end
+      else
+        match_only_title
+      end
+    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.8'
+  VERSION = '0.0.9'
 end

data/lib/tidtools/tiddle.rb

@@ -59,6 +59,13 @@ class Tiddle
 
   # tiddleの内容を取得
   def self.content(tiddle)
+    data = content1(tiddle)
+    data.gsub!(/\\n/, "\n")
+    data
+  end
+
+  # tiddleの内容を取得(処理1 HTMLから取り出し)
+  def self.content1(tiddle)
     pre = tiddle.search("pre")
 
     if (pre.size > 0)
@@ -67,6 +74,7 @@ class Tiddle
       tiddle.inner_html
     end
   end
+  private_class_method :content1
 
   # 時刻に変換
   def self.convtime(str)

data/lib/twgrep/cli.rb

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), '../tidgrep/cli')
+require File.join(File.dirname(__FILE__), '../tidgrep/tidgrep')
 require 'optparse'
 
 module Twgrep
   class CLI
     def self.execute(stdout, arguments=[])
-      file_name = ENV['TIDGREP_PATH']
+      file_names = ENV['TIDDLYWIKI_PATHS'].split
+      file_no = 0
       title = "Tweet"
       regexp_option = 0
       report = false 
@@ -14,14 +15,17 @@ module Twgrep
       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 }
+      opt.on('-f TIDDLYWIKI_PATHS', '--filename TIDDLYWIKI_PATHS', 'TiddlyWiki path names') {|v| file_names = v.split }
+      opt.on('-n SELECT_NO', '--fileno SELECT_NO', 'file select number. (0 is all. 1,2,3,4.. is select only one.)') {|v| file_no = v.to_i }
+      opt.on('-t TITLE', '--title TITLE', 'match title') {|v| title = v }
       opt.on('-i', '--ignore', 'ignore case') {|v| regexp_option |= Regexp::IGNORECASE }
       opt.on('-r', '--report', 'disp report') {|v| report = true }
       opt.on('-c', '--comp', 'compression disp') {|v| is_comp = true; report = true }
       opt.parse!(arguments)
 
       obj = Tidgrep::Tidgrep.new(stdout,
-                                 file_name,
+                                 file_names,
+                                 file_no,
                                  title,
                                  regexp_option,
                                  report,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +09:00
+date: 2010-06-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - bin/twgrep
 - bin/twmerge
 - lib/tidgrep/cli.rb
+- lib/tidgrep/tidgrep.rb
 - lib/tidtools.rb
 - lib/tidtools/platform.rb
 - lib/tidtools/tiddle.rb