termtter 1.5.0 → 1.6.0

data/lib/termtter/rubytter_proxy.rb

@@ -0,0 +1,32 @@
+module Termtter
+  class RubytterProxy
+    include Hookable
+
+    def initialize(*args)
+      @rubytter = Rubytter.new(*args)
+    end
+
+    def method_missing(method, *args, &block)
+      if @rubytter.methods.include?(method.to_s)
+        result = nil
+        begin
+          modified_args = args
+          hooks = self.class.get_hooks("pre_#{method}")
+          hooks.each do |hook|
+            modified_args = hook.call(*modified_args)
+          end
+
+          timeout(config.timeout) do
+            result = @rubytter.__send__(method, *modified_args)
+          end
+
+          self.class.call_hooks("post_#{method}", *args)
+        rescue HookCanceled
+        end
+        result
+      else
+        super
+      end
+    end
+  end
+end

data/lib/termtter/system_extensions/core_compatibles.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+unless Array.instance_methods.include?('take')
+  class Array
+    def take(n) self[0...n] end
+  end
+end
+
+unless Symbol.instance_methods.include?('to_proc')
+  class Symbol
+    def to_proc
+      Proc.new { |*args| args.shift.__send__(self, *args) }
+    end
+  end
+end
+

data/lib/termtter/system_extensions/termtter_compatibles.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+def plugin(name, init = {})
+  warn "plugin method will be removed. Use Termtter::Client.plug instead."
+  unless init.empty?
+    init.each do |key, value|
+      config.plugins.__refer__(name.to_sym).__assign__(key.to_sym, value)
+    end
+  end
+  load "plugins/#{name}.rb"
+rescue Exception => e
+  Termtter::Client.handle_error(e)
+end
+
+def filter(name, init = {})
+  warn "filter method will be removed. Use plugin instead."
+  plugin(name, init)
+end
+

data/lib/termtter/system_extensions/windows.rb

