termtter 1.3.0 → 1.3.1

data/ChangeLog

@@ -1,3 +1,27 @@
+== 1.3.1 2009-08-10
+
+Takaaki SONE:
+      Fixed help message for Exit
+      added protected column to users table.
+
+Tomohiro Nishimura:
+      add new command around the alias
+      more powerful list command available!
+      add alias method to Client module
+
+emasaka:
+      Added protected sign to default timeline_format.
+      Added hugeurl plugin: alternative of expand-tinyurl
+
+jugyo:
+      Fixed for termtter shutdown when raise network error.
+      Added a method 'command_exists?'
+      Changed to apply TermColor.unescape for status.text
+      Changed retweet command to add confirmation for protected user.
+
+ujihisa:
+      Ignore case for completion of user's screen name
+
 == 1.3.0 2009-07-27
 
 Koichiro Ohba (3):

data/lib/plugins/db.rb

@@ -21,6 +21,7 @@ unless DB.table_exists?(:users)
   DB.create_table :users do
     primary_key :id
     String :screen_name
+    boolean :protected
   end
 end
 
@@ -56,7 +57,12 @@ module Termtter
         if User.filter(:id => s.user.id).empty?
           user = {}
           User.columns.each do |col|
-            user[col] = s.user[col]
+            user[col] =
+              if event == :search && col == :protected
+                false
+              else
+                s.user[col]
+              end
           end
           User << user
         end

data/lib/plugins/defaults/auto_reload.rb

@@ -1,12 +1,22 @@
 # -*- coding: utf-8 -*-
 module Termtter::Client
   add_task(:name => :auto_reload, :interval => config.update_interval, :after => config.update_interval) do
-    call_commands('reload')
+    begin
+      call_commands('reload')
+    rescue Exception => e
+      handle_error(e)
+    end
   end
 
   register_hook(
     :name => :auto_reload_init,
     :point => :initialize,
-    :exec => lambda { call_commands('reload') }
+    :exec => lambda {
+      begin
+        call_commands('reload')
+      rescue Exception => e
+        handle_error(e)
+      end
+    }
   )
 end

data/lib/plugins/defaults/retweet.rb

@@ -4,6 +4,11 @@ config.plugins.retweet.set_default(:format, '<%= comment %>RT @<%=s.user.screen_
 
 module Termtter::Client
   def self.post_retweet(s, comment = nil)
+    if s.user.protected &&
+        !confirm("#{s.user.screen_name} is protected! Are you sure?", false)
+      return
+    end
+
     comment += ' ' unless comment.nil?
     text = ERB.new(config.plugins.retweet.format).result(binding)
     Termtter::API.twitter.update(text)

data/lib/plugins/defaults/standard_commands.rb

@@ -143,8 +143,11 @@ module Termtter::Client
         statuses = Termtter::API.twitter.friends_timeline
       else
         event = :list_user_timeline
-        user_name = normalize_as_user_name(arg)
-        statuses = Termtter::API.twitter.user_timeline(user_name)
+        statuses = []
+        Array(arg.split).each do |user|
+          user_name = normalize_as_user_name(user)
+          statuses += Termtter::API.twitter.user_timeline(user_name)
+        end
       end
       output(statuses, event)
     },
@@ -327,7 +330,7 @@ module Termtter::Client
   register_command(
     :name => :exit, :aliases => [:quit],
     :exec_proc => lambda {|arg| exit},
-    :help => ['exit,e', 'Exit']
+    :help => ['exit,quit', 'Exit']
   )
 
   register_command(
@@ -472,6 +475,35 @@ module Termtter::Client
     :help => ["redo,.", "Execute previous command"]
   )
 
+  register_command(:alias,
+    :help => ['alias NAME VALUE', 'Add alias for any operations']) do |text|
+    from, to = text.split(' ', 2)
+    next unless to
+    begin
+      add_alias from, to
+    rescue
+      STDOUT.print 'override? [y/n] '
+      STDOUT.flush
+      next unless /y/ =~ STDIN.gets.chomp
+      add_alias from, to, false
+    end
+    puts "#{from} => #{to}"
+  end
+
+  register_command(:remove_alias,
+    :help => ['remove_alias NAME', 'Remove alias completely']) do |target|
+    remove_alias target
+    STDOUT.puts 'done'
+  end
+
+  register_hook :aliases, :point => :pre_command do |text|
+    command, args = text.split(' ', 2)
+    if original = @aliases[command]
+      text = [original, args].compact.join(' ')
+    end
+    text
+  end
+
   def self.update_with_user_and_id(text, username, id)
     text = "@#{username} #{text}"
     result = Termtter::API.twitter.update(text, {'in_reply_to_status_id' => id})

data/lib/plugins/defaults/standard_completion.rb

@@ -27,7 +27,7 @@ module Termtter::Client
   register_hook(:collect_user_names, :point => :pre_filter) do |statuses, event|
     statuses.each do |s|
       public_storage[:users].add(s.user.screen_name)
-      public_storage[:users] += s.text.scan(/@([a-zA-Z_0-9]*)/).flatten
+      public_storage[:users] += s.text.scan(/@([a-zA-Z_0-9]*)/i).flatten
     end
   end
 
@@ -40,7 +40,7 @@ module Termtter::Client
         if part_of_user_name.nil? || part_of_user_name.empty?
           public_storage[:users].to_a
         else
