termtter 1.0.7 → 1.0.8

data/lib/plugins/standard_plugins.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require 'erb'
+require 'set'
 
 config.plugins.standard.set_default(
  :limit_format,
@@ -8,40 +9,61 @@ config.plugins.standard.set_default(
 
 module Termtter::Client
 
-  # standard commands
-
   register_command(
     :name => :update, :aliases => [:u],
     :exec_proc => lambda {|arg|
-      unless /^\s*$/ =~ arg
-        # TODO: Change to able to disable erb.
-        text = ERB.new(arg).result(binding).gsub(/\n/, ' ')
-        result = Termtter::API.twitter.update(text)
-        puts "=> #{text}"
-        result
+      unless arg.empty?
+        Termtter::API.twitter.update(arg)
+        puts "=> #{arg}"
       end
     },
     :completion_proc => lambda {|cmd, args|
       if /(.*)@([^\s]*)$/ =~ args
         find_user_candidates $2, "#{cmd} #{$1}@%s"
       end
-    }
+    },
+    :help => ["update,u TEXT", "Post a new message"]
   )
 
+  direct_message_struct = Struct.new(:id, :text, :user, :created_at)
+  direct_message_struct.class_eval do
+    def method_missing(*args, &block)
+      nil
+    end
+  end
   register_command(
     :name => :direct, :aliases => [:d],
     :exec_proc => lambda {|arg|
-      if /^([^\s]+)\s+(.*)\s*$/ =~ arg
+      case arg
+      when /^([^\s]+)\s+(.*)\s*$/
         user, text = $1, $2
         Termtter::API.twitter.direct_message(user, text)
         puts "=> to:#{user} message:#{text}"
+      when 'list'
+        output(
+          Termtter::API.twitter.direct_messages.map { |d|
+            direct_message_struct.new(d.id, "#{d.text} => #{d.recipient_screen_name}", d.sender, d.created_at)
+          },
+          :direct_messages
+        )
+      when 'sent_list'
+        output(
+          Termtter::API.twitter.sent_direct_messages.map { |d|
+            direct_message_struct.new(d.id, "#{d.text} => #{d.recipient_screen_name}", d.sender, d.created_at)
+          },
+          :direct_messages
+        )
       end
     },
-    :completion_proc => lambda {|cmd, args|
-      if /^([^\s]+)$/ =~ args
-        find_user_candidates $1, "#{cmd} %s"
-      end
-    }
+    :completion_proc => lambda {|cmd, arg|
+      find_user_candidates(arg, "#{cmd} %s") + 
+        ["list", "sent_list"].grep(/^#{Regexp.quote(arg)}/).map { |i| "#{cmd} #{i}" }
+    },
+    :help => [
+      ["direct,d USERNAME TEXT", "Send direct message"],
+      ["direct,d list", 'List direct messages'],
+      ["direct,d sent_list", 'List sent direct messages']
+    ]
   )
 
   register_command(
@@ -60,7 +82,8 @@ module Termtter::Client
     },
     :completion_proc => lambda {|cmd, arg|
       find_user_candidates arg, "#{cmd} %s"
-    }
+    },
+    :help => ["profile,p USERNAME", "Show user's profile"]
   )
 
   register_command(
@@ -75,9 +98,13 @@ module Termtter::Client
         followers += tmp = Termtter::API.twitter.followers(user_name, :page => page+=1)
       end until tmp.empty?
       Termtter::Client.public_storage[:followers] = followers
+      public_storage[:users] += followers.map(&:screen_name)
       puts followers.map(&:screen_name).join(' ')
-    }
-    # TODO :completion_proc
+    },
+    :completion_proc => lambda {|cmd, arg|
+      find_user_candidates arg, "#{cmd} %s"
+    },
+    :help => ["followers", "Show followers"]
   )
 
   register_command(
@@ -94,22 +121,30 @@ module Termtter::Client
     },
     :completion_proc => lambda {|cmd, arg|
       find_user_candidates arg, "#{cmd} %s"
-    }
+    },
+    :help => ["list,l [USERNAME]", "List the posts"]
   )
 
