jugyo-termtter 0.7.7 → 0.8.0

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 PostInstall.txt
 README.rdoc
 Rakefile
+bin/kill_termtter
 bin/termtter
 lib/filter/en2ja.rb
 lib/filter/english.rb
@@ -12,6 +13,7 @@ lib/filter/ignore.rb
 lib/filter/reply.rb
 lib/filter/reverse.rb
 lib/filter/yhara.rb
+lib/plugin/april_fool.rb
 lib/plugin/bomb.rb
 lib/plugin/confirm.rb
 lib/plugin/cool.rb
@@ -28,12 +30,16 @@ lib/plugin/hatebu.rb
 lib/plugin/history.rb
 lib/plugin/keyword.rb
 lib/plugin/log.rb
+lib/plugin/modify_arg_hook_sample.rb
 lib/plugin/msagent.rb
 lib/plugin/multi_reply.rb
 lib/plugin/notify-send.rb
 lib/plugin/otsune.rb
 lib/plugin/outputz.rb
+lib/plugin/pause.rb
 lib/plugin/plugin.rb
+lib/plugin/post_exec_hook_sample.rb
+lib/plugin/pre_exec_hook_sample.rb
 lib/plugin/primes.rb
 lib/plugin/quicklook.rb
 lib/plugin/reblog.rb
@@ -58,8 +64,12 @@ lib/termtter/api.rb
 lib/termtter/client.rb
 lib/termtter/command.rb
 lib/termtter/connection.rb
+lib/termtter/hook.rb
 lib/termtter/status.rb
+lib/termtter/task.rb
+lib/termtter/task_manager.rb
 lib/termtter/twitter.rb
+lib/termtter/user.rb
 run_termtter.rb
 test/friends_timeline.json
 test/search.json

data/Rakefile

@@ -37,3 +37,28 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['-c']
 end
 
+def egrep(pattern)
+  res = []
+  Dir['**/*.rb'].each do |fn|
+    count = 0
+    open(fn) do |f|
+      while line = f.gets
+        count += 1
+        if line =~ pattern
+          res << [fn, count.to_s, line.gsub(/\A\s+/, '')]
+        end
+      end
+    end
+  end
+  fmax = res.map {|i| i[0] }.map(&:size).max
+  cmax = res.map {|i| i[1] }.map(&:size).max
+  res.each do |fn, count, line|
+    puts "%s :%s:%s" % [fn.ljust(fmax), count.rjust(cmax), line]
+  end
+end
+
+desc "Look for TODO and FIXME tags in the code"
+task :todo do
+  egrep /(FIXME|TODO)/
+end
+

data/bin/kill_termtter

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# If your termtter can't be exited, you might use this script.
+#
+# > exit
+# (no response...)
+# C-z
+# $ kill_termtter -i
+# y
+#
+# OPTION
+#   -i interactive
+def s(a)
+  puts a
+  system a
+end
+
+`ps`.map(&:split).map {|i|
+  pid, runner, file = i[0], i[4], i[5]
+  if runner == 'ruby' && $$ != pid.to_i && /termtter/ =~ file
+    s "kill -KILL #{pid}"
+  end
+}

data/lib/filter/en2ja.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 plugin 'translation'
 
 Termtter::Client.add_filter do |statuses|

data/lib/filter/expand-tinyurl.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter::Client
   add_filter do |statuses|
     statuses.each do |s|

data/lib/filter/fib.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 def fib(n)i=0;j=1;n.times{j=i+i=j};i end
 module Termtter::Client
   add_filter do |statuses|

data/lib/filter/ignore.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 
 configatron.filters.ignore.set_default(:words, [])
 

data/lib/filter/reverse.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter::Client
   add_filter do |statuses|
     statuses.map do |s|

data/lib/plugin/april_fool.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+def april_fool?;true;end
+def april_fool;april_fool? ? "今日はエイプリルフールではありません。" : "今日はエイプリルフールです。";end
+
+Termtter::Client.register_command(
+  :name => :april_fool, :aliases => [:af],
+  :exec_proc => proc {|arg|
+    if arg =~ /^\?you\s(\w+)/
+      puts "=> #{Termtter::Client.update_status("@#{$1} #{april_fool}")}"
+    else
+      puts "=> #{Termtter::Client.update_status(april_fool)}"
+    end
+  }
+)

data/lib/plugin/bomb.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter
   class Status
     def bomb?
