jugyo-termtter 0.7.7 → 0.8.0

data/lib/plugin/stdout.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'highline'
 require 'erb'
 

data/lib/plugin/system_status.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'erb'
 
 configatron.plugins.system_status.set_default(:default_status_proc, proc { Time.now.strftime("%x %X") })
@@ -13,20 +15,11 @@ def out_put_status(status, color)
 end
 
 module Termtter::Client
-  Thread.new do
-    loop do
-      begin
-        status = public_storage[:system_status] ||
-                    configatron.plugins.system_status.default_status_proc.call
-        color = public_storage[:system_status_color] ||
-                        configatron.plugins.system_status.default_color
-      rescue => e
-        status = e.message
-        color = :on_red
-      end
-      out_put_status(status, color)
-      sleep configatron.plugins.system_status.interval
-    end
+  add_task(:name => :system_status, :interval => configatron.plugins.system_status.interval) do
+    status = (@@task_manager.get_task(:update_timeline).exec_at - Time.now).to_i.to_s
+    color = public_storage[:system_status_color] ||
+                    configatron.plugins.system_status.default_color
+    out_put_status(status, color)
   end
 end
 
@@ -38,4 +31,3 @@ end
 #   configatron.plugins.system_status.interval = 1
 #   configatron.plugins.system_status.default_color = :on_blue
 #   configatron.plugins.system_status.format = '<%= status %>'
-

data/lib/plugin/translation.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'nokogiri'
 require 'net/http'
 require 'kconv'

data/lib/plugin/update_editor.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'tempfile'
 
 module Termtter::Client
@@ -22,27 +24,25 @@ module Termtter::Client
     result
   end
 
