jugyo-termtter 0.5.8 → 0.6.0

data/README.rdoc

@@ -42,7 +42,7 @@ To update the config, just restart your termtter proccess.
 
 (The MIT License)
 
-Copyright (c) 2008 FIXME full name
+Copyright (c) 2008-2009 The Termtter Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -28,3 +28,11 @@ Dir['tasks/**/*.rake'].each { |t| load t }
 
 # TODO - want other tests/tasks run by default? Add them to the list
 # task :default => [:spec, :features]
+
+require 'spec/rake/spectask'
+desc 'run all specs'
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['-c']
+end
+

data/lib/plugin/english.rb

@@ -1,51 +1,60 @@
+require 'erb'
+
 Termtter::Client.clear_hooks # FIXME: not to clear all but to clear just stdout.rb
 
+configatron.set_default(
+  :timeline_format,
+  '<%= color(time, 90) %> <%= color(status, status_color) %> <%= color(id, 90) %>')
+
 # english? :: String -> Boolean
 def english?(message)
-  /[一-龠]+|[ぁ-ん]+|[ァ-ヴー]+|[ａ-ｚＡ-Ｚ０-９]+/ !~ message
+  /[��-��]+|[��-��]+|[��-����]+|[��-����-�ڣ�-��]+/ !~ message
+end
+
+def color(str, num)
+  "\e[#{num}m#{str}\e[0m"
 end
 
 # FIXME: The code below is a copy from stdout.rb so it's not DRY. DRY it.
+
 Termtter::Client.add_hook do |statuses, event|
   colors = %w(0 31 32 33 34 35 36 91 92 93 94 95 96)
 
   case event
   when :update_friends_timeline, :list_friends_timeline, :list_user_timeline, :show, :replies
     unless statuses.empty?
-      if event == :update_friends_timeline then statuses = statuses.reverse end
+      statuses.reverse! if event == :update_friends_timeline
       statuses.each do |s|
         text = s.text.gsub("\n", '')
         next unless english?(text) # if you substitute "if" for "unless", this script will be "japanese.rb"
-        color_num = colors[s.user_screen_name.hash % colors.size]
+        status_color = colors[s.user_screen_name.hash % colors.size]
         status = "#{s.user_screen_name}: #{text}"
         if s.in_reply_to_status_id
           status += " (reply to #{s.in_reply_to_status_id})"
         end
 
-        case event
-        when :update_friends_timeline, :list_friends_timeline
-          time_format = '%H:%M:%S'
-        else
-          time_format = '%m-%d %H:%d'
-        end
-        time_str = "(#{s.created_at.strftime(time_format)})"
+        time_format = case event
+          when :update_friends_timeline, :list_friends_timeline
+            '%H:%M:%S'
+          else
+            '%m-%d %H:%M'
+          end
+        time = "(#{s.created_at.strftime(time_format)})"
+
+        id = s.id
 
-        puts "#{color(time_str, 90)} #{color(status, color_num)}"
+        puts ERB.new(configatron.timeline_format).result(binding)
       end
     end
   when :search
     statuses.each do |s|
       text = s.text.gsub("\n", '')
-      color_num = colors[s.user_screen_name.hash % colors.size]
-      status = "#{s.user_screen_name}: #{text}"
-      time_str = "(#{s.created_at.strftime('%m-%d %H:%d')})"
+      status_color = colors[s.user_screen_name.hash % colors.size]
 
-      puts "#{color(time_str, 90)} #{color(status, color_num)}"
+      status = "#{s.user_screen_name}: #{text}"
+      time = "(#{s.created_at.strftime('%m-%d %H:%M')})"
+      id = s.id
+      puts ERB.new(configatron.timeline_format).result(binding)
     end
   end
 end
-
-# USAGE:
-#   Write the line on the *first line* of your ~/.termtter
-#     plugin 'english'
-#   (english.rb will destroy plugins which were required before)

data/lib/plugin/favorite.rb

@@ -1,4 +1,6 @@
 module Termtter::Client
+  add_help 'favorite,fav ID', 'Favorite a status'
+
   add_command %r'^(?:favorite|fav)\s+(\d+)$' do |m,t|
     id = m[1]
     res = t.favorite(id)
