termtter 1.7.2 → 1.8.0

data/lib/plugins/defaults/standard_completion.rb

@@ -4,6 +4,20 @@ require 'set'
 
 module Termtter::Client
 
+  #
+  # completion for status ids
+  # (This is needed for some plugins)
+  #
+
+  public_storage[:status_ids] ||= Set.new
+
+  register_hook(:collect_status_ids, :point => :pre_filter) do |statuses, event|
+    statuses.each do |s|
+      public_storage[:status_ids].add(s.id)
+      public_storage[:status_ids].add(s.in_reply_to_status_id) if s.in_reply_to_status_id
+    end
+  end
+
   #
   # completion for user names
   #

data/lib/plugins/defaults/stdout.rb

@@ -10,7 +10,7 @@ config.plugins.stdout.set_default(
   [
     '<90><%=time%> [<%=status_id%>]</90> ',
     '<%= indent_text %>',
-    '<<%=color%>><%=s.user.screen_name%>: <%=colorize_users(text)%></<%=color%>> ',
+    '<<%=color%>><%=s.user.screen_name%>: <%=text%></<%=color%>> ',
     '<90>',
     '<%=reply_to_status_id ? " (reply_to [#{reply_to_status_id}]) " : ""%>',
     '<%=retweeted_status_id ? " (retweet_to [#{retweeted_status_id}]) " : ""%>',
@@ -18,6 +18,8 @@ config.plugins.stdout.set_default(
     '</90>'
   ].join('')
 )
+config.plugins.stdout.set_default(:sweets, %w[jugyo ujm sora_h lingr_termtter termtter hitode909 nanki sixeight])
+config.plugins.stdout.set_default(:sweet_color, 'red')
 config.plugins.stdout.set_default(:time_format_today, '%H:%M:%S')
 config.plugins.stdout.set_default(:time_format_not_today, '%y/%m/%d %H:%M')
 config.plugins.stdout.set_default(:enable_pager, false)
@@ -28,6 +30,8 @@ config.plugins.stdout.set_default(:typable_id_prefix, '$')
 config.plugins.stdout.set_default(:show_reply_chain, true)
 config.plugins.stdout.set_default(:indent_format, %q("#{'    ' * (indent - 1)}  → "))
 config.plugins.stdout.set_default(:max_indent_level, 1)
+config.plugins.stdout.set_default(
+  :screen_name_to_hash_proc, lambda { |screen_name| screen_name.to_i(36) })
 
 module Termtter
   class TypableIdGenerator
@@ -64,7 +68,8 @@ module Termtter
     @typable_id_generator = TypableIdGenerator.new(config.plugins.stdout.typable_ids)
 
     def self.data_to_typable_id(data)
-      id = config.plugins.stdout.typable_id_prefix + @typable_id_generator.get_id(data)
+      id = config.plugins.stdout.typable_id_prefix +
+        @typable_id_generator.get_id(data)
     end
 
     def self.typable_id_to_data(id)
@@ -102,12 +107,14 @@ module Termtter
         output_text << status_line(s, time_format, event)
       end
 
-      if config.plugins.stdout.enable_pager && ENV['LINES'] && statuses.size > ENV['LINES'].to_i
-        file = Tempfile.new('termtter')
-        file.print output_text
-        file.close
-        system "#{config.plugins.stdout.pager} #{file.path}"
-        file.close(true)
+      if config.plugins.stdout.enable_pager &&
+        ENV['LINES'] &&
+        statuses.size > ENV['LINES'].to_i
+          file = Tempfile.new('termtter')
+          file.print output_text
+          file.close
+          system "#{config.plugins.stdout.pager} #{file.path}"
+          file.close(true)
       else
         print output_text
       end
@@ -116,7 +123,7 @@ module Termtter
     def status_line(s, time_format, event, indent = 0)
       return '' unless s
       text = TermColor.escape(s.text)
-      color = config.plugins.stdout.colors[s.user.id.to_i % config.plugins.stdout.colors.size]
+      color = color_of_user(s.user)
       status_id = Termtter::Client.data_to_typable_id(s.id)
       reply_to_status_id =
         if s.in_reply_to_status_id
@@ -139,18 +146,25 @@ module Termtter
         when 'web' then 'web'
         end
 
+      text = colorize_users(text)
+      text = Client.get_hooks(:pre_coloring).inject(text) {|result, hook|
+        Termtter::Client.logger.debug "stdout status_line: call hook :pre_coloring #{hook.inspect}"
+        hook.call(result, event)
+      }
       indent_text = indent > 0 ? eval(config.plugins.stdout.indent_format) : ''
       erbed_text = ERB.new(config.plugins.stdout.timeline_format).result(binding)
-
-      erbed_text = Client.get_hooks(:pre_coloring).inject(erbed_text){|result, hook| hook.call(result, event)}
-
+      erbed_text = Client.get_hooks(:pre_output).inject(erbed_text) {|result, hook|
+        Termtter::Client.logger.debug "stdout status_line: call hook :pre_output #{hook.inspect}"
+        hook.call(result, event)
+      }
       text = TermColor.unescape(TermColor.parse(erbed_text) + "\n")
       if config.plugins.stdout.show_reply_chain && s.in_reply_to_status_id
         indent += 1
         unless indent > config.plugins.stdout.max_indent_level
           begin
-            status = Termtter::API.twitter.show(s.in_reply_to_status_id)
-            text << status_line(status, time_format, event, indent)
+            if status = Termtter::API.twitter.cached_status(s.in_reply_to_status_id)
+              text << status_line(status, time_format, event, indent)
+            end
           rescue Rubytter::APIError
           end
         end
@@ -159,19 +173,35 @@ module Termtter
     end
 
     def colorize_users(text)
-      text.gsub(/@(\w+)/) do |i|
-        user = Termtter::API.twitter.cached_user($1)
-        if user
-          color = user_color(user)
-          "<#{color}>#{i}</#{color}>"
-        else
-          i
-        end
+      text.gsub(/@([0-9A-Za-z_]+)/) do |i|
+        color = color_of_screen_name($1)
+        "<#{color}>#{i}</#{color}>"
       end
     end
 
-    def user_color(user)
-      config.plugins.stdout.colors[user.id.to_i % config.plugins.stdout.colors.size]
+    def color_of_user(user)
+      color_of_screen_name(user.screen_name)
+    end
+
+    def color_of_screen_name(screen_name)
+      return color_of_screen_name_cache[screen_name] if
+        color_of_screen_name_cache.key?(screen_name)
+      num = screen_name_to_hash(screen_name)
+      color = config.plugins.stdout.instance_eval {
+        sweets.include?(screen_name) ?
+          sweet_color : colors[num % colors.size]
+      }
+      color_of_screen_name_cache[screen_name] = color
+      color_of_screen_name_cache[screen_name]
+    end
+
+    def screen_name_to_hash(screen_name)
+      config.plugins.stdout.screen_name_to_hash_proc.
+        call(screen_name)
+    end
+
+    def color_of_screen_name_cache
+      @color_of_screen_name_cache ||= {}
     end
   end
 
@@ -196,6 +226,8 @@ end
 # stdout.rb
 #   output statuses to stdout
 # example config
-#   config.plugins.stdout.colors = [:none, :red, :green, :yellow, :blue, :magenta, :cyan]
-#   config.plugins.stdout.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>'
+#   config.plugins.stdout.colors =
+#     [:none, :red, :green, :yellow, :blue, :magenta, :cyan]
+#   config.plugins.stdout.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>'

data/lib/plugins/defaults/user.rb

@@ -0,0 +1,32 @@
+module Termtter::Client
+  register_command(
+    'user show',
+    :aliases => [:p, :profile],
+    :help => ["user show USERNAME", "Show user's profile."]
+  ) do |arg|
+    user_name = arg.empty? ? config.user_name : arg
+    user = Termtter::API.twitter.user(user_name)
+    attrs = %w[ name screen_name url description profile_image_url location protected following
+    friends_count followers_count statuses_count favourites_count
+    id time_zone created_at utc_offset notifications
+    ]
+    label_width = attrs.map(&:size).max
+    attrs.each do |attr|
+      value = user.__send__(attr.to_sym)
+      puts "#{attr.gsub('_', ' ').rjust(label_width)}: #{value}"
+    end
+  end
+
+  class UserSearchEvent; attr_reader :query; def initialize(query); @query = query end; end
+
+  register_command(
+    'user search',
+    :help => ["user search QUERY", "search users"]
+  ) do |arg|
+    search_option = config.user_search.option.empty? ? {} : config.user_search.option
+    users = Termtter::API.twitter.search_user(arg, search_option)
+    users.each do |user|
+      puts "@#{user.screen_name} (#{user.name}): #{user.description}"
+    end
+  end
+end

data/lib/plugins/draft.rb

@@ -34,22 +34,19 @@ module Termtter::Client
 
   register_command('draft exec') do |arg|
     index = get_draft_index(arg)
-    if index
-      command = public_storage[:drafts][index]
-      if command
-        puts "exec => \"#{command}\""
-        execute(public_storage[:drafts][index])
-        public_storage[:drafts].delete_at(index)
-      end
-    end
+    break unless index
+    command = public_storage[:drafts][index]
+    break unless command
+    puts "exec => \"#{command}\""
+    execute(public_storage[:drafts][index])
+    public_storage[:drafts].delete_at(index)
   end
 
   register_command('draft delete') do |arg|
     index = get_draft_index(arg)
-    if index
-      deleted = public_storage[:drafts].delete_at(index)
-      puts "deleted => \"#{deleted}\"" if deleted
-    end
+    break unless index
+    deleted = public_storage[:drafts].delete_at(index)
+    puts "deleted => \"#{deleted}\"" if deleted
   end
 
   register_command('draft clear') do |arg|

data/lib/plugins/easy_post.rb

@@ -0,0 +1,5 @@
+module Termtter::Client
+  register_hook(:easy_post, :point => :command_not_found) do |text|
+    execute("update #{text}")
+  end
+end

data/lib/plugins/event_invoked_at.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+
+  register_hook(
+    :name => :set_invoked_at,
+    :point => :pre_filter,
+    :exec_proc => lambda do |statuses, event|
+      event[:invoked_at] = Time.now
+      statuses
+    end
+  )
+
+  register_hook(
+    :name => :print_invoked_at,
+    :point => :post_filter,
+    :exec_proc => lambda do |statuses, event|
+      puts "event was invoked at #{event.invoked_at}."
+      statuses
+    end
+  )
+
+end

data/lib/plugins/expand-tinyurl.rb

@@ -1,30 +1,22 @@
 # -*- coding: utf-8 -*-
 
 URL_SHORTTERS = [
-  { :host => "tinyurl.com", :pattern => %r'(http://tinyurl\.com(/[\w/]+))' },
-  { :host => "is.gd", :pattern => %r'(http://is\.gd(/[\w/]+))' },
-  { :host => "bit.ly", :pattern => %r'(http://bit\.ly(/[\w/]+))' },
-  { :host => "ff.im", :pattern => %r'(http://ff\.im(/[-\w/]+))'},
-  { :host => "j.mp", :pattern => %r'(http://j\.mp(/[\w/]+))' },
-  { :host => "goo.gl", :pattern => %r'(http://goo\.gl(/[\w/]+))' },
+  {:host => "tinyurl.com", :pattern => %r'(http://tinyurl\.com(/[\w/]+))'},
+  {:host => "is.gd", :pattern => %r'(http://is\.gd(/[\w/]+))'},
+  {:host => "bit.ly", :pattern => %r'(http://bit\.ly(/[\w/]+))'},
+  {:host => "ff.im", :pattern => %r'(http://ff\.im(/[-\w/]+))'},
+  {:host => "j.mp", :pattern => %r'(http://j\.mp(/[\w/]+))'},
+  {:host => "goo.gl", :pattern => %r'(http://goo\.gl(/[\w/]+))'},
+  {:host => "tr.im", :pattern => %r'(http://tr\.im(/[\w/]+))'},
+  {:host => "short.to", :pattern => %r'(http://short\.to(/[\w/]+))'},
+  {:host => "ow.ly", :pattern => %r'(http://ow\.ly(/[\w/]+))'},
+  {:host => "u.nu", :pattern => %r'(http://u\.nu(/[\w/]+))'},
+  {:host => "twurl.nl", :pattern => %r'(http://twurl\.nl(/\w+))'},
 ]
 
 config.plugins.expand_tinyurl.set_default(:shortters, [])
 config.plugins.expand_tinyurl.set_default(:skip_users, [])
 
-# for Ruby 1.8
-unless String.public_method_defined?(:force_encoding)
-  class String
-    def force_encoding(enc)
-      self
-    end
-  end
-
-  module Encoding
-    UTF_8 = nil
-  end
-end
-
 Termtter::Client::register_hook(
   :name => :expand_tinyurl,
   :point => :filter_for_output,
@@ -48,7 +40,8 @@ def expand_url(host, path)
     h.get(path, { 'User-Agent' => 'Mozilla' })
   end
   return nil unless res.code == "301" or res.code == "302"
-  res['Location'].force_encoding(Encoding::UTF_8)
+  newurl = res['Location']
+  newurl.respond_to?(:force_encoding) ? newurl.force_encoding(Encoding::UTF_8) : newurl
 rescue Exception => e
   Termtter::Client.handle_error(e)
   nil

data/lib/plugins/favotter.rb

@@ -5,7 +5,6 @@ require 'nokogiri'
 require 'open-uri'
 
 module Termtter::Client
-
   public_storage[:favorited_ids] = {}
 
   class << self
@@ -28,11 +27,12 @@ module Termtter::Client
     end
 
     private
+
     def parse(url)
       doc = Nokogiri(open(url).read)
       doc.css('div.entry').map do |entry|
         id     = entry['id'].gsub(/\Astatus_/, '')
-        text   = entry.css('span.status_text').first.content
+        text   = CGI.unescapeHTML(entry.css('span.status_text').first.content)
         amount = entry.css('div.info span.favotters').first.content
         amount = amount.match(/(\d+)/)[1].to_i
         users  = entry.css('div.info span.favotters img').map {|u| u['title'] }
@@ -53,13 +53,14 @@ module Termtter::Client
 
   help = ['favotter [USERNAME] [THRESHOLD]', 'Show info from favotter']
   register_command('favotter', :help => help) do |arg|
-    target = if arg.empty?
+    target =
+      if arg.empty?
        config.user_name
-     else
-       args = arg.split
-       threshold = args.size == 1 ? 1 : args[1]
-       args[0]
-    end
+      else
+        args = arg.split
+        threshold = args.size == 1 ? 1 : args[1]
+        args[0]
+      end
     if /@(.*)/ =~ target
       target = $1
     end
@@ -74,4 +75,3 @@ module Termtter::Client
     end
   end
 end
-

data/lib/plugins/footer.rb

@@ -1,22 +1,19 @@
 #-*- coding: utf-8 -*-
-
-config.set_default('footer',nil)
+config.set_default('footer', nil)
 
 Termtter::Client.register_hook(
   :name => :add_footer,
   :points => [:modify_arg_for_update, :modify_arg_for_reply],
-  :exec => lambda {|cmd, arg| 
-                    (config.footer.nil? || config.footer.empty?) ? arg : arg + " #{config.footer}"
-                  }
-)
+  :exec => lambda {|cmd, arg|
+    (config.footer.nil? || config.footer.empty?) ?
+      arg : arg + " #{config.footer}"
+  })
 
 Termtter::Client.register_command(
   :name => :footer,
   :aliases => [:ft],
   :exec => lambda {|arg|
-                    arg.empty? ? config.footer = nil : config.footer = arg
-                    puts config.footer.nil? ? "footer is turned off" : "new footer=> #{config.footer}"
-                  } 
-)
-
-
+    arg.empty? ? config.footer = nil : config.footer = arg
+    puts config.footer.nil? ?
+      "footer is turned off" : "new footer=> #{config.footer}"
+  })

