jugyo-termtter 0.7.7 → 0.8.0

data/lib/plugin/group.rb

@@ -1,4 +1,4 @@
-configatron.set_default('plugins.group.groups', {})
+# -*- coding: utf-8 -*-
 
 module Termtter
   class Status
@@ -13,41 +13,38 @@ module Termtter
 end
 
 module Termtter::Client
-  if public_storage[:log]
-    add_help 'group,g GROUPNAME', 'Filter by group members'
+  configatron.plugins.group.
+    set_default(:groups, {})
 
-    add_command /^(?:group|g)\s*$/ do |m, t|
-      configatron.plugins.group.groups.each_pair do |key, value|
-        puts "#{key}: #{value.join(',')}"
-      end
-    end
-
-    add_command /^(?:group|g)\s+(.+)/ do |m, t|
-      group_name = m[1].to_sym
-      group = configatron.plugins.group.groups[group_name]
-      statuses = group ? public_storage[:log].select { |s|
-        group.include?(s.user_screen_name) 
-      } : []
-      call_hooks(statuses, :search, t)
-    end
-
-    def self.find_group_candidates(a, b)
-      configatron.plugins.group.groups.keys.map {|k| k.to_s}.
-        grep(/^#{Regexp.quote a}/).
-        map {|u| b % u }
-    end
-
-    add_completion do |input|
-      case input
-      when /^(group|g)\s+(.+)/
-        find_group_candidates($2, "#{$1} %s")
-      when /^(group|g)\s+$/
-        configatron.plugins.group.groups.keys
-      else
-        %w(group).grep(/^#{Regexp.quote input}/)
-      end
-    end
+  def self.find_group_candidates(a, b)
+    configatron.plugins.group.groups.keys.map {|k| k.to_s}.
+      grep(/^#{Regexp.quote a}/).
+      map {|u| b % u }
   end
+
+  register_command(
+   :name => :group,
+   :aliases => [:g],
+   :exec_proc => proc {|arg|
+     unless arg.empty?
+       group_name = arg.to_sym
+       group = configatron.plugins.group.groups[group_name]
+       statuses = group ? public_storage[:log].select { |s|
+         group.include?(s.user_screen_name) 
+       } : []
+       call_hooks(statuses, :search)
+     else
+       configatron.plugins.group.groups.each_pair do |key, value|
+         puts "#{key}: #{value.join(',')}"
+       end
+     end
+   },
+   :completion_proc => proc {|cmd, arg|
+     find_group_candidates arg, "#{cmd} %s"
+                   },
+   :help => ['group,g GROUPNAME', 'Filter by group members']
+   )
+  
 end
 
 # group.rb
@@ -56,3 +53,4 @@ end
 #     :rits => %w(hakobe isano hitode909)
 #   }
 # NOTE: group.rb needs plugin/log
+

data/lib/plugin/growl.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'tmpdir'
 require 'open-uri'
 require 'uri'
@@ -35,7 +37,7 @@ 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', '-H', 'localhost']
           #icon_path = get_icon_path(s)
           #arg += ['--image', icon_path] if icon_path
           system *arg

data/lib/plugin/hatebu.rb

@@ -1,51 +1,53 @@
+# -*- coding: utf-8 -*-
+
 require 'rubygems'
 require 'atomutil'
 
 module Termtter::Client
-  add_help 'hatebu ID', 'Hatena bookmark a status'
-
-  add_command %r'^hatebu\s+(\d+)(.*)$' do |m, t|
-    id = m[1]
-    comment = m[2].strip
-    statuses = public_storage[:log].select { |s| s.id == id }
-    unless statuses.empty?
-      status = statuses.first
-    else
-      status = t.show(id).first
-    end
-    auth = auth = Atompub::Auth::Wsse.new({
-        :username => configatron.plugins.hatebu.username,
-        :password => configatron.plugins.hatebu.password,
-    })
-    link = Atom::Link.new({
-       :href => "http://twitter.com/#{status.user_screen_name}/status/#{status.id}",
-       :rel => 'related',
-       :type => 'text/html',
-    })
-    entry = Atom::Entry.new({
-        :link => link,
-        :title => 'dummy',
-        :summary => comment,
-    })
-    req = Net::HTTP::Post.new 'http://b.hatena.ne.jp/atom/post'
-    req['User-Agent'] = 'Mozilla/5.0'
-    req['Content-Type'] = 'application/atom+xml'
-    req['Slug'] = 'termtter'
-    req.body = entry.to_s
-    auth.authorize(req)
-    Net::HTTP.start('b.hatena.ne.jp', 80) do |http|
-      res = http.request(req)
-    end
-  end
-
-  add_completion do |input|
-    case input
-    when /^(hatebu)\s+(\d*)$/
-      find_status_id_candidates $2, "#{$1} %s"
-    else
-      %w(hatebu).grep(/^#{Regexp.quote input}/)
-    end
-  end
+  register_command(
+    :name => :hatebu, :aliases => [],
+    :exec_proc => proc {|arg|
+      if arg =~ /^(\d+)(.*)$/
+        id = $1.strip
+        comment = $2.strip
+        statuses = public_storage[:log].select { |s| s.id == id }
+        unless statuses.empty?
+          status = statuses.first
+        else
+          status = t.show(id).first
+        end
+        auth = auth = Atompub::Auth::Wsse.new({
+            :username => configatron.plugins.hatebu.username,
+            :password => configatron.plugins.hatebu.password,
+        })
+        link = Atom::Link.new({
+           :href => "http://twitter.com/#{status.user_screen_name}/status/#{status.id}",
+           :rel => 'related',
+           :type => 'text/html',
+        })
+        entry = Atom::Entry.new({
+            :link => link,
+            :title => 'dummy',
+            :summary => comment,
+        })
+        req = Net::HTTP::Post.new 'http://b.hatena.ne.jp/atom/post'
+        req['User-Agent'] = 'Mozilla/5.0'
+        req['Content-Type'] = 'application/atom+xml'
+        req['Slug'] = 'termtter'
+        req.body = entry.to_s
+        auth.authorize(req)
+        Net::HTTP.start('b.hatena.ne.jp', 80) do |http|
+          res = http.request(req)
+        end
+      end
+    },
+    :completion_proc => proc {|cmd, args|
+      if args =~ /^(\d*)$/
+        find_status_id_candidates $1, "#{cmd} %s"
+      end
+    },
+	:help => ['hatebu ID', 'Hatena bookmark a status']
+  )
 end
 
 # hatebu.rb

data/lib/plugin/history.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'zlib'
 
 configatron.plugins.history.
@@ -6,6 +8,10 @@ configatron.plugins.history.
   set_default(:keys, [:log, :users, :status_ids])
 configatron.plugins.history.
   set_default(:max_of_history, 100)
+configatron.plugins.history.
+  set_default(:enable_autosave, true)
+configatron.plugins.history.
+  set_default(:autosave_interval, 3600)
 
 module Termtter::Client
   def self.load_history
@@ -15,15 +21,13 @@ module Termtter::Client
     if File.exist?(filename)
       begin
         history = Marshal.load Zlib::Inflate.inflate(File.read(filename))
-      rescue Zlib::DataError
-        history = Marshal.load File.read(filename)
       end
       if history
         keys.each do |key|
           public_storage[key] = history[key] if history[key]
         end
         Readline::HISTORY.push *history[:history] if history[:history]
-        puts "history loaded(#{File.size(filename)}bytes)"
+        puts "history loaded(#{File.size(filename)/1000}kb)"
       end
     end
   end
@@ -44,7 +48,7 @@ module Termtter::Client
     File.open(filename, 'w') do |f|
       f.write Zlib::Deflate.deflate(Marshal.dump(history))
     end
-    puts "history saved(#{File.size(filename)}bytes)"
+    puts "history saved(#{File.size(filename)/1000}kb)"
   end
 
   add_hook do |statuses, event|
@@ -55,6 +59,14 @@ module Termtter::Client
       save_history
     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
+      save_history
+    end
+  end
+  
 end
 
 # history.rb

data/lib/plugin/keyword.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 configatron.set_default('plugins.keyword.keywords', [])
 
 module Termtter

data/lib/plugin/log.rb

@@ -1,12 +1,10 @@
+# -*- coding: utf-8 -*-
+
 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)
 
-  add_help '/WORD', 'Search log for WORD'
-  add_help 'log', 'Show local log'
-  add_help 'log (USER(S)) (MAX)', 'Show local log of the user(s)'
-
   add_hook do |statuses, event|
     case event
     when :pre_filter
@@ -19,37 +17,39 @@ module Termtter::Client
     end
   end
 
+  register_command(
+   :name => :log,
+   :exec_proc => proc{|arg|
+     if arg.empty?
+       # log
+       statuses = public_storage[:log]
+       print_max = configatron.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
+       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)
+     end
+   },
+   :completion_proc => proc {|cmd, arg|
+     find_user_candidates arg, "#{cmd} %s"
+   },
+   :help => [ 'log (USER(S)) (MAX)', 'Show local log of the user(s)']
+   )
+
+  # These are old code we must fix.
+  
+  add_help 'log', 'Show local log'
+
+  add_help '/WORD', 'Search log for WORD'
   add_command %r'^/(.+)' do |m, t|
     pat = Regexp.new(m[1])
     statuses = public_storage[:log].select { |s| s.text =~ pat }
     call_hooks(statuses, :search, t)
   end
-
-  # log
-  add_command /^(log)\s*$/ do |m, t|
-    statuses = public_storage[:log]
-    print_max = configatron.plugins.log.print_max_size
-    print_max = 0 if statuses.size < print_max
-    call_hooks(statuses[-print_max..-1], :search, t)
-  end
-
-  # log (user) (max)
-  add_command /^(log)\s+(.+)\s*/ do |m, t|
-    vars = m[2].split(' ')
-    print_max = vars.last =~ /^\d+$/ ? vars.pop.to_i : configatron.plugins.log.print_max_size
-    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, t)
-  end
-
-  add_completion do |input|
-    case input
-    when /^(log)\s+(.*)/
-      find_user_candidates $2, "#{$1} %s"
-    else
-      %w[ log ].grep(/^#{Regexp.quote input}/)
-    end
-  end
-
 end

data/lib/plugin/modify_arg_hook_sample.rb

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+Termtter::Client.register_hook(
+  :name => :modify_arg_hook_sample,
+  :points => [:modify_arg_for_update],
+  :exec_proc => proc {|cmd, arg| arg + '＼(＾o＾)／'}
+)

data/lib/plugin/msagent.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 raise 'msagent.rb runs only in windows' if RUBY_PLATFORM.downcase !~ /mswin(?!ce)|mingw|bccwin/
 require 'win32ole'
 require 'kconv'

data/lib/plugin/multi_reply.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter::Client
   add_help 'multi_reply, mp TEXT', 'reply to multi user'
   add_command /^(multi_reply|mr)\s+(.*)/ do |m, t|

data/lib/plugin/notify-send.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 Termtter::Client.add_hook do |statuses, event|
   if !statuses.empty? && event == :update_friends_timeline
     max = 10

data/lib/plugin/otsune.rb

@@ -1,17 +1,21 @@
-module Termtter::Client
-  add_help 'otsune {SCREENNAME}', 'update "@{SCREENNAME} 頭蓋骨の中身がお気の毒です"'
-  add_help 'otsnue {SCREENNAME}', 'update "@{SCREENNAME} 頭が気の毒です"'
+# -*- coding: utf-8 -*-
 
-  add_macro /^otsune ([^\s]*)/, "update @%s 頭蓋骨の中身がお気の毒です."
-  add_macro /^otsnue ([^\s]*)/, "update @%s 頭が気の毒です."
+module Termtter::Client
+  register_macro(:otsune, "update @%s 頭蓋骨の中身がお気の毒です.",
+    :help => ['otsune {SCREENNAME}', 'update "@{SCREENNAME} 頭蓋骨の中身がお気の毒です"'],
+    :completion_proc => proc {|cmd, args|
+      find_user_candidates args, "#{cmd} %s"
+    }
+  )
+end
 
-  add_completion do |input|
-    case input
-    when /^(otsune|otsnue) ([^\s]*)/
-      find_user_candidates $2, "#{$1} %s"
-    else
-      %w[otsune otsnue].grep(/^#{Regexp.quote input}/)
-    end
-  end
+module Termtter::Client
+  register_macro(:otsnue, "update @%s 頭蓋骨の中身がお気の毒です.",
+    :help => ['otsnue {SCREENNAME}', 'update @%s 頭が気の毒です.'],
+    :completion_proc => proc {|cmd, args|
+      find_user_candidates args, "#{cmd} %s"
+    }
+  )
 end
+
 # vim: fenc=utf8

data/lib/plugin/outputz.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 
 module Termtter::Client
   configatron.plugins.outputz.set_default(:uri, 'termtter://twitter.com/status/update')

data/lib/plugin/pause.rb

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+Termtter::Client.pause

data/lib/plugin/plugin.rb

@@ -1,40 +1,45 @@
+# -*- coding: utf-8 -*-
+
 module Termtter::Client
 
   public_storage[:plugins] = Dir["#{File.dirname(__FILE__)}/*.rb"].map do |f|
     f.match(%r|([^/]+).rb$|)[1]
   end
 
-  add_help 'plugin FILE', 'Load a plugin'
-  add_command /^plugin\s+(.*)/ do |m, t|
-    begin
-      result = plugin m[1].strip
-    rescue LoadError
-    ensure
-      puts "=> #{result.inspect}"
-    end
-  end
+  register_command(
+    :name      => :plugin, :aliases => [],
+    :exec_proc => proc {|arg|
+      begin
+        result = plugin arg.strip
+      rescue LoadError
+      ensure
+        puts "=> #{result.inspect}"
+      end
+    },
+    :completion_proc => proc {|cmd, args|
+      find_user_candidates args, "#{cmd} %s"
+      unless args.empty?
+        find_plugin_candidates args, "#{cmd} %s"
+      else
+        public_storage[:plugins].sort
+      end
+    },
+    :help      => ['plugin FILE', 'Load a plugin']
+  )
 
-  add_help 'plugins', 'Show list of plugins'
-  add_command /^plugins$/ do |m, t|
-    puts public_storage[:plugins].sort.join("\n")
-  end
+  register_command(
+    :name      => :plugins, :aliases => [],
+    :exec_proc => proc {|arg|
+      puts public_storage[:plugins].sort.join("\n")
+    },
+    :help      => ['plugins', 'Show list of plugins']
+  )
 
   def self.find_plugin_candidates(a, b)
     public_storage[:plugins].
       grep(/^#{Regexp.quote a}/i).
       map {|u| b % u }
   end
-
-  add_completion do |input|
-    case input
-    when /^(plugin)\s+(.+)/
-      find_plugin_candidates $2, "#{$1} %s"
-    when /^(plugin)\s+$/
-      public_storage[:plugins].sort
-    else
-      %w[ plugin plugins ].grep(/^#{Regexp.quote input}/)
-    end
-  end
 end
 
 # plugin.rb