termtter 0.8.14 → 1.0.0

data/lib/termtter/command.rb

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
 module Termtter
+
   class Command
+
     attr_accessor :name, :aliases, :exec_proc, :completion_proc, :help
 
     # args
@@ -12,43 +14,33 @@ module Termtter
     #   help:            help text for the command (Optional)
     def initialize(args)
       raise ArgumentError, ":name is not given." unless args.has_key?(:name)
-      @name = args[:name].to_sym
-      @aliases = args[:aliases] ? args[:aliases].map {|i| i.to_sym } : []
-      @exec_proc = args[:exec_proc] || lambda {|arg|}
-      @completion_proc = args[:completion_proc] || lambda {|command, arg| [] }
-      @help = args[:help]
+      cfg = {
+        :aliases        => [],
+        :exec_proc      => lambda {|arg| },
+        :comletion_proc => lambda {|command, arg| [] }
+      }.merge(args)
+
+      set cfg
     end
 
-    def complement(input)
-      command_info = match?(input)
-      if command_info
-        [completion_proc.call(command_info[0], command_info[1] || '')].flatten.compact
-      else
-        [name.to_s].grep(/^#{Regexp.quote(input)}/)
-      end
+    def set(cfg)
+      @name            = cfg[:name].to_sym
+      @aliases         = cfg[:aliases].map {|e| e.to_sym }
+      @exec_proc       = cfg[:exec_proc]
+      @completion_proc = cfg[:completion_proc]
+      @help            = cfg[:help]
     end
 
-    # MEMO: Termtter:Client からはこのメソッドを呼び出すことになると思う。
-    def exec_if_match(input)
-      command_info = match?(input)
-      if command_info
-        result = execute(command_info[1])
-        unless result.nil?
-          return result
+    def complement(input)
+      command_str, command_arg = match?(input)
+      if command_arg
+        if completion_proc
+          [completion_proc.call(command_str, command_arg || '')].flatten.compact
         else
-          return true
+          []
         end
       else
-        return nil
-      end
-    end
-
-    # return array like [command, arg]
-    def match?(input)
-      if pattern =~ input
-        [$2 || $3, $4]  # $2 or $3 => command, $4 => argument
-      else
-        nil
+        [name.to_s, aliases.to_s].grep(/^#{Regexp.quote(input)}/)
       end
     end
 
@@ -64,8 +56,17 @@ module Termtter
       exec_proc.call(arg)
     end
 
+    # return array like [command, arg]
+    def match?(input)
+      if pattern =~ input
+        [$2 || $3, $4]  # $2 or $3 => command, $4 => argument
+      else
+        [nil, nil]
+      end
+    end
+
     def pattern
-      commands_regex = commands.map {|i| Regexp.quote(i.to_s) }.join('|')
+      commands_regex = commands.map {|name| Regexp.quote(name.to_s) }.join('|')
       /^((#{commands_regex})|(#{commands_regex})\s+(.*?))\s*$/
     end
 

data/lib/termtter/config.rb

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+#
+module Termtter
+  class Config
+    def initialize
+      @store = Hash.new(:undefined)
+    end
+
+    def inspect
+      @store.inspect
+    end
+
+    # set_default :: (Symbol | String) -> a -> IO ()
+    def set_default(name, value)
+      match_p, init, last = *name.to_s.match(/^(.+)\.([^\.]+)$/)
+      if match_p
+        tmp = eval(init)
+        if tmp.__refer__(last.to_sym).empty?
+          tmp.__assign__(last.to_sym, value)
+        end
+      else
+        __assign__(name.to_sym, value) if __refer__(name.to_sym).empty?
+      end
+    end
+
+    # empty? :: Boolean
+    def empty?
+      @store.empty?
+    end
+
+    def method_missing(name, *args)
+      case name.to_s
+      when /(.*)=$/
+        __assign__($1.to_sym, args.first)
+      else
+        __refer__(name.to_sym)
+      end
+    end
+
+    # __assign__ :: Symbol -> a -> IO ()
+    def __assign__(name, value)
+      @store[name] = value
+    end
+
+    # __refer__ :: Symbol -> IO a
+    def __refer__(name)
+      @store[name] == :undefined ? @store[name] = Termtter::Config.new : @store[name]
+    end
+
+    __instance = self.new
+    (class << self; self end).
+      __send__(:define_method, :instance) { __instance }
+  end
+end
+
+def config
+  Termtter::Config.instance
+end
+
+def configatron
+  # remove this method until Termtter-1.2.0
+  warn "configatron method will be removed. Use config instead. (#{caller.first})"
+  Termtter::Config.instance
+end

data/lib/termtter/connection.rb

@@ -5,16 +5,18 @@ module Termtter
     attr_reader :protocol, :port, :proxy_uri
 
     def initialize
-      @proxy_host = configatron.proxy.host
-      @proxy_port = configatron.proxy.port
-      @proxy_user = configatron.proxy.user_name
-      @proxy_password = configatron.proxy.password
-      @proxy_uri = nil
-      @enable_ssl = configatron.enable_ssl
+      unless config.proxy.empty?
+        @proxy_host = config.proxy.host
+        @proxy_port = config.proxy.port
+        @proxy_user = config.proxy.user_name
+        @proxy_password = config.proxy.password
+        @proxy_uri = nil
+        @enable_ssl = config.enable_ssl
+      end
       @protocol = "http"
       @port = 80
 
-      unless @proxy_host.empty?
+      if @proxy_host
         @http_class = Net::HTTP::Proxy(@proxy_host, @proxy_port,
                                        @proxy_user, @proxy_password)
         @proxy_uri =  "http://" + @proxy_host + ":" + @proxy_port + "/"

data/lib/termtter/hook.rb

@@ -7,12 +7,21 @@ module Termtter
     def initialize(args)
       raise ArgumentError, ":name is not given." unless args.has_key?(:name)
       @name = args[:name].to_sym
-      @points = args[:points] ? args[:points].map {|i| i.to_sym } : []
+      @points = args[:points] ? args[:points].map {|i| i } : []
       @exec_proc = args[:exec_proc] || lambda {}
     end
 
     def match?(point)
-      points.include?(point.to_sym)
+      !points.select{|pt|
+        case pt
+        when String, Symbol
+          pt.to_s == point.to_s
+        when Regexp
+          (pt =~ point.to_s) ? true : false
+        else
+          false
+        end
+      }.empty?
     end
   end
 end

data/lib/termtter/optparse.rb

@@ -0,0 +1,14 @@
+OptionParser.new { |opt|
+  opt.on('-f', '--file config_file', 'Set path to configfile') do |val|
+    config.system.__assign__(:conf_file, val)
+  end
+  opt.on('-t', '--termtter-directory directory', 'Set termtter directory') do |val|
+    config.system.__assign__(:conf_dir, val)
+  end
+  opt.on('-d', '--devel', 'Start in developer mode') do |flg|
+    config.system.__assign__(:devel, true) if flg
+  end
+
+  Version = Termtter::VERSION
+  opt.parse!(ARGV)
+}

data/lib/termtter/version.rb

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

data/lib/termtter.rb

@@ -12,12 +12,12 @@ require 'open-uri'
 require 'cgi'
 require 'readline'
 require 'enumerator'
-require 'configatron'
+require 'optparse'
 
-require 'termtter/twitter'
+require 'termtter/config'
+require 'termtter/version'
+require 'termtter/optparse'
 require 'termtter/connection'
-require 'termtter/status'
-require 'termtter/user'
 require 'termtter/command'
 require 'termtter/hook'
 require 'termtter/task'
@@ -25,12 +25,15 @@ require 'termtter/task_manager'
 require 'termtter/client'
 require 'termtter/api'
 require 'termtter/system_extensions'
-require 'termtter/version'
 
 module Termtter
   APP_NAME = 'termtter'
-  CONF_FILE = '~/.termtterrc' # still does not use
-  CONF_DIR = '~/.termtter' # still does not use
+
+  config.system.set_default :conf_dir, File.expand_path('~/.termtter')
+  CONF_DIR = config.system.conf_dir
+
+  config.system.set_default :conf_file, CONF_DIR + '/config'
+  CONF_FILE = config.system.conf_file
 end
 
 if RUBY_VERSION < '1.8.7'
@@ -39,26 +42,20 @@ if RUBY_VERSION < '1.8.7'
   end
 end
 
-def plugin(s, init = {})
+def plugin(name, init = {})
   unless init.empty?
     init.each do |key, value|
-      eval("configatron.plugins.#{s}").__send__("#{key}=", value)
+      config.plugins.__refer__(name.to_sym).__assign__(key.to_sym, value)
     end
   end
-  require "plugin/#{s}"
-rescue => e
-  Termtter::Client.handle_error(e)
-end
-
-def filter(s)
-  load "filter/#{s}.rb"
-rescue => e
+  # FIXME: below path should be replaced by optparsed path
+  if File.exist?(path = File.expand_path("~/.termtter/plugins/#{name}"))
+    require path
+  else
+    require "plugins/#{name}"
+  end
+rescue LoadError => e
   Termtter::Client.handle_error(e)
-else
-  Termtter::Client.public_storage[:filters] ||= []
-  Termtter::Client.public_storage[:filters] << s
-  true
 end
 
 $:.unshift(Termtter::CONF_DIR) # still does not use
-

data/spec/plugin/english_spec.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# vim: set fenc=utf-8
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Termtter do
+  it 'english? method' do
+    Termtter::Client.should_receive(:add_filter)
+    plugin 'english'
+    Termtter::English.english?('This is a pen.').should be_true
+    Termtter::English.english?('これはペンです.').should be_false
+    Termtter::English.english?('これはpenです.').should be_false
+  end
+
+  it 'apply filter english only update_friends_timeline'
+  # NOTE: when below code is evaluated,
+  #     plugin 'english', :only => [:update_friends_timeline]
+  #   in update_friends_timeline there are English posts only but in replies there are both Japanese posts and English posts.
+  #   It's too difficult for me to write that spec, so this spec is pending now. Please write this spec, hey, you, a cool hacker!
+end

data/spec/plugin/favorite_spec.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Termtter::Client, 'when the plugin favorite is loaded' do
+  it 'should add command favorite' do
+    Termtter::Client.should_receive(:register_command).once
+    plugin 'favorite'
+  end
+end

data/spec/plugin/fib_spec.rb

@@ -4,8 +4,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Termtter::Client, 'when the plugin fib is loaded' do
   it 'should add command fib' do
-    Termtter::Client.should_receive(:add_command).with(/^fib\s+(\d+)/)
-    Termtter::Client.should_receive(:add_command).with(/^fibyou\s(\w+)\s(\d+)/)
+    Termtter::Client.should_receive(:register_command).twice
     plugin 'fib'
   end
 

data/spec/plugin/pause_spec.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Termtter do
+  it 'pause plugin' do
+    Termtter::Client.should_receive(:pause)
+    plugin 'pause'
+  end
+end

data/spec/plugin/plugin_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require File.dirname(__FILE__) + '/../../lib/termtter'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 module Termtter
   describe Client, 'when the plugin plugin is loaded' do

data/spec/plugin/primes_spec.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Termtter::Client, 'when the plugin primes is loaded' do
+  it 'should add command primes' do
+    Termtter::Client.should_receive(:register_command).once
+    plugin 'primes'
+  end
+
+  it 'should define primes method' do
+    plugin 'primes'
+    (0..10).map {|i| primes i }.should == ["", "", "", "2, 3", "2, 3", "2, 3, 5", "2, 3, 5", "2, 3, 5, 7", "2, 3, 5, 7", "2, 3, 5, 7", "2, 3, 5, 7"]
+  end
+end

data/spec/plugin/sl_spec.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Termtter do
+  it 'plugin sl' do
+    Termtter::Client.should_receive(:register_command).exactly(4).times
+    plugin 'sl'
+  end
+end

data/spec/plugin/spam_spec.rb

@@ -2,16 +2,3 @@
 
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Termtter::Client, 'when the plugin spam is loaded' do
-  it 'should add command spam and post immediately' do
-    connection = mock('connection', :null_object => true)
-    t = Termtter::Twitter.new('a', 'b', connection)
-    Termtter::Twitter.should_receive(:new).and_return(t)
-    t.should_receive(:update_status).with('*super spam time*')
-
-    Termtter::Client.should_receive(:clear_commands)
-    Termtter::Client.should_receive(:add_command).with(/.+/)
-    plugin 'spam'
-  end
-end
-

data/spec/plugin/standard_plugins_spec.rb

@@ -19,13 +19,6 @@ module Termtter
         command.aliases.should == aliases
       end
     end
-
-    it 'should return candidates when call find_status_id_candidates' do
-      Client.public_storage[:status_ids] = %w[1 2 22 3 4 5]
-      Client.find_status_id_candidates("1", "%s").should == ["1"]
-      Client.find_status_id_candidates("2", "%s").should == ["2", "22"]
-      #TODO: more spec for like "jugyo:1113830"
-    end
   end
 end
 

data/spec/plugin/storage/DB_spec.rb

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../lib/plugins/storage/DB'
+
+module Termtter::Storage
+  describe DB do
+    before do
+      @db = DB.instance.db
+    end
+  end
+end

data/spec/plugin/storage/status_spec.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../lib/plugins/storage/status'
+
+module Termtter::Storage
+  describe Status do
+    before do
+      @status = Status.new
+    end
+  end
+
+  describe Status do
+    it 'self.insert should not return false' do
+      Status.insert(
+        :post_id => 1,
+        :created_at => 12345,
+        :in_reply_to_status_id => -1,
+        :in_reply_to_user_id => -1,
+        :post_text => 'bomb',
+        :user_id => 1).should_not be_false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+ARGV.delete '-c'
 require 'termtter'
+
+

data/spec/termtter/client_spec.rb

@@ -142,6 +142,7 @@ module Termtter
       )
 
       hook_called.should == false
+      Client.should_receive(:puts)
       Client.exit
       hook_called.should == true
     end
@@ -154,12 +155,13 @@ module Termtter
 
       hook1_called.should == false
       hook2_called.should == false
+      Client.should_receive(:puts)
       Client.exit
       hook1_called.should == true
       hook2_called.should == true
     end
 
-    it 'should able to override hooks' do
+    it 'should be able to override hooks' do
       hook1_called = false
       hook2_called = false
       Client.register_hook(:name => :hook, :points => [:exit], :exec_proc => lambda {hook1_called = true})
@@ -167,9 +169,69 @@ module Termtter
 
       hook1_called.should == false
       hook2_called.should == false
+      Client.should_receive(:puts)
       Client.exit
       hook1_called.should == false
       hook2_called.should == true
     end
+
+    it 'run' do
+      Client.should_receive(:puts)
+      Client.should_receive(:load_default_plugins)
+      Client.should_receive(:load_config)
+      Termtter::API.should_receive(:setup)
+      Client.should_receive(:pre_config_load)
+      Client.should_receive(:call_hooks)
+      Client.should_receive(:call_new_hooks)
+      Client.should_receive(:setup_update_timeline_task)
+      Client.should_receive(:call_commands)
+      Client.should_receive(:start_input_thread)
+      Client.run
+    end
+
+    it 'load_config'
+
+    it 'should do nothing when ~/.termtter is directory' do
+      File.should_receive(:ftype).and_return('directory')
+      Client.should_not_receive(:move_legacy_config_file)
+      Client.legacy_config_support
+    end
+
+    it 'should do "move_legacy_config_file" when ~/.termtter is file' do
+      File.should_receive(:ftype).and_return('file')
+      Client.should_receive(:move_legacy_config_file)
+      Client.legacy_config_support
+    end
+
+    it 'should move legacy config file' do
+      FileUtils.should_receive(:mv).twice
+      Dir.should_receive(:mkdir)
+      Client.move_legacy_config_file
+    end
+
+    it 'should handle error' do
+      $stderr, old = StringIO.new, $stderr
+      Client.handle_error StandardError.new('error')
+      $stderr.string.should == "[ERROR] Something wrong: error\n"
+      $stderr = old
+    end
+
+    it 'should handle Rubytte::APIError' do
+      $stderr, old = StringIO.new, $stderr
+      class Rubytter::APIError < StandardError; end
+      [
+        ['401', "[ERROR] Unauthorized: maybe you tried to show protected user status\n"],
+        ['403', "[ERROR] Access denied: maybe that user is protected\n"],
+        ['404', "[ERROR] Not found: maybe there is no such user\n"],
+      ].each do |code, message|
+        res = mock('res', :code => code)
+        excep = Rubytter::APIError.new('error')
+        excep.should_receive(:response).and_return(res)
+        Client.handle_error excep
+        $stderr.string.should == message
+        $stderr.string = ''
+      end
+      $stderr = old
+    end
   end
 end