jugyo-termtter 1.0.6 → 1.0.7

data/README.rdoc

@@ -1,19 +1,36 @@
-# -*- coding: utf-8 -*-
 = termtter
 
 http://github.com/jugyo/termtter
 
 == DESCRIPTION:
 
-Termtter is a terminal based Twitter client
+Termtter is a terminal based Twitter client.
 
 == FEATURES/PROBLEMS:
 
 == SYNOPSIS:
 
-Run:
+=== Run:
 
-  termtter
+  % termtter
+
+=== Some Termtter Commands:
+
+Show help
+
+  > help
+
+Update status
+
+  > update hi!
+
+Show replies
+
+  > replies
+
+Search
+
+  > search termtter
 
 == REQUIREMENTS:
 
@@ -23,24 +40,14 @@ Run:
 
 == INSTALL:
 
-  sudo gem source -a http://gems.github.com (you only have to do this once)
-  sudo gem install jugyo-termtter
-
-  if you want to install gem package from source code, install like following.
-
-  git clone git://github.com/jugyo/termtter.git
-  cd termtter
-  rake gem
-  gem install *.gem
-
-Just run a new command termtter.
+  % sudo gem install termtter
 
-  termtter
+== CONFIGURATION:
 
-Termtter generates a configuration file named '.termtter' in your HOME directory.
+Termtter generates a configuration file named '~/.termtter/config'.
 You can edit the file anytime.
 
-  vim ~/.termtter
+  % vim ~/.termtter/config
 
   config.user_name = 'USERNAME'
   config.password = 'PASSWORD'
@@ -65,9 +72,7 @@ http://wiki.github.com/jugyo/termtter/home (in Japanese)
 == TODO:
 
 - Enhance the document and spec
-- Finalize the Hook specification and integration
 - Improve the UI(a status view, etc...)
-- Build a logging function
 
 == LICENSE:
 

data/Rakefile

@@ -26,8 +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.6.3")
-  s.add_dependency("sqlite3-ruby", ">= 1.2.4")
+  s.add_dependency("rubytter", ">= 0.6.4")
   s.authors = %w(jugyo ujihisa)
   s.email = 'jugyo.org@gmail.com'
   s.homepage = 'http://wiki.github.com/jugyo/termtter'

data/lib/plugins/addspace.rb

