termtter 1.7.2 → 1.8.0

data/lib/termtter/httppool.rb

@@ -4,13 +4,19 @@ require 'net/http'
 module Termtter
   module HTTPpool
     @@connections = {}
+    @@http_class = nil
 
     def self.start(host, port = 80)
+      count = config.retry || 3
       begin
         yield(connection(host, port))
       rescue EOFError
         finish(host, port)
-        retry
+        if count > 0
+          count -= 1
+          retry
+        end
+        raise
       end
     end
 
@@ -30,14 +36,16 @@ module Termtter
     end
 
     def self.http_class
-      if config.proxy.host.nil? or config.proxy.host.empty?
-        Net::HTTP
-      else
-        Net::HTTP::Proxy(config.proxy.host,
-                         config.proxy.port,
-                         config.proxy.user_name,
-                         config.proxy.password)
-      end
+      @@http_class ||=
+        if config.proxy.host.nil? or config.proxy.host.empty?
+          Net::HTTP
+        else
+          Net::HTTP::Proxy(
+            config.proxy.host,
+            config.proxy.port,
+            config.proxy.user_name,
+            config.proxy.password)
+        end
     end
 
   end

data/lib/termtter/optparse.rb

@@ -9,6 +9,14 @@ module Termtter
     @optionparser = OptionParser.new { |opt|
       opt.program_name = 'Termtter'
 
+      opt.on('-f', '--config-file file', 'Set path to configfile') do |val|
+        Termtter::CONF_FILE = val
+      end
+
+      opt.on('-t', '--termtter-directory directory', 'Set termtter directory') do |val|
+        Termtter::CONF_DIR = val
+      end
+
       opt.on('-d', '--devel', 'Start in developer mode') do |flg|
         config.__assign__(:devel, true) if flg
       end
@@ -39,7 +47,9 @@ module Termtter
           class << self
             alias parse_orig parse
             def parse(o)
-              o.gsub(/<.+?>(.*?)<\/.+?>/, '\1')
+              o.gsub(/<\/?.+?>/, '').
+                gsub('&lt;', '<').
+                gsub('&gt;', '>')
             end
           end
         end

data/lib/termtter/rubytter_proxy.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 config.set_default(:memory_cache_size, 10000)
 
 module Termtter
@@ -21,11 +22,24 @@ module Termtter
           end
 
           from = Time.now
+          Termtter::Client.logger.debug(
+            "rubytter_proxy: #{method}(#{modified_args.inspect[1...-1]})")
           result = call_rubytter_or_use_cache(method, *modified_args, &block)
-          Termtter::Client.logger.debug "rubytter_proxy: #{method}(#{modified_args.inspect[1...-1]}), %.2fsec" % (Time.now - from)
+          Termtter::Client.logger.debug(
+            "rubytter_proxy: #{method}(#{modified_args.inspect[1...-1]}), " +
+            "%.2fsec" % (Time.now - from))
 
           self.class.call_hooks("post_#{method}", *args)
         rescue HookCanceled
+        rescue TimeoutError => e
+          Termtter::Client.logger.debug(
+            "rubytter_proxy: #{method}(#{modified_args.inspect[1...-1]}) " +
+            "#{e.message} #{'%.2fsec' % (Time.now - from)}")
+          raise e
+        rescue => e
+          Termtter::Client.logger.debug(
+            "rubytter_proxy: #{method}(#{modified_args.inspect[1...-1]}) #{e.message}")
+          raise e
         end
         result
       else
@@ -46,16 +60,18 @@ module Termtter
       users_cache_store[screen_name]
     end
 
+    def cached_status(id)
+      status_cache_store[id.to_i]
+    end
+
     def call_rubytter_or_use_cache(method, *args, &block)
       case method
       when :show
-        if status_cache_store.key?(args[0].to_i)
-          status_cache_store[args[0].to_i]
-        else
+        unless status = cached_status(args[0])
           status = call_rubytter(method, *args, &block)
           store_status_cache(status)
-          status
         end
+        status
       when :home_timeline, :user_timeline, :friends_timeline, :search
         statuses = call_rubytter(method, *args, &block)
         statuses.each do |status|

data/spec/plugins/capital_update_spec.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Termtter::Client, 'when the plugin capital_update is loaded' do
+  it 'adds command capital_update' do
+    Termtter::Client.should_receive(:register_command).once
+    Termtter::Client.plug 'capital_update'
+  end
+end
+

data/spec/plugins/fib_spec.rb

@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Termtter::Client, 'when the plugin fib is loaded' do
-  it 'should add command fib' do
+  it 'adds command fib' do
     Termtter::Client.should_receive(:register_command).once
     Termtter::Client.plug 'defaults/fib'
   end
 
-  it 'should define fib method' do
+  it 'defines fib method' do
     Termtter::Client.plug 'defaults/fib'
     (0..10).map {|i| fib i }.should == [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
   end

data/spec/plugins/hi_spec.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Termtter::Client, 'when the plugin hi is loaded' do
+  it 'adds commands such as hi and hola' do
+    Termtter::Client.should_receive(:register_command).at_most(9).times
+    Termtter::Client.plug 'hi'
+  end
+end
+

data/spec/plugins/tinyurl_spec.rb

@@ -0,0 +1,78 @@
+#-*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'open-uri'
+require 'uri'
+require 'net/http'
+
+describe 'plugin tinyurl' do
+  before do
+    Termtter::Client.setup_task_manager
+  end
+
+  it 'adds hook :tinyurl' do
+    Termtter::Client.should_receive(:register_hook).once
+    Termtter::Client.plug 'tinyurl'
+    #Termtter::Client.get_hook(:tinyurl).should be_a_kind_of(Hook)
+    #Termtter::Client.get_hook(:tinyurl).name.should == :tinyurl
+  end
+
+  it 'truncates url' do
+    Termtter::Client.register_command(
+      :name => :update, :alias => :u,
+      :exec => lambda do |url|
+        url.should match(/(bit\.ly|tinyurl|is\.gd)/)
+        open(url) do |f|
+          f.base_uri.to_s.should match('www.google')
+        end
+      end
+    )
+    Termtter::Client.plug 'tinyurl'
+    Termtter::Client.execute('update http://www.google.com/')
+  end
+
+  it 'truncates url with not escaped Non-ASCII characters' do
+    Termtter::Client.register_command(
+      :name => :update, :alias => :u,
+      :exec => lambda do |url|
+        url.should match(/(bit\.ly|tinyurl|is\.gd)/)
+        uri = URI.parse(url)
+        Net::HTTP.new(uri.host,uri.port) do |h|
+            r = h.get(uri.path)
+            r['Location'].should match('http://ja.wikipedia.org/wiki/%E6%B7%B1%E7%94%B0%E6%81%AD%E5%AD%90')
+        end
+      end
+    )
+    Termtter::Client.plug 'tinyurl'
+    Termtter::Client.execute('update http://ja.wikipedia.org/wiki/深田恭子')
+  end
+
+  it 'truncates url with escaped Non-ASCII characters' do
+    Termtter::Client.register_command(
+      :name => :update, :alias => :u,
+      :exec => lambda do |url|
+        url.should match(/(bit\.ly|tinyurl|is\.gd)/)
+        open(url) do |f|
+          f.base_uri.to_s.should match('http://ja.wikipedia.org/wiki/%E3%82%B9%E3%83%88%E3%83%AA%E3%83%BC%E3%83%88%E3%82%B3%E3%83%B3%E3%83%94%E3%83%A5%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0')
+        end
+      end
+    )
+    Termtter::Client.plug 'tinyurl'
+    Termtter::Client.execute('update http://ja.wikipedia.org/wiki/%E3%82%B9%E3%83%88%E3%83%AA%E3%83%BC%E3%83%88%E3%82%B3%E3%83%B3%E3%83%94%E3%83%A5%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0')
+  end
+
+  it 'truncates url with many parameters' do
+    Termtter::Client.register_command(
+      :name => :update, :alias => :u,
+      :exec => lambda do |url|
+        url.should match(/(bit\.ly|tinyurl|is\.gd)/)
+        open(url) do |f|
+          f.base_uri.to_s.should match('hl=ja&source=hp&q=ujihisa&lr=&aq=f&aqi=g4g-r6&aql=&oq=&gs_rfai=')
+        end
+      end
+    )
+    Termtter::Client.plug 'tinyurl'
+    Termtter::Client.execute('update http://www.google.co.jp/search?hl=ja&source=hp&q=ujihisa&lr=&aq=f&aqi=g4g-r6&aql=&oq=&gs_rfai=')
+
+  end
+end

data/spec/termtter/client_spec.rb

@@ -15,7 +15,6 @@ module Termtter
     it 'can run' do
       Client.should_receive(:load_config) {}
       Termtter::API.should_receive(:setup) {}
-      Client.should_receive(:setup_logger) {}
       Client.should_receive(:load_plugins) {}
       Client.should_receive(:eval_init_block) {}
 
@@ -27,7 +26,6 @@ module Termtter
     it 'can run (eval script cannot eval)' do
       Client.stub(:load_config) {}
       Termtter::API.stub(:setup) {}
-      Client.stub(:setup_logger) {}
       Client.stub(:load_plugins) {}
       Client.stub(:eval_init_block) {}
 
@@ -41,7 +39,6 @@ module Termtter
     it 'can run (eval script cannot eval)' do
       Client.stub(:load_config) {}
       Termtter::API.stub(:setup) {}
-      Client.stub(:setup_logger) {}
       Client.stub(:load_plugins) {}
       Client.stub(:eval_init_block) {}
 
@@ -391,7 +388,7 @@ module Termtter
     it 'can output status (good)' do
       statuses = mock('statuses', :null_object => true)
       statuses.stub(:empty? => false, :nil? => false)
-      event = :event
+      event = Termtter::Event.new(:event)
       Client.should_receive(:call_hooks).with(:pre_filter, statuses, event)
       Client.should_receive(:apply_filters_for_hook).exactly(2).times.
         with(an_instance_of(Symbol), anything, event).
@@ -425,13 +422,9 @@ module Termtter
       Client.handle_error error
     end
 
-    it 'handle_error raise error when logger is nothing' do
-      Client.instance_variable_set(:@logger, nil)
-      $stderr, old = StringIO.new, $stderr
+    it 'handle_error raise error' do
+      Client.logger.should_receive(:error).with('StandardError: error')
       Client.handle_error(StandardError.new('error'))
-      $stderr.rewind
-      $stderr.gets.should match(/\AError: error/)
-      $stderr = old
     end
 
     it 'cancels command by hook' do
@@ -478,14 +471,14 @@ module Termtter
     it 'can confirm before update (yes default)' do
       message = 'hello'
       Readline.should_receive(:readline).
-        with("\"#{message}".strip + "\" [Y/n] ", false)
+        with("[Y/n] ", false)
       Client.confirm(message)
     end
 
     it 'can confirm before update (no default)' do
       message = 'hello'
       Readline.should_receive(:readline).
-        with("\"#{message}".strip + "\" [N/y] ", false)
+        with("[N/y] ", false)
       Client.confirm(message, false)
     end
 

data/spec/termtter/command_spec.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 module Termtter
@@ -28,6 +26,7 @@ module Termtter
       params =  {
         :name            => 'update',
         :aliases         => ['u', 'up'],
+        :author          => 'ujihisa',
         :exec_proc       => lambda {|arg| arg },
         :completion_proc => lambda {|command, arg| %w[complete1 complete2] },
         :help            => ['update,u TEXT', 'test command']
@@ -38,7 +37,7 @@ module Termtter
     describe '#pattern' do
       it 'returns command regex' do
         @command.pattern.
-          should == /^((update|u|up)|(update|u|up)\s+(.*?))\s*$/
+          should == /^\s*((update|u|up)|(update|u|up)\s+(.*?))\s*$/
       end
     end
 
@@ -55,6 +54,10 @@ module Termtter
       @command.aliases.should == [:u, :up]
     end
 
+    it 'returns author' do
+      @command.author.should == 'ujihisa'
+    end
+
     it 'returns commands' do
       @command.commands.should == [:update, :u, :up]
     end
@@ -86,10 +89,10 @@ module Termtter
         ['up',           true],
         ['u',            true],
         ['update ',      true],
-        [' update ',     false],
+        [' update ',     true],
         ['update foo',   true],
-        [' update foo',  false],
-        [' update foo ', false],
+        [' update foo',  true],
+        [' update foo ', true],
         ['u foo',        true],
         ['up foo',       true],
         ['upd foo',      false],
@@ -148,18 +151,27 @@ module Termtter
 
     describe 'spec for split_command_line with sub command' do
       before do
-        @command = Command.new(:name => 'foo bar')
+        @command = Command.new(:name => 'foo bar', :alias => 'f')
+      end
+
+      describe '#pattern' do
+        it 'returns command regex' do
+          @command.pattern.
+            should == /^\s*((foo\s+bar|f)|(foo\s+bar|f)\s+(.*?))\s*$/
+        end
       end
 
       it 'splits from a command line string to the command name and the arg' do
         @command.split_command_line('foo bar args').
           should == ['foo bar', 'args']
         @command.split_command_line('foo  bar args').
-          should == ['foo bar', 'args']
+          should == ['foo  bar', 'args']
         @command.split_command_line(' foo  bar  args ').
-          should == ['foo bar', 'args']
+          should == ['foo  bar', 'args']
         @command.split_command_line(' foo  foo  args ').
-          should == ['foo foo', 'args']
+          should == []
+        @command.split_command_line('f args').
+          should == ['f', 'args']
       end
     end
   end

data/spec/termtter/config_spec.rb

@@ -8,6 +8,29 @@ module Termtter
       @config = Config.new
     end
 
+    describe 'freeze' do
+      before do
+        @config.foo = 'foo'
+        @config.__freeze__(:foo)
+      end
+
+      it 'can not change value' do
+        @config.foo = 'bar'
+        @config.foo.should == 'foo'
+      end
+
+      it 'can not clear value' do
+        @config.__clear__(:foo)
+        @config.foo.should == 'foo'
+      end
+
+      it 'can unfreeze' do
+        @config.__unfreeze__(:foo)
+        @config.foo = 'bar'
+        @config.foo.should == 'bar'
+      end
+    end
+
     it 'can store value to new storage' do
       @config.new_storage = :value
       @config.new_storage.should == :value

data/spec/termtter/event_spec.rb

@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'termtter/event'
+
+module Termtter
+  describe Event do
+
+    it 'creates with name' do
+      event = Event.new(:foo)
+      event.should be_kind_of Event
+    end
+
+    it 'in not created with wrong arguments' do
+      lambda{ Event.new }.should raise_error
+      lambda{ Event.new(1) }.should raise_error
+      lambda{ Event.new('hello') }.should raise_error
+      lambda{ Event.new('hello', 'goodbye') }.should raise_error
+      lambda{ Event.new(:hello, :goodbye) }.should raise_error
+    end
+
+    it 'bes created with name and params' do
+      event = Event.new(:bar, :a => 'alpha', :b => 'bravo')
+      event.should be_kind_of Event
+    end
+
+    it 'has name' do
+      event = Event.new(:foo)
+      event.name.should == :foo
+    end
+
+    it 'compares with symbol' do
+      event = Event.new(:foo)
+      event.should == :foo
+      :foo.should == event
+    end
+
+    it 'compares with itself' do
+      event = Event.new(:foo)
+      event.should == event
+    end
+
+    it 'compares with other events' do
+      a = Event.new(:foo)
+      b1 = Event.new(:bar)
+      b2 = Event.new(:bar, :a => 'alpha', :b => 'bravo')
+      a.should_not == b1
+      a.should_not == b2
+      b1.should == b2
+    end
+
+    it 'compares with other objects' do
+      event = Event.new(:foo)
+      event.should_not == 'hello'
+      event.should_not == 33
+    end
+
+    it 'compares with symbol using case' do
+      event = Event.new(:foo)
+      matched =
+        case event
+        when :foo
+          :foo_matched
+        else
+          :not_matched
+        end
+      matched.should == :foo_matched
+
+      matched =
+        case :foo
+        when event
+          :foo_matched
+        else
+          :not_matched
+        end
+      matched.should == :foo_matched
+
+      matched =
+        case :bar
+        when event
+          :bar_matched
+        else
+          :not_matched
+        end
+      matched.should == :not_matched
+    end
+
+    it 'delegates to ActiveRubytter' do
+      event = Event.new(:bar, :a => 'alpha', :b => 'bravo')
+      event.a.should == 'alpha'
+      event.b.should == 'bravo'
+      lambda { event.c }.should raise_error(NoMethodError)
+      event[:a].should == 'alpha'
+      event[:b].should == 'bravo'
+      event[:c].should be_nil
+
+      event.to_hash.should == {:a => 'alpha', :b => 'bravo'}
+
+      lambda {
+        event.attributes = {:c => 'charlie', :d => 'delta'}
+      }.should_not raise_error
+
+      event.to_hash.should == {:c => 'charlie', :d => 'delta'}
+    end
+
+    it 'delegates to Symbol' do
+      a = Event.new(:foo, :a => 'alpha', :b => 'bravo')
+      a.to_sym.should == a.name.to_sym
+      a.id2name.should == a.name.id2name
+      a.to_s.should == a.name.to_s
+
+      # NOTE: Isn't this spec working?
+      #a.to_i.should == a.name.to_i
+    end
+
+    it 'provides has_key?' do
+      event = Event.new(:foo, :a => 'alpha', :b => 'bravo')
+      event.has_key?(:a).should be_true
+      event.has_key?(:b).should be_true
+      event.has_key?(:c).should be_false
+    end
+
+    it 'provides []= ' do
+      event = Event.new(:foo)
+      event[:a] = 'alpha'
+      event.a.should == 'alpha'
+    end
+  end
+end