termtter 1.7.2 → 1.8.0

data/lib/plugins/web.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  unless Termtter::Client.respond_to?(:open_uri)
+    plug 'uri-open' # FIXME: Actually it only needs Termtter::Client.open_uri method
+  end
+
+  helpmsg = 'USAGE: web [{username}|{id}]'
+  register_command(
+    :name => :web,
+    :help => ['web', helpmsg],
+    :exec_proc => lambda {|arg|
+      case arg
+      when ''
+        puts helpmsg
+      when /^\d+$/
+        statusid = arg #Termtter::API.twitter.show($1)
+        name = 'ujm' # FIXME: Do you know how to obtain the screen name of the status? I researched but I couldn't find how to do that yet.
+        puts "not impemented yet"
+        #Termtter::Client.open_uri "http://twitter.com/#{name}/#{statusid}"
+      else
+        name = normalize_as_user_name(arg)
+        Termtter::Client.open_uri "http://twitter.com/#{name}"
+      end
+    }
+  )
+end

data/lib/termtter.rb

@@ -14,16 +14,14 @@ require 'net/https'
 require 'open-uri'
 require 'optparse'
 require 'readline'
-gem 'rubytter', '>= 0.9.2'
+gem 'rubytter', '>= 0.11.0'
 require 'rubytter'
+require 'notify'
 require 'timeout'
 
 module Termtter
   VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION')).strip
   APP_NAME = 'termtter'
-  CONF_DIR = File.expand_path('~/.termtter')
-  CONF_FILE = File.join(Termtter::CONF_DIR, 'config')
-  $:.unshift(CONF_DIR)
 
   require 'termtter/config'
   require 'termtter/default_config'
@@ -39,4 +37,10 @@ module Termtter
   require 'termtter/api'
   require 'termtter/system_extensions'
   require 'termtter/httppool'
+  require 'termtter/event'
+
+  OptParser.parse!(ARGV)
+  CONF_DIR = File.expand_path('~/.termtter') unless defined? CONF_DIR
+  CONF_FILE = File.join(Termtter::CONF_DIR, 'config') unless defined? CONF_FILE
+  $:.unshift(CONF_DIR)
 end

data/lib/termtter/client.rb

@@ -8,7 +8,6 @@ module Termtter
   class CommandCanceled < StandardError; end
 
   module Client
-
     include Termtter::Hookable
 
     @commands = {}
@@ -18,7 +17,6 @@ module Termtter
     Thread.abort_on_exception = true
 
     class << self
-
       attr_reader :commands
 
       # plug :: Name -> (Hash) -> IO () where NAME = String | Symbol | [NAME]
@@ -111,6 +109,7 @@ module Termtter
       #           }
       def output(statuses, event)
         return if statuses.nil? || statuses.empty?
+        event = Termtter::Event.new(event) unless event.kind_of? Termtter::Event
 
         statuses = statuses.sort_by(&:id)
         call_hooks(:pre_filter, statuses, event)
@@ -118,16 +117,22 @@ module Termtter
         filtered = apply_filters_for_hook(:filter_for_output, statuses.map(&:clone), event)
 
         @filters.each do |f|  # TODO: code for compatibility. delete someday.
+          # but... when is the "someday"?
           filtered = f.call(filtered, event)
         end
 
         call_hooks(:post_filter, filtered, event)
         get_hooks(:output).each do |hook|
+          Termtter::Client.logger.debug "output: call hook :output #{hook.inspect}"
           hook.call(
             apply_filters_for_hook(:"filter_for_#{hook.name}", filtered, event),
-            event
-          )
+            event)
         end
+        Termtter::Client.logger.debug "output: call hook :output, done"
+      end
+
+      def notify(*args)
+        ::Notify.notify(*args)
       end
 
       def apply_filters_for_hook(hook_name, statuses, event)
@@ -225,6 +230,7 @@ module Termtter
         end
       end
 