@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 
 config.plugins.addspace.set_default( :before, [ %r{https?://} ] )
-config.plugins.addspace.set_default( :after, %w{ ★ ☆ △ ▽})
+config.plugins.addspace.set_default( :after, %w{ ★ ☆ △ ▽ … })
 
 module Termtter::Client
   add_filter do |statuses, event|
     statuses.each do |s|
       config.plugins.addspace.before.each do |c|
-        s.text.gsub!(/(\S)(#{c})/, '\1 \2' )
+        s.text.gsub!(/(?<=\S)(#{c})/, ' \1' )
       end
     end
     statuses.each do |s|
       config.plugins.addspace.after.each do |c|
-        s.text.gsub!(/(#{c})(\S)/, '\1 \2' )
+        s.text.gsub!(/(#{c})(?=\S)/, '\1 ' )
       end
       statuses
     end

data/lib/plugins/bomb.rb

@@ -7,7 +7,7 @@ module Termtter
 
     register_hook(
       :name => :bomb,
-      :points => [:post_filter],
+      :points => [:output],
       :exec_proc => lambda{|statuses, event|
         statuses.each do |status|
           if /爆発|bomb/ =~ status.text

data/lib/plugins/confirm.rb

@@ -4,6 +4,9 @@ Termtter::Client.register_hook(
   :name => :confirm,
   :points => [:pre_exec_update],
   :exec_proc => lambda {|cmd, arg|
-    false if arg.empty? || /^y?$/i !~ Readline.readline("update? #{arg} [Y/n] ", false)
+    if /^y?$/i !~ Readline.readline("update? #{arg} [Y/n] ", false)
+      puts 'canceled.'
+      raise Termtter::CommandCanceled
+    end
   }
 )

data/lib/plugins/expand-tinyurl.rb

@@ -10,7 +10,7 @@ module Termtter::Client
   add_filter do |statuses, event|
     statuses.each do |s|
       URL_SHORTTERS.each do |site|
-        s[:text].gsub!(site[:pattern]) do |m|
+        s.text.gsub!(site[:pattern]) do |m|
           expand_url(site[:host], $2) || $1
         end
       end

data/lib/plugins/growl.rb

@@ -4,58 +4,49 @@ require 'tmpdir'
 require 'open-uri'
 require 'uri'
 require 'fileutils'
+require 'cgi'
 
 begin
   require 'ruby-growl'
-  growl = Growl.new "localhost", "termtter", "termtter status notification"
+  growl = Growl.new "localhost", "termtter", ["update_friends_timeline"]
 rescue LoadError
   growl = nil
 end
 
-config.plugins.growl.set_default(:icon_cache_dir, "#{Dir.tmpdir}/termtter-icon-cache-dir")
+config.plugins.growl.set_default(:icon_cache_dir, "#{Termtter::CONF_DIR}/tmp/user_profile_images")
 FileUtils.mkdir_p(config.plugins.growl.icon_cache_dir) unless File.exist?(config.plugins.growl.icon_cache_dir)
 
 def get_icon_path(s)
+  Dir.mkdir_p(config.plugins.growl.icon_cache_dir) unless File.exists?(config.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
-    return cache_file
-  else
-    Thread.new do
-      File.open(cache_file, "wb") do |f|
-        f << open(URI.escape(s.user_profile_image_url)).read
+                              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
+    File.open(cache_file, "wb") do |f|
+      begin
+        f << open(URI.escape(s.user.profile_image_url)).read
+      rescue OpenURI::HTTPError
+        return nil
       end
     end
-    return nil
   end
+  cache_file
 end
 
-queue = []
-Thread.new do
-  loop do
-    begin
-      if s = queue.pop
+Termtter::Client.register_hook(
+  :name => :growl,
+  :points => [:output],
+  :exec_proc => lambda {|statuses, event|
+    return unless event == :update_friends_timeline
+    Thread.start do
+      statuses.each do |s|
         unless growl
-          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
+          system 'growlnotify', s.user.screen_name, '-m', s.text.gsub("\n",''), '-n', 'termtter', '--image', get_icon_path(s)
         else
-          growl.notify "termtter status notification", s.text, s.user.screen_name
+          growl.notify "update_friends_timeline", s.user.screen_name, CGI.unescapeHTML(s.text)
         end
+        sleep 0.1
       end
-    rescue => e
-      puts e
-      puts e.backtrace.join("\n")
     end
-    sleep 0.1
-  end
-end
-
-Termtter::Client.register_hook(:name => :growl,
-                               :points => [:post_filter],
-                               :exec_proc => lambda {|statuses, event|
-                                 statuses.each {|s| queue << s} if event == :update_friends_timeline
-                               }
+  }
 )

data/lib/plugins/log.rb

@@ -22,8 +22,12 @@ module Termtter::Client
       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
+
+      statuses.map{ |s| s.user.screen_name}.uniq.each do |name|
+        public_storage[:tweet][name]
+        if public_storage[:tweet][name].size > max_size
+          public_storage[:tweet][name] = public_storage[:tweet][name][-max_size..-1]
         end
       end
     }

data/lib/plugins/msagent.rb

@@ -13,12 +13,12 @@ achar.show
 
 Termtter::Client.register_hook(
   :name => :msagent,
-  :points => [:post_filter],
+  :points => [:output],
   :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[:text]}".tosjis)
+        statuses.each do |s|
+          req = achar.speak("#{s.user.screen_name}: #{s.text}".tosjis)
           sleep 1
           WIN32OLE_EVENT.message_loop
           achar.stop(req)

data/lib/plugins/notify-send.rb

@@ -2,15 +2,15 @@
 
 Termtter::Client.register_hook(
   :name => :notify_send,
-  :points => [:post_filter],
+  :points => [:output],
   :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 = CGI.escapeHTML(s.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>"
+        "<b>#{s.user.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

data/lib/plugins/notify-send2.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+
+require 'fileutils'
+
+# notify-send.rb からコピペ。共通化したいところ。
+config.plugins.notify_send.set_default(:icon_cache_dir, "#{Termtter::CONF_DIR}/tmp/user_profile_images")
+def get_icon_path(s)
+  FileUtils.mkdir_p(config.plugins.notify_send.icon_cache_dir) unless File.exist?(config.plugins.notify_send.icon_cache_dir)
+  cache_file = "%s/%s%s" % [  config.plugins.notify_send.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
+    File.open(cache_file, "wb") do |f|
+      begin
+        f << open(URI.escape(s.user.profile_image_url)).read
+      rescue OpenURI::HTTPError
+        return nil
+      end
+    end
+  end
+  cache_file
+end
+
+Termtter::Client.register_hook(
+  :name => :notify_send2,
+  :points => [:output],
+  :exec_proc => lambda {|statuses, event|
+    return unless event == :update_friends_timeline
+    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
+      end
+    end
+  }
+)
+

data/lib/plugins/say.rb

@@ -12,7 +12,7 @@ end
 module Termtter::Client
   register_hook(
     :name => :say,
-    :points => [:post_filter],
+    :points => [:output],
     :exec_proc => lambda {|statuses, event|
       statuses.reverse.each do |s|
         text_without_uri = s[:text].gsub(%r|https?://[^\s]+|, 'U.R.I.')

data/lib/plugins/screen-notify.rb

@@ -5,7 +5,7 @@ config.screen_notify.set_default(:format, "[termtter] %s")
 module Termtter::Client
   register_hook(
     :name => :screen_notify,
-    :points => [:post_filter],
+    :points => [:output],
     :exec_proc => lambda{|statuses, event|
       return unless event = :update_friends_timeline
       Thread.new(statuses) do |ss|

data/lib/plugins/spam.rb

@@ -1,13 +1,16 @@
 # -*- coding: utf-8 -*-
 
-Termtter::API.twitter.update('*super spam time*')
+message = '*super spam time*'
+Termtter::API.twitter.update(message)
+puts "=> #{message}"
+
 Termtter::Client.register_hook(
   :name => :span,
-  :points => [/^pre_exec/],
-  :exec_proc => lambda{|*arg|
+  :point => /^pre_exec/,
+  :exec => lambda{|*arg|
     text = arg.join(' ')
     Termtter::API.twitter.update(text)
     puts "=> #{text}"
-    false
+    raise Termtter::CommandCanceled
   }
 )

data/lib/plugins/standard_plugins.rb

@@ -13,7 +13,7 @@ module Termtter::Client
   register_command(
     :name => :update, :aliases => [:u],
     :exec_proc => lambda {|arg|
-      unless arg =~ /^\s*$/
+      unless /^\s*$/ =~ arg
         # TODO: Change to able to disable erb.
         text = ERB.new(arg).result(binding).gsub(/\n/, ' ')
         result = Termtter::API.twitter.update(text)
@@ -31,14 +31,14 @@ module Termtter::Client
   register_command(
     :name => :direct, :aliases => [:d],
     :exec_proc => lambda {|arg|
-      if arg =~ /^([^\s]+)\s+(.*)\s*$/
+      if /^([^\s]+)\s+(.*)\s*$/ =~ arg
         user, text = $1, $2
         Termtter::API.twitter.direct_message(user, text)
         puts "=> to:#{user} message:#{text}"
       end
     },
     :completion_proc => lambda {|cmd, args|
-      if args =~ /^([^\s]+)$/
+      if /^([^\s]+)$/ =~ args
         find_user_candidates $1, "#{cmd} %s"
       end
     }
@@ -49,10 +49,10 @@ module Termtter::Client
     :exec_proc => lambda {|arg|
       user = Termtter::API.twitter.user(arg.strip)
       attrs = %w[ name screen_name url description profile_image_url location protected following
-          friends_count followers_count statuses_count favourites_count
-          id time_zone created_at utc_offset notifications
+        friends_count followers_count statuses_count favourites_count
+        id time_zone created_at utc_offset notifications
       ]
-      label_width = attrs.map{|i|i.size}.max
+      label_width = attrs.map(&:size).max
       attrs.each do |attr|
         value = user.__send__(attr.to_sym)
         puts "#{attr.gsub('_', ' ').rjust(label_width)}: #{value}"
@@ -69,13 +69,13 @@ module Termtter::Client
       user_name = arg.strip
       user_name = config.user_name if user_name.empty?
 
-      followers = [] 
+      followers = []
       page = 0
       begin
         followers += tmp = Termtter::API.twitter.followers(user_name, :page => page+=1)
       end until tmp.empty?
       Termtter::Client.public_storage[:followers] = followers
-      puts followers.map{|f|f.screen_name}.join(' ')
+      puts followers.map(&:screen_name).join(' ')
     }
     # TODO :completion_proc
   )
@@ -85,7 +85,7 @@ module Termtter::Client
     :exec_proc => lambda {|arg|
       if arg.empty?
         event = :list_friends_timeline
-        statuses = Termtter::API.twitter.friends_timeline()
+        statuses = Termtter::API.twitter.friends_timeline
       else
         event = :list_user_timeline
         statuses = Termtter::API.twitter.user_timeline(arg)
@@ -108,7 +108,7 @@ module Termtter::Client
   register_command(
     :name => :replies, :aliases => [:r],
     :exec_proc => lambda {|arg|
-      output(Termtter::API.twitter.replies(), :replies)
+      output(Termtter::API.twitter.replies, :replies)
     }
   )
 
@@ -125,9 +125,9 @@ module Termtter::Client
       else
         users = find_users(arg)
         unless users.empty?
-          users.map{|user| "#{cmd} #{user}:"}
+          users.map {|user| "#{cmd} #{user}:"}
         else
-          find_status_ids(arg).map{|id| "#{cmd} #{id}"}
+          find_status_ids(arg).map {|id| "#{cmd} #{id}"}
         end
       end
     }
@@ -147,7 +147,7 @@ module Termtter::Client
     :name => :follow, :aliases => [],
     :exec_proc => lambda {|args|
       args.split(' ').each do |arg|
-        if arg =~ /^(\w+)/
+        if /^(\w+)/ =~ arg
           res = Termtter::API::twitter.follow($1.strip)
         end
       end
@@ -155,14 +155,14 @@ module Termtter::Client
     :completion_proc => lambda {|cmd, args|
       find_user_candidates args, "#{cmd} %s"
     },
-	:help => ['follow USER', 'Follow user']
+    :help => ['follow USER', 'Follow user']
   )
 
   register_command(
     :name => :leave, :aliases => [],
     :exec_proc => lambda {|args|
       args.split(' ').each do |arg|
-        if arg =~ /^(\w+)/
+        if /^(\w+)/ =~ arg
           res = Termtter::API::twitter.leave($1.strip)
         end
       end
@@ -170,7 +170,7 @@ module Termtter::Client
     :completion_proc => lambda {|cmd, args|
       find_user_candidates args, "#{cmd} %s"
     },
-	:help => ['leave USER', 'Leave user']
+    :help => ['leave USER', 'Leave user']
   )
 
   # TODO: Change colors when remaining_hits is low.
@@ -192,7 +192,7 @@ module Termtter::Client
     :help => ["limit,lm", "Show the API limit status"]
   )
 
-  register_command( 
+  register_command(
     :name => :pause,
     :exec_proc => lambda {|arg| pause},
     :help => ["pause", "Pause updating"]
@@ -255,21 +255,21 @@ module Termtter::Client
   register_command(
     :name => :execute,
     :exec_proc => lambda{|arg|
-    if arg
-      `#{arg}`.each_line do |line|
-        unless line.strip.empty?
-          Termtter::API.twitter.update(line)
-          puts "=> #{line}"
+      if arg
+        `#{arg}`.each_line do |line|
+          unless line.strip.empty?
+            Termtter::API.twitter.update(line)
+            puts "=> #{line}"
+          end
         end
       end
-    end
     },
     :help => ['execute COMMAND', 'execute the command']
   )
 
   def self.formatted_help(helps)
-    helps = helps.sort_by{|help| help[0]}
-    width = helps.map {|n, d| n.size }.max
+    helps = helps.sort_by {|help| help[0] }
+    width = helps.map {|n, _| n.size }.max
     space = 3
     helps.map {|name, desc|
       name.to_s.ljust(width + space) + desc.to_s
@@ -296,11 +296,11 @@ module Termtter::Client
   )
 
   def self.find_status_ids(text)
-    public_storage[:status_ids].select{|id| id =~ /#{Regexp.quote(text)}/}
+    public_storage[:status_ids].select {|id| /#{Regexp.quote(text)}/ =~ id.to_s}
   end
 
   def self.find_users(text)
-    public_storage[:users].select{|user| user =~ /#{Regexp.quote(text)}/}
+    public_storage[:users].select {|user| /#{Regexp.quote(text)}/ =~ user}
   end
 
   def self.find_user_candidates(a, b)
@@ -311,5 +311,4 @@ module Termtter::Client
     end.
     map {|u| b % u }
   end
-
 end

data/lib/plugins/stdout.rb

@@ -9,7 +9,11 @@ config.plugins.stdout.set_default(
 config.plugins.stdout.set_default(
   :timeline_format,
   '<90><%=time%></90> <<%=status_color%>><%=status%></<%=status_color%>> <90><%=id%></90>')
-config.plugins.stdout.set_default(:search_highlihgt_format, '<on_magenta><white>\1</white></on_magenta>')
+config.plugins.stdout.set_default(:search_highlight_format, '<on_magenta><white>\1</white></on_magenta>')
+
+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)
 
 module Termtter
   class StdOut < Hook
@@ -24,21 +28,23 @@ module Termtter
     def print_statuses(statuses, sort = true, time_format = nil)
       return unless statuses and statuses.first
       unless time_format
-        # 最初と最後の日付がちがうとき日付も出す
+        t0 = Time.now
         t1 = Time.parse(statuses.first[:created_at])
         t2 = Time.parse(statuses.last[:created_at])
         time_format = 
-          if [t1.year, t1.month, t1.day] == [t2.year, t2.month, t2.day]
+          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 = ''
       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}: #{text}"
+        status = "#{s.user.screen_name}: #{TermColor.escape(text)}"
         if s.in_reply_to_status_id
           status += " (repl. to #{s.in_reply_to_status_id})"
         end
@@ -46,7 +52,17 @@ module Termtter
         time = "(#{Time.parse(s.created_at).strftime(time_format)})"
         id = s.id
         erbed_text = ERB.new(config.plugins.stdout.timeline_format).result(binding)
-        puts TermColor.parse(erbed_text)
+        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
   end

data/lib/plugins/storage.rb

@@ -18,7 +18,7 @@ module Termtter::Client
           :created_at => Time.parse(s.created_at).to_i,
           :in_reply_to_status_id => s.in_reply_to_status_id,
           :in_reply_to_user_id => s.in_reply_to_user_id,
-          :post => s.text,
+          :text => s.text,
           :user_id => s.user.id,
           :screen_name => s.user.screen_name
         )
@@ -38,4 +38,18 @@ module Termtter::Client
     },
     :help => [ 'search_storage WORD', 'Search storage for WORD' ]
   )
+
+  register_command(
+    :name => :search_storage_user,
+    :aliases => [:ssu],
+    :exec_proc => lambda {|arg|
+      unless arg.strip.empty?
+        key = arg.strip
+        statuses = Termtter::Storage::Status.search_user({:user => key})
+        output(statuses, :search)
+      end
+    },
+    :help => [ 'search_storage_user SCREEN_NAME', 'Search storage for SCREE_NAME' ]
+  )
+
 end

data/lib/plugins/storage/status.rb

@@ -13,8 +13,16 @@ module Termtter::Storage
 
     def self.search(query)
       raise "query must be Hash(#{query}, #{query.class})" unless query.kind_of? Hash
+      if query[:text] == nil then
+        query[:text] = '';
+      end
+      if query[:user] == nil then
+        query[:user] = '';
+      end
       result = []
-      DB.instance.db.execute("select created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id from post inner join user on post.user_id = user.id where post_text like '%' || ? || '%' ",
+      sql = "select created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id "
+      sql += "from post inner join user on post.user_id = user.id where post_text like '%' || ? || '%'"
+      DB.instance.db.execute(sql,
                              query[:text]) do |created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id|
         created_at = Time.at(created_at).to_s
         result << {
@@ -32,19 +40,43 @@ module Termtter::Storage
       Rubytter.json_to_struct(result)
     end
 
+    def self.search_user(query)
+      raise "query must be Hash(#{query}, #{query.class})" unless query.kind_of? Hash
+      result = []
+      sql = "select created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id "
+      sql += "from post inner join user on post.user_id = user.id where "
+      sql += query[:user].split(' ').map!{|que| que.gsub(/(\w+)/, 'screen_name like \'%\1%\'')}.join(' or ')
+      DB.instance.db.execute(sql) do |created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id|
+        created_at = Time.at(created_at).to_s
+        result << {
+          :id => post_id,
+          :created_at => created_at,
+          :text => post_text,
+          :in_reply_to_status_id => in_reply_to_status_id,
+          :in_reply_to_user_id => nil,
+          :user => {
+            :id => user_id,
+            :screen_name => screen_name
+          }
+        }
+      end
+      Rubytter.json_to_struct(result)
+    end
+
     def self.insert(data)
+      return unless data[:text]
       DB.instance.db.execute(
-                             "insert into post values(?,?,?,?,?,?)",
-                             data[:post_id],
-                             data[:created_at],
-                             data[:in_reply_to_status_id],
-                             data[:in_reply_to_user_id],
-                             data[:text],
-                             data[:user_id])
+        "insert into post values(?,?,?,?,?,?)",
+        data[:post_id],
+        data[:created_at],
+        data[:in_reply_to_status_id],
+        data[:in_reply_to_user_id],
+        data[:text],
+        data[:user_id])
       DB.instance.db.execute(
-                             "insert into user values(?,?)",
-                             data[:user_id],
-                             data[:screen_name])
+        "insert into user values(?,?)",
+        data[:user_id],
+        data[:screen_name])
     rescue SQLite3::SQLException
     end
   end

data/lib/plugins/timer.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  register_command(
+    :name => :timer,
+    :exec_proc => lambda{|arg|
+      # argをparseする
+      return unless arg =~ /^\d+$/
+      after = arg.to_i
+      Termtter::Client.add_task(:after => after) do
+        text = "@#{config.user_name} 時間ですよ！！"
+        Termtter::API.twitter.update text
+        puts "=> " << text
+      end
+    },
+    :help => ['timer SEC', 'post reminder after SEC.']
+    )
+end

data/lib/plugins/uri-open.rb

@@ -5,7 +5,7 @@ module Termtter::Client
 
   register_hook(
     :name => :uri_open,
-    :points => [:post_filter],
+    :points => [:output],
     :exec_proc => lambda {|statuses, event|
       statuses.each do |s|
         public_storage[:uris] += s[:text].scan(%r|https?://[^\s]+|)

data/lib/termtter/api.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+gem 'rubytter', '>= 0.6.5'
 require 'rubytter'
 
 config.set_default(:host, 'twitter.com')

data/lib/termtter/client.rb

@@ -5,6 +5,7 @@ require 'logger'
 module Termtter
 
   class CommandNotFound < StandardError; end
+  class CommandCanceled < StandardError; end
 
   module Client
 
@@ -17,8 +18,7 @@ module Termtter
         @since_id = nil
         @input_thread = nil
         @task_manager = Termtter::TaskManager.new
-        config.log.set_default(:logger, nil)
-        config.log.set_default(:level, nil)
+        config.set_default(:logger, nil)
         config.set_default(:update_interval, 300)
         config.set_default(:prompt, '> ')
         config.set_default(:devel, false)
@@ -102,7 +102,10 @@ module Termtter
         call_hooks(:pre_filter, statuses, event)
         filtered = apply_filters(statuses, event)
         call_hooks(:post_filter, filtered, event)
-        call_hooks(:output, filtered, event)
+        get_hooks(:output).each do |hook|
+          filtered_for_hook = apply_filters_for_hook(filtered, hook.name)
+          hook.call(filtered_for_hook, event)
+        end
       end
 
       def apply_filters(statuses, event)
@@ -111,8 +114,12 @@ module Termtter
             filtered = f.call(filtered, event)
           end
           filtered
-        rescue => e
-          handle_error(e)
+      end
+
+      def apply_filters_for_hook(statuses, hook_name)
+        # TODO
+        filtered = statuses.map(&:dup)
+        filtered
       end
 
       # return last hook return value
@@ -123,12 +130,6 @@ module Termtter
           result = hook.call(*args)
         }
         result
-      rescue => e
-        if point.to_sym == :on_error
-          raise
-        else
-          handle_error(e)
-        end
       end
 
       def call_commands(text, tw = nil)
@@ -136,26 +137,24 @@ module Termtter
 
         command_found = false
         @commands.each do |key, command|
-          # match? メソッドがなんかきもちわるいので変える予定
-          command_str, command_arg = command.match?(text)
-          if command_str
-            command_found = true
+          next unless command.match?(text)
+          command_found = true
+          command_str, command_arg = Command.split_command_line(text)
 
-            modified_arg = call_hooks(
-                              "modify_arg_for_#{command.name.to_s}",
-                              command_str,
-                              command_arg) || command_arg || ''
+          modified_arg = call_hooks(
+                            "modify_arg_for_#{command.name.to_s}",
+                            command_str,
+                            command_arg) || command_arg || ''
 
-            @task_manager.invoke_and_wait do
-
-              pre_exec_hook_result = call_hooks("pre_exec_#{command.name.to_s}", command_str, modified_arg)
-              next if pre_exec_hook_result == false
+          @task_manager.invoke_and_wait do
+            begin
+              call_hooks("pre_exec_#{command.name.to_s}", command_str, modified_arg)
               # exec command
-              result = command.call(modified_arg)
+              result = command.call(command_str, modified_arg, text)
               if result
                 call_hooks("post_exec_#{command.name.to_s}", command_str, modified_arg, result)
               end
-
+            rescue CommandCanceled
             end
           end
         end
@@ -259,6 +258,8 @@ module Termtter
                 puts 'plese check your account settings'
                 exit!
               end
+            rescue => e
+              handle_error(e)
             end
           }
         )
@@ -308,8 +309,7 @@ module Termtter
       end
 
       def setup_logger
-        @logger = config.log.logger || Logger.new(STDOUT)
-        @logger.level = config.log.level || Logger::WARN
+        @logger = config.logger || Logger.new(STDOUT)
       end
 
       def run
@@ -328,7 +328,7 @@ module Termtter
       end
 
       def handle_error(e)
-        call_hooks("on_error", e)
+        get_hooks(:on_error).each {|hook| hook.call(e) }
       rescue Exception => e
         puts "Error: #{e}"
         puts e.backtrace.join("\n")

data/lib/termtter/command.rb

@@ -36,7 +36,7 @@ module Termtter
     end
 
     def complement(input)
-      command_str, command_arg = match?(input)
+      command_str, command_arg = Command.split_command_line(input)
       if command_arg
         if completion_proc
           [completion_proc.call(command_str, command_arg || '')].flatten.compact
@@ -48,7 +48,7 @@ module Termtter
       end
     end
 
-    def call(arg)
+    def call(cmd, arg, original_text)
       arg = case arg
         when nil
           ''
@@ -60,14 +60,8 @@ module Termtter
       exec_proc.call(arg)
     end
 
-    # return array like [command, arg]
-    # match? メソッドがなんかきもちわるいので変える予定
     def match?(input)
-      if pattern =~ input
-        [$2 || $3, $4]  # $2 or $3 => command, $4 => argument
-      else
-        [nil, nil]
-      end
+      (pattern =~ input) != nil
     end
 
     def pattern
@@ -78,6 +72,10 @@ module Termtter
     def commands
       [name] + aliases
     end
+
+    def self.split_command_line(line)
+      line.strip.split(/\s+/, 2)
+    end
   end
 end
 

data/lib/termtter/hook.rb

@@ -24,7 +24,6 @@ module Termtter
       }.empty?
     end
 
-    # TODO: need spec
     def call(*args)
       self.exec_proc.call(*args)
     end

data/lib/termtter/version.rb

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

data/spec/termtter/client_spec.rb

@@ -230,5 +230,19 @@ module Termtter
       end
       $stderr = old
     end
+
+    it 'should cancel command by hook' do
+      command = Command.new(:name => :test)
+      Client.register_command(command)
+      Client.register_hook(
+        :name => :test,
+        :point => /^pre_exec/,
+        :exec => lambda{|*arg|
+            raise Termtter::CommandCanceled
+        }
+      )
+      command.should_not_receive(:call)
+      Client.call_commands('test')
+    end
   end
 end

data/spec/termtter/command_spec.rb

@@ -58,18 +58,18 @@ module Termtter
 
     it 'should return command_info when call method "match?"' do
       [
-        ['update',       ['update', nil]],
-        ['up',           ['up', nil]],
-        ['u',            ['u', nil]],
-        ['update ',      ['update', nil]],
-        [' update ',     [nil, nil]],
-        ['update foo',   ['update', 'foo']],
-        [' update foo',  [nil, nil]],
-        [' update foo ', [nil, nil]],
-        ['u foo',        ['u', 'foo']],
-        ['up foo',       ['up', 'foo']],
-        ['upd foo',      [nil, nil]],
-        ['upd foo',      [nil, nil]],
+        ['update',       true],
+        ['up',           true],
+        ['u',            true],
+        ['update ',      true],
+        [' update ',     false],
+        ['update foo',   true],
+        [' update foo',  false],
+        [' update foo ', false],
+        ['u foo',        true],
+        ['up foo',       true],
+        ['upd foo',      false],
+        ['upd foo',      false],
       ].each do |input, result|
         @command.match?(input).should == result
       end
@@ -82,17 +82,25 @@ module Termtter
     end
 
     it 'should call exec_proc when call method "call"' do
-      @command.call('test').should == 'test'
-      @command.call(' test').should == ' test'
-      @command.call(' test ').should == ' test '
-      @command.call('test test').should == 'test test'
+      @command.call('foo', 'test', 'foo test').should == 'test'
+      @command.call('foo', ' test', 'foo  test').should == ' test'
+      @command.call('foo', ' test ', 'foo  test ').should == ' test '
+      @command.call('foo', 'test test', 'foo test test').should == 'test test'
     end
 
     it 'should raise ArgumentError at call' do
-      lambda { @command.call(nil) }.should_not raise_error(ArgumentError)
-      lambda { @command.call('foo') }.should_not raise_error(ArgumentError)
-      lambda { @command.call(false) }.should raise_error(ArgumentError)
-      lambda { @command.call(Array.new) }.should raise_error(ArgumentError)
+      lambda { @command.call('foo', nil, 'foo') }.should_not raise_error(ArgumentError)
+      lambda { @command.call('foo', 'foo', 'foo') }.should_not raise_error(ArgumentError)
+      lambda { @command.call('foo', false, 'foo') }.should raise_error(ArgumentError)
+      lambda { @command.call('foo', Array.new, 'foo') }.should raise_error(ArgumentError)
+    end
+
+    it 'split command line' do
+      Command.split_command_line('test foo bar').should == ['test', 'foo bar']
+      Command.split_command_line('test   foo bar').should == ['test', 'foo bar']
+      Command.split_command_line('test   foo  bar').should == ['test', 'foo  bar']
+      Command.split_command_line(' test   foo  bar').should == ['test', 'foo  bar']
+      Command.split_command_line(' test   foo  bar ').should == ['test', 'foo  bar']
     end
   end
 end

data/spec/termtter/hook_spec.rb

@@ -9,10 +9,9 @@ module Termtter
 
     it 'should match' do
       hook = Hook.new(
-        :name => :span,
+        :name => :spam,
         :points => ['foo'],
         :exec_proc => lambda{|cmd, arg|
-          puts 'a'
         }
       )
       hook.match?('foo').should == true
@@ -23,10 +22,9 @@ module Termtter
 
     it 'should match when multi points' do
       hook = Hook.new(
-        :name => :span,
+        :name => :spam,
         :points => ['foo', 'bar'],
         :exec_proc => lambda{|cmd, arg|
-          puts 'a'
         }
       )
       hook.match?('foo').should == true
@@ -37,10 +35,9 @@ module Termtter
 
     it 'should match when multi points' do
       hook = Hook.new(
-        :name => :span,
+        :name => :spam,
         :points => ['foo', /bar/],
         :exec_proc => lambda{|cmd, arg|
-          puts 'a'
         }
       )
       hook.match?('foo').should == true
@@ -52,10 +49,9 @@ module Termtter
 
     it 'should match when multi points' do
       hook = Hook.new(
-        :name => :span,
+        :name => :spam,
         :points => ['foo', /^bar/],
         :exec_proc => lambda{|cmd, arg|
-          puts 'a'
         }
       )
       hook.match?('bar').should == true
@@ -65,5 +61,18 @@ module Termtter
       hook.match?(:'bar_').should == true
       hook.match?(:'_bar_').should == false
     end
+
+    it 'call hook proc' do
+      proc_args = nil
+      hook = Hook.new(
+        :name => :spam,
+        :points => ['foo'],
+        :exec_proc => lambda{|*args|
+          proc_args = args
+        }
+      )
+      hook.call('foo', 'bar')
+      proc_args.should == ['foo', 'bar']
+    end
   end
 end

data/spec/termtter_spec.rb

@@ -4,14 +4,12 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Termtter, 'when plugin is called (without init option)' do
   it 'should require global plugin if exist' do
-    File.should_receive(:exist?).and_return(false)
-    should_receive(:require).with('plugins/aaa')
+    should_receive(:load).with('plugins/aaa.rb')
     plugin 'aaa'
   end
 
   it 'should require user plugin if not exist' do
-    File.should_receive(:exist?).and_return(true)
-    should_receive(:require).with(File.expand_path('~/.termtter/plugins/aaa'))
+    should_receive(:load).with('plugins/aaa.rb')
     plugin 'aaa'
   end
 
@@ -23,7 +21,7 @@ end
 
 describe Termtter, 'when plugin is called (with init option)' do
   it 'init option will become config' do
-    should_receive(:require)
+    should_receive(:load)
 
     plugin 'aaa', :bbb => :ccc
     config.plugins.aaa.bbb.should == :ccc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - jugyo
@@ -51,17 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.4
+        version: 0.6.4
     version: 
 description: Termtter is a terminal based Twitter client
 email: jugyo.org@gmail.com
@@ -103,6 +93,7 @@ files:
 - lib/plugins/msagent.rb
 - lib/plugins/multi_reply.rb
 - lib/plugins/notify-send.rb
+- lib/plugins/notify-send2.rb
 - lib/plugins/otsune.rb
 - lib/plugins/outputz.rb
 - lib/plugins/pause.rb
@@ -130,10 +121,10 @@ files:
 - lib/plugins/storage/status_mook.rb
 - lib/plugins/storage.rb
 - lib/plugins/system_status.rb
+- lib/plugins/timer.rb
 - lib/plugins/translation.rb
 - lib/plugins/update_editor.rb
 - lib/plugins/uri-open.rb
-- lib/plugins/url_addspace.rb
 - lib/plugins/wassr_post.rb
 - lib/plugins/yhara.rb
 - lib/plugins/yhara_filter.rb

data/lib/plugins/url_addspace.rb

@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module Termtter::Client
-  add_filter do |statuses, event|
-    statuses.each do |s|
-      s.text.gsub!(/(\S)(https?:\/\/)/, '\1 \2')
-    end
-    statuses
-  end
-end
-
-# url_addspace
-#   add space before URL without space
-# example:
-#   before: ABCDEhttp://~~~
-#   after:  ABCDE http://~~~