jugyo-termtter 0.2.3 → 0.3.0

data/README.rdoc

@@ -21,7 +21,7 @@ Run:
 
 == INSTALL:
 
-  sudo gem install jugyo-termtter
+  sudo gem install jugyo-termtter -s http://gems.github.com
 
 == LICENSE:
 

data/bin/termtter

@@ -2,9 +2,16 @@
 
 $KCODE = 'u'
 
-$:.unshift(File.dirname(__FILE__) + "/../lib")
+self_file =
+  if File.ftype(__FILE__) == 'link'
+    File.readlink(__FILE__)
+  else
+    __FILE__
+  end
+$:.unshift(File.dirname(self_file) + "/../lib")
 
 require 'termtter'
+require 'termtter/standard_commands'
 require 'termtter/stdout'
 require 'configatron'
 

data/lib/termtter.rb

@@ -10,20 +10,31 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Termtter
-  VERSION = '0.2.3'
-  
+  VERSION = '0.3.0'
+
+  class CommandNotFound < StandardError; end
+
   class Client
-    
+
     @@hooks = []
+    @@commands = {}
 
     def self.add_hook(&hook)
       @@hooks << hook
     end
 
-    def self.clear_hook
+    def self.clear_hooks
       @@hooks.clear
     end
-    
+
+    def self.add_command(regex, &block)
+      @@commands[regex] = block
+    end
+
+    def self.clear_commands
+      @@commands.clear
+    end
+
     attr_reader :since_id
 
     def initialize
@@ -51,7 +62,7 @@ module Termtter
       statuses = get_timeline("http://twitter.com/statuses/friends_timeline.xml")
       call_hooks(statuses, :list_friends_timeline)
     end
-    
+
     def update_friends_timeline
       uri = "http://twitter.com/statuses/friends_timeline.xml"
       if @since_id && !@since_id.empty?
@@ -86,7 +97,7 @@ module Termtter
       call_hooks(statuses, :search)
       return statuses
     end
-    
+
     def show(id)
       statuses = get_timeline("http://twitter.com/statuses/show/#{id}.xml")
       call_hooks(statuses, :show)
@@ -132,12 +143,45 @@ module Termtter
       return statuses
     end
 
+    def call_commands(text)
+      return if text.empty?
+      
+      command_found = false
+      @@commands.each do |key, command|
+        if key =~ text
+          command_found = true
+          begin
+            command.call(self, $~)
+          rescue => e
+            puts "Error: #{e}"
+            puts e.backtrace.join("\n")
+          end
+        end
+      end
+
+      raise CommandNotFound unless command_found
+    end
+
+    def pause
+      @pause = true
+    end
+
+    def resume
+      @pause = false
+      @update.run
+    end
+
+    def exit
+      @update.kill
+      @input.kill
+    end
+
     def run
-      pause = false
+      @pause = false
 
-      update = Thread.new do
-        while true
-          if pause
+      @update = Thread.new do
+        loop do
+          if @pause
             Thread.stop
           end
           update_friends_timeline()
@@ -145,61 +189,13 @@ module Termtter
         end
       end
 
-      input = Thread.new do
+      @input = Thread.new do
         while buf = Readline.readline("", true)
           begin
-            case buf
-            when ''
-              # do nothing
-            when 'debug'
-              if @debug
-                update_friends_timeline()
-              end
-            when /^(post|p)\s+(.*)/, /^(update|u)\s+(.*)/
-              unless $2.empty?
-                update_status($2)
-                puts "=> #{$2}"
-              end
-            when /^(list|l)\s*$/
-              list_friends_timeline()
-            when /^(list|l)\s+([^\s]+)/
-              get_user_timeline($2)
-            when /^(search|s)\s+(.*)/
-              unless $2.empty?
-                search($2)
-              end
-            when /^(replies|r)\s*$/
-              replies()
-            when /^show\s+([^\s]+)/
-              show($1)
-            when /^pause\s*$/
-              pause = true
-            when /^resume\s*$/
-              pause = false
-              update.run
-            when /^exit\s*$/
-              update.kill
-              input.kill
-            when /^help\s*$/
-              puts <<-EOS
-exit              Exit
-help              Print this help message
-list,l            List the posts in your friends timeline
-list USERNAME     List the posts in the the given user's timeline
-pause             Pause updating
-update,u TEXT     Post a new message
-resume            Resume updating
-replies,r         List the most recent @replies for the authenticating user
-search,s TEXT     Search for Twitter
-show ID           Show a single status
-update TEXT       Update friends timeline
-            EOS
-            else
-              puts <<-EOS
-Unknown command "#{buf}"
-Enter "help" for instructions
-            EOS
-            end
+            call_commands(buf)
+          rescue CommandNotFound => e
+            puts "Unknown command \"#{buf}\""
+            puts 'Enter "help" for instructions'
           rescue => e
             puts "Error: #{e}"
             puts e.backtrace.join("\n")
