termtter 1.0.3 → 1.0.4

data/Rakefile

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency("json_pure", ">= 1.1.3")
   s.add_dependency("highline", ">= 1.5.0")
   s.add_dependency("termcolor", ">= 0.3.1")
-  s.add_dependency("rubytter", ">= 0.4.8")
+  s.add_dependency("rubytter", ">= 0.5.0")
   s.add_dependency("sqlite3-ruby", ">= 1.2.4")
   s.authors = %w(jugyo ujihisa)
   s.email = 'jugyo.org@gmail.com'

data/lib/plugins/bomb.rb

@@ -1,24 +1,21 @@
 # -*- coding: utf-8 -*-
+require 'enumerator'
 
 module Termtter
-
   module Client
-    config.plugins.bomb.color.set_default :foreground, 'white'
-    config.plugins.bomb.color.set_default :background, 'red'
+    config.plugins.bomb.set_default :format, "<on_red><white>%s</white></on_red>"
 
-    add_hook do |statuses, event|
-      case event
-      when :post_filter
-        fg = config.plugins.bomb.color.foreground
-        bg = config.plugins.bomb.color.background
-        statuses = [statuses] unless statuses.instance_of? Array
+    register_hook(
+      :name => :bomb,
+      :points => [:post_filter],
+      :exec_proc => lambda{|statuses, event|
         statuses.each do |status|
           if /爆発|bomb/ =~ status.text
-            status.text = "<on_#{bg}><#{fg}>#{status.text}</#{fg}></on_#{bg}>"
+            status.text = config.plugins.bomb.format % status.text
           end
         end
-      end
-    end
+      }
+    )
 
     register_command(
       :name => :bomb, :aliases => [],

data/lib/plugins/expand-tinyurl.rb

@@ -1,17 +1,25 @@
 # -*- coding: utf-8 -*-
 
+URL_SHORTTERS = [
+  { :host => "tinyurl.com", :pattern => %r'(http://tinyurl\.com(/[\w/]+))' },
+  { :host => "is.gd", :pattern => %r'(http://is\.gd(/[\w/]+))' },
+#  { :host => "bit.ly", :pattern => %r'(http://bit\.ly(/[\w/]+))' }
+]
+
 module Termtter::Client
   add_filter do |statuses, event|
     statuses.each do |s|
-      s.text.gsub!(%r'(http://tinyurl\.com(/[\w/]+))') do |m|
-        expand_tinyurl($2) || $1
+      URL_SHORTTERS.each do |site|
+        s[:text].gsub!(site[:pattern]) do |m|
+          expand_url(site[:host], $2) || $1
+        end
       end
     end
     statuses
   end
 end
 
-def expand_tinyurl(path)
+def expand_url(host, path)
   http_class = Net::HTTP
   unless config.proxy.host.nil? or config.proxy.host.empty?
     http_class = Net::HTTP::Proxy(config.proxy.host,
@@ -20,5 +28,6 @@ def expand_tinyurl(path)
                                   config.proxy.password)
   end
   res = http_class.new('tinyurl.com').head(path)
+  return nil unless res.code == "301" or res.code == "302"
   res['Location']
 end

data/lib/plugins/group.rb

@@ -22,6 +22,10 @@ module Termtter::Client
       map {|u| b % u }
   end
 
+  def self.get_group_of(screen_name)
+    config.plugins.group.groups.select{ |k, v| v.include? screen_name}.map{|a| a.first}
+  end    
+
   register_command(
    :name => :group,
    :aliases => [:g],
@@ -29,14 +33,14 @@ module Termtter::Client
      unless arg.empty?
        group_name = arg.to_sym
        if group_name == :all
-         group = config.plugins.group.groups.values.flatten.uniq
+         targets = config.plugins.group.groups.values.flatten.uniq
        else
-         group = config.plugins.group.groups[group_name]
+         targets = config.plugins.group.groups[group_name]
        end
-       statuses = group ? public_storage[:log].select { |s|
-         group.include?(s.user.screen_name) 
-       } : []
-       call_hooks(statuses, :search)
+       statuses = targets ? targets.map { |target|
+          public_storage[:tweet][target]
+        }.flatten.uniq.compact.sort_by{ |s| s[:id]} : []
+       output(statuses, :search)
      else
        config.plugins.group.groups.each_pair do |key, value|
          puts "#{key}: #{value.join(',')}"

data/lib/plugins/history.rb

@@ -3,9 +3,9 @@
 require 'zlib'
 
 config.plugins.history.
-  set_default(:filename, '~/.termtter_history')
+  set_default(:filename, Termtter::CONF_DIR + '/history')
 config.plugins.history.
-  set_default(:keys, [:log, :users, :status_ids])
+  set_default(:keys, [:users, :status_ids])
 config.plugins.history.
   set_default(:max_of_history, 100)
 config.plugins.history.
@@ -51,14 +51,17 @@ module Termtter::Client
     puts "history saved(#{File.size(filename)/1000}kb)"
   end
 
-  add_hook do |statuses, event|
-    case event
-    when :initialize
-      load_history
-    when :exit
-      save_history
-    end
-  end
+  register_hook(
+    :name => :history_initialize,
+    :points => [:initialize],
+    :exec_proc => lambda { load_history; logger.debug('load_history') }
+  )
+
+  register_hook(
+    :name => :history_exit,
+    :points => [:exit],
+    :exec_proc => lambda { save_history; logger.debug('save_history') }
+  )
 
   if config.plugins.history.enable_autosave
     Termtter::Client.add_task(:interval => config.plugins.history.autosave_interval,
@@ -75,6 +78,14 @@ module Termtter::Client
    :help => ['save', 'Save hisory']
    )
 
+  register_command(
+   :name => :load,
+   :exec_proc => lambda{|arg|
+     load_history
+   },
+   :help => ['load', 'Load hisory']
+   )
+
   
 end
 

data/lib/plugins/log.rb

@@ -6,19 +6,19 @@ module Termtter::Client
   config.plugins.log.set_default('max_size', 1/0.0)
   config.plugins.log.set_default('print_max_size', 30)
 
-  add_hook do |statuses, event|
-    case event
-    when :pre_filter
+  register_hook(
+    :name => :log,
+    :points => [:pre_filter],
+    :exec_proc => lambda {|statuses, event|
       # log(sequential storage)
       public_storage[:log] += statuses
       max_size = config.plugins.log.max_size
       if public_storage[:log].size > max_size
         public_storage[:log] = public_storage[:log][-max_size..-1]
       end
-      public_storage[:log] = public_storage[:log].uniq.sort_by{|a| a.created_at} if statuses.first
+      public_storage[:log] = public_storage[:log].uniq.sort_by{|s| s.created_at} if statuses.first
 
       # tweet(storage for each user)
-
       statuses.each do |s|
         public_storage[:tweet][s.user.screen_name] = [] unless public_storage[:tweet][s.user.screen_name]
         public_storage[:tweet][s.user.screen_name] << s
@@ -26,8 +26,8 @@ module Termtter::Client
           public_storage[:tweet] = public_storage[:tweet][-max_size..-1]
         end
       end
-    end
-  end
+    }
+  )
 
   register_command(
    :name => :log,
@@ -37,7 +37,7 @@ module Termtter::Client
        statuses = public_storage[:log]
        print_max = config.plugins.log.print_max_size
        print_max = 0 if statuses.size < print_max
-       call_hooks(statuses[-print_max..-1], :search)
+       output(statuses[-print_max..-1], :search)
      else
        # log (user) (max)
        vars = arg.split(' ')
@@ -45,7 +45,7 @@ module Termtter::Client
        id = vars
        statuses = id.first ? public_storage[:log].select{ |s| id.include? s.user.screen_name} : public_storage[:log]
        print_max = 0 if statuses.size < print_max
-       call_hooks(statuses[-print_max..-1], :search)
+       output(statuses[-print_max..-1], :search)
      end
    },
    :completion_proc => lambda {|cmd, arg|
@@ -60,7 +60,7 @@ module Termtter::Client
     unless arg.strip.empty?
       pat = Regexp.new arg
       statuses = public_storage[:log].select { |s| s.text =~ pat }
-      call_hooks(statuses, :search)
+      output(statuses, :search)
      end
    },
    :help => [ 'search_log WORD', 'Search log for WORD' ]

data/lib/plugins/msagent.rb

@@ -11,16 +11,28 @@ achar = agent.characters.character("Merlin")
 achar.languageID = 0x411
 achar.show
 
-Termtter::Client.add_hook do |statuses, event, t|
-  if event == :exit
+Termtter::Client.register_hook(
+  :name => :msagent,
+  :points => [:post_filter],
+  :exec_proc => lambda {|statuses, event|
+    if !statuses.empty? && event == :update_friends_timeline
+      Thread.start do
+        statuses.reverse.each do |s|
+          req = achar.speak("#{s[:screen_name]}: #{s[:post_text]}".tosjis)
+          sleep 1
+          WIN32OLE_EVENT.message_loop
+          achar.stop(req)
+        end
+      end
+    end
+  }
+)
+
+Termtter::Client.register_hook(
+  :name => :msagent_exit,
+  :points => [:exit],
+  :exec_proc => lambda {
     achar.hide   
     GC.start
-  elsif !statuses.empty? && event == :update_friends_timeline
-    statuses.reverse.each do |s|
-      req = achar.speak("#{s.user.screen_name}: #{s.text}".tosjis)
-      sleep 3
-      WIN32OLE_EVENT.message_loop
-      achar.stop(req)
-    end
-  end
-end
+  }
+)

data/lib/plugins/notify-send.rb

@@ -1,17 +1,22 @@
 # -*- coding: utf-8 -*-
 
-Termtter::Client.add_hook do |statuses, event|
-  if !statuses.empty? && event == :update_friends_timeline
-    max = 10
+Termtter::Client.register_hook(
+  :name => :notify_send,
+  :points => [:post_filter],
+  :exec_proc => lambda {|statuses, event|
+    if event == :update_friends_timeline
+      max = 10
 
-    text = statuses.take(max).map {|s|
-      status_text = CGI.escapeHTML(s.text)
-      status_text.gsub!(%r{https?://[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+},'<a href="\0">\0</a>')
-      "<b>#{s.user.screen_name}:</b> <span font=\"9.0\">#{status_text}</span>"
-    }.join("\n")
+      text = statuses.take(max).map {|s|
+        status_text = CGI.escapeHTML(s[:post_text])
+        status_text.gsub!(%r{https?://[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+},'<a href="\0">\0</a>')
+        "<b>#{s[:screen_name]}:</b> <span font=\"9.0\">#{status_text}</span>"
+      }.join("\n")
 
-    text << %Q|\n<a href="http://twitter.com/">more...</a>| if statuses.size > max
+      text << %Q|\n<a href="http://twitter.com/">more...</a>| if statuses.size > max
+
+      system 'notify-send', 'Termtter', text, '-t', '60000'
+    end
+  }
+)
 
-    system 'notify-send', 'Termtter', text, '-t', '60000'
-  end
-end

data/lib/plugins/say.rb

@@ -10,14 +10,16 @@ def say(who, what)
 end
 
 module Termtter::Client
-  add_hook do |statuses, event, t|
-    if !statuses.empty? && event == :update_friends_timeline
+  register_hook(
+    :name => :say,
+    :points => [:post_filter],
+    :exec_proc => lambda {|statuses, event|
       statuses.reverse.each do |s|
-        text_without_uri = s.text.gsub(%r|https?://[^\s]+|, 'U.R.I.')
-        say s.user.screen_name, text_without_uri
+        text_without_uri = s[:post_text].gsub(%r|https?://[^\s]+|, 'U.R.I.')
+        say s[:screen_name], text_without_uri
       end
-    end
-  end
+    }
+  )
 end
 
 # KNOWN BUG:

data/lib/plugins/scrape.rb

@@ -29,7 +29,7 @@ module Termtter::Client
                        members += config.plugins.group.groups[group]
                      end
                      statuses = scrape_members(members.uniq.compact.sort)
-                     call_hooks(statuses, :pre_filter)
+                     output(statuses_to_hash(statuses), :pre_filter)
                    },
                    :completion_proc => lambda {|cmd, args|
                      arg = args.split(' ').last

data/lib/plugins/screen-notify.rb

@@ -1,13 +1,20 @@
+# -*- coding: utf-8 -*-
 
-if config.screen_notify.format.nil? or config.screen_notify.format.empty?
-  config.screen_notify.format = "[termtter] @%s"
-end
+config.screen_notify.set_default(:format, "[termtter] %s")
 
-Termtter::Client.add_hook do |statuses, event|
-  if !statuses.empty? && event == :update_friends_timeline
-    statuses.reverse.each do |s|
-      msg = config.screen_notify.format % [s.user.screen_name, s.text]
-      system 'screen', '-X', 'eval', "bell_msg '#{msg}'", 'bell'
-    end
-  end
+module Termtter::Client
+  register_hook(
+    :name => :screen_notify,
+    :points => [:post_filter],
+    :exec_proc => lambda{|statuses, event|
+      return unless event = :update_friends_timeline
+      Thread.new(statuses) do |ss|
+        ss.each do |s|
+          msg = config.screen_notify.format % s.user.screen_name
+          system 'screen', '-X', 'eval', "bell_msg '#{msg}'", 'bell'
+          sleep 1
+        end
+      end
+    }
+  )
 end

data/lib/plugins/standard_plugins.rb

@@ -2,6 +2,10 @@
 
 require 'erb'
 
+config.plugins.standard.set_default(
+ :limit_format,
+ '<<%=remaining_color%>><%=limit.remaining_hits%></<%=remaining_color%>>/<%=limit.hourly_limit%> until <%=limit.reset_time%> (<%=remaining_time%> remaining)')
+
 module Termtter::Client
 
   # standard commands
@@ -10,8 +14,9 @@ module Termtter::Client
     :name => :update, :aliases => [:u],
     :exec_proc => lambda {|arg|
       unless arg =~ /^\s*$/
+        # TODO: Change to able to disable erb.
         text = ERB.new(arg).result(binding).gsub(/\n/, ' ')
-        result = Termtter::API.twitter.update(text, :source=>Termtter::APP_NAME)
+        result = Termtter::API.twitter.update(text)
         puts "=> #{text}"
         result
       end
@@ -78,11 +83,14 @@ module Termtter::Client
   register_command(
     :name => :list, :aliases => [:l],
     :exec_proc => lambda {|arg|
-      unless arg.empty?
-        call_hooks(Termtter::API.twitter.user_timeline(arg), :list_user_timeline)
+      if arg.empty?
+        event = :list_friends_timeline
+        statuses = Termtter::API.twitter.friends_timeline()
       else
-        call_hooks(Termtter::API.twitter.friends_timeline(), :list_friends_timeline)
+        event = :list_user_timeline
+        statuses = Termtter::API.twitter.user_timeline(arg)
       end
+      output(statuses, event)
     },
     :completion_proc => lambda {|cmd, arg|
       find_user_candidates arg, "#{cmd} %s"
@@ -92,14 +100,15 @@ module Termtter::Client
   register_command(
     :name => :search, :aliases => [:s],
     :exec_proc => lambda {|arg|
-      call_hooks(Termtter::API.twitter.search(arg), :search)
+      statuses = Termtter::API.twitter.search(arg)
+      output(statuses, :search)
     }
   )
 
   register_command(
     :name => :replies, :aliases => [:r],
     :exec_proc => lambda {|arg|
-      call_hooks(Termtter::API.twitter.replies(), :replies)
+      output(Termtter::API.twitter.replies(), :replies)
     }
   )
 
@@ -107,7 +116,7 @@ module Termtter::Client
     :name => :show,
     :exec_proc => lambda {|arg|
       id = arg.gsub(/.*:\s*/, '')
-      call_hooks(Termtter::API.twitter.show(id), :show)
+      output([Termtter::API.twitter.show(id)], :show)
     },
     :completion_proc => lambda {|cmd, arg|
       case arg
@@ -128,7 +137,8 @@ module Termtter::Client
     :name => :shows,
     :exec_proc => lambda {|arg|
       id = arg.gsub(/.*:\s*/, '')
-      call_hooks(Termtter::API.twitter.show(id, true), :show)
+      # TODO: Implement
+      output([Termtter::API.twitter.show(id)], :show)
     },
     :completion_proc => get_command(:show).completion_proc
   )
@@ -176,7 +186,8 @@ module Termtter::Client
         when 0..0.2   then :red
         else               :green
         end
-      puts "=> #{color(limit.remaining_hits, remaining_color)}/#{limit.hourly_limit} until #{limit.reset_time} (#{remaining_time} remaining)"
+      erbed_text = ERB.new(config.plugins.standard.limit_format).result(binding)
+      puts TermColor.parse(erbed_text)
     },
     :help => ["limit,lm", "Show the API limit status"]
   )
@@ -229,7 +240,7 @@ module Termtter::Client
         ["list,l", "List the posts in your friends timeline"],
         ["list,l USERNAME", "List the posts in the the given user's timeline"],
         ["update,u TEXT", "Post a new message"],
-        ["direct,d @USERNAME TEXT", "Send direct message"],
+        ["direct,d USERNAME TEXT", "Send direct message"],
         ["profile,p USERNAME", "Show user's profile"],
         ["replies,r", "List the most recent @replies for the authenticating user"],
         ["search,s TEXT", "Search for Twitter"],
@@ -272,17 +283,18 @@ module Termtter::Client
   public_storage[:users] ||= Set.new
   public_storage[:status_ids] ||= Set.new
 
-  add_hook do |statuses, event, t|
-    case event
-    when :update_friends_timeline, :list_friends_timeline, :list_user_timeline, :replies
+  register_hook(
+    :name => :for_completion,
+    :points => [:pre_filter],
+    :exec_proc => lambda {|statuses, event|
       statuses.each do |s|
         public_storage[:users].add(s.user.screen_name)
         public_storage[:users] += s.text.scan(/@([a-zA-Z_0-9]*)/).flatten
-        public_storage[:status_ids].add(s.id.to_s)
-        public_storage[:status_ids].add(s.in_reply_to_status_id.to_s) if s.in_reply_to_status_id
+        public_storage[:status_ids].add(s.id)
+        public_storage[:status_ids].add(s.in_reply_to_status_id) if s.in_reply_to_status_id
       end
-    end
-  end
+    }
+  )
 
   def self.find_status_ids(text)
     public_storage[:status_ids].select{|id| id =~ /#{Regexp.quote(text)}/}