jugyo-termtter 0.5.3 → 0.5.4

data/Manifest.txt

@@ -7,14 +7,14 @@ run_termtter.rb
 example_dot_termtter
 bin/termtter
 lib/termtter.rb
-lib/termtter/stdout.rb
-lib/termtter/notify-send.rb
-lib/termtter/standard_commands.rb
-lib/termtter/uri-open.rb
-lib/termtter/growl.rb
-lib/termtter/say.rb
-lib/termtter/english.rb
-lib/termtter/completion.rb
+lib/plugin/stdout.rb
+lib/plugin/notify-send.rb
+lib/plugin/standard_commands.rb
+lib/plugin/uri-open.rb
+lib/plugin/growl.rb
+lib/plugin/say.rb
+lib/plugin/english.rb
+lib/plugin/completion.rb
 test/test_termtter.rb
 test/friends_timeline.json
 test/search.json

data/bin/termtter

@@ -4,9 +4,9 @@ $KCODE = 'u'
 
 require 'rubygems'
 require 'termtter'
-require 'termtter/standard_commands'
-require 'termtter/stdout'
 require 'configatron'
+plugin 'standard_commands'
+plugin 'stdout'
 
 conf_file = File.expand_path('~/.termtter')
 if File.exist? conf_file

data/example_dot_termtter

@@ -1,9 +1,9 @@
-#require 'termtter/english'
-#require 'termtter/say'
-#require 'termtter/notify-send'
-#require 'termtter/uri-open'
-#require 'termtter/growl'
-#require 'termtter/completion'
+#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'

data/lib/termtter.rb

@@ -12,8 +12,12 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 configatron.set_default(:update_interval, 300)
 
+def plugin(s)
+  require "plugin/#{s}"
+end
+
 module Termtter
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 
   class Twitter
 
@@ -65,20 +69,15 @@ module Termtter
 
     def get_timeline(uri)
       data = JSON.parse(open(uri, :http_basic_authentication => [@user_name, @password]).read)
-      data =  if data.instance_of? Array
-                data
-              else
-                [data]
-              end
+      data = [data] unless data.instance_of? Array
       return data.map do |s|
-        u = s["user"]
         status = Status.new
         status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
         %w(id text truncated in_reply_to_status_id in_reply_to_user_id).each do |key|
           status.__send__("#{key}=".to_sym, s[key])
         end
         %w(id name screen_name url profile_image_url).each do |key|
-          status.__send__("user_#{key}=".to_sym, u[key])
+          status.__send__("user_#{key}=".to_sym, s["user"][key])
         end
         status
       end
@@ -90,47 +89,32 @@ module Termtter
     @@hooks = []
     @@commands = {}
 
-    def self.add_hook(&hook)
-      @@hooks << hook
-    end
-
-    def self.clear_hooks
-      @@hooks.clear
-    end
-
-    def self.add_command(regex, &block)
-      @@commands[regex] = block
-    end
+    class << self
+      def add_hook(&hook)
+        @@hooks << hook
+      end
 
-    def self.clear_commands
-      @@commands.clear
-    end
+      def clear_hooks
+        @@hooks.clear
+      end
 
-    def self.public_storage
-      @@public_storage ||= {}
-      return @@public_storage
-    end
+      def add_command(regex, &block)
+        @@commands[regex] = block
+      end
 
-    def self.call_hooks(statuses, event, tw)
-      @@hooks.each do |h|
-        begin
-          h.call(statuses.dup, event, tw)
-        rescue => e
-          puts "Error: #{e}"
-          puts e.backtrace.join("\n")
-        end
+      def clear_commands
+        @@commands.clear
       end
-    end
 
-    def self.call_commands(text, tw)
-      return if text.empty?
+      def public_storage
+        @@public_storage ||= {}
+        return @@public_storage
+      end
 
-      command_found = false
-      @@commands.each do |key, command|
-        if key =~ text
-          command_found = true
+      def call_hooks(statuses, event, tw)
+        @@hooks.each do |h|
           begin
-            command.call($~, tw)
+            h.call(statuses.dup, event, tw)
           rescue => e
             puts "Error: #{e}"
             puts e.backtrace.join("\n")
@@ -138,68 +122,84 @@ module Termtter
         end
       end
 
-      raise CommandNotFound unless command_found
-    end
+      def call_commands(text, tw)
+        return if text.empty?
+
+        command_found = false
+        @@commands.each do |key, command|
+          if key =~ text
+            command_found = true
+            begin
+              command.call($~, tw)
+            rescue => e
+              puts "Error: #{e}"
+              puts e.backtrace.join("\n")
+            end
+          end
+        end
 
-    def self.pause
-      @@pause = true
-    end
+        raise CommandNotFound unless command_found
+      end
 
-    def self.resume
-      @@pause = false
-      @@update_thread.run
-    end
+      def pause
+        @@pause = true
+      end
 