+      # MEMO: This method will be removed in Termtter 2.0.0
       def move_legacy_config_file
         FileUtils.mv(
           Termtter::CONF_DIR,
@@ -295,11 +301,13 @@ module Termtter
 
       def run
         parse_options
+        config.__freeze__(:user_name) unless config.user_name.empty?
         show_splash
         load_config
         setup_task_manager
         load_plugins
         eval_init_block
+        config.__unfreeze__(:user_name)
         Termtter::API.setup
 
         config.system.eval_scripts.each do |script|
@@ -323,30 +331,18 @@ module Termtter
       end
 
       def handle_error(e)
-        if logger
-          logger.error("#{e.class.to_s}: #{e.message}")
-          logger.error(e.backtrace.join("\n")) if (e.backtrace and config.devel)
-        else
-          raise e
-        end
+        logger.error("#{e.class.to_s}: #{e.message}")
+        logger.error(e.backtrace.join("\n")) if (e.backtrace and config.devel)
         get_hooks(:on_error).each {|hook| hook.call(e) }
-      rescue Exception => e
-        $stderr.puts "Error: #{e}"
-        $stderr.puts e.backtrace.join("\n")
       end
 
       def confirm(message, default_yes = true, &block)
         pause # TODO: TaskManager から呼ばれるならこれいらないなぁ
 
-        prompt =
-          if default_yes
-            "\"#{message}".strip + "\" [Y/n] "
-          else
-            "\"#{message}".strip + "\" [N/y] "
-          end
-        readline = Readline.readline(prompt, false)
+        print "\"#{message.strip}\" "
+        readline = Readline.readline(default_yes ? "[Y/n] " : "[N/y] ", false)
         result =
-          if !!(/^$/ =~ readline) 
+          if !!(/^$/ =~ readline)
             default_yes
           else
             !!(/^y/i =~ readline)

data/lib/termtter/command.rb

@@ -2,14 +2,15 @@
 
 module Termtter
   class Command
-    attr_accessor :name, :aliases, :exec_proc, :completion_proc, :help
+    attr_accessor :name, :aliases, :author, :exec_proc, :completion_proc, :help
 
     # args
     #   name:            (required) Symbol as command name
     #   aliases:         Array of command alias (ex. ['u', 'up'])
     #   exec_proc:       Proc for procedure of the command. If need the proc must return object for hook.
     #   completion_proc: Proc for input completion. The proc must return Array of candidates (Optional)
-    #   help:            help text for the command (Optional)
+    #   help:            Help text for the command (Optional)
+    #   author:          The author's name (Optional)
     def initialize(args)
       raise ArgumentError, ":name is not given." unless args.has_key?(:name)
       args = args.dup
@@ -18,10 +19,11 @@ module Termtter
       args[:aliases] ||= [args[:alias]].compact
 
       cfg = {
-        :aliases        => [],
-        :exec_proc      => lambda {|arg| },
-        :comletion_proc => lambda {|command, arg| [] }
-      }.merge(args)
+        :aliases => [],
+        :exec_proc => lambda {|arg| },
+        :comletion_proc => lambda {|command, arg| [] },
+        :author => 'ujihisa',
+      }.merge(args) {|k, v1, v2| v2 ? v2 : v1 }
 
       set cfg
     end
@@ -33,6 +35,7 @@ module Termtter
       self.exec_proc        = cfg[:exec_proc]
       self.completion_proc  = cfg[:completion_proc]
       self.help             = cfg[:help]
+      self.author           = cfg[:author]
     end
 
     # complement :: String -> [String]
@@ -52,6 +55,7 @@ module Termtter
 
     # call :: ???
     def call(cmd = nil, arg = nil, original_text = nil)
+      from = Time.now
       arg = case arg
         when nil
           ''
@@ -60,18 +64,24 @@ module Termtter
         else
           raise ArgumentError, 'arg should be String or nil'
         end
-      exec_proc.call(arg)
+      Termtter::Client.logger.debug "command: #{cmd} #{arg}"
+      result = exec_proc.call(arg)
+      Termtter::Client.logger.debug "command: #{cmd} #{arg} #{'%.2fsec' % (Time.now - from)}"
+      result
+    rescue => e
+      Termtter::Client.logger.debug "command: #{cmd} #{arg} #{e.message} #{'%.2fsec' % (Time.now - from)}"
+      raise e
     end
 
     # match? :: String -> Boolean
     def match?(input)
-      pattern === input
+      !!pattern.match(input)
     end
 
     # pattern :: Regexp
     def pattern
