jugyo-termtter 0.7.7 → 0.8.0

data/lib/termtter/command.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter
   class Command
     attr_accessor :name, :aliases, :exec_proc, :completion_proc, :help
@@ -11,7 +13,7 @@ module Termtter
     def initialize(args)
       raise ArgumentError, ":name is not given." unless args.has_key?(:name)
       @name = args[:name].to_sym
-      @aliases = args[:aliases] || []
+      @aliases = args[:aliases] ? args[:aliases].map {|i| i.to_sym } : []
       @exec_proc = args[:exec_proc] || proc {|arg|}
       @completion_proc = args[:completion_proc] || proc {|command, arg| [] }
       @help = args[:help]
@@ -20,7 +22,7 @@ module Termtter
     def complement(input)
       command_info = match?(input)
       if command_info
-        [completion_proc.call(command_info[0], command_info[1])].flatten.compact
+        [completion_proc.call(command_info[0], command_info[1] || '')].flatten.compact
       else
         [name.to_s].grep(/^#{Regexp.quote(input)}/)
       end
@@ -51,16 +53,24 @@ module Termtter
     end
 
     def execute(arg)
+      arg = case arg
+        when nil
+          ''
+        when String
+          arg
+        else
+          raise ArgumentError, 'arg should be String or nil'
+        end
       exec_proc.call(arg)
     end
 
     def pattern
-      commands_regex = commands.map {|i| Regexp.quote(i) }.join('|')
-      /^\s*((#{commands_regex})|(#{commands_regex})\s+(.*?))\s*$/
+      commands_regex = commands.map {|i| Regexp.quote(i.to_s) }.join('|')
+      /^((#{commands_regex})|(#{commands_regex})\s+(.*?))\s*$/
     end
 
     def commands
-      aliases.unshift(name.to_s)
+      aliases.unshift(name)
     end
   end
 end

data/lib/termtter/connection.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter
   class Connection
     attr_reader :protocol, :port, :proxy_uri
@@ -29,7 +31,7 @@ module Termtter
     def start(host, port, &block)
       http = @http_class.new(host, port)
       http.use_ssl = @enable_ssl
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl?
       http.start(&block)
     end
   end

data/lib/termtter/hook.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+module Termtter
+  class Hook
+    attr_accessor :name, :points, :exec_proc
+
+    def initialize(args)
+      raise ArgumentError, ":name is not given." unless args.has_key?(:name)
+      @name = args[:name].to_sym
+      @points = args[:points] ? args[:points].map {|i| i.to_sym } : []
+      @exec_proc = args[:exec_proc] || proc {}
+    end
+
+    def match?(point)
+      points.include?(point.to_sym)
+    end
+  end
+end

data/lib/termtter/status.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 module Termtter
   class Status
     %w(

data/lib/termtter/task.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+module Termtter
+  class Task
+    attr_accessor :name, :exec_at, :exec_proc, :interval
+    def initialize(args = {}, &block)
+      @name = args[:name]
+      @exec_at = Time.now + (args[:after] || 0)
+      @interval = args[:interval]
+      @exec_proc = block || proc {}
+    end
+    def execute
+      exec_proc.call
+    end
+  end
+end

data/lib/termtter/task_manager.rb

@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+
+module Termtter
+  class TaskManager
+
+    INTERVAL = 1
+
+    def initialize()
+      @tasks = {}
+      @work = true
+      @mutex = Mutex.new
+      @pause = false
+    end
+
+    def pause
+      @pause = true
+    end
+
+    def resume
+      @pause = false
+    end
+
+    def kill
+      @work = false
+    end
+
+    def run
+      Thread.new do
+        while @work
+          step unless @pause
+          sleep INTERVAL
+        end
+      end
+    end
+
+    def step
+      pull_due_tasks().each do |task|
+        invoke_and_wait do
+          task.execute
+        end
+      end
+    end
+
+    def invoke_later
+      Thread.new do
+        invoke_and_wait do
+          yield
+        end
+      end
+    end
+
+    def invoke_and_wait(&block)
+      synchronize do
+        begin
+          yield
+        rescue => e
+          Termtter::Client.handle_error(e)
+        end
+      end
+    end
+
+    def add_task(args = {}, &block)
+      synchronize do
+        task = Task.new(args, &block)
+        @tasks[task.name || task.object_id] = task
+      end
+    end
+
+    def get_task(key)
+      synchronize do
+        @tasks[key]
+      end
+    end
+
+    def delete_task(key)
+      synchronize do
+        @tasks.delete(key)
+      end
+    end
+
+    private
+
+    def synchronize
+      unless Thread.current == @thread_in_sync
+        @mutex.synchronize do
+          @thread_in_sync = Thread.current
+          yield
+        end
+      else
+        yield
+      end
+    end
+
+    def pull_due_tasks()
+      synchronize do
+        time_now = Time.now
+        due_tasks = []
+        @tasks.delete_if do |key, task|
+          if task.exec_at <= time_now
+            due_tasks << task
+            if task.interval
+              task.exec_at = time_now + task.interval
+              false
+            else
+              true
+            end
+          else
+            false
+          end
+        end
+        return due_tasks
+      end
+    end
+
+  end
+end

data/lib/termtter/twitter.rb

@@ -1,4 +1,7 @@
+# -*- coding: utf-8 -*-
+
 require 'highline'
+require 'time'
 
 module Termtter
   class Twitter
@@ -27,7 +30,15 @@ module Termtter
 
     def get_user_profile(screen_name)
       uri = "#{@connection.protocol}://twitter.com/users/show/#{screen_name}.json"
-      return JSON.parse(open(uri, :http_basic_authentication => [user_name, password], :proxy => @connection.proxy_uri).read)
+      result = JSON.parse(open(uri, :http_basic_authentication => [user_name, password], :proxy => @connection.proxy_uri).read)
+      user = User.new
+      %w[ name favourites_count url id description protected utc_offset time_zone
+          screen_name notifications statuses_count followers_count friends_count
+          profile_image_url location following created_at
+      ].each do |attr|
+        user.__send__("#{attr}=".to_sym, result[attr])
+      end
+      return user
     end
 
     def get_friends_timeline(since_id = nil)
@@ -50,8 +61,8 @@ module Termtter
       return results.map do |s|
         status = Status.new
         status.id = s['id']
-        status.text = CGI.unescapeHTML(s['text']).gsub(/(\n|\r)/, '').gsub(query, color(color(query, 41), 37))
-        status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
+        status.text = CGI.unescapeHTML(s['text']).gsub(/(\n|\r)/, '').gsub(/#{Regexp.escape(query)}/i, color(color('\0', 41), 37))
+        status.created_at = Time.parse(s["created_at"])
         status.user_screen_name = s['from_user']
         status
       end
@@ -74,7 +85,7 @@ module Termtter
       data = [data] unless data.instance_of? Array
       return data.map do |s|
         status = Status.new
-        status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
+        status.created_at = Time.parse(s["created_at"])
         %w(id text truncated in_reply_to_status_id in_reply_to_user_id in_reply_to_screen_name).each do |key|
           status.__send__("#{key}=".to_sym, s[key])
         end

data/lib/termtter/user.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+module Termtter
+  class User
+    %w[ name favourites_count url id description protected utc_offset time_zone
+        screen_name notifications statuses_count followers_count friends_count
+        profile_image_url location following created_at
+    ].each do |attr|
+      attr_accessor attr.to_sym
+    end
+  end  
+end
+

data/run_termtter.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 $KCODE = 'u'
 

data/test/test_termtter.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'rubygems'
 require 'configatron'
 require 'test/unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors: 
 - bubblegum
@@ -18,8 +18,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -08:00
-default_executable: termtter
+date: 2009-02-01 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -61,6 +61,7 @@ description: Termtter is a terminal based Twitter client
 email: 
 - jugyo.org@gmail.com
 executables: 
+- kill_termtter
 - termtter
 extensions: []
 
@@ -75,6 +76,7 @@ files:
 - PostInstall.txt
 - README.rdoc
 - Rakefile
+- bin/kill_termtter
 - bin/termtter
 - lib/filter/en2ja.rb
 - lib/filter/english.rb
@@ -84,6 +86,7 @@ files:
 - 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
@@ -100,12 +103,16 @@ files:
 - 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
@@ -130,8 +137,12 @@ files:
 - 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