-    def self.exit
-      @@update_thread.kill
-      @@input_thread.kill
-    end
+      def resume
+        @@pause = false
+        @@update_thread.run
+      end
 
-    def self.run
-      @@pause = false
-      tw = Termtter::Twitter.new(configatron.user_name, configatron.password)
+      def exit
+        @@update_thread.kill
+        @@input_thread.kill
+      end
 
-      @@update_thread = Thread.new do
-        since_id = nil
-        loop do
-          begin
-            Thread.stop if @@pause
+      def run
+        @@pause = false
+        tw = Termtter::Twitter.new(configatron.user_name, configatron.password)
 
-            statuses = tw.get_friends_timeline(since_id)
-            unless statuses.empty?
-              since_id = statuses[0].id
-            end
-            call_hooks(statuses, :update_friends_timeline, tw)
+        @@update_thread = Thread.new do
+          since_id = nil
+          loop do
+            begin
+              Thread.stop if @@pause
 
-          rescue => e
-            puts "Error: #{e}"
-            puts e.backtrace.join("\n")
-          ensure
-            sleep configatron.update_interval
+              statuses = tw.get_friends_timeline(since_id)
+              unless statuses.empty?
+                since_id = statuses[0].id
+              end
+              call_hooks(statuses, :update_friends_timeline, tw)
+
+            rescue => e
+              puts "Error: #{e}"
+              puts e.backtrace.join("\n")
+            ensure
+              sleep configatron.update_interval
+            end
           end
         end
-      end
 
-      @@input_thread = Thread.new do
-        while buf = Readline.readline("", true)
-          begin
-            call_commands(buf, tw)
-          rescue CommandNotFound => e
-            puts "Unknown command \"#{buf}\""
-            puts 'Enter "help" for instructions'
-          rescue => e
-            puts "Error: #{e}"
-            puts e.backtrace.join("\n")
+        @@input_thread = Thread.new do
+          while buf = Readline.readline("", true)
+            begin
+              call_commands(buf, tw)
+            rescue CommandNotFound => e
+              puts "Unknown command \"#{buf}\""
+              puts 'Enter "help" for instructions'
+            rescue => e
+              puts "Error: #{e}"
+              puts e.backtrace.join("\n")
+            end
           end
         end
-      end
 
-      stty_save = `stty -g`.chomp
-      trap("INT") { system "stty", stty_save; exit }
+        stty_save = `stty -g`.chomp
+        trap("INT") { system "stty", stty_save; exit }
 
-      @@input_thread.join
+        @@input_thread.join
+      end
     end
-
   end
 
   class CommandNotFound < StandardError; end

data/run_termtter.rb

@@ -11,8 +11,8 @@ self_file =
 $:.unshift(File.dirname(self_file) + "/lib")
 
 require 'termtter'
-require 'termtter/standard_commands'
-require 'termtter/stdout'
+plugin 'standard_commands'
+plugin 'stdout'
 
 configatron.update_interval
 
@@ -26,4 +26,4 @@ end
 
 Termtter::Client.run
 
-# Startup scripts for development
+# Startup scripts for development

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - jugyo
+- ujihisa
 autorequire: 
 bindir: bin
 cert_chain: []

data/lib/termtter/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

data/lib/termtter/english.rb

@@ -1,51 +0,0 @@
-Termtter::Client.clear_hooks # FIXME: not to clear all but to clear just stdout.rb
-
-# english? :: String -> Boolean
-def english?(message)
-  /[一-龠]+|[ぁ-ん]+|[ァ-ヴー]+|[ａ-ｚＡ-Ｚ０-９]+/ !~ message
-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.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 = "#{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)})"
-
-        puts "#{color(time_str, 90)} #{color(status, color_num)}"
-      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)}"
-    end
-  end
-end
-
-# USAGE:
-#   Write the line on the *first line* of your ~/.termtter
-#     require 'termtter/english'
-#   (english.rb will destroy plugins which were required before)

data/lib/termtter/growl.rb

@@ -1,7 +0,0 @@
-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'
-    end
-  end
-end

data/lib/termtter/notify-send.rb