data/lib/plugins/friends.rb

@@ -1,31 +1,5 @@
 # -*- coding: utf-8 -*-
 module Termtter::Client
-
-  class << self
-    def get_friends(user_name, max)
-      friends = []
-      cursor = -1
-      begin
-        tmp = Termtter::API::twitter.friends(user_name, :cursor => cursor)
-        cursor = tmp[:next_cursor]
-        friends += tmp[:users]
-        puts "#{friends.length}/#{max}"
-      rescue
-      end until (cursor.zero? or friends.length > max)
-      friends.take(max)
-    end
-  end
-
-  register_command(
-    :name => :friends, :aliases => [:following],
-    :exec_proc => lambda {|arg|
-      user_name = arg.empty? ? config.user_name : arg
-      public_storage[:friends] = friends = get_friends(user_name, 2000)
-      puts friends.map(&:screen_name).join(' ')
-    },
-    :help => ["friends,following [USERNAME]", "Show user's friends."]
-  )
-
   register_command(
     :name => :diff_follow, :aliases => [:diff],
     :exec_proc => lambda {|arg|

data/lib/plugins/grass.rb

@@ -1,21 +1,19 @@
 # -*- coding: utf-8 -*-
 module Termtter
   module Client
-
     config.plugins.grass.set_default(:rate, 0)
 
     register_command(
       :name => :w, :aliases => [:grass],
       :exec_proc => lambda {|arg|
         arg, rate = arg.split(/ /)
-        count = arg =~ /^[0-9]+$/ ? arg.to_i : 3
+        count = /^[0-9]+$/ =~ arg ? arg.to_i : 3
         rate ||= config.plugins.grass.rate
         grow = (count * rate.to_i).quo(100).round
         grasses = ('w' * (count-grow) + 'W' * grow).split(//).shuffle.join
         execute("update #{grasses}")
       },
-      :help => ['grass, w', 'Grass it!']
-    )
+      :help => ['grass, w', 'Grass it!'])
   end
 end