@@ -208,13 +204,13 @@ Enter "help" for instructions
       end
 
       stty_save = `stty -g`.chomp
-      trap("INT") { system "stty", stty_save; exit }
+      trap("INT") { system "stty", stty_save; self.exit }
 
-      input.join
+      @input.join
     end
 
   end
-  
+
   class Status
     %w(
       id text created_at truncated in_reply_to_status_id in_reply_to_user_id 

data/test/test_termtter.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'configatron'
 require 'test/unit'
+require 'kagemusha'
 require File.dirname(__FILE__) + '/../lib/termtter'
 
 class TestTermtter < Test::Unit::TestCase
@@ -8,7 +9,7 @@ class TestTermtter < Test::Unit::TestCase
     configatron.user_name = 'test'
     configatron.password = 'test'
     @termtter = Termtter::Client.new
-    
+
     Termtter::Client.add_hook do |statuses, event|
       @statuses = statuses
       @event = event
@@ -16,11 +17,7 @@ class TestTermtter < Test::Unit::TestCase
   end
 
   def test_get_timeline
-    def @termtter.open(*arg)
-      return File.open(File.dirname(__FILE__) + '/../test/friends_timeline.xml')
-    end
-
-    statuses = @termtter.get_timeline('')
+    statuses = swap_open('friends_timeline.xml') { @termtter.get_timeline('') }
 
     assert_equal 3, statuses.size
     assert_equal '102', statuses[0].user_id
@@ -34,22 +31,14 @@ class TestTermtter < Test::Unit::TestCase
     assert_equal 'texttext 0', statuses[2].text
     assert_equal 'Thu Dec 25 22:10:57 +0900 2008', statuses[2].created_at.to_s
   end
-  
-  def test_get_timeline_with_update_since_id
-    def @termtter.open(*arg)
-      return File.open(File.dirname(__FILE__) + '/../test/friends_timeline.xml')
-    end
 
-    statuses = @termtter.get_timeline('', true)
+  def test_get_timeline_with_update_since_id
+    statuses = swap_open('friends_timeline.xml') { @termtter.get_timeline('', true) }
     assert_equal '10002', @termtter.since_id
   end
-  
-  def test_search
-    def @termtter.open(*arg)
-      return File.open(File.dirname(__FILE__) + '/../test/search.atom')
-    end
 
-    statuses = @termtter.search('')
+  def test_search
+    statuses = swap_open('search.atom') { @termtter.search('') }
     assert_equal 3, statuses.size
     assert_equal 'test2', statuses[0].user_screen_name
     assert_equal 'Test User 2', statuses[0].user_name
@@ -60,23 +49,47 @@ class TestTermtter < Test::Unit::TestCase
     assert_equal 'texttext 0', statuses[2].text
     assert_equal 'Thu Dec 25 22:42:36 +0900 2008', statuses[2].created_at.to_s
   end
-  
+
   def test_add_hook
-    def @termtter.open(*arg)
-      return File.open(File.dirname(__FILE__) + '/../test/search.atom')
-    end
     call_hook = false
     Termtter::Client.add_hook do |statuses, event|
       call_hook = true
     end
-    @termtter.search('')
-    
+    swap_open('search.atom'){ @termtter.search('') }
+
     assert_equal true, call_hook
-    
-    Termtter::Client.clear_hook()
+
+    Termtter::Client.clear_hooks()
     call_hook = false
     @termtter.search('')
-    
+
     assert_equal false, call_hook
   end
+  
+  def test_add_command
+    command_text = nil
+    matche_text = nil
+    Termtter::Client.add_command /foo\s+(.*)/ do |termtter, matche|
+      command_text = matche[0]
+      matche_text = matche[1]
+    end
+    
+    @termtter.call_commands('foo xxxxxxxxxxxxxx')
+    assert_equal 'foo xxxxxxxxxxxxxx', command_text
+    assert_equal 'xxxxxxxxxxxxxx', matche_text
+    
+    Termtter::Client.clear_commands()
+    assert_raise Termtter::CommandNotFound do
+      @termtter.call_commands('foo xxxxxxxxxxxxxx')
+    end
+  end
+
+  def swap_open(name)
+    Kagemusha.new(Termtter::Client).def(:open) {
+      File.open(File.dirname(__FILE__) + "/../test/#{name}")
+    }.swap do
+      yield
+    end
+  end
+  private :swap_open
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-28 00:00:00 -08:00
+date: 2009-01-03 00:00:00 -08:00
 default_executable: termtter
 dependencies: 
 - !ruby/object:Gem::Dependency