-      commands_regex = commands.map {|name| Regexp.quote(name.to_s) }.join('|')
-      /^((#{commands_regex})|(#{commands_regex})\s+(.*?))\s*$/
+      commands_regex = commands.map {|name| name.to_s.split(' ').map {|i| Regexp.quote(i)}.join('\s+') }.join('|')
+      /^\s*((#{commands_regex})|(#{commands_regex})\s+(.*?))\s*$/
     end
 
     # commands :: [Symbol]
@@ -88,15 +98,27 @@ module Termtter
       self.aliases = [a]
     end
 
+    # author= :: String -> ()
+    def author=(a)
+      @author = a
+    end
+
     def command_words
       name.to_s.split(/\s+/)
     end
 
     # split_command_line :: String -> (String, String)
     def split_command_line(line)
-      command_words_count = command_words.size
-      parts = line.strip.split(/\s+/, command_words_count + 1)
-      [parts[0...command_words_count].join(' '), parts[command_words_count] || '']
+      m = pattern.match(line)
+      if m
+        unless m[2].nil?
+          [m[2], '']
+        else
+          [m[3], m[4]]
+        end
+      else
+        []
+      end
     end
   end
 end

data/lib/termtter/config.rb

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 #
+require 'set'
+
 module Termtter
   class Config
     def initialize
       @store = Hash.new(:undefined)
+      @freezes = Set.new
     end
 
     def inspect
@@ -40,8 +43,17 @@ module Termtter
       end
     end
 
+    def __freeze__(name)
+      @freezes << name.to_sym
+    end
+
+    def __unfreeze__(name)
+      @freezes.delete(name.to_sym)
+    end
+
     # __assign__ :: Symbol -> a -> IO ()
     def __assign__(name, value)
+      return if @freezes.include?(name)
       @store[name] = value
     end
 
@@ -55,6 +67,7 @@ module Termtter
     end
 
     def __clear__(name = nil)
+      return if name && @freezes.include?(name)
       if name
         @store[name] = :undefined
       else

data/lib/termtter/config_template.erb

@@ -2,7 +2,7 @@
 
 config.user_name = '<%= user_name %>'
 #config.update_interval = 120
-#config.timeout = 5
+#config.timeout = 60
 #config.retry = 3
 #config.enable_ssl = true
 #config.proxy.host = 'proxy host'
@@ -10,7 +10,8 @@ config.user_name = '<%= user_name %>'
 #config.proxy.user_name = 'proxy user'
 #config.proxy.password = 'proxy password'
 
-#config.plugins.keyword.keywords = ["ruby", "termtter"]
+config.plugins.keyword.keywords = ["@<%= user_name %>"]
+config.confirm = true
 #config.plugins.stdout.colors = (31..36).to_a + (91..96).to_a
 
 Termtter::Client.init do |t|

data/lib/termtter/default_config.rb

@@ -2,11 +2,11 @@ config.set_default(:logger, nil)
 config.set_default(:update_interval, 120)
 config.set_default(:prompt, '> ')
 config.set_default(:devel, false)
-config.set_default(:timeout, 5)
+config.set_default(:timeout, 60)
 config.set_default(:retry, 1)
 config.set_default(:splash, <<SPLASH)
 
-   <cyan>&lt;(@)//_</cyan>  .  .      <on_green> Termtter <underline>#{Termtter::VERSION}</underline> </on_green>
+   <cyan>&lt;(@)//_</cyan>  .  .      <on_green> #{(Time.now.year == 2010 && Time.now.month == 4 && Time.now.day == 1)?'Centertter':'Termtter'} <underline>#{Termtter::VERSION}</underline> </on_green>
       <cyan>\\\\</cyan>           <on_green> http://termtter.org/ </on_green>
 
 SPLASH

data/lib/termtter/event.rb

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+require 'termtter/active_rubytter'
+
+module Termtter
+  class Event
+    def initialize(name, params = {})
+      raise TypeError unless name.kind_of? Symbol
+      raise TypeError unless params.kind_of? Hash
+      @name = name
+      @params = ActiveRubytter.new(params)
+    end
+
+    attr_reader :name
+    undef_method :to_s
+
+    def method_missing(name, *args)
+      @name.__send__(name, *args)
+    rescue NoMethodError
+      @params.__send__(name, *args)
+    end
+
+    def [](name)
+      @params.__send__(:[], name)
+    end
+
+    def hash
+      @name.hash
+    end
+
+    def has_key?(key)
+      @params.to_hash.has_key?(key)
+    end
+
+    def set_param(key, value)
+      data = @params.to_hash
+      data[key] = value
+      @params.attributes = data
+      value
+    end
+
+    alias_method :[]=, :set_param
+
+    def ==(b)
+      self.eql?(b)
+    end
+
+    def eql?(b)
+      if b.kind_of? Event
+        @name == b.name
+      else
+        @name == b
+      end
+    end
+    alias_method :===, :==
+  end
+end
+__END__
+class Symbol
+  def eql?(b)
+    if b.kind_of? Termtter::Event
+      self.equal? b.name
+    else
+      self.equal? b
+    end
+  end
+  alias_method :==,   :eql?
+  alias_method :===,  :eql?
+end

data/lib/termtter/hook.rb

@@ -25,7 +25,12 @@ module Termtter
     end
 
     def call(*args)
-      self.exec_proc.call(*args)
+      begin
+        self.exec_proc.call(*args)
+      rescue ArgumentError
+        args.pop
+        retry
+      end
     end
   end
 end

data/lib/termtter/hookable.rb

@@ -1,5 +1,11 @@
 # -*- coding: utf-8 -*-
 
+if RUBY_VERSION <= '1.8.6'
+  class String
+    def each_char; split(//); end
+  end
+end
+
 module Termtter
   class HookCanceled < StandardError; end
 
@@ -41,12 +47,14 @@ module Termtter
 
           # return last hook return value
           def call_hooks(point, *args)
-            Termtter::Client.logger.debug "call_hooks: [:point => #{point}, :args => [#{args.map {|a| a.inspect.split(//)[0..10].join}.join(', ')}]]"
+            Termtter::Client.logger.debug "call_hooks: [:point => #{point}, :args => [#{args.map {|a| a.inspect.each_char.take(11).join}.join(', ')}]]"
             result = nil
             get_hooks(point).each {|hook|
               break if result == false # interrupt if hook return false
+              Termtter::Client.logger.debug "call_hooks: #{point} #{hook.inspect}"
               result = hook.call(*args)
             }
+            Termtter::Client.logger.debug "call_hooks: [:point => #{point}, :args => [#{args.map {|a| a.inspect.each_char.take(11).join}.join(', ')}]], done"
             result
           end