jugyo-termtter 0.4.0 → 0.4.5

data/bin/termtter

@@ -23,11 +23,11 @@ else
 The configuration file does not exist.
 Example: 
 # ~/.termtter
-configatron.user_name = USERNAME
-configatron.password = PASSWORD
+configatron.user_name = 'USERNAME'
+configatron.password = 'PASSWORD'
 EOS
   exit 1
 end
 
-Termtter::Client.new.run
+Termtter::Client.run
 

data/lib/termtter/standard_commands.rb

@@ -2,64 +2,68 @@ class Termtter::Client
 
   add_command /^(update|u)\s+(.*)/ do |m, t|
     text = m[2]
-    next if text.empty?
-    t.update_status(text)
-    puts "=> #{text}"
+    unless text.empty?
+      t.update_status(text)
+      puts "=> #{text}"
+    end
   end
 
   add_command /^(list|l)\s*$/ do |m, t|
-    t.list_friends_timeline()
+    statuses = t.get_friends_timeline()
+    call_hooks(statuses, :list_friends_timeline, t)
   end
 
   add_command /^(list|l)\s+([^\s]+)/ do |m, t|
-    t.get_user_timeline(m[2])
+    statuses = t.get_user_timeline(m[2])
+    call_hooks(statuses, :list_user_timeline, t)
   end
 
-  add_command /^(search|s)\s+(.*)/ do |m, t|
-    query = m[2]
-    unless query.empty?
-      t.search(query)
-    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|
-    t.replies()
+    call_hooks(t.replies(), :replies, t)
   end
 
   add_command /^show\s+([^\s]+)/ do |m, t|
-    t.show(m[1])
+    call_hooks(t.show(m[1]), :show, t)
   end
 
   add_command /^pause\s*$/ do |m, t|
-    t.pause
+    pause
   end
 
   add_command /^resume\s*$/ do |m, t|
-    t.resume
+    resume
   end
 
   add_command /^exit\s*$/ do |m, t|
-    t.exit
+    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 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
+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|
-    result = t.instance_eval m[1] unless m[1].empty?
-    puts "=> #{result.inspect}"
+    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

@@ -6,7 +6,7 @@ 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
+  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|

data/lib/termtter/uri-open.rb