@@ -6,14 +8,15 @@ module Termtter
   end
 
   module Client
-    add_help 'bomb WORD', 'Bomb it'
-    add_command %r'^bomb\s+(.+)$' do |m, t|
-      bomb = m[1]
-      msg = "#{bomb} 爆発しろ!"
-
-      puts msg
-      t.update_status msg
-    end
+    register_command(
+      :name => :bomb, :aliases => [],
+      :exec_proc => proc {|arg|
+        text = "#{arg.strip} 爆発しろ!"
+        Termtter::API::twitter.update_status(text)
+        puts "=> #{text}"
+      },
+      :help => ['bomb WORD', 'Bomb it']
+    )
   end
 end
 

data/lib/plugin/confirm.rb

@@ -1,24 +1,9 @@
-module Termtter::Client
-
-  add_command /^confirm\s+(.*)/ do |m, t|
-    text = m[1]
-    unless text.empty?
-      pause
-      print "update? #{text} [Y/n] "
-      buf = Readline.readline("", false)
-      t.update_status(text) if /^y?$/i =~ buf
-      resume
-    end
-  end
-
-  add_completion do |input|
-    case input
-    when /^(confirm)\s+(.*)@([^\s]*)$/
-      find_user_candidates $3, "#{$1} #{$2}@%s"
-    else
-      ['confirm'].grep(/^#{Regexp.quote input}/)
-    end
-  end
-
-end
-
+# -*- coding: utf-8 -*-
+
+Termtter::Client.register_hook(
+  :name => :confirm,
+  :points => [:pre_exec_update],
+  :exec_proc => proc {|cmd, arg|
+    false if arg.empty? || /^y?$/i !~ Readline.readline("update? #{arg} [Y/n] ", false)
+  }
+)

data/lib/plugin/cool.rb

@@ -1,12 +1,10 @@
+# -*- coding: utf-8 -*-
+
 module Termtter::Client
-  add_help 'cool {SCREENNAME}', 'update "@{SCREENNAME} cool."'
-  add_macro /^cool ([^\s]*)/, "update @%s cool."
-  add_completion do |input|
-    case input
-    when /^c$/
-      ['cool']
-    when /^cool ([^\s]*)/
-      find_user_candidates $1, "cool %s"
-    end
-  end
+  register_macro(:cool, "update @%s cool.",
+    :help => ['cool {SCREENNAME}', 'update "@{SCREENNAME} cool."'],
+    :completion_proc => proc {|cmd, args|
+      find_user_candidates args, "#{cmd} %s"
+    }
+  )
 end

data/lib/plugin/english.rb

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

data/lib/plugin/erb.rb

@@ -1,14 +1,14 @@
+# -*- coding: utf-8 -*-
+
 require 'erb'
 
-module Termtter::Client
-  add_command /^(update|u)\s+(.*)/ do |m, t|
-    text = ERB.new(m[2]).result(binding).gsub(/\n/, ' ')
-    unless text.empty?
-      t.update_status(text)
-      puts "=> #{text}"
-    end
-  end
-end
+Termtter::Client.register_hook(
+  :name => :erb,
+  :points => [:pre_exec_update],
+  :exec_proc => proc {|cmd, arg|
+    ERB.new(arg).result(binding)
+  }
+)
 
 # erb.rb
 #   enable to <%= %> in the command update

data/lib/plugin/favorite.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter::Client
   add_help 'favorite,fav ID', 'Favorite a status'
 

data/lib/plugin/fib.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 def fib(n)i=0;j=1;n.times{j=i+i=j};i end
 module Termtter::Client
 add_command /^fib\s+(\d+)/ do|m,t|t.update_status x="fib(#{n=m[1].to_i}) = #{fib n}"

data/lib/plugin/filter.rb

@@ -1,34 +1,50 @@
+# -*- coding: utf-8 -*-
 
-module Termtter::Client
 
+module Termtter::Client
   public_storage[:filters] = []
-
-  add_help 'filter FILE', 'Apply a filter'
-  add_command /^filter\s+(.*)/ do |m, t|
-    begin
-      result = filter m[1].strip
-    rescue LoadError
-      result = false
-    ensure
-      puts "=> #{result.inspect}"
-    end
+  filters = Dir["#{File.dirname(__FILE__)}/../filter/*.rb"].map do |f|
+    f.match(%r|([^/]+).rb$|)[1]
   end
 
-  add_help 'unfilter', 'Clear all filters'
-  add_command /^unfilter\s*$/ do |m, t|
-    clear_filters
-    public_storage[:filters].clear
-    puts '=> filter cleared'
-  end
+  register_command(
+    :name => :filter, :aliases => [],
+    :exec_proc => proc {|arg|
+      begin
+        result = filter arg.strip
+      rescue LoadError
+        result = false
+      ensure
+        puts "=> #{result.inspect}"
+      end
+    },
+    :completion_proc => proc {|cmd, args|
+      find_filter_candidates args, "#{cmd} %s", filters
+    },
+    :help => ['filter FILE', 'Apply a filter']
+  )
 
-  add_help 'filters', 'Show list of applied filters'
-  add_command /^filters\s*$/ do |m, t|
-    unless public_storage[:filters].empty?
-      puts public_storage[:filters].join(', ')
-    else
-      puts 'no filter was applied'
-    end
-  end
+  register_command(
+    :name => :unfilter, :aliases => [],
+    :exec_proc => proc {|arg|
+      clear_filters
+      public_storage[:filters].clear
+      puts '=> filter cleared'
+    },
+    :help => ['ufilter', 'Clear all filters']
+  )
+
+  register_command(
+    :name => :filters, :aliases => [],
+    :exec_proc => proc {|arg|
+      unless public_storage[:filters].empty?
+        puts public_storage[:filters].join(', ')
+      else
+        puts 'no filter was applied'
+      end
+    },
+    :help => ['filters', 'Show list of applied filters']
+  )
 
   def self.find_filter_candidates(a, b, filters)
     if a.empty?
@@ -38,17 +54,6 @@ module Termtter::Client
     end.
     map {|u| b % u }
   end
-
-  filters = Dir["#{File.dirname(__FILE__)}/../filter/*.rb"].map do |f|
-    f.match(%r|([^/]+).rb$|)[1]
-  end
-  add_completion do |input|
-    if input =~ /^(filter)\s+(.*)/
-      find_filter_candidates $2, "#{$1} %s", filters
-    else
-      %w[ filter filters unfilter ].grep(/^#{Regexp.quote input}/)
-    end
-  end
 end
 
 # filter.rb

data/lib/plugin/follow.rb

@@ -1,25 +1,41 @@
-module Termtter::Client
-  add_help 'follow USER', 'Follow user'
-  add_help 'leave USER', 'Leave user'
+# -*- coding: utf-8 -*-
 
-  add_command %r'^(follow|leave)\s+(\w+)\s*$' do |m, t|
-    user = m[2]
-    res = t.social(user, m[1].to_sym)
-    if res.code == '200'
-      puts "#{m[1].capitalize}ed user @#{user}"
-    else
-      puts "Failed: #{res}"
-    end
-  end
+module Termtter::Client
+  register_command(
+    :name => :follow, :aliases => [],
+    :exec_proc => proc {|arg|
+      if arg =~ /^(\w+)/
+        res = Termtter::API::twitter.social($1.strip, :follow)
+        if res.code == '200'
+          puts "Followed user @#{$1}"
+        else
+          puts "Failed: #{res}"
+        end
+      end
+    },
+    :completion_proc => proc {|cmd, args|
+      find_user_candidates args, "#{cmd} %s"
+    },
+	:help => ['follow USER', 'Follow user']
+  )
 
-  add_completion do |input|
-    case input
-    when /^(follow|leave)?\s+(.*)/
-      find_user_candidates $2, "#{$1} %s"
-    else
-      %w[follow leave].grep(/^#{Regexp.quote input}/)
-    end
-  end
+  register_command(
+    :name => :leave, :aliases => [],
+    :exec_proc => proc {|arg|
+      if arg =~ /^(\w+)/
+        res = t.social($1.strip, :leave)
+        if res.code == '200'
+          puts "Leaved user @#{$1}"
+        else
+          puts "Failed: #{res}"
+        end
+      end
+    },
+    :completion_proc => proc {|cmd, args|
+      find_user_candidates args, "#{cmd} %s"
+    },
+	:help => ['leave USER', 'Leave user']
+  )
 end
 
 module Termtter

data/lib/plugin/graduatter.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 twitter = Termtter::Twitter.new(configatron.user_name, configatron.password)
 Thread.start do
   100.times do |i|