+  public_storage[:search_keywords] = Set.new
   register_command(
     :name => :search, :aliases => [:s],
     :exec_proc => lambda {|arg|
       statuses = Termtter::API.twitter.search(arg)
+      public_storage[:search_keywords] << arg
       output(statuses, :search)
-    }
+    },
+    :completion_proc => lambda {|cmd, arg|
+      public_storage[:search_keywords].grep(/#{Regexp.quote(arg)}/).map { |i| "#{cmd} #{i}" }
+    },
+    :help => ["search,s TEXT", "Search for Twitter"]
   )
 
   register_command(
     :name => :replies, :aliases => [:r],
     :exec_proc => lambda {|arg|
       output(Termtter::API.twitter.replies, :replies)
-    }
+    },
+    :help => ["replies,r", "List the most recent @replies for the authenticating user"]
   )
 
   register_command(
@@ -130,7 +165,8 @@ module Termtter::Client
           find_status_ids(arg).map {|id| "#{cmd} #{id}"}
         end
       end
-    }
+    },
+    :help => ["show ID", "Show a single status"]
   )
 
   register_command(
@@ -138,7 +174,8 @@ module Termtter::Client
     :exec_proc => lambda {|arg|
       id = arg.gsub(/.*:\s*/, '')
       # TODO: Implement
-      output([Termtter::API.twitter.show(id)], :show)
+      #output([Termtter::API.twitter.show(id)], :show)
+      puts "Not implemented yet."
     },
     :completion_proc => get_command(:show).completion_proc
   )
@@ -173,6 +210,61 @@ module Termtter::Client
     :help => ['leave USER', 'Leave user']
   )
 
+  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
+
+      r = Termtter::API.twitter.favorite id
+      puts "Favorited status ##{r.id} on user @#{r.user.screen_name} #{r.text}"
+    },
+    :completion_proc => lambda {|cmd, arg|
+      case arg
+      when /@(.*)/
+        find_user_candidates $1, "#{cmd} @%s"
+      when /(\d+)/
+        find_status_ids(arg).map{|id| "#{cmd} #{id}"}
+      else
+        %w(favorite).grep(/^#{Regexp.quote arg}/)
+      end
+    },
+    :help => ['favorite,fav (ID|@USER|/WORD)', 'Favorite a status']
+  )
+
+  def self.show_settings(conf, level = 0)
+    conf.__values__.each do |k, v|
+      if v.instance_of? Termtter::Config
+        puts "#{k}:"
+        show_settings v, level + 1
+      else
+        print '  ' * level
+        puts "#{k} = #{v.nil? ? 'nil' : v.inspect}"
+      end
+    end
+  end
+
+  register_command(
+    :name => :settings, :aliases => [:set],
+    :exec_proc => lambda {|_|
+      show_settings config
+    },
+    :help => ['settings,set', 'Show your settings']
+  )
+
   # TODO: Change colors when remaining_hits is low.
   # TODO: Simmulate remaining_hits.
   register_command(
@@ -210,61 +302,23 @@ module Termtter::Client
     :help => ['exit,e', 'Exit']
   )
 
-  register_hook(
-    :name => :default_error_handler,
-    :points => [:on_error],
-    :exec_proc => lambda {|e|
-      case e
-      when Rubytter::APIError
-        case e.response.code
-        when /401/
-          warn '[ERROR] Unauthorized: maybe you tried to show protected user status'
-        when /403/
-          warn '[ERROR] Access denied: maybe that user is protected'
-        when /404/
-          warn '[ERROR] Not found: maybe there is no such user'
-        end
-      else
-        warn "[ERROR] Something wrong: #{e.message}"
-      end
-      raise e if config.system.devel == true
-    }
-  )
-
   register_command(
     :name => :help, :aliases => [:h],
     :exec_proc => lambda {|arg|
-      # TODO: move to each commands
-      helps = [
-        ["help,h", "Print this help message"],
-        ["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"],
-        ["profile,p USERNAME", "Show user's profile"],
-        ["replies,r", "List the most recent @replies for the authenticating user"],
-        ["search,s TEXT", "Search for Twitter"],
-        ["show ID", "Show a single status"]
-      ]
-      helps += @commands.map {|name, command| command.help}
-      helps.compact!
-      puts formatted_help(helps)
-    }
-  )
-
-  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}"
-          end
+      helps = []
+      @commands.map do |name, command|
+        next unless command.help
+        case command.help[0]
+        when String
+          helps << command.help
+        when Array
+          helps += command.help
         end
       end
