termtter 0.8.14 → 1.0.0

data/README.rdoc

@@ -17,7 +17,8 @@ Run:
 == REQUIREMENTS:
 
 * json_pure
-* configatron
+* termcolor
+* rubytter
 
 == INSTALL:
 
@@ -40,15 +41,15 @@ You can edit the file anytime.
 
   vim ~/.termtter
 
-  configatron.user_name = 'USERNAME'
-  configatron.password = 'PASSWORD'
+  config.user_name = 'USERNAME'
+  config.password = 'PASSWORD'
 
 If you would like to use proxy server, add configurations like this:
 
-  configatron.proxy.host = 'PROXYHOST'
-  configatron.proxy.port = 'PROXYPORT'
-  configatron.proxy.user_name = 'USERNAME'
-  configatron.proxy.password = 'PASSWORD'
+  config.proxy.host = 'PROXYHOST'
+  config.proxy.port = 'PROXYPORT'
+  config.proxy.user_name = 'USERNAME'
+  config.proxy.password = 'PASSWORD'
 
 To update the config, just restart your termtter proccess.
 
@@ -62,7 +63,6 @@ http://wiki.github.com/jugyo/termtter/home (in Japanese)
 
 == TODO:
 
-- rubytter を使うようにする
 - filter と plugin を統一する
 - plugin => plugins （ディレクトリ名変更）
 - $HOME 以下に plugin 用のディレクトリを置けるようにする

data/Rakefile

@@ -1,6 +1,4 @@
 $:.unshift File.dirname(__FILE__) + '/lib'
-require 'termtter'
-
 require 'spec/rake/spectask'
 desc 'run all specs'
 Spec::Rake::SpecTask.new do |t|
@@ -10,6 +8,7 @@ end
 
 desc 'Generate gemspec'
 task :gemspec do |t|
+  require 'termtter'
   open('termtter.gemspec', "wb" ) do |file|
     file << <<-EOS
 Gem::Specification.new do |s|
@@ -25,9 +24,9 @@ Gem::Specification.new do |s|
                 Rakefile )
   s.executables = ["kill_termtter", "termtter"]
   s.add_dependency("json_pure", ">= 1.1.3")
-  s.add_dependency("configatron", ">= 2.2.2")
   s.add_dependency("highline", ">= 1.5.0")
   s.add_dependency("termcolor", ">= 0.3.1")
+  s.add_dependency("rubytter", ">= 0.4.8")
   s.authors = %w(jugyo ujihisa)
   s.email = 'jugyo.org@gmail.com'
   s.homepage = 'http://wiki.github.com/jugyo/termtter'
@@ -49,9 +48,8 @@ end
 namespace :gem do
   desc 'Install needed gems'
   task :install do
-    %w[ json_pure configatron highline termcolor ].each do |gem|
+    %w[ json_pure highline termcolor rubytter ].each do |gem|
       sh "sudo gem install #{gem} -r"
     end
   end
 end
-

data/lib/plugins/bomb.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+module Termtter
+
+  module Client
+    config.plugins.bomb.color.set_default :foreground, 'white'
+    config.plugins.bomb.color.set_default :background, '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
+        statuses.each do |status|
+          if /爆発|bomb/ =~ status.text
+            status.text = "<on_#{bg}><#{fg}>#{status.text}</#{fg}></on_#{bg}>"
+          end
+        end
+      end
+    end
+
+    register_command(
+      :name => :bomb, :aliases => [],
+      :exec_proc => lambda {|arg|
+        text = "#{arg.strip} 爆発しろ!"
+        Termtter::API::twitter.update(text)
+        puts "=> #{text}"
+      },
+      :help => ['bomb WORD', 'Bomb it']
+    )
+  end
+end
+
+# bomb.rb
+# Bomb it!
+#
+# See http://gyazo.com/4b33517380673d92f51a52e675ecdb02.png .
+# config.plugins.bomb.color.foreground = 'white'
+# config.plugins.bomb.color.background = 'red'
+#
+# vim: fenc=utf8

data/lib/{filter → plugins}/en2ja.rb

@@ -2,7 +2,7 @@
 
 plugin 'translation'
 
-Termtter::Client.add_filter do |statuses|
+Termtter::Client.add_filter do |statuses, event|
   statuses.each do |s|
     if s.english?
       s.text = translate(s.text, 'en|ja')