@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+
+require 'iconv'
+require 'Win32API'
+$wGetACP = Win32API.new('kernel32','GetACP','','I')
+
+module Readline
+  $iconv_sj_to_u8 = Iconv.new('UTF-8', "CP#{$wGetACP.call()}")
+  alias :old_readline :readline
+  def readline(*a)
+    str = old_readline(*a)
+    out = ''
+    loop do
+      begin
+        out << $iconv_sj_to_u8.iconv(str)
+        break
+      rescue Iconv::Failure
+        out << "#{$!.success}?"
+        str = $!.failed[1..-1]
+      end
+    end
+    return out
+  end
+  module_function :old_readline, :readline
+end
+
+$wSetConsoleTextAttribute = Win32API.new('kernel32','SetConsoleTextAttribute','II','I')
+$wGetConsoleScreenBufferInfo = Win32API.new("kernel32", "GetConsoleScreenBufferInfo", ['l', 'p'], 'i')
+$wGetStdHandle = Win32API.new('kernel32','GetStdHandle','I','I')
+$wGetACP = Win32API.new('kernel32','GetACP','','I')
+
+$hStdOut = $wGetStdHandle.call(0xFFFFFFF5)
+lpBuffer = ' ' * 22
+$wGetConsoleScreenBufferInfo.call($hStdOut, lpBuffer)
+$oldColor = lpBuffer.unpack('SSSSSssssSS')[4]
+
+$colorMap = {
+   0 => 0x07|0x00|0x00|0x00, # black/white
+  37 => 0x08|0x00|0x00|0x00, # white/intensity
+  31 => 0x04|0x08|0x00|0x00, # red/red
+  32 => 0x02|0x08|0x00|0x00, # green/green
+  33 => 0x06|0x08|0x00|0x00, # yellow/yellow
+  34 => 0x01|0x08|0x00|0x00, # blue/blue
+  35 => 0x05|0x08|0x00|0x00, # magenta/purple
+  36 => 0x03|0x08|0x00|0x00, # cyan/aqua
+  39 => 0x07,                # default
+  40 => 0x00|0x00|0xf0|0x00, # background:white
+  41 => 0x07|0x00|0x40|0x00, # background:red
+  42 => 0x07|0x00|0x20|0x00, # background:green
+  43 => 0x07|0x00|0x60|0x00, # background:yellow
+  44 => 0x07|0x00|0x10|0x00, # background:blue
+  45 => 0x07|0x00|0x50|0x80, # background:magenta
+  46 => 0x07|0x00|0x30|0x80, # background:cyan
+  47 => 0x07|0x00|0x70|0x80, # background:gray
+  49 => 0x70,                # default
+  90 => 0x07|0x00|0x00|0x00, # erase/white
+}
+$iconv_u8_to_sj = Iconv.new("CP#{$wGetACP.call()}", 'UTF-8')
+def print(str)
+  str.to_s.gsub("\xef\xbd\x9e", "\xe3\x80\x9c").split(/(\e\[\d*[a-zA-Z])/).each do |token|
+    case token
+    when /\e\[(\d+)m/
+      color = $1.to_i > 90 ? ($1.to_i % 60) : $1.to_i
+      $wSetConsoleTextAttribute.call $hStdOut, $colorMap[color].to_i
+    when /\e\[\d*[a-zA-Z]/
+      # do nothing
+    else
+      loop do
+        begin
+          STDOUT.print $iconv_u8_to_sj.iconv(token)
+          break
+        rescue Iconv::Failure
+          STDOUT.print "#{$!.success}?"
+          token = $!.failed[1..-1]
+        end
+      end
+    end
+  end
+  $wSetConsoleTextAttribute.call $hStdOut, $oldColor
+  $iconv_u8_to_sj.iconv(nil)
+end
+def puts(str)
+  print str
+  STDOUT.puts
+end
+

data/lib/termtter/system_extensions.rb

@@ -1,21 +1,12 @@
 # -*- coding: utf-8 -*-
 
-def plugin(name, init = {})
-  warn "plugin method will be removed. Use Termtter::Client.plug instead."
-  unless init.empty?
-    init.each do |key, value|
-      config.plugins.__refer__(name.to_sym).__assign__(key.to_sym, value)
-    end
-  end
-  load "plugins/#{name}.rb"
-rescue Exception => e
-  Termtter::Client.handle_error(e)
+def win?
+  !!(RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin|cygwin/)
 end
 
-def filter(name, init = {})
-  warn "filter method will be removed. Use plugin instead."
-  plugin(name, init)
-end
+require 'termtter/system_extensions/windows' if win?
+require 'termtter/system_extensions/core_compatibles'
+require 'termtter/system_extensions/termtter_compatibles'
 
 require 'dl/import'
 module Readline
@@ -43,122 +34,17 @@ module Readline
   end
 end
 
-def win?
-  RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin|cygwin/
-end
-
-if win?
-  require 'iconv'
-  require 'Win32API'
-  $wGetACP = Win32API.new('kernel32','GetACP','','I')
-
-  module Readline
-    $iconv_sj_to_u8 = Iconv.new('UTF-8', "CP#{$wGetACP.call()}")
-    alias :old_readline :readline
-    def readline(*a)
-      str = old_readline(*a)
-      out = ''
-      loop do
-        begin
-          out << $iconv_sj_to_u8.iconv(str)
-          break
-        rescue Iconv::Failure
-          out << "#{$!.success}?"
-          str = $!.failed[1..-1]
-        end
-      end
-      return out
-    end
-    module_function :old_readline, :readline
-  end
-
-  $wSetConsoleTextAttribute = Win32API.new('kernel32','SetConsoleTextAttribute','II','I')
-  $wGetConsoleScreenBufferInfo = Win32API.new("kernel32", "GetConsoleScreenBufferInfo", ['l', 'p'], 'i')
-  $wGetStdHandle = Win32API.new('kernel32','GetStdHandle','I','I')
-  $wGetACP = Win32API.new('kernel32','GetACP','','I')
-
-  $hStdOut = $wGetStdHandle.call(0xFFFFFFF5)
-  lpBuffer = ' ' * 22
-  $wGetConsoleScreenBufferInfo.call($hStdOut, lpBuffer)
-  $oldColor = lpBuffer.unpack('SSSSSssssSS')[4]
-
-  $colorMap = {
-     0 => 0x07|0x00|0x00|0x00, # black/white
-    37 => 0x08|0x00|0x00|0x00, # white/intensity
-    31 => 0x04|0x08|0x00|0x00, # red/red
-    32 => 0x02|0x08|0x00|0x00, # green/green
-    33 => 0x06|0x08|0x00|0x00, # yellow/yellow
-    34 => 0x01|0x08|0x00|0x00, # blue/blue
-    35 => 0x05|0x08|0x00|0x00, # magenta/purple
-    36 => 0x03|0x08|0x00|0x00, # cyan/aqua
-    39 => 0x07,                # default
-    40 => 0x00|0x00|0xf0|0x00, # background:white
-    41 => 0x07|0x00|0x40|0x00, # background:red
-    42 => 0x07|0x00|0x20|0x00, # background:green
-    43 => 0x07|0x00|0x60|0x00, # background:yellow
-    44 => 0x07|0x00|0x10|0x00, # background:blue
-    45 => 0x07|0x00|0x50|0x80, # background:magenta
-    46 => 0x07|0x00|0x30|0x80, # background:cyan
-    47 => 0x07|0x00|0x70|0x80, # background:gray
-    49 => 0x70,                # default
-    90 => 0x07|0x00|0x00|0x00, # erase/white
-  }
-  $iconv_u8_to_sj = Iconv.new("CP#{$wGetACP.call()}", 'UTF-8')
-  def print(str)
-    str.to_s.gsub("\xef\xbd\x9e", "\xe3\x80\x9c").split(/(\e\[\d*[a-zA-Z])/).each do |token|
-      case token
-      when /\e\[(\d+)m/
-        color = $1.to_i > 90 ? ($1.to_i % 60) : $1.to_i
-        $wSetConsoleTextAttribute.call $hStdOut, $colorMap[color].to_i
-      when /\e\[\d*[a-zA-Z]/
-        # do nothing
-      else
-        loop do
-          begin
-            STDOUT.print $iconv_u8_to_sj.iconv(token)
-            break
-          rescue Iconv::Failure
-            STDOUT.print "#{$!.success}?"
-            token = $!.failed[1..-1]
-          end
-        end
-      end
-    end
-    $wSetConsoleTextAttribute.call $hStdOut, $oldColor
-    $iconv_u8_to_sj.iconv(nil)
-  end
-  def puts(str)
-    print str
-    STDOUT.puts
-  end
-end
-
-unless Array.instance_methods.include?('take')
-  class Array
-    def take(n) self[0...n] end
-  end
-end
-
-unless Symbol.instance_methods.include?('to_proc')
-  class Symbol
-    def to_proc
-      Proc.new { |*args| args.shift.__send__(self, *args) }
-    end
-  end
-end
-
 require 'highline'
 def create_highline
   HighLine.track_eof = false
   if $stdin.respond_to?(:getbyte) # for ruby1.9
-    def $stdin.getc
-      getbyte
+    def $stdin.getc; getbyte
     end
   end
   HighLine.new($stdin)
 end
 
-def open_brawser(url)
+def open_browser(url)
   case RUBY_PLATFORM
   when /linux/
     system 'firefox', url
@@ -168,3 +54,4 @@ def open_brawser(url)
     system 'open', url
   end
 end
+

data/lib/termtter/task_manager.rb

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
-
 module Termtter
   class TaskManager
-
-    INTERVAL = 1
-
-    def initialize()
+    def initialize(interval = 1)
+      @interval = interval
       @tasks = {}
       @work = true
       @mutex = Mutex.new
@@ -28,7 +25,7 @@ module Termtter
       Thread.new do
         while @work
           step unless @pause
-          sleep INTERVAL
+          sleep @interval
         end
       end
     end
@@ -43,9 +40,7 @@ module Termtter
 
     def invoke_later
       Thread.new do
-        invoke_and_wait do
-          yield
-        end
+        invoke_and_wait { yield }
       end
     end
 
@@ -107,6 +102,5 @@ module Termtter
         return due_tasks
       end
     end
-
   end
 end

data/lib/termtter/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module Termtter
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/lib/termtter.rb

@@ -2,8 +2,8 @@
 
 $KCODE = "u" unless Object.const_defined? :Encoding
 
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
+                                          $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'rubygems'
 
@@ -16,15 +16,17 @@ require 'optparse'
 require 'readline'
 gem 'rubytter', '>= 0.9.2'
 require 'rubytter'
+require 'timeout'
 
 require 'termtter/config'
 require 'termtter/version'
 require 'termtter/optparse'
-require 'termtter/connection'
 require 'termtter/command'
 require 'termtter/hook'
 require 'termtter/task'
 require 'termtter/task_manager'
+require 'termtter/hookable'
+require 'termtter/rubytter_proxy'
 require 'termtter/client'
 require 'termtter/api'
 require 'termtter/system_extensions'

data/spec/plugins/defaults/hashtag_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'plugin hashtag' do
+  before do
+    Termtter::Client.setup_task_manager
+    Termtter::Client.plug 'defaults'
+  end
+
+  describe 'spec for "hashtag add"' do
+    before do
+      Termtter::Client.public_storage[:hashtags].clear
+    end
+
+    it 'should add hashtag "test"' do
+      Termtter::Client.call_commands('hashtag add test')
+      Termtter::Client.public_storage[:hashtags].should == Set.new('#test')
+    end
+
+    it 'should add hashtag "#test"' do
+      Termtter::Client.call_commands('hashtag add #test')
+      Termtter::Client.public_storage[:hashtags].should == Set.new('#test')
+    end
+
+    it 'should add hashtags "foo", "bar"' do
+      Termtter::Client.call_commands('hashtag add foo bar')
+      Termtter::Client.public_storage[:hashtags].should == Set.new(["#foo", "#bar"])
+    end
+  end
+
+  describe 'spec for hook of hashtag' do
+    before do
+      Termtter::Client.call_commands('hashtag add foo bar')
+    end
+
+    it 'add hashtags as args of command' do
+      @update_command = Termtter::Client.commands[:update]
+      @update_command.exec_proc.should_receive(:call).with("test #foo #bar")
+      Termtter::Client.call_commands('update test')
+    end
+  end
+end

data/spec/plugins/defaults/lists_spec.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe 'plugin lists' do
+  before do
+    config.user_name = 'jugyo'
+    @twitter_stub = Object.new
+    Termtter::API.stub!(:twitter).and_return(@twitter_stub)
+  end
+
+  describe 'command lists' do
+    before do
+      Termtter::Client.plug 'defaults'
+      @command = Termtter::Client.commands[:lists]
+    end
+
+    it 'command name is :lists' do
+      @command.name.should == :lists
+    end
+
+    it 'should call with no user_name' do
+      response = Object.new
+      response.stub!(:lists).and_return({})
+      @twitter_stub.should_receive(:lists).with('jugyo').and_return(response)
+      Termtter::Client.call_commands('lists')
+    end
+
+    it 'should call with user_name' do
+      response = Object.new
+      response.stub!(:lists).and_return({})
+      @twitter_stub.should_receive(:lists).with('termtter').and_return(response)
+      Termtter::Client.call_commands('lists termtter')
+    end
+  end
+end

data/spec/plugins/gsub_spec.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Termtter::Client, 'when the plugin gsub is loaded' do
+  it 'plugin gsub' do
+    f = nil
+    Termtter::Client.should_receive(:register_hook).once do |params|
+      f = params[:exec]
+    end
+    config.plugins.gsub.table = [[/^foo/, 'FOO'], ['bar']]
+    Termtter::Client.plug 'gsub'
+    f.should_not be_nil
+    status_struct = Struct.new(:text)
+    statuses = []
+    statuses << status_struct.new('foobarbaz')
+    f.call(statuses, nil)
+    statuses[0].text.should == 'FOObaz'
+  end
+end

data/spec/plugins/haml_spec.rb

@@ -0,0 +1,134 @@
+# coding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'plugins/haml'
+
+describe Termtter::Plugins::Haml do
+  before do
+    Termtter::API.stub!(:twitter).and_return(@twitter = mock(:twitter))
+  end
+
+  subject do
+    @config = Termtter::Config.new
+    @logger = mock(:logger)
+
+    Termtter::Plugins::Haml.new(@config, @logger)
+  end
+
+  describe '#run' do
+    context 'happy case' do
+      before do
+        @status = '<hamlified string>'
+        subject.should_receive(:haml).with('xhtml').and_return(@status)
+      end
+
+      it 'update status with hamlified string' do
+        @twitter.should_receive(:update).with(@status)
+        subject.should_receive(:puts).with("=> #{@status}")
+
+        subject.run('xhtml')
+      end
+    end
+
+    context 'error occured in #haml' do
+      before do
+        subject.should_receive(:haml).and_raise(@error = StandardError.new)
+      end
+
+      it 'records the log' do
+        @logger.should_receive(:error).with(@error)
+
+        subject.run('xhtml')
+      end
+    end
+
+    context '#haml returned nil' do
+      before do
+        subject.should_receive(:haml).and_return(nil)
+      end
+
+      it 'do nothing' do
+        subject.run('xhtml')
+      end
+    end
+
+    context '#haml returned empty string' do
+      before do
+        subject.should_receive(:haml).and_return('')
+      end
+
+      it 'do nothing' do
+        subject.run('xhtml')
+      end
+    end
+  end
+
+  describe '#haml' do
+    context 'neither argument nor options were specified' do
+      before do
+        subject.should_receive(:editor).with(:haml).and_return('!!!')
+      end
+
+      it 'render Haml with default options' do
+        subject.haml('').should == <<-DTD.chomp
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+        DTD
+      end
+    end
+
+    context 'argument was specified' do
+      before do
+        subject.should_receive(:editor).with(:haml).and_return('!!!')
+      end
+
+      it do
+        subject.haml('html5').should == '<!DOCTYPE html>'
+      end
+    end
+
+    context 'options was specified' do
+      before do
+        subject.should_receive(:editor).with(:haml).and_return('!!!')
+      end
+
+      it do
+        @config.plugins.haml.options = {:format => :html5}
+        subject.haml('').should == '<!DOCTYPE html>'
+      end
+    end
+
+    context 'both argument and options were specified' do
+      before do
+        subject.should_receive(:editor).with(:haml).and_return('!!!')
+      end
+
+      it 'gives priority to argument' do
+        @config.plugins.haml.options = {:format => :html5}
+
+        subject.haml('xhtml').should == <<-DTD.chomp
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+        DTD
+      end
+    end
+
+    context 'argument was invalid' do
+      before do
+        subject.should_receive(:editor).with(:haml).and_return('!!!')
+      end
+
+      it do
+        expect { subject.haml('hoge') }.to raise_error
+      end
+    end
+
+    context '#editor returned nil' do
+      before do
+        subject.should_receive(:editor).with(:haml).and_return(nil)
+      end
+
+      it do
+        subject.haml('').should be_nil
+      end
+    end
+  end
+end

data/spec/plugins/md5pass_spec.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Termtter::Client, 'when the plugin md5pass is loaded' do
+  it 'plugin md5pass' do
+    config.user_name = 'foo'
+    Termtter::Client.should_receive(:register_command).once
+    Termtter::Client.should_receive(:create_highline).and_return(
+      mock(Termtter::Client, :ask => 'bar')
+    )
+    Termtter::Client.plug 'md5pass'
+    config.password.should == "BuCE5l6YBVd2"
+  end
+end

data/spec/plugins/standard_commands_spec.rb

@@ -5,7 +5,7 @@ Termtter::Client.plug 'defaults/standard_commands'
 
 module Termtter
   describe Client do
-    it 'shold return registerd commands' do
+    it 'returns registerd commands' do
       [
         [:update,  [:u]],  [:direct,  [:d]],
         [:profile, [:p]],  [:list,    [:l]],

data/spec/plugins/truncate_spec.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Termtter::Client, 'when the plugin truncate is loaded' do
+
+  it 'should add command truncate' do
+    Termtter::RubytterProxy.should_receive(:register_hook).once
+    be_quiet { Termtter::Client.plug 'truncate' }
+  end
+
+  it 'should define truncate method' do
+    be_quiet { Termtter::Client.plug 'truncate' }
+
+    truncate('11111').should == '11111'
+
+    truncate('1' * 140).should == '1' * 140
+
+    truncate('1' * 141).should == '1' * 137 + '...'
+
+    truncate('あああああ').should == 'あああああ'
+
+    truncate('あ' * 140).should == 'あ' * 140
+
+    truncate('あ' * 141).should == 'あ' * 137 + '...'
+  end
+end