+      helps.compact!
+      puts formatted_help(helps)
     },
-    :help => ['execute COMMAND', 'execute the command']
+    :help => ["help,h", "Print this help message"]
   )
 
   def self.formatted_help(helps)
@@ -278,9 +332,9 @@ module Termtter::Client
 
   # completion for standard commands
 
-  require 'set'
   public_storage[:users] ||= Set.new
   public_storage[:status_ids] ||= Set.new
+  public_storage[:last_status_id] ||= Hash.new
 
   register_hook(
     :name => :for_completion,
@@ -291,24 +345,180 @@ module Termtter::Client
         public_storage[:users] += s.text.scan(/@([a-zA-Z_0-9]*)/).flatten
         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
+        public_storage[:last_status_id].store(s.user.screen_name, s.id)
+      end
+    }
+  )
+
+  public_storage[:plugins] = (Dir["#{File.dirname(__FILE__)}/*.rb"] + Dir["#{Termtter::CONF_DIR}/plugins/*.rb"]).map do |f|
+    f.match(%r|([^/]+).rb$|)[1]
+  end
+
+  register_command(
+    :name      => :plugin,
+    :exec_proc => lambda {|arg|
+      if arg.empty?
+        puts 'Should specify plugin name.'
+        return
+      end
+      begin
+        result = plugin arg
+      rescue LoadError
+      ensure
+        puts "=> #{result.inspect}"
+      end
+    },
+    :completion_proc => lambda {|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']
+  )
+
+  register_command(
+    :name      => :plugins,
+    :exec_proc => lambda {|arg|
+      puts public_storage[:plugins].sort.join("\n")
+    },
+    :help      => ['plugins', 'Show list of plugins']
+  )
+
+  register_command(
+    :name => :reply,
+    :aliases => [:re],
+    :exec_proc => lambda {|arg|
+      case arg
+      when /^\s*(?:list|ls)\s*(?:\s+(\w+))?\s*$/
+        public_storage[:log4re] = if $1
+                                    public_storage[:log].
+                                      select{|l| l.user.screen_name == $1}.
+                                      sort {|a,b| a.id <=> b.id}
+                                  else
+                                    public_storage[:log].sort {|a,b| a.id <=> b.id}
+                                  end
+        public_storage[:log4re].each_with_index do |s, i|
+          puts "#{i}: #{s.user.screen_name}: #{s.text}"
+        end
+      when /^\s*(?:up(?:date)?)\s+(\d+)\s+(.+)$/
+        id   = public_storage[:log4re][$1.to_i].id
+        text = $2
+        user = public_storage[:log4re][$1.to_i].user
+        update_with_user_and_id(text, user.screen_name, id) if user
+        public_storage.delete :log4re
+      when /^\s*(\d+)\s+(.+)$/
+        id, text = $1, $2
+        user = public_storage[:log].select {|l| l.id == id.to_i }.first.user
+        update_with_user_and_id(text, user.screen_name, id) if user
+      when /^\s*@(\w+)/
+        in_reply_to_status_id = Termtter::API.twitter.user($1).status.id rescue nil
+        params = in_reply_to_status_id ? {:in_reply_to_status_id => in_reply_to_status_id} : {}
+        Termtter::API.twitter.update(arg, params)
+        puts "=> #{arg}"
+      end
+    },
+    :completion_proc => lambda {|cmd, arg|
+      case arg
+      when /(.*)@([^\s]*)$/
+        find_user_candidates $2, "#{cmd} #{$1}@%s"
+      when /(\d+)/
+        find_status_ids(arg).map{|id| "#{cmd} #{id}"}
       end
     }
   )
 
+  register_command(
+    :name => :redo,
+    :aliases => [:"."],
+    :exec_proc => lambda {|arg|
+      break if Readline::HISTORY.length < 2
+      i = Readline::HISTORY.length - 2
+      input = ""
+      begin
+        input = Readline::HISTORY[i]
+        i -= 1
+        return if i <= 0
+      end while input == "redo" or input == "."
+      begin
+        Termtter::Client.call_commands(input)
+      rescue CommandNotFound => e
+        warn "Unknown command \"#{e}\""
+        warn 'Enter "help" for instructions'
+      rescue => e
+        handle_error e
+      end
+    },
+    :help => ["redo,.", "Execute previous command"]
+  )
+
+  def self.update_with_user_and_id(text, username, id)
+    text = ERB.new("@#{username} #{text}").result(binding).gsub(/\n/, ' ')
+    result = Termtter::API.twitter.update(text, {'in_reply_to_status_id' => id})
+    puts "=> #{text}"
+    result
+  end
+
+=begin
+  = Termtter reply command
+  == Usage
+  === list
+  * ステータスリストを連番と一緒に出す。
+  > reply [list|ls]
+  0: foo: foo's message
+  1: bar: bar's message
+  ..
+
+  * ユーザ指定してリスト作成。
+  > reply [list|ls] foo
+  0: foo: foo's message0
+  1: foo: foo's message1
+
+  === reply
+  メッセージ送信の際、@usernameが自動的に付与される。
+
+  * status_idを自分で入力してreply送信
+  > reply 1234567890 message to status_id
+  => @foo message to status_id (reply to 1234567890)
+
+  * reply listコマンドで出したステータス番号に対してreply送信
+  > reply up 0 message to status no
+  => @foo message to status_no
+
+  * 対象ユーザの最後の発言に対してreply
+  > reply @foo message to foo
+  => @foo message to foo
+
+  == Todo
+  * 英語で説明 => ヘルプを設定する
+  * リファクタ
+  * 補完
+  * 確認画面を出したい
+=end
+
+  def self.find_plugin_candidates(a, b)
+    public_storage[:plugins].
+      grep(/^#{Regexp.quote a}/i).
+      map {|u| b % u }
+  end
+
   def self.find_status_ids(text)
     public_storage[:status_ids].select {|id| /#{Regexp.quote(text)}/ =~ id.to_s}
   end
 
   def self.find_users(text)
-    public_storage[:users].select {|user| /#{Regexp.quote(text)}/ =~ user}
+    public_storage[:users].select {|user| /^#{Regexp.quote(text)}/ =~ user}
   end
 
   def self.find_user_candidates(a, b)
-    if a.nil? || a.empty?
-      public_storage[:users].to_a
-    else
-      public_storage[:users].grep(/^#{Regexp.quote a}/i)
-    end.
-    map {|u| b % u }
+    users = 
+      if a.nil? || a.empty?
+        public_storage[:users].to_a
+      else
+        public_storage[:users].grep(/^#{Regexp.quote a}/i)
+      end
+    users.map {|u| b % u }
   end
 end

data/lib/plugins/stdout.rb

@@ -46,11 +46,17 @@ module Termtter
         status_color = config.plugins.stdout.colors[s.user.id.hash % config.plugins.stdout.colors.size]
         status = "#{s.user.screen_name}: #{TermColor.escape(text)}"
         if s.in_reply_to_status_id
-          status += " (repl. to #{s.in_reply_to_status_id})"
+          status += " (reply to #{s.in_reply_to_status_id})"
         end
 
         time = "(#{Time.parse(s.created_at).strftime(time_format)})"
         id = s.id
+        source =
+          case s.source
+          when />(.*?)</ then $1
+          when 'web' then 'web'
+          end
+
         erbed_text = ERB.new(config.plugins.stdout.timeline_format).result(binding)
         output_text << TermColor.parse(erbed_text) + "\n"
       end

data/lib/plugins/switch_user.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  register_command(
+    :name => :switch_user,
+    :exec_proc => lambda {|arg|
+      Termtter::API.switch_user(arg)
+    },
+    :completion_proc => lambda {|cmd, arg|
+      # TODO
+    },
+    :help => ["switch_user USERNAME", "Switch twitter account."]
+  )
+
+  register_command(
+    :name => :restore_user,
+    :exec_proc => lambda {|arg|
+      Termtter::API.restore_user
+    },
+    :help => ["restore_user", "Restore default twitter account."]
+  )
+end

data/lib/plugins/tinyurl.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+Termtter::Client.register_hook(
+  :name => :tinyurl,
+  :points => [:modify_arg_for_update],
+  :exec_proc => lambda {|cmd, arg|
+    arg = arg.gsub(URI.regexp) do |url|
+      if url =~ %r!^https?:!
+        Termtter::API.connection.start('tinyurl.com', 80) do |http|
+          http.get('/api-create.php?url=' + URI.escape(url)).body
+        end
+      else
+        url
+      end
+    end
+  }
+)
+
+# tinyuri.rb
+# make URLs in your update to convert tinyurl.com/XXXXXXX.

data/lib/plugins/typable_id.rb

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+
+config.plugins.typable_id.set_default(:typable_keys, %w[ a  i  u  e  o
+                                                        ka ki ku ke ko
+                                                        ga gi gu ge go
+                                                        sa si su se so
+                                                        za zi zu ze zo
+                                                        ta ti tu te to
+                                                        da di du de do
+                                                        na ni nu ne no
+                                                        ha hi hu he ho
+                                                        ba bi bu be bo
+                                                        pa pi pu pe po
+                                                        ma mi mu me mo
+                                                        ya    yu    yo
+                                                        ra ri ru re ro
+                                                        wa          wo
+                                                        nn ])
+
+module Termtter::Client
+  public_storage[:typable_id] = []
+  config.plugins.typable_id.typable_keys.each {|key|
+    public_storage[:typable_id].push([key, '', ''])
+  }
+
+  register_hook(
+    :name => :typable_id,
+    :points => [:post_filter],
+    :exec_proc => lambda {|filtered, event|
+      filtered.each do |s|
+        current_id = public_storage[:typable_id].shift
+        current_id[1] = s.id.to_s
+        current_id[2] = s
+        public_storage[:typable_id].push(current_id)
+      end
+    }
+  )
+
+  def self.typable_id_convert(id)
+    if current_id = public_storage[:typable_id].assoc(id.to_s)
+      return current_id[1]
+    elsif current_id = public_storage[:typable_id].rassoc(id.to_s)
+      return current_id[0]
+    else
+      return nil
+    end
+  end
+
+  def self.typable_id_status(id)
+    if current_id = (public_storage[:typable_id].assoc(id.to_s)||\
+                     public_storage[:typable_id].rassoc(id.to_s))
+      return current_id[2]
+    else
+      return nil
+    end
+  end
+
+  def self.typable_id?(id)
+    if public_storage[:typable_id].assoc(id.to_s)
+      return true
+    else
+      return false
+    end
+  end
+end
+
+#Setting
+#  ex)
+#    config.plugins.stdout.timeline_format = '<90><%=time%></90> <<%=status_color%>><%=status%></<%=status_color%>> <90><%=id%>>[<%=Termtter::Client.typable_id_convert(id)%>]</90>
+#Optional Settng
+#  ex) Like hepburn system
+#    config.plugins.typable_id.typable_keys = %w[ a   i   u  e  o
+#                                                ka  ki  ku ke ko ga gi gu ge go
+#                                                sa shi  su se so za ji zu ze zo
+#                                                ta chi tsu te to da di du de do
+#                                                na  ni  nu ne no
+#                                                ha  hi  fu he ho ba bi bu be bo pa pi pu pe po
+#                                                ma  mi  mu me mo
+#                                                ya      yu    yo
+#                                                ra  ri  ru re ro
+#                                                wa            wo
+#                                                nn ]
+#  ex) Hiragana
+#    config.plugins.typable_id.typable_keys = %w[あ い う え お
+#                                                か き く け こ が ぎ ぐ げ ご
+#                                                さ し す せ そ ざ じ ず ぜ ぞ
+#                                                た ち つ て と だ ぢ づ で ど
+#                                                な に ぬ ね の
+#                                                は ひ ふ へ ほ ば び ぶ べ ぼ ぱ ぴ ぷ ぺ ぽ
+#                                                ま み む め も
+#                                                や    ゆ    よ
+#                                                ら り る れ ろ
+#                                                わ          を
+#                                                ん ]