data/lib/plugins/english.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# vim: set fenc=utf-8
+
+module Termtter::English
+  # english? :: String -> Boolean
+  def self.english?(message)
+    /[一-龠]+|[ぁ-ん]+|[ァ-ヴー]+|[ａ-ｚＡ-Ｚ０-９]+/ !~ message
+  end
+end
+
+Termtter::Client.add_filter do |statuses, event|
+  config.plugins.english.set_default(:only, [])
+  statuses.select {|i|
+    !config.plugins.english.only.include?(event) ||
+      Termtter::English.english?(i.text)
+  }
+end
+
+# english_filter.rb
+#   select English posts only
+#
+# config sample:
+#   plugin 'english'
+# or,
+#   plugin 'english', :only => [:list_friends_timeline, :update_friends_timeline]

data/lib/{filter → plugins}/expand-tinyurl.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module Termtter::Client
-  add_filter do |statuses|
+  add_filter do |statuses, event|
     statuses.each do |s|
       s.text.gsub!(%r'(http://tinyurl\.com(/[\w/]+))') do |m|
         expand_tinyurl($2) || $1
@@ -13,11 +13,11 @@ end
 
 def expand_tinyurl(path)
   http_class = Net::HTTP
-  unless configatron.proxy.host.empty?
-    http_class = Net::HTTP::Proxy(configatron.proxy.host,
-                                  configatron.proxy.port,
-                                  configatron.proxy.user_name,
-                                  configatron.proxy.password)
+  unless config.proxy.host.nil? or config.proxy.host.empty?
+    http_class = Net::HTTP::Proxy(config.proxy.host,
+                                  config.proxy.port,
+                                  config.proxy.user_name,
+                                  config.proxy.password)
   end
   res = http_class.new('tinyurl.com').head(path)
   res['Location']

