draftcode-termtter 1.1.0 → 1.1.3

data/README.rdoc

@@ -59,6 +59,14 @@ If you would like to use proxy server, add configurations like this:
   config.proxy.user_name = 'USERNAME'
   config.proxy.password = 'PASSWORD'
 
+You can to load plugins in this way:
+
+  Termtter::Client.init do |t|
+    t.plug 'stdout'
+    t.plug 'standard_commands'
+    t.plug 'auto_reload'
+  end
+
 To update the config, just restart your termtter proccess.
 
 == FORUM:

data/Rakefile

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.version = '#{Termtter::VERSION}'
   s.summary = "Terminal based Twitter client"
   s.description = "Termtter is a terminal based Twitter client"
-  s.files = %w( #{Dir['lib/**/*.rb'].join(' ')}
+  s.files = %w( #{Dir['lib/**/*.rb', 'lib/**/*.erb'].join(' ')}
                 #{Dir['spec/**/*.rb'].join(' ')}
                 #{Dir['test/**/*.rb', 'test/**/*.json'].join(' ')}
                 README.rdoc

data/lib/plugins/auto_reload.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+module Termtter::Client
+  add_task(:name => :auto_reload, :interval => config.update_interval, :after => config.update_interval) do
+    call_commands('reload')
+  end
+
+  call_commands('reload')
+end

data/lib/plugins/hatebu_and_update.rb

@@ -45,8 +45,8 @@ module Termtter::Client
         end
       end
     },
-    :help => ['hatebu2 URL', 'Hatena bookmark a URL, and update']
-    )
+    :help => ['hatebu_and_update,hau URL comment', 'Hatena bookmark a URL, and update']
+  )
 end
 
 # hatebu.rb

data/lib/plugins/history.rb

@@ -85,8 +85,6 @@ module Termtter::Client
    },
    :help => ['load', 'Load hisory']
    )
-
-  
 end
 
 # history.rb

data/lib/plugins/ignore.rb

@@ -1,15 +1,21 @@
 # -*- coding: utf-8 -*-
 
-
 config.filters.ignore.set_default(:words, [])
 
 module Termtter::Client
-  add_filter do |statuses, _|
-    ignore_words = config.filters.ignore.words
-    statuses.delete_if do |s|
-      ignore_words.any? {|i| i =~ s.text }
-    end
-  end
+  register_hook(
+    :name => :ignore,
+    :point => :filter_for_output,
+    :exec => lambda { |statuses, event|  
+      ignore_words = config.filters.ignore.words
+      statuses.delete_if do |s|
+        ignore_words.any? do |word|
+          word = /#{Regexp.quote(word)}/ if word.kind_of? String
+          word =~ s.text
+        end
+      end
+    }
+  )
 end
 
 # filter/ignore.rb

data/lib/plugins/irc_gw.rb

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+require 'net/irc'
+
+# TODO: post text of stdout too
+
+config.plugins.irc_gw.set_default(:port, 16669)
+config.plugins.irc_gw.set_default(:last_statuses_count, 100)
+
+class TermtterIrcGateway < Net::IRC::Server::Session
+  @@listners = []
+  @@last_statuses = []
+
+  Termtter::Client.register_hook(
+    :name => :irc_gw,
+    :point => :output,
+    :exec => lambda { |statuses, event|
+      if event == :update_friends_timeline
+        @@last_statuses = 
+          (@@last_statuses + statuses.dup).reverse![0..config.plugins.irc_gw.last_statuses_count].reverse!
+      end
+
+      @@listners.each do |listner|
+        listner.call(statuses.dup, event)
+      end
+    }
+  )
+
+  def server_name; 'termtter' end
+  def server_version; '0.0.0' end
+  def main_channel; '#termtter' end
+
+  def initialize(*args)
+    super
+    @@listners << self
+  end
+
+  def call(statuses, event)
+    msg_type =
+      case event
+      when :update_friends_timeline
+        PRIVMSG
+      else
+        NOTICE
+      end
+
+    statuses.each do |s|
+      post s.user.screen_name, msg_type, main_channel, [s.text, s.id].join(' ')
+    end
+  end
+
+  def on_message(m)
+    termtter_command = m.command.downcase + ' ' + m.params.join(' ')
+    unless Termtter::Client.find_commands(termtter_command).empty?
+      post '#termtter', NOTICE, main_channel, '> ' + termtter_command
+      Termtter::Client.call_commands(termtter_command)
+    end
+  end
+
+  def on_user(m)
+    super
+    post @prefix, JOIN, main_channel
+    post server_name, MODE, main_channel, "+o", @prefix.nick
+    self.call(@@last_statuses || [], :update_friends_timeline)
+  end
+
+  def on_privmsg(m)
+    target, message = *m.params
+    Termtter::Client.call_commands('update ' + message)
+  end
+end
+
+unless defined? IRC_SERVER
+  IRC_SERVER = Net::IRC::Server.new(
+    'localhost',
+    config.plugins.irc_gw.port,
+    TermtterIrcGateway,
+    :logger => Termtter::Client.logger
+  )
+  Thread.start do
+    IRC_SERVER.start
+  end
+end

