jugyo-termtter 0.5.7 → 0.5.8

data/Manifest.txt

@@ -4,7 +4,6 @@ PostInstall.txt
 README.rdoc
 Rakefile
 run_termtter.rb
-example_dot_termtter
 bin/termtter
 lib/termtter.rb
 lib/plugin/stdout.rb
@@ -15,6 +14,10 @@ lib/plugin/growl.rb
 lib/plugin/say.rb
 lib/plugin/english.rb
 lib/plugin/completion.rb
+lib/plugin/log.rb
+lib/plugin/favorite.rb
+lib/plugin/plugin.rb
+lib/plugin/erb.rb
 test/test_termtter.rb
 test/friends_timeline.json
 test/search.json

data/README.rdoc

@@ -24,13 +24,20 @@ Run:
   sudo gem source -a http://gems.github.com (you only have to do this once)
   sudo gem install jugyo-termtter
 
-create configuration file named '.termtter' in your HOME directory.
+Just run a new command termtter.
+
+  termtter
+
+Termtter generates a configuration file named '.termtter' in your HOME directory.
+You can edit the file anytime.
 
   vim ~/.termtter
 
   configatron.user_name = 'USERNAME'
   configatron.password = 'PASSWORD'
 
+To update the config, just restart your termtter proccess.
+
 == LICENSE:
 
 (The MIT License)

data/bin/termtter

@@ -25,8 +25,10 @@ else
       io.puts "#plugin '#{p}'"
     end
 
+    io.puts
     io.puts "configatron.user_name = '#{username}'"
     io.puts "configatron.password = '#{password}'"
+    io.puts "#configatron.update_interval = 120"
     io.puts
     io.puts "# vim: set filetype=ruby"
   }

data/lib/plugin/erb.rb

@@ -0,0 +1,17 @@
+require 'erb'
+
+module Termtter::Client
+  add_command /^(update|u)\s+(.*)/ do |m, t|
+    text = ERB.new(m[2]).result(binding).gsub(/\n/, ' ')
+    unless text.empty?
+      t.update_status(text)
+      puts "=> #{text}"
+    end
+  end
+end
+
+# erb.rb
+#   enable to <%= %> in the command update
+# example:
+#   > u erb test <%= 1+1 %>
+#   => erb test 2

data/lib/plugin/favorite.rb

@@ -0,0 +1,47 @@
+module Termtter::Client
+  add_command %r'^(?:favorite|fav)\s+(\d+)$' do |m,t|
+    id = m[1]
+    res = t.favorite(id)
+    if res.code == '200'
+      puts "Favorited status ##{id}"
+    else
+      puts "Failed: #{res}"
+    end
+  end
+
+  if public_storage[:log]
+    add_command %r'^(?:favorite|fav)\s+/(.+)$' do |m,t|
+      pat = Regexp.new(m[1])
+      statuses = public_storage[:log].select { |s| s.text =~ pat }
+      if statuses.size == 1
+        status = statuses.first
+        res = t.favorite(status.id)
+        if res.code == '200'
+          puts %Q(Favorited "#{status.user_screen_name}: #{status.text}")
+        else
+          puts "Failed: #{res}"
+        end
+      else
+        puts "#{pat} does not match single status"
+      end
+    end
+  end
+end
+
+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)
+      end
+    end
+  end
+end

data/lib/plugin/growl.rb

@@ -1,7 +1,29 @@
+require 'tmpdir'
+require 'uri'
+
+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
+    end
+    File.open(cache_file, "w") do |f|
+      f.write(buf)
+    end
+  end
+  cache_file
+end
+
 Termtter::Client.add_hook do |statuses, event|
   if !statuses.empty? && event == :update_friends_timeline
-    statuses.each do |s|
-      system 'growlnotify', 'Termtter', '-m', "#{s.user_screen_name}: #{s.text}", '-n', 'termtter'
+    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
     end
   end
 end

data/lib/plugin/log.rb

@@ -0,0 +1,16 @@
+module Termtter::Client
+  public_storage[:log] = []
+
+  add_hook do |statuses,event|
+    case event
+    when :update_friends_timeline
+      public_storage[:log] += statuses
+    end
+  end
+
+  add_command %r'^/(.+)' do |m,t|
+    pat = Regexp.new(m[1])
+    statuses = public_storage[:log].select { |s| s.text =~ pat }
+    call_hooks(statuses, :list_friends_timeline, t)
+  end
+end

data/lib/plugin/plugin.rb

@@ -0,0 +1,14 @@
+module Termtter::Client
+  add_command /^plugin\s+(.*)/ do |m, t|
+    plugin m[1]
+  end
+end
+
+# plugin.rb
+#   a dynamic plugin loader
+# example
+#   > u <%= not erbed %>
+#   => <%= not erbed %>
+#   > plugin erb
+#   > u <%= 1 + 2 %>
+#   => 3

data/lib/plugin/stdout.rb

@@ -1,3 +1,7 @@
+require 'erb'
+
+configatron.set_default(:timeline_format, '<%= color(time, 90) %> <%= status %> <%= color(id, 90) %>')
+
 def color(str, num)
   "\e[#{num}m#{str}\e[0m"
 end