@@ -1,16 +0,0 @@
-Termtter::Client.add_hook do |statuses, event|
-  if !statuses.empty? && event == :update_friends_timeline
-    max = 10
-
-    text = statuses[0..(max - 1)].map{|s|
-      status_text = CGI.escapeHTML(s.text)
-      status_text.gsub!(%r{https?://[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+},'<a href="\0">\0</a>')
-      status_text.gsub!("\n", '')
-      "<b>#{s.user_screen_name}:</b> <span font=\"9.0\">#{status_text}</span>"
-    }.join("\n")
-
-    text += "\n<a href=\"http://twitter.com/\">more…</a>" if statuses.size > max
-
-    system 'notify-send', 'Termtter', text, '-t', '60000'
-  end
-end

data/lib/termtter/say.rb

@@ -1,22 +0,0 @@
-raise 'say.rb runs only in OSX Leopard' if /darwin9/ !~ RUBY_PLATFORM
-
-# say :: String -> String -> IO ()
-def say(who, what)
-  voices = %w(Alex Bruce Fred Junior Ralph Agnes Kathy Princess Vicki Victoria Albert Bad\ News Bahh Bells Boing Bubbles Cellos Deranged Good\ News Hysterical Pipe\ Organ Trinoids Whisper Zarvox)
-  voice = voices[who.hash % voices.size]
-  system 'say', '-v', voice, what
-end
-
-module Termtter::Client
-  add_hook do |statuses, event, t|
-    if !statuses.empty? && event == :update_friends_timeline
-      statuses.reverse.each do |s|
-        text_without_uri = s.text.gsub(%r|https?://[^\s]+|, 'U.R.I.')
-        say s.user_screen_name, text_without_uri
-      end
-    end
-  end
-end
-
-# KNOWN BUG:
-# * exit or <C-c> doen't work quickly.

data/lib/termtter/standard_commands.rb

@@ -1,69 +0,0 @@
-module Termtter::Client
-
-  add_command /^(update|u)\s+(.*)/ do |m, t|
-    text = m[2]
-    unless text.empty?
-      t.update_status(text)
-      puts "=> #{text}"
-    end
-  end
-
-  add_command /^(list|l)\s*$/ do |m, t|
-    statuses = t.get_friends_timeline()
-    call_hooks(statuses, :list_friends_timeline, t)
-  end
-
-  add_command /^(list|l)\s+([^\s]+)/ do |m, t|
-    statuses = t.get_user_timeline(m[2])
-    call_hooks(statuses, :list_user_timeline, t)
-  end
-
-  add_command /^(search|s)\s+(.+)/ do |m, t|
-    call_hooks(t.search(m[2]), :search, t)
-  end
-
-  add_command /^(replies|r)\s*$/ do |m, t|
-    call_hooks(t.replies(), :replies, t)
-  end
-
-  add_command /^show\s+([^\s]+)/ do |m, t|
-    call_hooks(t.show(m[1]), :show, t)
-  end
-
-  add_command /^pause\s*$/ do |m, t|
-    pause
-  end
-
-  add_command /^resume\s*$/ do |m, t|
-    resume
-  end
-
-  add_command /^exit\s*$/ do |m, t|
-    exit
-  end
-
-  add_command /^help\s*$/ do |m, t|
-    puts <<-EOS
-exit              Exit
-help              Print this help message
-list,l            List the posts in your friends timeline
-list,l USERNAME   List the posts in the the given user's timeline
-pause             Pause updating
-update,u TEXT     Post a new message
-resume            Resume updating
-replies,r         List the most recent @replies for the authenticating user
-search,s TEXT     Search for Twitter
-show ID           Show a single status
-EOS
-  end
-
-  add_command /^eval\s+(.*)$/ do |m, t|
-    begin
-      result = eval(m[1]) unless m[1].empty?
-      puts "=> #{result.inspect}"
-    rescue SyntaxError => e
-      puts e
-    end
-  end
-
-end

data/lib/termtter/stdout.rb

@@ -1,41 +0,0 @@
-def color(str, num)
-  "\e[#{num}m#{str}\e[0m"
-end
-
-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.each do |s|
-        text = s.text.gsub("\n", '')
-        color_num = 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)})"
-
-        puts "#{color(time_str, 90)} #{color(status, color_num)}"
-      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)}"
-    end
-  end
-end

data/lib/termtter/uri-open.rb

@@ -1,39 +0,0 @@
-module Termtter::Client
-  public_storage[:uris] = []
-
-  add_hook do |statuses, event, t|
-    if !statuses.empty? && event == :update_friends_timeline
-      statuses.each do |s|
-        public_storage[:uris] += s.text.scan(%r|https?://[^\s]+|)
-      end
-    end
-  end
-
-  add_command /^uri-open\s*$/ do |m, t|
-    public_storage[:uris].each do |uri|
-      # FIXME: works only in OSX and other *NIXs
-      if /linux/ =~ RUBY_PLATFORM
-        system 'firefox', uri
-      else
-        system 'open', uri
-      end
-    end
-    public_storage[:uris].clear
-  end
-
-  add_command /^uri-open\s+list\s*$/ do |m, t|
-    puts public_storage[:uris]
-  end
-
-  add_command /^uri-open\s+clear\s*$/ do |m, t|
-    public_storage[:uris].clear
-    puts "clear uris"
-  end
-end
-# ~/.termtter
-# require 'termtter/uri-open'
-#
-# see also: http://ujihisa.nowa.jp/entry/c3dd00c4e0
-#
-# KNOWN BUG
-# * In Debian, exit or C-c in the termtter kills your firefox.