jugyo-termtter 0.5.2 → 0.5.3

data/lib/termtter/completion.rb

@@ -1,6 +1,6 @@
 require 'set'
 
-class Termtter::Client
+module Termtter::Client
 
   public_storage[:users] ||= Set.new
 
@@ -25,24 +25,23 @@ module Termtter
 
     Commands = %w[exit help list pause update resume replies search show uri-open]
 
+    def self.find_candidates(a, b)
+      if a.empty?
+        Termtter::Client.public_storage[:users].to_a
+      else
+        Termtter::Client.public_storage[:users].
+          grep(/^#{Regexp.quote a}/i).map {|u| b % u }
+      end
+    end
+
     CompletionProc = proc {|input|
       case input
       when /^l(ist)? +(.*)/
-        username = $2
-        if username.empty?
-          Termtter::Client.public_storage[:users].to_a
-        else
-          Termtter::Client.public_storage[:users].to_a.
-            grep(/^#{Regexp.quote username}/).map{|u| "list #{u}"}
-        end
+        find_candidates $2, "list %s"
+      when /^(update|u)\s+(.*)@([^\s]*)$/
+        find_candidates $3, "#{$1} #{$2}@%s"
       when /^uri-open +(.*)/
-        uri_open_com = $1
-        if uri_open_com.empty?
-          %w[clear list]
-        else
-          %w[clear list].
-            grep(/^#{Regexp.quote uri_open_com}/).map{|c| "uri-open #{c}"}
-        end
+        find_candidates $1, "uri-open %s"
       else
         Commands.grep(/^#{Regexp.quote input}/)
       end

data/lib/termtter/say.rb

@@ -7,7 +7,7 @@ def say(who, what)
   system 'say', '-v', voice, what
 end
 
-class Termtter::Client
+module Termtter::Client
   add_hook do |statuses, event, t|
     if !statuses.empty? && event == :update_friends_timeline
       statuses.reverse.each do |s|

data/lib/termtter/standard_commands.rb

@@ -1,4 +1,4 @@
-class Termtter::Client
+module Termtter::Client
 
   add_command /^(update|u)\s+(.*)/ do |m, t|
     text = m[2]

data/lib/termtter/uri-open.rb

@@ -1,4 +1,4 @@
-class Termtter::Client
+module Termtter::Client
   public_storage[:uris] = []
 
   add_hook do |statuses, event, t|

data/lib/termtter.rb

@@ -5,12 +5,15 @@ require 'cgi'
 require 'readline'
 require 'enumerator'
 require 'parsedate'
+require 'configatron'
 
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+configatron.set_default(:update_interval, 300)
+
 module Termtter
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 
   class Twitter
 
@@ -82,7 +85,7 @@ module Termtter
     end
   end
 
-  class Client
+  module Client
 
     @@hooks = []
     @@commands = {}
@@ -144,19 +147,19 @@ module Termtter
 
     def self.resume
       @@pause = false
-      @@update.run
+      @@update_thread.run
     end
 
     def self.exit
-      @@update.kill
-      @@input.kill
+      @@update_thread.kill
+      @@input_thread.kill
     end
 
     def self.run
       @@pause = false
       tw = Termtter::Twitter.new(configatron.user_name, configatron.password)
 
-      @@update = Thread.new do
+      @@update_thread = Thread.new do
         since_id = nil
         loop do
           begin
@@ -177,7 +180,7 @@ module Termtter
         end
       end
 
-      @@input = Thread.new do
+      @@input_thread = Thread.new do
         while buf = Readline.readline("", true)
           begin
             call_commands(buf, tw)
@@ -194,7 +197,7 @@ module Termtter
       stty_save = `stty -g`.chomp
       trap("INT") { system "stty", stty_save; exit }
 
-      @@input.join
+      @@input_thread.join
     end
 
   end

data/run_termtter.rb

@@ -13,7 +13,8 @@ $:.unshift(File.dirname(self_file) + "/lib")
 require 'termtter'
 require 'termtter/standard_commands'
 require 'termtter/stdout'
-require 'configatron'
+
+configatron.update_interval
 
 conf_file = File.expand_path('~/.termtter')
 if File.exist? conf_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-05 00:00:00 -08:00
+date: 2009-01-06 00:00:00 -08:00
 default_executable: termtter
 dependencies: 
 - !ruby/object:Gem::Dependency