@@ -10,6 +12,8 @@ module Termtter::Client
   end
 
   if public_storage[:log]
+    add_help 'favorite,fav /word', 'Favorite a status by searching'
+
     add_command %r'^(?:favorite|fav)\s+/(.+)$' do |m,t|
       pat = Regexp.new(m[1])
       statuses = public_storage[:log].select { |s| s.text =~ pat }
@@ -32,15 +36,9 @@ module Termtter
   class Twitter
     def favorite(id)
       uri = "http://twitter.com/favourings/create/#{id}.json"
-      req = Net::HTTP::Post.new(uri)
-      req.basic_auth(@user_name, @password)
-      req.add_field('User-Agent', 'Termtter http://github.com/jugyo/termtter')
-      req.add_field('X-Twitter-Client', 'Termtter')
-      req.add_field('X-Twitter-Client-URL', 'http://github.com/jugyo/termtter')
-      req.add_field('X-Twitter-Client-Version', '0.1')
 
       Net::HTTP.start('twitter.com', 80) do |http|
-        http.request(req)
+        http.request(post_request(uri))
       end
     end
   end

data/lib/plugin/growl.rb

@@ -1,29 +1,48 @@
 require 'tmpdir'
+require 'open-uri'
 require 'uri'
 
+configatron.plugins.growl.set_default(:icon_cache_dir, "#{Dir.tmpdir}/termtter-icon-cache-dir")
+Dir.mkdir_p(configatron.plugins.growl.icon_cache_dir) unless File.exist?(configatron.plugins.growl.icon_cache_dir)
+
 def get_icon_path(s)
-  cache_dir = "#{Dir.tmpdir}/termtter-icon-cache-dir"
-  cache_file = "#{cache_dir}/#{s.user_id}"
-  unless File.exist?(cache_file)
-    Dir.mkdir(cache_dir) unless File.exist?(cache_dir)
-    buf = ""
-    File.open(URI.encode(s.user_profile_image_url)) do |f|
-      buf = f.read
+  cache_file = "%s/%s%s" % [  configatron.plugins.growl.icon_cache_dir, 
+                              s.user_screen_name, 
+                              File.extname(s.user_profile_image_url)  ]
+  if File.exist?(cache_file) && (File.atime(cache_file) + 24*60*60) > Time.now
+    return cache_file
+  else
+    Thread.new do
+      File.open(cache_file, "wb") do |f|
+        f << open(URI.escape(s.user_profile_image_url)).read
+      end
     end
-    File.open(cache_file, "w") do |f|
-      f.write(buf)
+    return nil
+  end
+end
+
+queue = []
+Thread.new do
+  loop do
+    begin
+      if s = queue.pop
+        arg = ['growlnotify', s.user_screen_name, '-m', s.text.gsub("\n",''), '-n', 'termtter']
+        #icon_path = get_icon_path(s)
+        #arg += ['--image', icon_path] if icon_path
+        system *arg
+      end
+    rescue => e
+      puts e
+      puts e.backtrace.join("\n")
     end
+    sleep 0.1
   end
-  cache_file
 end
 
 Termtter::Client.add_hook do |statuses, event|
   if !statuses.empty? && event == :update_friends_timeline
     statuses.reverse.each do |s|
-      text = s.text.gsub("\n",'')
-      icon_path = get_icon_path(s)
-      system 'growlnotify', s.user_screen_name, '-m', text,
-        '-n', 'termtter', '--image', icon_path
+      queue << s
     end
   end
 end

data/lib/plugin/log.rb

@@ -1,6 +1,8 @@
 module Termtter::Client
   public_storage[:log] = []
 
+  add_help '/word', 'Search log'
+
   add_hook do |statuses,event|
     case event
     when :update_friends_timeline

data/lib/plugin/plugin.rb

@@ -1,6 +1,39 @@
 module Termtter::Client