data/lib/plugins/list_with_opts.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+module Termtter::Client
+  register_command(
+    :name => :list, :aliases => [:l],
+    :exec_proc => lambda {|arg|
+      _, options, user = */((?:\-[a-z][= ]\S+\s*)+)?(\w+)?/.match(arg)
+      params = {}
+      options.scan(/(\-[a-z])[= ](\S+)/).each do |k,v|
+        v = v.sub(/^['"]/,'').sub(/['"]$/,'')
+        case k
+        when '-n' #count
+          params['count'] = v.to_i if v.to_i > 0
+        when '-p' #page
+          params['page'] = v.to_i if v.to_i > 0
+        end
+      end if options
+
+      unless user
+        event = :list_friends_timeline
+        statuses = Termtter::API.twitter.friends_timeline(params)
+      else
+        event = :list_user_timeline
+        statuses = Termtter::API.twitter.user_timeline(user, params)
+      end
+      output(statuses, event)
+    },
+    :completion_proc => lambda {|cmd, arg|
+      find_user_candidates arg, "#{cmd} %s"
+    },
+    :help => ["list,l [USERNAME]", "List the posts"]
+  )
+end

data/lib/plugins/mark.rb

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+config.plugins.mark.set_default(
+  :text, '<on_green>' + (' ' * 30) + '#mark' + (' ' * 30) + '</on_green>')
+
+Termtter::Client.register_command(
+  :name => :mark, :alias => :m, 
+  :exec => lambda {|arg|
+    puts TermColor.parse(config.plugins.mark.text)
+  }
+)

data/lib/plugins/multi_post.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  class << self
+    def wassr_update(text)
+      Net::HTTP.version_1_2
+      req = Net::HTTP::Post.new("/statuses/update.json?")
+      req.basic_auth config.plugins.wassr.username, config.plugins.wassr.password
+      Net::HTTP.start('api.wassr.jp', 80) do |http|
+        res = http.request(req, "status=#{URI.escape(text)}&source=Termtter")
+      end
+    end
+  end
+end
+
+Termtter::Client.register_hook(
+  :name => :multi_post,
+  :points => [:modify_arg_for_update, :modify_arg_for_reply],
+  :exec_proc => lambda {|cmd, arg|
+    begin
+      wassr_arg = arg.gsub(/\d{10,}/, '')
+      Termtter::Client.wassr_update(wassr_arg.strip)
+    rescue
+      puts "RuntimeError: #{$!}"
+    end
+
+    return arg
+  }
+)
+
+# multi_post.rb
+# One post, multi update.

data/lib/plugins/notify-send3.rb

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 require 'RMagick'
+require 'uri'
 
 # Copy from notify-send2.rb
 config.plugins.notify_send.set_default(:icon_cache_dir, "#{Termtter::CONF_DIR}/tmp/user_profile_images")
@@ -33,9 +34,13 @@ Termtter::Client.register_hook(
     Thread.start do
       statuses.each do |s|
         text = CGI.escapeHTML(s.text)
-        text.gsub!(%r{https?://[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+},'<a href="\0">\0</a>')
-        system 'notify-send', s.user.screen_name, text, '-i', get_icon_path(s)
-        sleep 0.1
+        text = %Q{"#{text}"} if text =~ /^-/
+        text.gsub!(URI.regexp,'<a href="\0">\0</a>')
+        begin
+          system 'notify-send', s.user.screen_name, text, '-i', get_icon_path(s)
+          sleep 0.05
+        rescue
+        end
       end
     end
   }

data/lib/plugins/{standard_plugins.rb → standard_commands.rb}

@@ -10,14 +10,28 @@ config.plugins.standard.set_default(
 module Termtter::Client
 
   register_command(
-    :name => :update, :aliases => [:u],
-    :exec_proc => lambda {|arg|
+    :name => :reload,
+    :exec => lambda {|arg|
+      args = @since_id ? [{:since_id => @since_id}] : []
+      statuses = Termtter::API.twitter.friends_timeline(*args)
+      unless statuses.empty?
+        print "\e[1K\e[0G" unless win?
+        @since_id = statuses[0].id
+        output(statuses, :update_friends_timeline)
+        Readline.refresh_line
+      end
+    }
+  )
+
+  register_command(
+    :name => :update, :alias => :u,
+    :exec => lambda {|arg|
       unless arg.empty?
-        Termtter::API.twitter.update(arg)
-        puts "=> #{arg}"
+        result = Termtter::API.twitter.update(arg)
+        puts TermColor.parse("updated => #{result.text} <90>#{result.id}</90>")
       end
     },
-    :completion_proc => lambda {|cmd, args|
+    :completion => lambda {|cmd, args|
       if /(.*)@([^\s]*)$/ =~ args
         find_user_candidates $2, "#{cmd} #{$1}@%s"
       end
@@ -25,6 +39,24 @@ module Termtter::Client
     :help => ["update,u TEXT", "Post a new message"]
   )
 
+  register_command(
+    :name => :delete, :aliases =>[:del],
+    :exec_proc => lambda {|arg|
+      id =
+        case arg
+        when ''
+          Termtter::API.twitter.user_timeline(config.user_name)[0].id
+        when /^\d+$/
+          arg.to_i
+        end
+      if id
+        result = Termtter::API.twitter.remove_status(id)
+        puts TermColor.parse("deleted => #{result.text} <90>#{result.id}</90>")
+      end
+    },
+    :help => ['delete,del [STATUS ID]', 'Delete a status']
+  )
+
   direct_message_struct = Struct.new(:id, :text, :user, :created_at)
   direct_message_struct.class_eval do
     def method_missing(*args, &block)
@@ -142,9 +174,13 @@ module Termtter::Client
   register_command(
     :name => :replies, :aliases => [:r],
     :exec_proc => lambda {|arg|
-      output(Termtter::API.twitter.replies, :replies)
+      res = Termtter::API.twitter.replies
+      unless arg.empty?
+        res = res.map {|e| e.user.screen_name == arg ? e : nil }.compact
+      end
+      output(res, :replies)
     },
-    :help => ["replies,r", "List the most recent @replies for the authenticating user"]
+    :help => ["replies,r", "List the replies"]
   )
 
   register_command(
@@ -226,7 +262,11 @@ module Termtter::Client
         word = $1
         raise "Not implemented yet."
       else
-        return
+        if public_storage[:typable_id] && typable_id?(arg)
+          id = typable_id_convert(arg)
+        else
+          return
+        end
       end
 
       r = Termtter::API.twitter.favorite id
@@ -239,10 +279,14 @@ module Termtter::Client
       when /(\d+)/
         find_status_ids(arg).map{|id| "#{cmd} #{id}"}
       else
-        %w(favorite).grep(/^#{Regexp.quote arg}/)
+        if public_storage[:typable_id] && typable_id?(arg)
+          "#{cmd} #{typable_id_convert(arg)}"
+        else
+          %w(favorite).grep(/^#{Regexp.quote arg}/)
+        end
       end
     },
-    :help => ['favorite,fav (ID|@USER|/WORD)', 'Favorite a status']
+    :help => ['favorite,fav (ID|@USER|/WORD)', 'Mark a status as a favorite']
   )
 
   def self.show_settings(conf, level = 0)
@@ -353,14 +397,15 @@ module Termtter::Client
   end
 
   register_command(
-    :name      => :plugin,
+    :name      => :plug,
+    :alias     => :plugin,
     :exec_proc => lambda {|arg|
       if arg.empty?
         puts 'Should specify plugin name.'
         return
       end
       begin
-        result = plugin arg
+        result = plug arg
       rescue LoadError
       ensure
         puts "=> #{result.inspect}"
@@ -374,7 +419,7 @@ module Termtter::Client
         public_storage[:plugins].sort
       end
     },
-    :help      => ['plugin FILE', 'Load a plugin']
+    :help      => ['plug FILE', 'Load a plugin']
   )
 
   register_command(
@@ -408,9 +453,10 @@ module Termtter::Client
         update_with_user_and_id(text, user.screen_name, id) if user
         public_storage.delete :log4re
       when /^\s*(\d+)\s+(.+)$/
-        id, text = $1, $2
-        user = public_storage[:log].select {|l| l.id == id.to_i }.first.user
-        update_with_user_and_id(text, user.screen_name, id) if user
+        s = Termtter::API.twitter.show($1) rescue nil
+        if s
+          update_with_user_and_id($2, s.user.screen_name, id)
+        end
       when /^\s*@(\w+)/
         in_reply_to_status_id = Termtter::API.twitter.user($1).status.id rescue nil
         params = in_reply_to_status_id ? {:in_reply_to_status_id => in_reply_to_status_id} : {}
@@ -454,10 +500,9 @@ module Termtter::Client
   )
 
   def self.update_with_user_and_id(text, username, id)
-    text = ERB.new("@#{username} #{text}").result(binding).gsub(/\n/, ' ')
+    text = "@#{username} #{text}"
     result = Termtter::API.twitter.update(text, {'in_reply_to_status_id' => id})
-    puts "=> #{text}"
-    result
+    puts TermColor.parse("replied => #{result.text} <90>#{result.id}</90>")
   end
 
 =begin

data/lib/plugins/stdout.rb

@@ -4,65 +4,13 @@ require 'termcolor'
 require 'erb'
 require 'tempfile'
 require 'curses'
-require 'dl/import'
-
-module Readline
-  begin
-    module LIBREADLINE
-      if DL.const_defined? :Importable
-        extend DL::Importable
-      else
-        extend DL::Importer
-      end
-      pathes = Array(ENV['TERMTTER_EXT_LIB'] || [
-        '/opt/local/lib/libreadline.dylib',
-        '/usr/lib/libreadline.so',
-        '/usr/local/lib/libreadline.so',
-        File.join(Gem.bindir, 'readline.dll')
-      ])
-      dlload(pathes.find { |path| File.exist?(path)})
-      extern 'int rl_refresh_line(int, int)'
-    end
-    def self.refresh_line
-      LIBREADLINE.rl_refresh_line(0, 0)
-    end
-  rescue Exception
-    def self.refresh_line;end
-  end
-end
-
-if win?
-  require 'iconv'
-
-  module Readline
-    $iconv_sj_to_u8 = Iconv.new('UTF-8', "CP#{$wGetACP.call()}")
-    alias :old_readline :readline
-    def readline(*a)
-      str = old_readline(*a)
-      out = ''
-      loop do
-        begin
-          out << $iconv_sj_to_u8.iconv(str)
-          break
-        rescue Iconv::Failure
-          out << "#{$!.success}?"
-          str = $!.failed[1..-1]
-        end
-      end
-      return out
-    end
-    module_function :old_readline, :readline
-  end
-end
 
-config.plugins.stdout.set_default(
-  :colors,
-  [:none, :red, :green, :yellow, :blue, :magenta, :cyan])
+config.plugins.stdout.set_default(:colors, (31..36).to_a + (91..96).to_a)
 config.plugins.stdout.set_default(
   :timeline_format,
-  '<90><%=time%></90> <<%=status_color%>><%=status%></<%=status_color%>> <90><%=id%></90>')
-config.plugins.stdout.set_default(:search_highlight_format, '<on_magenta><white>\1</white></on_magenta>')
-
+  '<90><%=time%></90> <<%=color%>><%=s.user.screen_name%>: <%=text%></<%=color%>> ' +
+  '<90><%=reply_to ? reply_to + " " : ""%><%=s.id%> <%=source%></90>'
+)
 config.plugins.stdout.set_default(:enable_pager, true)
 config.plugins.stdout.set_default(:pager, 'less -R -f +G')
 config.plugins.stdout.set_default(:window_height, 50)
@@ -70,18 +18,18 @@ config.plugins.stdout.set_default(:window_height, 50)
 class String
   def truncate_column(col)
     count = 0
-    ary = []
+    str = String.new
     ret = []
     self.split(//u).each {|c|
-      count += (c.size == 1 ? 1 : 2)
+      count += (c.bytesize == 1 ? 1 : 2)
       if count > col then
-          ret.push(ary.to_s)
-          ary = []
+          ret.push(str)
+          str = String.new
           count = 0
       end
-      ary.push(c)
+      str += c
     }
-    ret.push(ary.to_s) unless ary.empty?
+    ret.push(str) unless str.empty?
     ret
   end
 end
@@ -90,67 +38,12 @@ module Termtter
   class StdOut < Hook
     def initialize
       super(:name => :stdout, :points => [:output])
-      @input_thread = nil
-      Client.register_hook(
-        :name => :stdout_exit,
-        :points => [:exit],
-        :exec_proc => lambda { @input_thread.kill if @input_thread }
-      )
-      Client.register_hook(
-          :name => :stdout_readline_yield_thread,
-          :points => [:before_task_thread_run],
-          :exec_proc => lambda { start_input_thread() unless @input_thread }
-      )
     end
 
     def call(statuses, event)
       print_statuses(statuses)
     end
 
-    def trap_setting()
-      begin
-        stty_save = `stty -g`.chomp
-        trap("INT") do
-          begin
-            system "stty", stty_save
-          ensure
-            exit
-          end
-        end
-      rescue Errno::ENOENT
-      end
-    end
-
-    def setup_readline
-      if Readline.respond_to?(:basic_word_break_characters=)
-        Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
-      end
-      Readline.completion_proc = Client.get_command_completion_proc()
-      vi_or_emacs = config.editing_mod
-      unless vi_or_emacs.empty?
-        Readline.__send__("#{vi_or_emacs}_editing_mode")
-      end
-    end
-
-    def start_input_thread
-      setup_readline()
-      trap_setting()
-      @input_thread = Thread.new do
-        while buf = Readline.readline(ERB.new(config.prompt).result(API.twitter.__send__(:binding)), true)
-          Readline::HISTORY.pop if buf.empty?
-          begin
-            Client.call_commands(buf)
-          rescue CommandNotFound => e
-            warn "Unknown command \"#{e}\""
-            warn 'Enter "help" for instructions'
-          rescue => e
-            Client.handle_error e
-          end
-        end
-      end
-      @input_thread.join
-    end
-
     def print_statuses(statuses, sort = true, time_format = nil)
       return unless statuses and statuses.first
       unless time_format
@@ -172,14 +65,14 @@ module Termtter
       cols = Curses.cols;
       Curses::close_screen
       statuses.each do |s|
-        text = s.text
-        status_color = config.plugins.stdout.colors[s.user.id.hash % config.plugins.stdout.colors.size]
-        status = "#{s.user.screen_name}: #{TermColor.escape(text)}"
+        text = TermColor.escape(s.text)
+        color = config.plugins.stdout.colors[s.user.id.to_i % config.plugins.stdout.colors.size]
+        reply_to = s.in_reply_to_status_id ? "(reply to #{s.in_reply_to_status_id})" : nil
+        time = "(#{Time.parse(s.created_at).strftime(time_format)})"
         if s.in_reply_to_status_id
           status += " (reply to #{s.in_reply_to_status_id})"
         end
 
-        time = "(#{Time.parse(s.created_at).strftime(time_format)})"
         id = s.id
         len =  id.to_s.length + 2
         if cols > 0 then
@@ -206,7 +99,6 @@ module Termtter
         output_text << TermColor.parse("<90>-----Fetched on " + Time.now.strftime(time_format) + "</90>\n")
         print output_text
       end
-      Readline.refresh_line
     end
   end
 

data/lib/plugins/wassr.rb

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+
+Termtter::API.module_eval %Q{
+  class << self
+    attr_reader :wassr
+
+    def setup_wassr(user_name, password)
+      @wassr = create_wassr(user_name, password)
+    end
+
+    def create_wassr(user_name, password)
+      Rubytter.new(
+        user_name,
+        password,
+        {
+          :app_name => config.app_name.empty? ? Termtter::APP_NAME : config.app_name,
+          :host => 'api.wassr.jp',
+          :header => {
+            'User-Agent' => 'Termtter http://github.com/jugyo/termtter',
+            'X-Wassr-Client' => 'Termtter',
+            'X-Wassr-Client-URL' => 'http://github.com/jugyo/termtter',
+            'X-Wassr-Client-Version' => Termtter::VERSION
+          },
+          :enable_ssl => config.enable_ssl,
+          :proxy_host => config.proxy.host,
+          :proxy_port => config.proxy.port,
+          :proxy_user_name => config.proxy.user_name,
+          :proxy_password => config.proxy.password
+        }
+        )
+    end
+  end
+}
+
+module Termtter::Client
+  register_command(
+    :name => :wassr, :aliases => [:wsr],
+    :exec_proc => lambda {|arg|
+      Termtter::API.setup_wassr(config.plugins.wassr.username, config.plugins.wassr.password)
+      statuses = Termtter::API.wassr.friends_timeline
+      add_member = [:created_at, :in_reply_to_status_id]
+      event = :wassr_friends_timeline
+      print_statuses(statuses, event)
+    },
+    :completion_proc => lambda {|cmd, arg|
+      find_user_candidates arg, "#{cmd} %s"
+    },
+    :help => ["wassr, wsr", "List the wassr timeline."]
+  )
+end
+
+def print_statuses(statuses, sort = true, time_format = nil)
+  return unless statuses and statuses.first
+  unless time_format
+    t0 = Time.now
+    t1 = Time.at(statuses.first[:epoch])
+    t2 = Time.at(statuses.last[:epoch])
+    time_format =
+      if [t0.year, t0.month, t0.day] == [t1.year, t1.month, t1.day] \
+        and [t1.year, t1.month, t1.day] == [t2.year, t2.month, t2.day]
+        '%H:%M:%S'
+      else
+        '%y/%m/%d %H:%M'
+      end
+  end
+
+  output_text = ''
+
+  user_login_ids = []
+  statuses.sort{|a, b| a.epoch <=> b.epoch}.each do |s|
+    text = s.text
+    user_login_ids << s.user_login_id unless user_login_ids.include?(s.user_login_id)
+    status_color = config.plugins.stdout.colors[user_login_ids.index(s.user_login_id) % config.plugins.stdout.colors.size]
+    status = "#{s.user.screen_name}: #{TermColor.escape(text)}"
+
+    time = "[wassr] [#{Time.at(s.epoch).strftime(time_format)}]"
+    id = s.id
+    source =
+      case s.source
+      when />(.*?)</ then $1
+      when 'web' then 'web'
+      end
+
+    erbed_text = ERB.new('<90><%=time%></90> <<%=status_color%>><%=status%></<%=status_color%>>').result(binding)
+    output_text << TermColor.parse(erbed_text) + "\n"
+  end
+
+  if config.plugins.stdout.enable_pager && ENV['LINES'] && statuses.size > ENV['LINES'].to_i
+    file = Tempfile.new('termtter')
+    file.print output_text
+    file.close
+    system "#{config.plugins.stdout.pager} #{file.path}"
+    file.close(true)
+  else
+    print output_text
+  end
+end

data/lib/termtter/client.rb

@@ -3,6 +3,12 @@ require 'fileutils'
 require 'logger'
 require 'termcolor'
 
+def plugin(name, init = {})
+  Termtter::Client.load_plugin(name, init)
+rescue Exception => e
+  Termtter::Client.handle_error(e)
+end
+
 module Termtter
 
   class CommandNotFound < StandardError; end
@@ -10,13 +16,29 @@ module Termtter
 
   module Client
 
+    @hooks = {}
+    @commands = {}
+    @filters = []
+    @since_id = nil
+    @input_thread = nil
+    @task_manager = Termtter::TaskManager.new
+
+    config.set_default(:logger, nil)
+    config.set_default(:update_interval, 300)
+    config.set_default(:prompt, '> ')
+    config.set_default(:devel, false)
+
+    Thread.abort_on_exception = true
+
     class << self
 
       def init
         @hooks = {}
         @commands = {}
         @filters = []
+        @loaded_plugins = []
         @since_id = nil
+        @plugin_loader = nil
         @task_manager = Termtter::TaskManager.new
         config.set_default(:logger, nil)
         config.set_default(:update_interval, 300)
@@ -30,6 +52,7 @@ module Termtter
       end
 
       def add_filter(&b)
+        warn "add_filter method will be removed. Use Termtter::Client.register_hook(:name => ..., :point => :filter_for_output, :exec => ... ) instead."
         @filters << b
       end
 
@@ -59,6 +82,15 @@ module Termtter
         end
       end
 
+      def load_plugin(name, init={})
+        unless init.empty?
+          init.each do |key, value|
+            config.plugins.__refer__(name.to_sym).__assign__(key.to_sym, value)
+          end
+        end
+        @plugin_loader.call(name) if @plugin_loader
+      end
+
       def register_command(arg)
         command = case arg
           when Command
@@ -71,6 +103,10 @@ module Termtter
         @commands[command.name] = command
       end
 
+      def clear_command
+        @commands.clear
+      end
+
       def get_command(name)
         @commands[name]
       end
@@ -110,26 +146,28 @@ module Termtter
 
         statuses = statuses.sort_by{|s|s.id}
         call_hooks(:pre_filter, statuses, event)
-        filtered = apply_filters(statuses, event)
+
+        filtered = statuses.map(&:dup)
+        @filters.each do |f|  # TODO: code for compatibility. delete someday.
+          statuses = f.call(statuses, event)
+        end
+        apply_filters_for_hook(:filter_for_output, statuses, event)
+
         call_hooks(:post_filter, filtered, event)
         get_hooks(:output).each do |hook|
-          filtered_for_hook = apply_filters_for_hook(filtered, hook.name)
-          hook.call(filtered_for_hook, event)
+          hook.call(
+            apply_filters_for_hook("filter_for_#{hook.name}", filtered, event),
+            event
+          )
         end
+        call_hooks(:post_output, filtered, event)
       end
 
-      def apply_filters(statuses, event)
-          filtered = statuses.map(&:dup)
-          @filters.each do |f|
-            filtered = f.call(filtered, event)
-          end
-          filtered
-      end
-
-      def apply_filters_for_hook(statuses, hook_name)
-        # TODO
-        filtered = statuses.map(&:dup)
-        filtered
+      def apply_filters_for_hook(hook_name, statuses, event)
+        get_hooks(hook_name).each do |hook|
+          statuses = hook.call(statuses, event)
+        end
+        statuses
       end
 
       # return last hook return value
@@ -142,12 +180,13 @@ module Termtter
         result
       end
 
-      def call_commands(text, tw = nil)
+      def call_commands(text)
         return if text.empty?
 
-        command_found = false
-        @commands.each do |key, command|
-          next unless command.match?(text)
+        commands = find_commands(text)
+        raise CommandNotFound, text if commands.empty?
+
+        commands.each do |command|
           command_found = true
           command_str, command_arg = Command.split_command_line(text)
 
@@ -168,8 +207,10 @@ module Termtter
             end
           end
         end
+      end
 
-        raise CommandNotFound, text unless command_found
+      def find_commands(text)
+        @commands.values.select { |command| command.match?(text) }
       end
 
       def pause
@@ -194,6 +235,8 @@ module Termtter
       def load_default_plugins
         plugin 'standard_plugins'
         plugin 'stdout'
+        plugin 'readline'
+        plugin 'update_timeline'
       end
 
       def load_config
@@ -224,12 +267,6 @@ module Termtter
           Termtter::CONF_FILE)
       end
 
-      def post_config_load()
-        if config.devel
-          plugin 'devel'
-        end
-      end
-
       def logger
         @logger
       end
@@ -261,12 +298,29 @@ module Termtter
         logger
       end
 
+      def init(&block)
+        @init_block = block
+      end
+
       def run
-        load_default_plugins()
+        @plugin_loader = lambda do |name|
+          @loaded_plugins.push(name)
+        end
+
         load_config()
+        load_default_plugins()
         Termtter::API.setup()
         setup_logger()
-        post_config_load()
+
+        plugin 'devel' if config.devel
+
+        @plugin_loader = lambda do |name|
+          @loaded_plugins.push(name)
+          load "plugins/#{name}.rb"
+        end
+        @loaded_plugins.each { |name| load "plugins/#{name}.rb" }
+
+        call_hooks(:initialize)
 
         config.system.eval_scripts.each do |script|
           begin
@@ -279,10 +333,8 @@ module Termtter
         config.system.run_commands.each { |cmd| call_commands(cmd) }
 
         unless config.system.cmd_mode
-          call_hooks(:initialize)
-          plugin('update_timeline')
           @task_manager.run()
-          call_hooks(:before_task_thread_run)
+          call_hooks(:post_task_thread_run)
         end
       end
 
@@ -301,5 +353,3 @@ module Termtter
     end
   end
 end
-
-Termtter::Client.init

data/lib/termtter/config_setup.rb

@@ -1,36 +1,28 @@
 # -*- coding: utf-8 -*-
 
+require 'erb'
+
 module Termtter
   module ConfigSetup
     module_function
     def run
       ui = create_highline
-      username = ui.ask('your twitter username: ')
+      user_name = ui.ask('your twitter user name: ')
       password = ui.ask('your twitter password: ') { |q| q.echo = false }
 
+      plugins = Dir.glob(File.expand_path(File.dirname(__FILE__) + "/../plugins/*.rb")).map  {|f|
+        f.match(%r|lib/plugins/(.*?).rb$|)[1]
+      }
+      standard_plugins = %w[stdout standard_commands auto_reload]
+
+      template = open(File.dirname(__FILE__) + '/config_template.erb').read
+      config = ERB.new(template, nil, '-').result(binding) # trim_mode => '-'
+
       Dir.mkdir(Termtter::CONF_DIR) unless File.exists?(Termtter::CONF_DIR)
       File.open(Termtter::CONF_FILE, 'w') {|io|
-        io.puts '# -*- coding: utf-8 -*-'
-
-        io.puts
-        io.puts "config.user_name = '#{username}'"
-        io.puts "config.password = '#{password}'"
-        io.puts "#config.update_interval = 120"
-        io.puts "#config.proxy.host = 'proxy host'"
-        io.puts "#config.proxy.port = '8080'"
-        io.puts "#config.proxy.user_name = 'proxy user'"
-        io.puts "#config.proxy.password = 'proxy password'"
-        io.puts
-        plugins = Dir.glob(File.expand_path(File.dirname(__FILE__) + "/../plugins/*.rb")).map  {|f|
-          f.match(%r|lib/plugins/(.*?).rb$|)[1]
-        }
-        plugins -= %w[stdout standard_plugins]
-        plugins.each do |p|
-          io.puts "#plugin '#{p}'"
-        end
-        io.puts
-        io.puts "# vim: set filetype=ruby"
+        io << config
       }
+
       puts "generated: ~/.termtter/config"
       puts "enjoy!"
     end

data/lib/termtter/config_template.erb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+config.user_name = '<%= user_name %>'
+config.password = '<%= password %>'
+#config.update_interval = 120
+#config.proxy.host = 'proxy host'
+#config.proxy.port = '8080'
+#config.proxy.user_name = 'proxy user'
+#config.proxy.password = 'proxy password'
+
+Termtter::Client.init do |t|
+  <%- standard_plugins.each do |plugin| -%>
+  t.plug '<%= plugin %>'
+  <%- end -%>
+  <%- (plugins - standard_plugins).each do |plugin| -%>
+  # t.plug '<%= plugin %>'
+  <%- end -%>
+end

data/lib/termtter/optparse.rb

@@ -23,6 +23,11 @@ OptionParser.new { |opt|
     config.system.run_commands << cmd
   end
 
+  config.system.load_plugins = []
+  opt.on('-p', '--plugin plugin', 'Load plugin') do |plugin|
+    config.system.load_plugins << plugin
+  end
+
   config.system.eval_scripts = []
   opt.on('-e', '--eval-script script', 'Eval script') do |script|
     config.system.eval_scripts << script

data/lib/termtter/system_extensions.rb

@@ -1,23 +1,12 @@
 # -*- coding: utf-8 -*-
 
-def plugin(name, init = {})
-  unless init.empty?
-    init.each do |key, value|
-      config.plugins.__refer__(name.to_sym).__assign__(key.to_sym, value)
-    end
-  end
-  load "plugins/#{name}.rb"
-rescue Exception => e
-  Termtter::Client.handle_error(e)
-end
-
 def filter(name, init = {})
   warn "filter method will be removed. Use plugin instead."
   plugin(name, init)
 end
 
 def win?
-  RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin/
+  RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin|cygwin/
 end
 
 if win?
@@ -103,13 +92,9 @@ require 'highline'
 def create_highline
   HighLine.track_eof = false
   if $stdin.respond_to?(:getbyte) # for ruby1.9
-    require 'delegate'
-    stdin_for_highline = SimpleDelegator.new($stdin)
-    def stdin_for_highline.getc
+    def $stdin.getc
       getbyte
     end
-  else
-    stdin_for_highline = $stdin
   end
-  HighLine.new(stdin_for_highline)
+  HighLine.new($stdin)
 end

data/lib/termtter/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module Termtter
-  VERSION = '1.1.0'
+  VERSION = '1.1.3'
 end

data/spec/plugins/standard_plugins_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require File.dirname(__FILE__) + '/../spec_helper'
-plugin 'standard_plugins'
+plugin 'standard_commands'
 
 module Termtter
   describe Client do

data/spec/termtter/client_spec.rb

@@ -6,8 +6,11 @@ module Termtter
 
   describe Client do
 
-    it 'should take command' do
+    before do
       Client.setup_logger
+    end
+
+    it 'should take command' do
       command = Command.new(:name => :test)
       Client.register_command(command)
       Client.get_command(:test).should == command
@@ -30,7 +33,7 @@ module Termtter
         ['test  foo bar ',  'foo bar'],
         ['test  foo  bar ', 'foo  bar'],
       ].each do |input, args|
-        Client.call_commands(input, nil)
+        Client.call_commands(input)
         command_arg.should == args
       end
     end
@@ -177,10 +180,8 @@ module Termtter
     end
 
     it 'run' do
-      Client.should_receive(:load_default_plugins)
       Client.should_receive(:load_config)
       Termtter::API.should_receive(:setup)
-      Client.should_receive(:post_config_load)
       Client.should_receive(:start_input_thread)
       Client.run
     end
@@ -249,5 +250,38 @@ module Termtter
       $stdout.string.should match(/foo USER/)
       $stdout.string.should match(/foo list/)
     end
+
+    describe 'add commands' do
+      before(:each) do
+        Client.clear_command
+        Client.register_command(:name => :foo1)
+        Client.register_command(:name => :foo2)
+        Client.register_command(:name => :bar)
+      end
+
+      it 'commands number is 3' do
+        Client.commands.size.should == 3
+      end
+
+      it 'should find a command' do
+        Client.find_commands('foo1').size.should == 1
+        Client.find_commands('foo1')[0].name.should == :foo1
+        Client.find_commands('bar').size.should == 1
+      end
+
+      it 'should find no command' do
+        Client.find_commands('foo').size.should == 0
+      end
+    end
+
+    describe 'clear commands' do
+      before(:each) do
+        Client.clear_command
+      end
+
+      it 'should no command' do
+        Client.commands.size.should == 0
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: draftcode-termtter
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors: 
 - draftcode
@@ -65,6 +65,7 @@ extra_rdoc_files:
 files: 
 - lib/plugins/addspace.rb
 - lib/plugins/april_fool.rb
+- lib/plugins/auto_reload.rb
 - lib/plugins/bomb.rb
 - lib/plugins/clear.rb
 - lib/plugins/command_plus.rb
@@ -91,12 +92,16 @@ files:
 - lib/plugins/hatebu_and_update.rb
 - lib/plugins/history.rb
 - lib/plugins/ignore.rb
+- lib/plugins/irc_gw.rb
 - lib/plugins/keyword.rb
 - lib/plugins/l2.rb
+- lib/plugins/list_with_opts.rb
 - lib/plugins/log.rb
+- lib/plugins/mark.rb
 - lib/plugins/me.rb
 - lib/plugins/modify_arg_hook_sample.rb
 - lib/plugins/msagent.rb
+- lib/plugins/multi_post.rb
 - lib/plugins/multi_reply.rb
 - lib/plugins/notify-send.rb
 - lib/plugins/notify-send2.rb
@@ -123,7 +128,7 @@ files:
 - lib/plugins/shell.rb
 - lib/plugins/sl.rb
 - lib/plugins/spam.rb
-- lib/plugins/standard_plugins.rb
+- lib/plugins/standard_commands.rb
 - lib/plugins/stdout.rb
 - lib/plugins/storage/DB.rb
 - lib/plugins/storage/status.rb
@@ -136,8 +141,8 @@ files:
 - lib/plugins/translation.rb
 - lib/plugins/typable_id.rb
 - lib/plugins/update_editor.rb
-- lib/plugins/update_timeline.rb
 - lib/plugins/uri-open.rb
+- lib/plugins/wassr.rb
 - lib/plugins/wassr_post.rb
 - lib/plugins/yhara.rb
 - lib/plugins/yhara_filter.rb
@@ -155,6 +160,7 @@ files:
 - lib/termtter/task_manager.rb
 - lib/termtter/version.rb
 - lib/termtter.rb
+- lib/termtter/config_template.erb
 - spec/plugins/cool_spec.rb
 - spec/plugins/english_spec.rb
 - spec/plugins/fib_spec.rb

data/lib/plugins/update_timeline.rb

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-module Termtter::Client
-  register_command(
-    :name => :_update_timeline,
-    :exec_proc => lambda {|arg|
-      begin
-        args = @since_id ? [{:since_id => @since_id}] : []
-        statuses = Termtter::API.twitter.friends_timeline(*args)
-        unless statuses.empty?
-          print "\e[1K\e[0G" unless win?
-          @since_id = statuses[0].id
-          output(statuses, :update_friends_timeline)
-          Readline.refresh_line
-        end
-      rescue OpenURI::HTTPError => e
-        if e.message == '401 Unauthorized'
-          puts 'Could not login'
-          puts 'plese check your account settings'
-          exit!
-        end
-      rescue => e
-        handle_error(e)
-      end
-    }
-  )
-
-  add_task(:name => :update_timeline, :interval => config.update_interval, :after => config.update_interval) do
-    call_commands('_update_timeline')
-  end
-
-  call_commands('_update_timeline')
-end