@@ -21,21 +25,24 @@ Termtter::Client.add_hook do |statuses, event|
         when :update_friends_timeline, :list_friends_timeline
           time_format = '%H:%M:%S'
         else
-          time_format = '%m-%d %H:%d'
+          time_format = '%m-%d %H:%M'
         end
-        time_str = "(#{s.created_at.strftime(time_format)})"
 
-        puts "#{color(time_str, 90)} #{color(status, color_num)}"
+        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 = "#{s.user_screen_name}: #{text}"
-      time_str = "(#{s.created_at.strftime('%m-%d %H:%d')})"
 
-      puts "#{color(time_str, 90)} #{color(status, color_num)}"
+      status = color("#{s.user_screen_name}: #{text}", color_num)
+      time = "(#{s.created_at.strftime('%m-%d %H:%M')})"
+      id = s.id
+      puts ERB.new(configatron.timeline_format).result(binding)
     end
   end
 end

data/lib/termtter.rb

@@ -11,6 +11,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 configatron.set_default(:update_interval, 300)
+configatron.set_default(:prompt, '> ')
 
 def plugin(s)
   require "plugin/#{s}"
@@ -28,7 +29,7 @@ def require(s)
 end
 
 module Termtter
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 
   class Twitter
 
@@ -63,6 +64,7 @@ module Termtter
       results = JSON.parse(open('http://search.twitter.com/search.json?q=' + CGI.escape(query)).read)['results']
       return results.map do |s|
         status = Status.new
+        status.id = s['id']
         status.text = s['text']
         status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
         status.user_screen_name = s['from_user']
@@ -135,7 +137,6 @@ module Termtter
 
       def public_storage
         @@public_storage ||= {}
-        return @@public_storage
       end
 
       def call_hooks(statuses, event, tw)
@@ -183,6 +184,8 @@ module Termtter
       end
 
       def run
+        puts 'initializing...'
+        initialized = false
         @@pause = false
         tw = Termtter::Twitter.new(configatron.user_name, configatron.password)
 
@@ -197,6 +200,7 @@ module Termtter
                 since_id = statuses[0].id
               end
               call_hooks(statuses, :update_friends_timeline, tw)
+              initialized = true
 
             rescue => e
               puts "Error: #{e}"
@@ -207,8 +211,10 @@ module Termtter
           end
         end
 
+        until initialized; end
+
         @@input_thread = Thread.new do
-          while buf = Readline.readline("", true)
+          while buf = Readline.readline(configatron.prompt, true)
             begin
               call_commands(buf, tw)
             rescue CommandNotFound => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - jugyo
@@ -59,7 +59,6 @@ files:
 - README.rdoc
 - Rakefile
 - run_termtter.rb
-- example_dot_termtter
 - bin/termtter
 - lib/termtter.rb
 - lib/plugin/stdout.rb
@@ -70,6 +69,10 @@ files:
 - lib/plugin/say.rb
 - lib/plugin/english.rb
 - lib/plugin/completion.rb
+- lib/plugin/log.rb
+- lib/plugin/favorite.rb
+- lib/plugin/plugin.rb
+- lib/plugin/erb.rb
 - test/test_termtter.rb
 - test/friends_timeline.json
 - test/search.json

data/example_dot_termtter

@@ -1,11 +0,0 @@
-#require 'plugin/english'
-#require 'plugin/say'
-#require 'plugin/notify-send'
-#require 'plugin/uri-open'
-#require 'plugin/growl'
-#require 'plugin/completion'
-
-configatron.user_name = 'USERNAME'
-configatron.password = 'PASSWORD'
-#configatron.update_interval = 120
-

data/lib/plugin/completion.rb

@@ -1,58 +0,0 @@
-require 'set'
-
-module Termtter::Client
-
-  public_storage[:users] ||= Set.new
-
-  add_hook do |statuses, event, t|
-    if !statuses.empty?
-      case event
-      when :update_friends_timeline, :replies, :list_user_timeline
-        statuses.each do |s|
-          public_storage[:users].add(s.user_screen_name)
-          s.text.scan(/@[a-zA-Z_0-9]*/).each do |u| # reply
-            public_storage[:users].add(u.gsub("@","")) unless u == "@"
-          end
-        end
-      end
-    end
-  end
-
-end
-
-module Termtter
-  module InputCompletor
-
-    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)? +(.*)/
-        find_candidates $2, "list %s"
-      when /^(update|u)\s+(.*)@([^\s]*)$/
-        find_candidates $3, "#{$1} #{$2}@%s"
-      when /^uri-open +(.*)/
-        find_candidates $1, "uri-open %s"
-      else
-        Commands.grep(/^#{Regexp.quote input}/)
-      end
-    }
-
-  end
-end
-
-Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
-Readline.completion_proc = Termtter::InputCompletor::CompletionProc
-
-# author: bubbles
-#
-# see also: http://d.hatena.ne.jp/bubbles/20090105/1231145823