-  add_command /^(update_editor|ue)\s*$/ do |m, t|
-    pause
-    text = input_editor
-    unless text.empty?
-      text = ERB.new(text).result(binding)
-      text.split("\n").each do |post|
-        break if post =~ /^__END__$/
-        unless post.empty?
-          t.update_status(post)
-          puts "=> #{post}"
-        end
-      end
-    end
-    resume
-  end
-
-  add_help 'update_editor,ue', 'Update status from editor.'
-
-  add_completion do |input|
-    %w[ update_editor ].grep(/^#{Regexp.quote input}/)
-  end
+  register_command(
+                   :name => :update_editor, :aliases => [:ue],
+                   :exec_proc => proc{|arg|
+                     pause
+                     text = input_editor
+                     unless text.empty?
+                       text = ERB.new(text).result(binding)
+                       text.split("\n").each do |post|
+                         break if post =~ /^__END__$/
+                         unless post.empty?
+                           Termtter::API.twitter.update_status(post)
+                           puts "=> #{post}"
+                         end
+                       end
+                     end
+                     resume
+                   },
+                   :help => ["update_editor,ue", "Update status from editor."]
+                   )
 end
 
 # update_editor.rb

data/lib/plugin/uri-open.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter::Client
   public_storage[:uris] = []
 

data/lib/plugin/wassr_post.rb

@@ -1,21 +1,22 @@
+# -*- coding: utf-8 -*-
+
 require 'uri'
 require 'net/http'
 
-module Termtter::Client
-  # NOTE: overwrite original update command
-  add_command /^(update|u)\s+(.*)/ do |m, t|
-    text = ERB.new(m[2]).result(binding).gsub(/\n/, ' ')
-    t.update_status(text)
-    puts "=> #{text}"
+Termtter::Client.register_hook(
+  :name => :wassr_post,
+  :points => [:modify_arg_for_update],
+  :exec_proc => proc {|cmd, arg|
     begin
       Net::HTTP.version_1_2
       req = Net::HTTP::Post.new("/statuses/update.json?")
       req.basic_auth configatron.plugins.wassr_post.username, configatron.plugins.wassr_post.password
       Net::HTTP.start('api.wassr.jp', 80) do |http|
-        res = http.request(req, "status=#{URI.escape(text)}&source=Termtter")
+        res = http.request(req, "status=#{URI.escape(arg.strip)}&source=Termtter")
       end
     rescue
       puts "RuntimeError: #{$!}"
     end
-  end
-end
+    return arg
+  }
+)

data/lib/plugin/yhara.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 if RUBY_VERSION < "1.8.7"
   class Array
     def choice
@@ -123,31 +125,20 @@ module Yharian
 end
 
 module Termtter::Client
-
-  add_help 'yhara', 'Post a new Yharian sentence'
-  add_help 'yhara USER', 'Speak to the user in Yharian'
-  
-  add_command /^(yhara)\s*$/ do |m, t|
-    text = Yharian::text
-    t.update_status(text)
-    puts "=> #{text}"
-  end
-
-  add_command /^(yhara)\s+(\w+)/ do |m, t|
-    text = "@#{m[2]} #{Yharian::text}"
-    t.update_status(text)
-    puts "=> #{text}"
-  end
-
-  add_completion do |input|
-    case input
-    when /^(yhara)\s+(.*)/
-      find_user_candidates $2, "#{$1} %s"
-    else
-      %w[ yhara ].grep(/^#{Regexp.quote input}/)
-    end
-  end
-
+  register_command(
+                   :name => :yhara,
+                   :exec_proc => proc{|arg|
+                     text = "#{'@' if arg[0..0] != '@'}#{arg} #{Yharian::text}"
+                     Termtter::API.twitter.update_status(text)
+                     puts "=> #{text}"
+                   },
+                   :completion_proc => proc {|cmd, args|
+                     if /(.*)@([^\s]*)$/ =~ args
+                       find_user_candidates $2, "#{cmd} #{$1}@%s"
+                     end
+                   },
+                   :help => ["yhara (USER)", 'Post a new Yharian sentence']
+                   )
 end
 
 # yhara.rb

data/lib/plugin/yonda.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter::Client
   public_storage[:unread_count] = 0
 

data/lib/termtter.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
@@ -8,7 +10,6 @@ require 'open-uri'
 require 'cgi'
 require 'readline'
 require 'enumerator'
-require 'parsedate'
 require 'configatron'
 
 Thread.abort_on_exception = true
@@ -21,12 +22,16 @@ configatron.proxy.set_default(:port, '8080')
 require 'termtter/twitter'
 require 'termtter/connection'
 require 'termtter/status'
+require 'termtter/user'
 require 'termtter/command'
+require 'termtter/hook'
+require 'termtter/task'
+require 'termtter/task_manager'
 require 'termtter/client'
 require 'termtter/api'
 
 module Termtter
-  VERSION = '0.7.7'
+  VERSION = '0.8.0'
   APP_NAME = 'termtter'
   CONF_FILE = '~/.termtterrc' # still does not use
   CONF_DIR = '~/.termtter' # still does not use
@@ -78,22 +83,34 @@ if win?
   $oldColor = lpBuffer.unpack('SSSSSssssSS')[4]
 
   $colorMap = {
-    0 => 7,     # black/white
-    37 => 8,     # white/intensity
-    31 => 4 + 8, # red/red
-    32 => 2 + 8, # green/green
-    33 => 6 + 8, # yellow/yellow
-    34 => 1 + 8, # blue/blue
-    35 => 5 + 8, # magenta/purple
-    36 => 3 + 8, # cyan/aqua
-    90 => 7,     # erase/white
+     0 => 0x07|0x00|0x00|0x00, # black/white
+    37 => 0x08|0x00|0x00|0x00, # white/intensity
+    31 => 0x04|0x08|0x00|0x00, # red/red
+    32 => 0x02|0x08|0x00|0x00, # green/green
+    33 => 0x06|0x08|0x00|0x00, # yellow/yellow
+    34 => 0x01|0x08|0x00|0x00, # blue/blue
+    35 => 0x05|0x08|0x00|0x00, # magenta/purple
+    36 => 0x03|0x08|0x00|0x00, # cyan/aqua
+    39 => 0x07,                # default
+    40 => 0x00|0x00|0xf0|0x00, # background:white
+    41 => 0x07|0x00|0x40|0x00, # background:red
+    42 => 0x07|0x00|0x20|0x00, # background:green
+    43 => 0x07|0x00|0x60|0x00, # background:yellow
+    44 => 0x07|0x00|0x10|0x00, # background:blue
+    45 => 0x07|0x00|0x50|0x80, # background:magenta
+    46 => 0x07|0x00|0x30|0x80, # background:cyan
+    47 => 0x07|0x00|0x70|0x80, # background:gray
+    49 => 0x70,                # default
+    90 => 0x07|0x00|0x00|0x00, # erase/white
   }
   $iconv_u8_to_sj = Iconv.new("CP#{$wGetACP.call()}", 'UTF-8')
-  def puts(str)
-    #str.to_s.tosjis.split(/(\e\[\d+m)/).each do |token|
-    str.to_s.gsub("\xef\xbd\x9e", "\xe3\x80\x9c").split(/(\e\[\d+m)/).each do |token|
-      if token =~ /\e\[(\d+)m/
+  def print(str)
+    str.to_s.gsub("\xef\xbd\x9e", "\xe3\x80\x9c").split(/(\e\[\d*[a-zA-Z])/).each do |token|
+      case token
+      when /\e\[(\d+)m/
         $wSetConsoleTextAttribute.call $hStdOut, $colorMap[$1.to_i].to_i
+	  when /\e\[\d*[a-zA-Z]/
+        # do nothing
       else
         loop do
           begin
@@ -107,26 +124,29 @@ if win?
       end
     end
     $wSetConsoleTextAttribute.call $hStdOut, $oldColor
-    STDOUT.puts
     $iconv_u8_to_sj.iconv(nil)
   end
+  def puts(str)
+    print str
+    STDOUT.puts
+  end
 end
 
-def handle_error(e)
-  puts "Error: #{e}"
-  puts e.backtrace.join("\n")
-end
-
-def plugin(s)
+def plugin(s, init = {})
+  unless init.empty?
+    init.each do |key, value|
+      eval("configatron.plugins.#{s}").__send__("#{key}=", value)
+    end
+  end
   require "plugin/#{s}"
 rescue => e
-  handle_error(e)
+  Termtter::Client.handle_error(e)
 end
 
 def filter(s)
   load "filter/#{s}.rb"
 rescue => e
-  handle_error(e)
+  Termtter::Client.handle_error(e)
 else
   Termtter::Client.public_storage[:filters] ||= []
   Termtter::Client.public_storage[:filters] << s

data/lib/termtter/api.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter
   module API
     class << self

data/lib/termtter/client.rb

@@ -1,16 +1,26 @@
+# -*- coding: utf-8 -*-
+
 module Termtter
   class CommandNotFound < StandardError; end
 
   module Client
 
-    @@hooks = []
-    @@commands = {}
-    @@new_commands = {}
-    @@completions = []
-    @@filters = []
-    @@helps = []
-
     class << self
+
+      def init
+        @@hooks = []
+        @@new_hooks = {}
+        @@commands = {}
+        @@new_commands = {}
+        @@completions = []
+        @@filters = []
+        @@helps = []
+        @@since_id = nil
+        @@main_thread = nil
+        @@input_thread = nil
+        @@task_manager = Termtter::TaskManager.new
+      end
+
       def public_storage
         @@public_storage ||= {}
       end
@@ -23,10 +33,35 @@ module Termtter
         EOF
       end
 
+      # Deprecated
+      # FIXME: delete when become unnecessary
       def add_command(regex, &block)
+        warn "Termtter:Client.add_command method will be removed. Use Termtter::Client.register_command() instead. (#{caller.first})"
         @@commands[regex] = block
       end
 
+      def register_hook(arg)
+        hook = case arg
+          when Hook
+            arg
+          when Hash
+            Hook.new(arg)
+          else
+            raise ArgumentError, 'must be given Termtter::Hook or Hash'
+          end
+        @@new_hooks[hook.name] = hook
+      end
+
+      def get_hook(name)
+        @@new_hooks[name]
+      end
+
+      def get_hooks(point)
+        @@new_hooks.values.select do |hook|
+          hook.match?(point)
+        end
+      end
+
       def register_command(arg)
         command = case arg
           when Command
@@ -43,10 +78,12 @@ module Termtter
         @@new_commands[name]
       end
 
-      def add_macro(r, s)
-        add_command(r) do |m, t|
-          call_commands(s % m.to_a[1..-1])
-        end
+      def register_macro(name, macro, options = {})
+        arg = {
+          :name => name.to_sym,
+          :exec_proc => proc {|arg| call_commands(macro % arg)}
+        }.merge(options)
+        register_command(arg)
       end
 
       def add_help(name, desc)
@@ -83,6 +120,22 @@ module Termtter
         end
       end
 
+      # return last hook return value
+      def call_new_hooks(point, *args)
+        result = nil
+        get_hooks(point).each {|hook|
+          break if result == false # interrupt if hook return false
+          result = hook.exec_proc.call(*args)
+        }
+        return result
+      rescue => e
+        if point.to_sym == :on_error
+          raise
+        else
+          handle_error(e)
+        end
+      end
+
       # TODO: delete argument "tw" when unnecessary
       def call_hooks(statuses, event, tw = nil)
         do_hooks(statuses, :pre_filter)
@@ -96,22 +149,29 @@ module Termtter
         @@commands.each do |key, command|
           if key =~ text
             command_found = true
-            begin
+            @@task_manager.invoke_and_wait do
               command.call($~, Termtter::API.twitter)
-            rescue => e
-              handle_error(e)
             end
           end
         end
 
         @@new_commands.each do |key, command|
           command_info = command.match?(text)
-          # TODO: call hook for before command here.
           if command_info
             command_found = true
-            result = command.execute(command_info[1])
-            if result
-              # TODO: call hook for after command with result.
+            input_command, arg = *command_info
+
+            modified_arg = call_new_hooks("modify_arg_for_#{command.name.to_s}", input_command, arg) || arg || ''
+
+            @@task_manager.invoke_and_wait do
+              pre_exec_hook_result = call_new_hooks("pre_exec_#{command.name.to_s}", input_command, modified_arg)
+              next if pre_exec_hook_result == false
+
+              # exec command
+              result = command.execute(modified_arg)
+              if result
+                call_new_hooks("post_exec_#{command.name.to_s}", input_command, modified_arg, result)
+              end
             end
           end
         end
@@ -120,19 +180,25 @@ module Termtter
       end
 
       def pause
-        @@pause = true
+        @@task_manager.pause
       end
 
       def resume
-        @@pause = false
-        @@update_thread.run
+        @@task_manager.resume
+      end
+
+      def add_task(*arg, &block)
+        @@task_manager.add_task(*arg, &block)
       end
 
       def exit
+        puts 'finalizing...'
+
         call_hooks([], :exit)
-        @@main_thread.kill
-        @@update_thread.kill
-        @@input_thread.kill
+        call_new_hooks(:exit)
+        @@task_manager.kill
+        @@main_thread.kill if @@main_thread
+        @@input_thread.kill if @@input_thread
       end
 
       def load_default_plugins
@@ -202,35 +268,17 @@ module Termtter
         end
       end
 
-      def setup_api()
-        Termtter::API.setup()
-      end
-
-      def run
-        load_default_plugins()
-        load_config()
-        setup_readline()
-        setup_api()
-
-        puts 'initializing...'
-        initialized = false
-        @@pause = false
-        call_hooks([], :initialize)
-
-        @@input_thread = nil
-        @@update_thread = Thread.new do
-          since_id = nil
-          loop do
+      def setup_update_timeline_task()
+        register_command(
+          :name => :_update_timeline,
+          :exec_proc => proc {|arg|
             begin
-              Thread.stop if @@pause
-
-              statuses = Termtter::API.twitter.get_friends_timeline(since_id)
+              statuses = Termtter::API.twitter.get_friends_timeline(@@since_id)
               unless statuses.empty?
-                since_id = statuses[0].id
+                @@since_id = statuses[0].id
               end
               print "\e[1K\e[0G" if !statuses.empty? && !win?
               call_hooks(statuses, :update_friends_timeline)
-              initialized = true
               @@input_thread.kill if @@input_thread && !statuses.empty?
             rescue OpenURI::HTTPError => e
               if e.message == '401 Unauthorized'
@@ -238,20 +286,32 @@ module Termtter
                 puts 'plese check your account settings'
                 exit!
               end
-            ensure
-              sleep configatron.update_interval
             end
-          end
-        end
+          }
+        )
 
-        until initialized; end
+        add_task(:name => :update_timeline, :interval => configatron.update_interval) do
+          call_commands('_update_timeline')
+        end
+      end
 
+      def trap_setting()
         begin
           stty_save = `stty -g`.chomp
-          trap("INT") { system "stty", stty_save; exit }
+          trap("INT") do
+            begin
+              system "stty", stty_save
+            ensure
+              exit
+            end
+          end
         rescue Errno::ENOENT
         end
+      end
 
+      def start_input_thread
+        setup_readline()
+        trap_setting()
         @@main_thread = Thread.new do
           loop do
             @@input_thread = create_input_thread()
@@ -261,10 +321,26 @@ module Termtter
         @@main_thread.join
       end
 
+      def run
+        puts 'initializing...'
+
+        load_default_plugins()
+        load_config()
+        Termtter::API.setup()
+
+        call_hooks([], :initialize)
+        call_new_hooks(:initialize)
+
+        setup_update_timeline_task()
+        call_commands('_update_timeline')
+
+        @@task_manager.run()
+        start_input_thread()
+      end
+
       def create_input_thread()
         Thread.new do
-          erb = ERB.new(configatron.prompt)
-          while buf = Readline.readline(erb.result(Termtter::API.twitter.__send__(:binding)), true)
+          while buf = Readline.readline(ERB.new(configatron.prompt).result(API.twitter.__send__(:binding)), true)
             Readline::HISTORY.pop if /^(u|update)\s+(.+)$/ =~ buf
             begin
               call_commands(buf)
@@ -277,6 +353,13 @@ module Termtter
         end
       end
 
+      def handle_error(e)
+        call_new_hooks("on_error", e)
+      rescue => e
+        puts "Error: #{e}"
+        puts e.backtrace.join("\n")
+      end
+
       def wrap_require
         # FIXME: delete this method after the major version up
         alias original_require require
@@ -296,3 +379,4 @@ module Termtter
   end
 end
 
+Termtter::Client.init