tidtools 0.0.3 → 0.0.4

data/History.txt

@@ -1,4 +1,10 @@
-=== 0.0.3 xxxx-xx-xx
+=== 0.0.4 2010/04/27
+
+* 圧縮表示時に、十分に短ければ圧縮しないように
+
+* つぶやき専用検索、twgrepを追加
+
+=== 0.0.3 2010-04-25
 
 * -cオプションを追加(結果を圧縮して表示する)
 

data/Manifest.txt

@@ -4,12 +4,15 @@ PostInstall.txt
 README.rdoc
 Rakefile
 bin/tidgrep
+bin/twgrep
 lib/tidgrep/cli.rb
 lib/tidtools.rb
 lib/tidtools/tiddle.rb
+lib/twgrep/cli.rb
 script/console
 script/destroy
 script/generate
 test/test_helper.rb
 test/test_tidgrep_cli.rb
 test/test_tidtools.rb
+test/test_twgrep_cli.rb

data/bin/twgrep

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+#
+#  Created on 2010-4-27.
+#  Copyright (c) 2010. All rights reserved.
+
+require 'rubygems'
+require File.expand_path(File.dirname(__FILE__) + "/../lib/tidtools")
+require "twgrep/cli"
+
+# バージョン番号
+Version = "0.0.1"
+
+# コマンドの実行
+Twgrep::CLI.execute(STDOUT, ARGV)

data/lib/tidgrep/cli.rb

@@ -15,36 +15,20 @@ module Tidgrep
   MATCH_TWEET_COMP_NUM = 5
 
   class Tidgrep
-    def initialize
-      @file_name = ENV['TIDGREP_PATH']
-      @title = nil
-      @regexp_option = 0
-      @report = false
-      @match_rule = "line"
-      @is_comp = false
-    end
+    def initialize(stdout, file_name, title, regexp_option, report, match_rule, is_comp, keywords)
+      @file_name = file_name
+      @title = title
+      @regexp_option = regexp_option
+      @report = report
+      @match_rule = match_rule
+      @is_comp = is_comp
 
-    def setupParam(stdout, arguments)
-      opt = OptionParser.new('tidgrep [option] keyword')
-      opt.on('-f FILE_NAME', '--filename FILE_NAME', 'TiddlyWiki file name') {|v| @file_name = v }
-      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('-m MATCH_RULE', '--match MATCH_RULE', 'match rule [line, tiddle, tweet]') {|v| @match_rule = v }
-      opt.on('-c', '--comp', 'compression disp') {|v| @is_comp = true; @report = true }
-      opt.parse!(arguments)
-      
       @title_regexp = @title && Regexp.new(@title, @regexp_option)
 
       @content_regexps = []
-      arguments.each do |keyword|
+      keywords.each do |keyword|
         @content_regexps << Regexp.new(keyword, @regexp_option)
       end
-
-      unless validOption?
-        puts opt.help
-        exit
-      end
     end
 
     def validOption?
@@ -156,7 +140,13 @@ module Tidgrep
             unless @is_comp
               puts tiddle.content
             else
-              print tiddle.content.split(/\n/)[0..(MATCH_TIDDLE_LINE_NUM - 1)].join("\n") + "\n.\n"
+              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)
@@ -204,7 +194,13 @@ module Tidgrep
               unless @is_comp
                 print tweet
               else
-                print tweet.split(/\n/)[0..(MATCH_TWEET_LINE_NUM - 1)].join("\n") + "\n.\n"
+                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)
@@ -223,11 +219,7 @@ module Tidgrep
       end
     end
 
-    def execute(stdout, arguments=[])
-      # パラメータの設定
-      setupParam(stdout, arguments)
-      
-      # マッチルールごとに処理を変える
+    def execute
       if (@content_regexps.size > 0) 
         case @match_rule
         when "line"
@@ -246,7 +238,37 @@ module Tidgrep
 
   class CLI
     def self.execute(stdout, arguments=[])
-      Tidgrep.new.execute(stdout, arguments)
+      file_name = ENV['TIDGREP_PATH']
+      title = nil
+      regexp_option = 0
+      report = false 
+      match_rule = "line"
+      is_comp = false
+      
+      opt = OptionParser.new('tidgrep [option] keyword')
+      opt.on('-f FILE_NAME', '--filename FILE_NAME', 'TiddlyWiki file name') {|v| file_name = v }
+      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('-m MATCH_RULE', '--match MATCH_RULE', 'match rule [line, tiddle, tweet]') {|v| match_rule = v }
+      opt.on('-c', '--comp', 'compression disp') {|v| is_comp = true; report = true }
+      opt.parse!(arguments)
+
+      obj = Tidgrep.new(stdout,
+                        file_name,
+                        title,
+                        regexp_option,
+                        report,
+                        match_rule,
+                        is_comp,
+                        arguments)
+
+      unless obj.validOption?
+        puts opt.help
+        exit
+      end
+      
+      obj.execute
     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.3'
+  VERSION = '0.0.4'
 end

data/lib/twgrep/cli.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), '../tidgrep/cli')
+require 'optparse'
+
+module Twgrep
+  class CLI
+    def self.execute(stdout, arguments=[])
+      file_name = ENV['TIDGREP_PATH']
+      title = "Tweet"
+      regexp_option = 0
+      report = false 
+      match_rule = "tweet"
+      is_comp = false
+      
+      opt = OptionParser.new('twgrep [option] keyword')
+      opt.on('-f FILE_NAME', '--filename FILE_NAME', 'TiddlyWiki file name') {|v| file_name = 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,
+                                 title,
+                                 regexp_option,
+                                 report,
+                                 match_rule,
+                                 is_comp,
+                                 arguments)
+
+      unless obj.validOption? && arguments.size > 0
+        puts opt.help
+        exit
+      end
+      
+      obj.execute
+    end
+  end
+end

data/test/test_twgrep_cli.rb

@@ -0,0 +1,14 @@
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require 'twgrep/cli'
+
+class TestTwgrepCli < Test::Unit::TestCase
+  def setup
+    Twgrep::CLI.execute(@stdout_io = StringIO.new, [])
+    @stdout_io.rewind
+    @stdout = @stdout_io.read
+  end
+  
+  def test_print_default_output
+    assert_match(/To update this executable/, @stdout)
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 +09:00
+date: 2010-04-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ email:
 - ongaeshi@example.com
 executables: 
 - tidgrep
+- twgrep
 extensions: []
 
 extra_rdoc_files: 
@@ -77,15 +78,18 @@ files:
 - README.rdoc
 - Rakefile
 - bin/tidgrep
+- bin/twgrep
 - lib/tidgrep/cli.rb
 - lib/tidtools.rb
 - lib/tidtools/tiddle.rb
+- lib/twgrep/cli.rb
 - script/console
 - script/destroy
 - script/generate
 - test/test_helper.rb
 - test/test_tidgrep_cli.rb
 - test/test_tidtools.rb
+- test/test_twgrep_cli.rb
 has_rdoc: true
 homepage: http://github.com/ongaeshi/tidtools
 licenses: []
@@ -121,3 +125,4 @@ test_files:
 - test/test_helper.rb
 - test/test_tidgrep_cli.rb
 - test/test_tidtools.rb
+- test/test_twgrep_cli.rb