@@ -1,16 +1,16 @@
-Termtter::Client.add_hook do |statuses, event, t|
-  t.public_storage[:uris] ||= []
-  if !statuses.empty? && event == :update_friends_timeline
-    statuses.each do |s|
-      t.public_storage[:uris] += s.text.scan(%r|https?://[^\s]+|)
+class 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
-end
 
-class Termtter::Client
   add_command /^uri-open\s*$/ do |m, t|
-    t.public_storage[:uris] ||= [] # It's not DRY
-    t.public_storage[:uris].each do |uri|
+    public_storage[:uris].each do |uri|
       # FIXME: works only in OSX and other *NIXs
       if /linux/ =~ RUBY_PLATFORM
         system 'firefox', uri
@@ -18,7 +18,16 @@ class Termtter::Client
         system 'open', uri
       end
     end
-    t.public_storage[:uris].clear
+    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

data/lib/termtter.rb

@@ -10,41 +10,13 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Termtter
-  VERSION = '0.4.0'
+  VERSION = '0.4.5'
 
-  class CommandNotFound < StandardError; end
-
-  class Client
-
-    @@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
-
-    def self.clear_commands
-      @@commands.clear
-    end
-
-    attr_reader :since_id, :public_storage
+  class Twitter
 
-    def initialize
-      configatron.set_default(:update_interval, 300)
-      configatron.set_default(:debug, false)
-      @user_name = configatron.user_name
-      @password = configatron.password
-      @update_interval = configatron.update_interval
-      @debug = configatron.debug
-      @public_storage = {}
+    def initialize(user_name, password)
+      @user_name = user_name
+      @password = password
     end
 
     def update_status(status)
@@ -59,70 +31,43 @@ module Termtter
       end
     end
 
-    def list_friends_timeline
-      statuses = get_timeline("http://twitter.com/statuses/friends_timeline.json")
-      call_hooks(statuses, :list_friends_timeline)
-    end
-
-    def update_friends_timeline
+    def get_friends_timeline(since_id = nil)
       uri = "http://twitter.com/statuses/friends_timeline.json"
-      if @since_id
-        uri += "?since_id=#{@since_id}"
-      end
-
-      statuses = get_timeline(uri, true)
-      call_hooks(statuses, :update_friends_timeline)
+      uri += "?since_id=#{since_id}" if since_id
+      return get_timeline(uri)
     end
 
     def get_user_timeline(screen_name)
-      statuses = get_timeline("http://twitter.com/statuses/user_timeline/#{screen_name}.json")
-      call_hooks(statuses, :list_user_timeline)
+      return get_timeline("http://twitter.com/statuses/user_timeline/#{screen_name}.json")
     end
 
     def search(query)
-      statuses = []
-
       results = JSON.parse(open('http://search.twitter.com/search.json?q=' + CGI.escape(query)).read)['results']
-      results.each do |s|
+      return results.inject([]) do |statuses, s|
         status = Status.new
         status.text = s['text']
         status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
         status.user_screen_name = s['from_user']
         statuses << status
       end
-
-      call_hooks(statuses, :search)
-      return statuses
     end
 
     def show(id)
-      statuses = get_timeline("http://twitter.com/statuses/show/#{id}.json")
-      call_hooks(statuses, :show)
+      return get_timeline("http://twitter.com/statuses/show/#{id}.json")
     end
 
     def replies
-      statuses = get_timeline("http://twitter.com/statuses/replies.json")
-      call_hooks(statuses, :show)
-    end
-
-    def call_hooks(statuses, event)
-      @@hooks.each do |h|
-        begin
-          h.call(statuses.dup, event, self)
-        rescue => e
-          puts "Error: #{e}"
-          puts e.backtrace.join("\n")
-        end
-      end
+      return get_timeline("http://twitter.com/statuses/replies.json")
     end
 
-    def get_timeline(uri, update_since_id = false)
-      statuses = []
-
+    def get_timeline(uri)
       data = JSON.parse(open(uri, :http_basic_authentication => [@user_name, @password]).read)
-      data =  if data.instance_of? Array then data else [data] end
-
-      data.each do |s|
+      data =  if data.instance_of? Array
+                data
+              else
+                [data]
+              end
+      return data.inject([]) do |statuses, s|
         u = s["user"]
         status = Status.new
         status.created_at = Time.utc(*ParseDate::parsedate(s["created_at"])).localtime
@@ -134,15 +79,47 @@ module Termtter
         end
         statuses << status
       end
+    end
+  end
 
-      if update_since_id && !statuses.empty?
-        @since_id = statuses[0].id
-      end
+  class Client
+
+    @@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
+
+    def self.clear_commands
+      @@commands.clear
+    end
+
+    def self.public_storage
+      @@public_storage ||= {}
+      return @@public_storage
+    end
 
-      return statuses
+    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
+      end
     end
 
-    def call_commands(text)
+    def self.call_commands(text, tw)
       return if text.empty?
 
       command_found = false
@@ -150,7 +127,7 @@ module Termtter
         if key =~ text
           command_found = true
           begin
-            command.call($~, self)
+            command.call($~, tw)
           rescue => e
             puts "Error: #{e}"
             puts e.backtrace.join("\n")
@@ -161,37 +138,49 @@ module Termtter
       raise CommandNotFound unless command_found
     end
 
-    def pause
-      @pause = true
+    def self.pause
+      @@pause = true
     end
 
-    def resume
-      @pause = false
-      @update.run
+    def self.resume
+      @@pause = false
+      @@update.run
     end
 
-    def exit
-      @update.kill
-      @input.kill
+    def self.exit
+      @@update.kill
+      @@input.kill
     end
 
-    def run
-      @pause = false
+    def self.run
+      @@pause = false
+      tw = Termtter::Twitter.new(configatron.user_name, configatron.password)
 
-      @update = Thread.new do
+      @@update = Thread.new do
+        since_id = nil
         loop do
-          if @pause
-            Thread.stop
+          begin
+            Thread.stop if @@pause
+
+            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
-          update_friends_timeline()
-          sleep @update_interval
         end
       end
 
-      @input = Thread.new do
+      @@input = Thread.new do
         while buf = Readline.readline("", true)
           begin
-            call_commands(buf)
+            call_commands(buf, tw)
           rescue CommandNotFound => e
             puts "Unknown command \"#{buf}\""
             puts 'Enter "help" for instructions'
@@ -203,13 +192,15 @@ module Termtter
       end
 
       stty_save = `stty -g`.chomp
-      trap("INT") { system "stty", stty_save; self.exit }
+      trap("INT") { system "stty", stty_save; exit }
 
-      @input.join
+      @@input.join
     end
 
   end
 
+  class CommandNotFound < StandardError; end
+
   class Status
     %w(
       id text created_at truncated in_reply_to_status_id in_reply_to_user_id 

data/test/friends_timeline.json

@@ -1,3 +1,5 @@
-[{"in_reply_to_user_id":null,"truncated":false,"created_at":"Sat Jan 03 12:13:45 +0000 2009","user":{"description":"test2 xxxx","followers_count":102,"profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/000\/102.png","url":"http:\/\/twitter.com/test2","name":"Test User 2","protected":false,"screen_name":"test2","location":"Tokyo2","id":102},"favorited":false,"in_reply_to_screen_name":null,"text":"texttext 2","id":10002,"in_reply_to_status_id":null,"source":"<a href=\"http:\/\/ssss2\">ssss2<\/a>"},
+[
+{"in_reply_to_user_id":null,"truncated":false,"created_at":"Sat Jan 03 12:13:45 +0000 2009","user":{"description":"test2 xxxx","followers_count":102,"profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/000\/102.png","url":"http:\/\/twitter.com/test2","name":"Test User 2","protected":false,"screen_name":"test2","location":"Tokyo2","id":102},"favorited":false,"in_reply_to_screen_name":null,"text":"texttext 2","id":10002,"in_reply_to_status_id":null,"source":"<a href=\"http:\/\/ssss2\">ssss2<\/a>"},
 {"in_reply_to_user_id":null,"truncated":false,"created_at":"Sat Jan 03 12:13:45 +0000 2009","user":{"description":"test1 xxxx","followers_count":101,"profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/000\/101.png","url":"http:\/\/twitter.com/test1","name":"Test User 1","protected":false,"screen_name":"test1","location":"Tokyo1","id":101},"favorited":false,"in_reply_to_screen_name":null,"text":"texttext 1","id":10001,"in_reply_to_status_id":null,"source":"<a href=\"http:\/\/ssss1\">ssss1<\/a>"},
-{"in_reply_to_user_id":null,"truncated":false,"created_at":"Sat Jan 03 12:13:45 +0000 2009","user":{"description":"test0 xxxx","followers_count":100,"profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/000\/100.png","url":"http:\/\/twitter.com/test0","name":"Test User 0","protected":false,"screen_name":"test0","location":"Tokyo0","id":100},"favorited":false,"in_reply_to_screen_name":null,"text":"texttext 0","id":10000,"in_reply_to_status_id":null,"source":"<a href=\"http:\/\/ssss0\">ssss0<\/a>"},
+{"in_reply_to_user_id":null,"truncated":false,"created_at":"Sat Jan 03 12:13:45 +0000 2009","user":{"description":"test0 xxxx","followers_count":100,"profile_image_url":"http:\/\/s3.amazonaws.com\/twitter_production\/profile_images\/000\/100.png","url":"http:\/\/twitter.com/test0","name":"Test User 0","protected":false,"screen_name":"test0","location":"Tokyo0","id":100},"favorited":false,"in_reply_to_screen_name":null,"text":"texttext 0","id":10000,"in_reply_to_status_id":null,"source":"<a href=\"http:\/\/ssss0\">ssss0<\/a>"}
+]

data/test/test_termtter.rb

@@ -4,11 +4,11 @@ require 'test/unit'
 require 'kagemusha'
 require File.dirname(__FILE__) + '/../lib/termtter'
 
+# TODO: もっとテスト書く！
+
 class TestTermtter < Test::Unit::TestCase
   def setup
-    configatron.user_name = 'test'
-    configatron.password = 'test'
-    @termtter = Termtter::Client.new
+    @twitter = Termtter::Twitter.new('test', 'test')
 
     Termtter::Client.add_hook do |statuses, event|
       @statuses = statuses
@@ -17,7 +17,7 @@ class TestTermtter < Test::Unit::TestCase
   end
 
   def test_get_timeline
-    statuses = swap_open('friends_timeline.json') { @termtter.get_timeline('') }
+    statuses = swap_open('friends_timeline.json') { @twitter.get_timeline('') }
 
     assert_equal 3, statuses.size
 
@@ -38,13 +38,8 @@ class TestTermtter < Test::Unit::TestCase
     assert_equal 'Sat Jan 03 21:13:45 +0900 2009', statuses[2].created_at.to_s
   end
 
-  def test_get_timeline_with_update_since_id
-    statuses = swap_open('friends_timeline.json') { @termtter.get_timeline('', true) }
-    assert_equal 10002, @termtter.since_id
-  end
-
   def test_search
-    statuses = swap_open('search.json') { @termtter.search('') }
+    statuses = swap_open('search.json') { @twitter.search('') }
     assert_equal 3, statuses.size
     assert_equal 'test2', statuses[0].user_screen_name
     assert_equal 'texttext 2', statuses[0].text
@@ -55,41 +50,53 @@ class TestTermtter < Test::Unit::TestCase
   end
 
   def test_add_hook
-    call_hook = false
-    Termtter::Client.add_hook do |statuses, event|
-      call_hook = true
+    statuses = nil
+    event = nil
+    twitter = nil
+    Termtter::Client.add_hook do |s, e, t|
+      statuses = s
+      event = e
+      twitter = t
     end
-    swap_open('search.json'){ @termtter.search('') }
 
-    assert_equal true, call_hook
+    Termtter::Client.call_hooks([], :foo, @twitter)
+
+    assert_equal [], statuses
+    assert_equal :foo, event
+    assert_equal @twitter, twitter
 
     Termtter::Client.clear_hooks()
-    call_hook = false
-    @termtter.search('')
+    statuses = nil
+    event = nil
+    Termtter::Client.call_hooks([], :foo, @twitter)
 
-    assert_equal false, call_hook
+    assert_equal nil, statuses
+    assert_equal nil, event
   end
 
   def test_add_command
     command_text = nil
     matche_text = nil
-    Termtter::Client.add_command /foo\s+(.*)/ do |matche, termtter|
-      command_text = matche[0]
-      matche_text = matche[1]
+    twitter = nil
+    Termtter::Client.add_command /foo\s+(.*)/ do |m, t|
+      command_text = m[0]
+      matche_text = m[1]
+      twitter = t
     end
     
-    @termtter.call_commands('foo xxxxxxxxxxxxxx')
+    Termtter::Client.call_commands('foo xxxxxxxxxxxxxx', @twitter)
     assert_equal 'foo xxxxxxxxxxxxxx', command_text
     assert_equal 'xxxxxxxxxxxxxx', matche_text
+    assert_equal @twitter, twitter
     
     Termtter::Client.clear_commands()
     assert_raise Termtter::CommandNotFound do
-      @termtter.call_commands('foo xxxxxxxxxxxxxx')
+      Termtter::Client.call_commands('foo xxxxxxxxxxxxxx', @twitter)
     end
   end
 
   def swap_open(name)
-    Kagemusha.new(Termtter::Client).def(:open) {
+    Kagemusha.new(Termtter::Twitter).def(:open) {
       File.open(File.dirname(__FILE__) + "/../test/#{name}")
     }.swap do
       yield

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.5
 platform: ruby
 authors: 
 - jugyo