data/lib/plugins/favorite.rb

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+def create_favorite(id)
+  r = Termtter::API.twitter.favorite id
+  puts "Favorited status ##{r.id} on user @#{r.user.screen_name} #{r.text}"
+end
+
+module Termtter::Client
+  register_command(
+    :name => :favorite, :aliases => [:fav],
+    :exec_proc => lambda {|arg|
+      id = 0
+      case arg
+      when /^\d+/
+        id = arg.to_i
+      when /^@([A-Za-z0-9_]+)/
+        user = $1
+        statuses = Termtter::API.twitter.user_timeline(user)
+        return if statuses.empty?
+        id = statuses[0].id
+      when /^\/(.*)$/
+        word = $1
+        raise "Not implemented yet."
+      else
+        return
+      end
+
+      create_favorite id
+    },
+    :completion_proc => lambda {|cmd, arg|
+      case arg
+      when /@(.*)/
+        find_user_candidates $1, "#{cmd} @%s"
+      when /(\d+)/
+        find_status_ids(arg).map{|id| "#{cmd} #{$1}"}
+      else
+        %w(favorite).grep(/^#{Regexp.quote arg}/)
+      end
+    },
+    :help => ['favorite,fav (ID|@USER|/WORD)', 'Favorite a status']
+  )
+
+#   TBD: Implement this when database support comes.
+#
+#   if public_storage[:log]
+#     add_help 'favorite,fav /WORD', 'Favorite a status by searching'
+#
+#     add_command %r'^(?:favorite|fav)\s+/(.+)$' do |m, t|
+#       pat = Regexp.new(m[1])
+#       statuses = public_storage[:log].select {|s| pat =~ s.text }
+#       if statuses.size == 1
+#         status = statuses.first
+#         res = t.favorite(status.id)
+#         if res.code == '200'
+#           puts %Q(Favorited "#{status.user.screen_name}: #{status.text}")
+#         else
+#           puts "Failed: #{res}"
+#         end
+#       else
+#         puts "#{pat} does not match single status"
+#       end
+#     end
+end

data/lib/plugins/fib.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+def fib(n)i=0;j=1;n.times{j=i+i=j};i end
+module Termtter::Client
+  register_command(
+    :name => :fib,
+    :exec_proc => lambda {|arg|
+      n = arg.to_i
+      text = "fib(#{n}) = #{fib n}"
+      Termtter::API.twitter.update(text)
+      puts "=> " << text
+    }
+  )
+  register_command(
+    :name => :fibyou,
+    :exec_proc => lambda {|arg|
+      /(\w+)\s(\d+)/ =~ arg
+      name = $1
+      n = $2.to_i
+      text = "@#{name} fib(#{n}) = #{fib n}"
+      Termtter::API.twitter.update(text)
+      puts "=> " << text
+    },
+    :completion_proc => lambda {|cmd, arg|
+      find_user_candidates arg, "#{cmd} %s"
+    }
+  )
+end

data/lib/{filter/fib.rb → plugins/fib_filter.rb}

@@ -2,7 +2,7 @@
 
 def fib(n)i=0;j=1;n.times{j=i+i=j};i end
 module Termtter::Client
-  add_filter do |statuses|
+  add_filter do |statuses, _|
     statuses.each do |s|
       s.text.gsub!(/(\d+)/) do |m|
         n = $1.to_i
@@ -12,4 +12,3 @@ module Termtter::Client
     statuses
   end
 end
-

data/lib/{plugin → plugins}/graduatter.rb

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
-twitter = Termtter::Twitter.new(configatron.user_name, configatron.password)
 Thread.start do
   100.times do |i|
-    twitter.update_status(
+    Twitter::API.twitter.update(
       "I decided not to use twitter so as not to leave university before I complete the dissertation#{i.odd? ? '!' : '.'}")
   end
 end

data/lib/{plugin → plugins}/grass.rb

@@ -2,14 +2,14 @@
 module Termtter
   module Client
 
-    configatron.plugins.grass.set_default(:rate, 0)
+    config.plugins.grass.set_default(:rate, 0)
 
     register_command(
       :name => :w, :aliases => [:grass],
       :exec_proc => lambda {|arg|
         arg, rate = arg.split(/ /)
         count = arg =~ /^[0-9]+$/ ? arg.to_i : 3
-        rate ||= configatron.plugins.grass.rate
+        rate ||= config.plugins.grass.rate
         grow = (count * rate.to_i).quo(100).round
         grasses = ('w' * (count-grow) + 'W' * grow).split(//).shuffle.join
         call_commands("update #{grasses}")

data/lib/{plugin → plugins}/group.rb

@@ -4,20 +4,20 @@ module Termtter
   class Status
     def is_member?(group = nil)
       if group
-        configatron.plugins.group.groups[group].include? self.user_screen_name
+        config.plugins.group.groups[group].include? self.user_screen_name
       else
-        configatron.plugins.group.groups.values.flatten.include? self.user_screen_name
+        config.plugins.group.groups.values.flatten.include? self.user_screen_name
       end
     end
   end
 end
 
 module Termtter::Client
-  configatron.plugins.group.
+  config.plugins.group.
     set_default(:groups, {})
 
   def self.find_group_candidates(a, b)
-    configatron.plugins.group.groups.keys.map {|k| k.to_s}.
+    config.plugins.group.groups.keys.map {|k| k.to_s}.
       grep(/^#{Regexp.quote a}/).
       map {|u| b % u }
   end
@@ -29,16 +29,16 @@ module Termtter::Client
      unless arg.empty?
        group_name = arg.to_sym
        if group_name == :all
-         group = configatron.plugins.group.groups.values.flatten.uniq
+         group = config.plugins.group.groups.values.flatten.uniq
        else
-         group = configatron.plugins.group.groups[group_name]
+         group = config.plugins.group.groups[group_name]
        end
        statuses = group ? public_storage[:log].select { |s|
-         group.include?(s.user_screen_name) 
+         group.include?(s.user.screen_name) 
        } : []
        call_hooks(statuses, :search)
      else
-       configatron.plugins.group.groups.each_pair do |key, value|
+       config.plugins.group.groups.each_pair do |key, value|
          puts "#{key}: #{value.join(',')}"
        end
      end
@@ -53,7 +53,7 @@ end
 
 # group.rb
 #   plugin 'group'
-#   configatron.plugins.group.groups = {
+#   config.plugins.group.groups = {
 #     :rits => %w(hakobe isano hitode909)
 #   }
 # NOTE: group.rb needs plugin/log

data/lib/{plugin → plugins}/growl.rb

@@ -12,11 +12,11 @@ rescue LoadError
   growl = nil
 end
 
-configatron.plugins.growl.set_default(:icon_cache_dir, "#{Dir.tmpdir}/termtter-icon-cache-dir")
-FileUtils.mkdir_p(configatron.plugins.growl.icon_cache_dir) unless File.exist?(configatron.plugins.growl.icon_cache_dir)
+config.plugins.growl.set_default(:icon_cache_dir, "#{Dir.tmpdir}/termtter-icon-cache-dir")
+FileUtils.mkdir_p(config.plugins.growl.icon_cache_dir) unless File.exist?(config.plugins.growl.icon_cache_dir)
 
 def get_icon_path(s)
-  cache_file = "%s/%s%s" % [  configatron.plugins.growl.icon_cache_dir, 
+  cache_file = "%s/%s%s" % [  config.plugins.growl.icon_cache_dir, 
                               s.user_screen_name, 
                               File.extname(s.user_profile_image_url)  ]
   if File.exist?(cache_file) && (File.atime(cache_file) + 24*60*60) > Time.now
@@ -37,12 +37,12 @@ Thread.new do
     begin
       if s = queue.pop
         unless growl
-          arg = ['growlnotify', s.user_screen_name, '-m', s.text.gsub("\n",''), '-n', 'termtter']
+          arg = ['growlnotify', s.user.screen_name, '-m', s.text.gsub("\n",''), '-n', 'termtter']
           #icon_path = get_icon_path(s)
           #arg += ['--image', icon_path] if icon_path
           system *arg
         else
-          growl.notify "termtter status notification", s.text, s.user_screen_name
+          growl.notify "termtter status notification", s.text, s.user.screen_name
         end
       end
     rescue => e
@@ -53,10 +53,9 @@ Thread.new do
   end
 end
 
-Termtter::Client.add_hook do |statuses, event|
-  if !statuses.empty? && event == :update_friends_timeline
-    statuses.reverse.each do |s|
-      queue << s
-    end
-  end
-end
+Termtter::Client.register_hook(:name => :growl,
+                               :points => [:post_exec__update_timeline],
+                               :exec_proc => lambda { |cmd, arg, result|
+                                 result.reverse.each { |s| queue << s }
+                               }
+)

data/lib/{plugin → plugins}/hatebu.rb

@@ -17,11 +17,11 @@ module Termtter::Client
           status = t.show(id).first
         end
         auth = auth = Atompub::Auth::Wsse.new({
-            :username => configatron.plugins.hatebu.username,
-            :password => configatron.plugins.hatebu.password,
+            :username => config.plugins.hatebu.username,
+            :password => config.plugins.hatebu.password,
         })
         link = Atom::Link.new({
-           :href => "http://twitter.com/#{status.user_screen_name}/status/#{status.id}",
+           :href => "http://twitter.com/#{status.user.screen_name}/status/#{status.id}",
            :rel => 'related',
            :type => 'text/html',
         })
@@ -53,7 +53,7 @@ end
 # hatebu.rb
 # hatena bookmark it!
 #
-# configatron.plugins.hatebu.username = 'your-username-on-hatena'
-# configatron.plugins.hatebu.password = 'your-password-on-hatena'
+# config.plugins.hatebu.username = 'your-username-on-hatena'
+# config.plugins.hatebu.password = 'your-password-on-hatena'
 #
 #   hatebu 1114860346 [termtter][<82>±<82>ê<82>Í<82>·<82>²<82>¢]mattn++

data/lib/{plugin → plugins}/history.rb

@@ -2,21 +2,21 @@
 
 require 'zlib'
 
-configatron.plugins.history.
+config.plugins.history.
   set_default(:filename, '~/.termtter_history')
-configatron.plugins.history.
+config.plugins.history.
   set_default(:keys, [:log, :users, :status_ids])
-configatron.plugins.history.
+config.plugins.history.
   set_default(:max_of_history, 100)
-configatron.plugins.history.
+config.plugins.history.
   set_default(:enable_autosave, true)
-configatron.plugins.history.
+config.plugins.history.
   set_default(:autosave_interval, 3600)
 
 module Termtter::Client
   def self.load_history
-    filename = File.expand_path(configatron.plugins.history.filename)
-    keys = configatron.plugins.history.keys
+    filename = File.expand_path(config.plugins.history.filename)
+    keys = config.plugins.history.keys
 
     if File.exist?(filename)
       begin
@@ -33,13 +33,13 @@ module Termtter::Client
   end
 
   def self.save_history
-    filename = File.expand_path(configatron.plugins.history.filename)
-    keys = configatron.plugins.history.keys
+    filename = File.expand_path(config.plugins.history.filename)
+    keys = config.plugins.history.keys
     history = { }
     keys.each do |key|
       history[key] = public_storage[key]
     end
-    max_of_history = configatron.plugins.history.max_of_history
+    max_of_history = config.plugins.history.max_of_history
     history[:history] = Readline::HISTORY.to_a.reverse.uniq.reverse
     if history[:history].size > max_of_history
       history[:history] = history[:history][-max_of_history..-1]
@@ -60,9 +60,9 @@ module Termtter::Client
     end
   end
 
-  if configatron.plugins.history.enable_autosave
-    Termtter::Client.add_task(:interval => configatron.plugins.history.autosave_interval,
-                              :after => configatron.plugins.history.autosave_interval) do
+  if config.plugins.history.enable_autosave
+    Termtter::Client.add_task(:interval => config.plugins.history.autosave_interval,
+                              :after => config.plugins.history.autosave_interval) do
       save_history
     end
   end

data/lib/plugins/ignore.rb

@@ -0,0 +1,19 @@
+# -*- 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
+end
+
+# filter/ignore.rb
+#   ignore words
+# setting
+#   config.filters.ignore.words = [ /ignore/, /words/ ]
+

data/lib/plugins/keyword.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+config.set_default('plugins.keyword.keywords', [])
+
+module Termtter
+  class Status
+    def has_keyword?
+      config.plugins.keyword.keywords.find { |k| k === self.text }
+    end
+    alias :has_keyword :has_keyword?
+  end
+end
+
+# keyword.rb
+#   provides a keyword watching method
+# example config
+#   config.plugins.stdout.timeline_format = '<%= color(time, 90) %> <%= color(status, s.has_keyword ? 4 : status_color) %> <%= color(id, 90) %>'
+#   config.plugins.keyword.keywords = [ /motemen/ ]

data/lib/{plugin → plugins}/log.rb

@@ -2,18 +2,30 @@
 
 module Termtter::Client
   public_storage[:log] = []
-  configatron.plugins.log.set_default('max_size', 1/0.0)
-  configatron.plugins.log.set_default('print_max_size', 30)
+  public_storage[:tweet] = { }
+  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
+      # log(sequential storage)
       public_storage[:log] += statuses
-      max_size = configatron.plugins.log.max_size
+      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
+
+      # 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
+        if public_storage[:tweet].size > max_size
+          public_storage[:tweet] = public_storage[:tweet][-max_size..-1]
+        end
+      end
     end
   end
 
@@ -23,15 +35,15 @@ module Termtter::Client
      if arg.empty?
        # log
        statuses = public_storage[:log]
-       print_max = configatron.plugins.log.print_max_size
+       print_max = config.plugins.log.print_max_size
        print_max = 0 if statuses.size < print_max
        call_hooks(statuses[-print_max..-1], :search)
      else
        # log (user) (max)
        vars = arg.split(' ')
-       print_max = vars.last =~ /^\d+$/ ? vars.pop.to_i : configatron.plugins.log.print_max_size
+       print_max = vars.last =~ /^\d+$/ ? vars.pop.to_i : config.plugins.log.print_max_size
        id = vars
-       statuses = id.first ? public_storage[:log].select{ |s| id.include? s.user_screen_name} : public_storage[:log]
+       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)
      end
@@ -54,10 +66,4 @@ module Termtter::Client
    :help => [ 'search_log WORD', 'Search log for WORD' ]
    )
 
-  add_command %r'^/(.+)' do |m, t|
-    warn '/WORD command will be removed. Use search_log command instead.'
-    pat = Regexp.new(m[1])
-    statuses = public_storage[:log].select { |s| s.text =~ pat }
-    call_hooks(statuses, :search, t)
-  end
 end

data/lib/{plugin → plugins}/me.rb

@@ -3,8 +3,7 @@ module Termtter::Client
   register_command(
     :name => :me, :aliases => [],
     :exec_proc => lambda {|arg|
-      myname = configatron.user_name
-      call_hooks(Termtter::API.twitter.get_user_timeline(myname), :list_user_timeline)
+      call_commands('list ' + config.user_name)
     },
     :help => ['me', 'show my timeline']
   )

data/lib/{plugin → plugins}/msagent.rb

@@ -17,7 +17,7 @@ Termtter::Client.add_hook do |statuses, event, t|
     GC.start
   elsif !statuses.empty? && event == :update_friends_timeline
     statuses.reverse.each do |s|
-      req = achar.speak("#{s.user_screen_name}: #{s.text}".tosjis)
+      req = achar.speak("#{s.user.screen_name}: #{s.text}".tosjis)
       sleep 3
       WIN32OLE_EVENT.message_loop
       achar.stop(req)