tidtools 0.0.7 → 0.0.8

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.0.7 xxxx/xx/xx
+=== 0.0.8 2010/05/19
+
+* Manifest.txt更新忘れ
+
+=== 0.0.7 2010/05/19
 
 * twmerge追加
   * 携帯電話等で記録したつぶやき形式のファイルをマージするためのツール

data/Manifest.txt

@@ -5,11 +5,14 @@ README.rdoc
 Rakefile
 bin/tidgrep
 bin/twgrep
+bin/twmerge
 lib/tidgrep/cli.rb
 lib/tidtools.rb
 lib/tidtools/platform.rb
 lib/tidtools/tiddle.rb
+lib/tidtools/tweet.rb
 lib/twgrep/cli.rb
+lib/twmerge/cli.rb
 script/console
 script/destroy
 script/generate
@@ -17,3 +20,4 @@ test/test_helper.rb
 test/test_tidgrep_cli.rb
 test/test_tidtools.rb
 test/test_twgrep_cli.rb
+test/test_twmerge_cli.rb

data/bin/twmerge

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

data/lib/tidtools/tweet.rb

@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+
+require 'parsedate'
+
+class Tweet
+  attr_reader :time_stamp, :content
+
+  def initialize(time_stamp, content)
+    @time_stamp = time_stamp
+    @content = content
+  end
+  
+  # テキストをつぶやき形式に整形する
+  def self.decorate(text)
+    array = text.split("\n")
+
+    array.each_with_index do |line, index|
+      # 5つ以上の水平線を4つにそろえる
+      array[index] = array[index].sub(/^----+$/, "----")
+
+      # 水平線手前の日付表示に装飾を付ける
+      if (line =~ /^----+$/ and index > 0)
+        ary = ParseDate::parsedate(array[index - 1])
+        if (ary[0])           # 日付表示の場合のみ
+          array[index - 1] = "~~@@color(gray):" + array[index - 1] + "@@~~"
+        end
+      end
+    end
+
+    array.join("\n")
+  end
+
+  # つぶやき形式のテキストをマージする
+  def self.merge(origin, add)
+    origin_t = Tweet.parse_from_text(origin)
+    add_t = Tweet.parse_from_text(add)
+
+    add_t.each do |tweet|
+      origin_t.insert(find_insert_pos(origin_t, tweet), tweet)
+    end
+
+    origin_t
+  end
+
+  # ソートされたつぶやきの配列に対して、あるつぶやきの挿入位置を返す
+  def self.find_insert_pos(tweets, tweet)
+    return 0 if tweet.time_stamp.nil?
+    
+    tweets.each_index do |index|
+      if (tweets[index].time_stamp.nil?)
+        next
+      elsif (tweet.time_stamp >= tweets[index].time_stamp)
+        return index
+      end
+    end
+
+    return tweets.size
+  end
+
+  # つぶやき形式の文字列を渡すと、Tweet型の配列を返す
+  def self.parse_from_text(text)
+    tweets = []
+    array = text.split("\n")
+
+    index = 0
+    start_index = 0
+    is_pre = false
+    
+    while true
+      if (array[index] =~ /^\{\{\{/)
+        is_pre = true
+      end
+      
+      if (!is_pre and array[index] =~ /^----+/)
+        text = array[start_index...index].join("\n")
+        tweets.push Tweet.new(parse_time_stamp(text), text)
+        start_index = index + 1
+      end
+      
+      if (array[index] =~ /^\}\}\}/)
+        is_pre = false
+      end
+
+      index += 1
+
+      if (index >= array.size)
+        if (index > start_index)
+          text = array[start_index..index].join("\n")
+          tweets.push Tweet.new(parse_time_stamp(text), text)
+        end
+
+        break
+      end
+    end
+      
+    tweets
+  end
+
+  def self.parse_time_stamp(text)
+    str = text.split(/\n/)[-1]
+
+    if (str)
+      ary = ParseDate::parsedate(str)
+      if (ary[0])
+        Time::local(*ary[0..4])
+      else
+        nil
+      end
+    else
+      nil
+    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.7'
+  VERSION = '0.0.8'
 end

data/lib/twmerge/cli.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), '../tidtools/tiddle')
+require File.join(File.dirname(__FILE__), '../tidtools/tweet')
+require 'optparse'
+
+module Twmerge
+  class CLI
+    def self.execute(stdout, arguments=[])
+      opt = OptionParser.new('twmerge origin_file add_file')
+      opt.parse!(arguments)
+
+      if (arguments.size != 2)
+        puts opt.help
+        exit
+      end
+      
+      # テキストを取得
+      origin = open(arguments[0]).read
+      add = Tweet.decorate(open(arguments[1]).read)
+      
+      # マージ
+      tweets = Tweet.merge(origin, add)
+
+      # 結果を表示
+      tweets.each do |elem|
+        puts elem.content, "----"
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - ongaeshi
@@ -65,6 +65,7 @@ email:
 executables: 
 - tidgrep
 - twgrep
+- twmerge
 extensions: []
 
 extra_rdoc_files: 
@@ -79,11 +80,14 @@ files:
 - Rakefile
 - bin/tidgrep
 - bin/twgrep
+- bin/twmerge
 - lib/tidgrep/cli.rb
 - lib/tidtools.rb
 - lib/tidtools/platform.rb
 - lib/tidtools/tiddle.rb
+- lib/tidtools/tweet.rb
 - lib/twgrep/cli.rb
+- lib/twmerge/cli.rb
 - script/console
 - script/destroy
 - script/generate
@@ -91,6 +95,7 @@ files:
 - test/test_tidgrep_cli.rb
 - test/test_tidtools.rb
 - test/test_twgrep_cli.rb
+- test/test_twmerge_cli.rb
 has_rdoc: true
 homepage: http://github.com/ongaeshi/tidtools
 licenses: []