+
+  public_storage[:plugins] = Dir["#{File.dirname(__FILE__)}/*.rb"].map do |f|
+    f.match(%r|([^/]+).rb$|)[1]
+  end
+
+  add_help 'plugin FILE', 'Load a plugin'
   add_command /^plugin\s+(.*)/ do |m, t|
-    plugin m[1]
+    begin
+      result = plugin m[1].strip
+    rescue LoadError
+    ensure
+      puts "=> #{result.inspect}"
+    end
+  end
+
+  add_help 'plugins', 'Show list of plugins'
+  add_command /^plugins$/ do |m, t|
+    puts public_storage[:plugins].join("\n")
+  end
+
+  def self.find_plugin_candidates(a, b)
+    if a.empty?
+      public_storage[:plugins].to_a
+    else
+      public_storage[:plugins].grep(/^#{Regexp.quote a}/i)
+    end.
+    map {|u| b % u }
+  end
+
+  add_completion do |input|
+    if input =~ /^(plugin)\s+(.*)/
+      find_plugin_candidates $2, "#{$1} %s"
+    else
+      %w[ plugin plugins ].grep(/^#{Regexp.quote input}/)
+    end
   end
 end
 
@@ -10,5 +43,6 @@ end
 #   > u <%= not erbed %>
 #   => <%= not erbed %>
 #   > plugin erb
+#   => true
 #   > u <%= 1 + 2 %>
 #   => 3

data/lib/plugin/standard_plugins.rb

@@ -57,6 +57,7 @@ replies,r         List the most recent @replies for the authenticating user
 search,s TEXT     Search for Twitter
 show ID           Show a single status
     EOS
+    puts formatted_help unless @@helps.empty?
   end
 
   add_command /^eval\s+(.*)$/ do |m, t|
@@ -68,6 +69,15 @@ show ID           Show a single status
     end
   end
 
+  def self.formatted_help
+    width = @@helps.map {|n, d| n.size }.max
+    space = 3
+    "\nuser commands:\n" +
+      @@helps.map {|name, desc|
+        name.to_s.ljust(width + space) + desc.to_s
+      }.join("\n")
+  end
+
   # completion for standard commands
 
   require 'set'

data/lib/plugin/stdout.rb

@@ -1,6 +1,8 @@
 require 'erb'
 
-configatron.set_default(:timeline_format, '<%= color(time, 90) %> <%= status %> <%= color(id, 90) %>')
+configatron.set_default(
+  :timeline_format,
+  '<%= color(time, 90) %> <%= color(status, status_color) %> <%= color(id, 90) %>')
 
 def color(str, num)
   "\e[#{num}m#{str}\e[0m"
@@ -12,34 +14,34 @@ Termtter::Client.add_hook do |statuses, event|
   case event
   when :update_friends_timeline, :list_friends_timeline, :list_user_timeline, :show, :replies
     unless statuses.empty?
-      if event == :update_friends_timeline then statuses = statuses.reverse end
+      statuses.reverse! if event == :update_friends_timeline
       statuses.each do |s|
         text = s.text.gsub("\n", '')
-        color_num = colors[s.user_screen_name.hash % colors.size]
+        status_color = colors[s.user_screen_name.hash % colors.size]
         status = "#{s.user_screen_name}: #{text}"
         if s.in_reply_to_status_id
           status += " (reply to #{s.in_reply_to_status_id})"
         end
 
-        case event
-        when :update_friends_timeline, :list_friends_timeline
-          time_format = '%H:%M:%S'
-        else
-          time_format = '%m-%d %H:%M'
-        end
-
+        time_format = case event
+          when :update_friends_timeline, :list_friends_timeline
+            '%H:%M:%S'
+          else
+            '%m-%d %H:%M'
+          end
         time = "(#{s.created_at.strftime(time_format)})"
-        status = color(status, color_num)
+
         id = s.id
+
         puts ERB.new(configatron.timeline_format).result(binding)
       end
     end
   when :search
     statuses.each do |s|
       text = s.text.gsub("\n", '')
-      color_num = colors[s.user_screen_name.hash % colors.size]
+      status_color = colors[s.user_screen_name.hash % colors.size]
 
-      status = color("#{s.user_screen_name}: #{text}", color_num)
+      status = "#{s.user_screen_name}: #{text}"
       time = "(#{s.created_at.strftime('%m-%d %H:%M')})"
       id = s.id
       puts ERB.new(configatron.timeline_format).result(binding)

data/lib/termtter.rb

@@ -7,6 +7,12 @@ require 'enumerator'
 require 'parsedate'
 require 'configatron'
 
+if RUBY_VERSION < '1.8.7'
+  class Array
+    def take(n) at(0...n) end
+  end
+end
+
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
@@ -22,14 +28,15 @@ alias original_require require
 def require(s)
   if %r|^termtter/(.*)| =~ s
     puts "[WARNING] use plugin '#{$1}' instead of require"
-    original_require "plugin/#{$1}"
-  else
-    original_require s
+    puts "  Such a legacy .termtter file will not be supported until version 1.0.0"
+    s = "plugin/#{$1}"
   end
+  original_require s
 end
 
 module Termtter
-  VERSION = '0.5.8'
+  VERSION = '0.6.0'
+  APP_NAME = 'termtter'
 
   class Twitter
 
@@ -39,14 +46,9 @@ module Termtter
     end
 
     def update_status(status)
-      req = Net::HTTP::Post.new('/statuses/update.xml')
-      req.basic_auth(@user_name, @password)
-      req.add_field("User-Agent", "Termtter http://github.com/jugyo/termtter")
-      req.add_field("X-Twitter-Client", "Termtter")
-      req.add_field("X-Twitter-Client-URL", "http://github.com/jugyo/termtter")
-      req.add_field("X-Twitter-Client-Version", "0.1")
       Net::HTTP.start("twitter.com", 80) do |http|
-        http.request(req, "status=#{CGI.escape(status)}")
+        uri = '/statuses/update.xml'
+        http.request(post_request(uri), "status=#{CGI.escape(status)}&source=#{APP_NAME}")
       end
     end
 
@@ -58,6 +60,11 @@ module Termtter
 
     def get_user_timeline(screen_name)
       return get_timeline("http://twitter.com/statuses/user_timeline/#{screen_name}.json")
+    rescue OpenURI::HTTPError => e
+      puts "No such user: #{screen_name}"
+      nears = near_users(screen_name)
+      puts "near users: #{nears}" unless nears.empty?
+      return {}
     end
 
     def search(query)
@@ -65,7 +72,7 @@ module Termtter
       return results.map do |s|
         status = Status.new
         status.id = s['id']
-        status.text = s['text']
+        status.text = CGI.unescapeHTML(s['text'])
         status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
         status.user_screen_name = s['from_user']
         status
@@ -92,9 +99,27 @@ module Termtter
         %w(id name screen_name url profile_image_url).each do |key|
           status.__send__("user_#{key}=".to_sym, s["user"][key])
         end
+        status.text = CGI.unescapeHTML(status.text)
         status
       end
     end
+
+    def near_users(screen_name)
+      Client::public_storage[:users].select {|user|
+        /#{user}/i =~ screen_name || /#{screen_name}/i =~ user
+      }.join(', ')
+    end
+    private :near_users
+
+    def post_request(uri)
+      req = Net::HTTP::Post.new(uri)
+      req.basic_auth(@user_name, @password)
+      req.add_field('User-Agent', 'Termtter http://github.com/jugyo/termtter')
+      req.add_field('X-Twitter-Client', 'Termtter')
+      req.add_field('X-Twitter-Client-URL', 'http://github.com/jugyo/termtter')
+      req.add_field('X-Twitter-Client-Version', '0.1')
+      req
+    end
   end
 
   module Client
@@ -102,6 +127,7 @@ module Termtter
     @@hooks = []
     @@commands = {}
     @@completions = []
+    @@helps = []
 
     class << self
       def add_hook(&hook)
@@ -128,6 +154,14 @@ module Termtter
         @@completions.clear
       end
 
+      def add_help(name, desc)
+        @@helps << [name, desc]
+      end
+
+      def clear_helps
+        @@helps.clear
+      end
+
       Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
       Readline.completion_proc = proc {|input|
         @@completions.map {|completion|

metadata

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