-          public_storage[:users].grep(/^#{Regexp.quote(part_of_user_name)}/)
+          public_storage[:users].grep(/^#{Regexp.quote(part_of_user_name)}/i)
         end
 
       users.map {|u| "#{command_str}@%s" % u }
@@ -54,7 +54,7 @@ module Termtter::Client
   public_storage[:hashtag] ||= Set.new
 
   register_hook(:collect_hashtags, :point => /^post_exec_/) do |cmd, arg, result|
-    public_storage[:hashtag] += arg.scan(/\s+#([^\s]+)/).flatten if arg
+    public_storage[:hashtag] += arg.scan(/\s+#([^\s]+)/i).flatten if arg
   end
 
   register_hook(:hashtags_completion, :point => :completion) do |input|

data/lib/plugins/defaults/stdout.rb

@@ -8,7 +8,7 @@ config.plugins.stdout.set_default(:colors, (31..36).to_a + (91..96).to_a)
 config.plugins.stdout.set_default(
   :timeline_format,
   '<90><%=time%> [<%=status_id%>]</90> <<%=color%>><%=s.user.screen_name%>: <%=text%></<%=color%>> ' +
-  '<90><%=reply_to_status_id ? " (reply_to [#{reply_to_status_id}]) " : ""%><%=source%></90>'
+  '<90><%=reply_to_status_id ? " (reply_to [#{reply_to_status_id}]) " : ""%><%=source%><%=s.user.protected ? "[P]" : ""%></90>'
 )
 config.plugins.stdout.set_default(:enable_pager, true)
 config.plugins.stdout.set_default(:pager, 'less -R -f +G')
@@ -115,6 +115,7 @@ module Termtter
       erbed_text = ERB.new(config.plugins.stdout.timeline_format).result(binding)
       indent_text = indent > 0 ? "#{'    ' * (indent - 1)} ┗ " : ''
       text = TermColor.parse(indent_text + erbed_text) + "\n"
+      text = TermColor.unescape(text)
       if config.plugins.stdout.show_as_thread && s.in_reply_to_status_id
         text << status_line(Status[s.in_reply_to_status_id], time_format, indent + 1)
       end

data/lib/plugins/hugeurl.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+HUGEURL_TARGET_PATTERN = %r{
+    http://tinyurl\.com/[\w/]+
+  | http://is\.gd/[\w/]+
+  | http://bit\.ly/[\w/]+
+  | http://ff\.im/[-\w/]+
+  | http://tr\.im/[\w/]+
+}x
+
+config.plugins.hugeurl.set_default(:skip_users, [])
+
+Termtter::Client::register_hook(
+  :name => :hugeurl,
+  :point => :filter_for_output,
+  :exec_proc => lambda do |statuses, event|
+    http_class = Net::HTTP
+    unless config.proxy.host.nil? or config.proxy.host.empty?
+      http_class = Net::HTTP::Proxy(config.proxy.host,
+                                    config.proxy.port,
+                                    config.proxy.user_name,
+                                    config.proxy.password)
+    end
+    http_class.start('search.twitter.com') do |http|
+      statuses.each do |s|
+        config.plugins.hugeurl.skip_users.include?(s.user.screen_name) and next
+        s.text.gsub!(HUGEURL_TARGET_PATTERN) do |m|
+          res = http.get('/hugeurl?url=' + m)
+          res.code == '200' ? res.body : m
+        end
+      end
+    end
+    statuses
+  end
+)
+
+# hugeurl.rb:
+# expands bit.ly, tiniurl, etc. by search.twitter.com API

data/lib/termtter/client.rb

@@ -13,6 +13,7 @@ module Termtter
     @hooks = {}
     @commands = {}
     @filters = []
+    @aliases = {}
     @since_id = nil
     @task_manager = Termtter::TaskManager.new
 
@@ -41,6 +42,10 @@ module Termtter
         Termtter::Client.handle_error(e)
       end
 
+      def alias(name, value)
+        @aliases[name] = value
+      end
+
       def public_storage
         @public_storage ||= {}
       end
@@ -125,6 +130,17 @@ module Termtter
         register_command(command)
       end
 
+      def add_alias(from, to, confirm = true)
+        if confirm
+          raise 'Already exist' if @aliases[from]
+        end
+        @aliases[from] = to
+      end
+
+      def remove_alias(target)
+        @aliases.delete target
+      end
+
       # statuses => [status, status, ...]
       # status => {
       #             :id => status id,
@@ -176,7 +192,6 @@ module Termtter
 
       def call_commands(text)
         @task_manager.invoke_and_wait do
-          call_hooks("pre_command", text)
           # FIXME: This block can become Maybe Monad
           get_hooks("pre_command").each {|hook|
             break if text == nil # interrupt if hook returns nil
@@ -208,6 +223,10 @@ module Termtter
         end
       end
 
+      def command_exists?(text)
+        @commands.values.any? {|command| command.match?(text) }
+      end
+
       def find_commands(text)
         @commands.values.select {|command| command.match?(text) }
       end

data/lib/termtter/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module Termtter
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/termtter/client_spec.rb

@@ -368,6 +368,13 @@ module Termtter
         Client.find_commands('bar').size.should == 1
       end
 
+      it 'check command exists' do
+        Client.command_exists?('foo').should == false
+        Client.command_exists?('foo1').should == true
+        Client.command_exists?('bar').should == true
+        Client.command_exists?('foo1 bar').should == true
+      end
+
       it 'finds no command' do
         Client.find_commands('foo').size.should == 0
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 +09:00
+date: 2009-08-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - lib/plugins/http_server/favicon.ico
 - lib/plugins/http_server/index.html
 - lib/plugins/http_server.rb
+- lib/plugins/hugeurl.rb
 - lib/plugins/ignore.rb
 - lib/plugins/irb.rb
 - lib/plugins/irc_gw.rb