termtter 1.0.4 → 1.0.5

data/Rakefile

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency("json_pure", ">= 1.1.3")
   s.add_dependency("highline", ">= 1.5.0")
   s.add_dependency("termcolor", ">= 0.3.1")
-  s.add_dependency("rubytter", ">= 0.5.0")
+  s.add_dependency("rubytter", ">= 0.6.3")
   s.add_dependency("sqlite3-ruby", ">= 1.2.4")
   s.authors = %w(jugyo ujihisa)
   s.email = 'jugyo.org@gmail.com'

data/lib/plugins/addspace.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+config.plugins.addspace.set_default( :before, [ %r{https?://} ] )
+config.plugins.addspace.set_default( :after, %w{ ★ ☆ △ ▽})
+
+module Termtter::Client
+  add_filter do |statuses, event|
+    statuses.each do |s|
+      config.plugins.addspace.before.each do |c|
+        s.text.gsub!(/(\S)(#{c})/, '\1 \2' )
+      end
+    end
+    statuses.each do |s|
+      config.plugins.addspace.after.each do |c|
+        s.text.gsub!(/(#{c})(\S)/, '\1 \2' )
+      end
+      statuses
+    end
+  end
+end
+# addspace
+#   add space before or after specified words.
+# example:
+#   before: ABCDEhttp://~~~
+#   after:  ABCDE http://~~~
+#   before: ★★★
+#   after:  ★ ★ ★ 

data/lib/plugins/growl.rb

@@ -54,8 +54,8 @@ Thread.new do
 end
 
 Termtter::Client.register_hook(:name => :growl,
-                               :points => [:post_exec__update_timeline],
-                               :exec_proc => lambda { |cmd, arg, result|
-                                 result.reverse.each { |s| queue << s }
+                               :points => [:post_filter],
+                               :exec_proc => lambda {|statuses, event|
+                                 statuses.each {|s| queue << s} if event == :update_friends_timeline
                                }
 )

data/lib/plugins/plugin.rb

@@ -2,7 +2,7 @@
 
 module Termtter::Client
 
-  public_storage[:plugins] = Dir["#{File.dirname(__FILE__)}/*.rb"].map do |f|
+  public_storage[:plugins] = (Dir["#{File.dirname(__FILE__)}/*.rb"] + Dir["#{Termtter::CONF_DIR}/plugins/*.rb"]).map do |f|
     f.match(%r|([^/]+).rb$|)[1]
   end
 

data/lib/plugins/standard_plugins.rb

@@ -246,8 +246,7 @@ module Termtter::Client
         ["search,s TEXT", "Search for Twitter"],
         ["show ID", "Show a single status"]
       ]
-      helps += @@helps
-      helps += @@new_commands.map {|name, command| command.help}
+      helps += @commands.map {|name, command| command.help}
       helps.compact!
       puts formatted_help(helps)
     }

data/lib/plugins/stdout.rb

@@ -17,12 +17,12 @@ module Termtter
       super(:name => :stdout, :points => [:output])
     end
 
-    def execute(statuses, event)
+    def call(statuses, event)
       print_statuses(statuses)
     end
 
     def print_statuses(statuses, sort = true, time_format = nil)
-      return unless statuses
+      return unless statuses and statuses.first
       unless time_format
         # 最初と最後の日付がちがうとき日付も出す
         t1 = Time.parse(statuses.first[:created_at])

data/lib/plugins/url_addspace.rb

@@ -3,7 +3,7 @@
 module Termtter::Client
   add_filter do |statuses, event|
     statuses.each do |s|
-      s[:post_text].gsub!(/(\S)(https?:\/\/)/, '\1 \2')
+      s.text.gsub!(/(\S)(https?:\/\/)/, '\1 \2')
     end
     statuses
   end

data/lib/termtter.rb

@@ -25,3 +25,14 @@ require 'termtter/task_manager'
 require 'termtter/client'
 require 'termtter/api'
 require 'termtter/system_extensions'
+
+module Termtter
+  APP_NAME = 'termtter'
+
+  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
+  $:.unshift(Termtter::CONF_DIR)
+end

data/lib/termtter/client.rb

@@ -3,14 +3,6 @@ require 'fileutils'
 require 'logger'
 
 module Termtter
-  APP_NAME = 'termtter'
-
-  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
-  $:.unshift(Termtter::CONF_DIR)
 
   class CommandNotFound < StandardError; end
 
@@ -38,11 +30,11 @@ module Termtter
       end
 
       def add_filter(&b)
-        filters << b
+        @filters << b
       end
 
       def clear_filter
-        filters.clear
+        @filters.clear
       end
 
       def register_hook(arg)
@@ -128,7 +120,7 @@ module Termtter
         result = nil
         get_hooks(point).each {|hook|
           break if result == false # interrupt if hook return false
-          result = hook.execute(*args)
+          result = hook.call(*args)
         }
         result
       rescue => e
@@ -159,7 +151,7 @@ module Termtter
               pre_exec_hook_result = call_hooks("pre_exec_#{command.name.to_s}", command_str, modified_arg)
               next if pre_exec_hook_result == false
               # exec command
-              result = command.execute(modified_arg)
+              result = command.call(modified_arg)
               if result
                 call_hooks("post_exec_#{command.name.to_s}", command_str, modified_arg, result)
               end
@@ -337,7 +329,7 @@ module Termtter
 
       def handle_error(e)
         call_hooks("on_error", e)
-      rescue => e
+      rescue Exception => e
         puts "Error: #{e}"
         puts e.backtrace.join("\n")
       end

data/lib/termtter/command.rb

@@ -14,6 +14,10 @@ module Termtter
     #   help:            help text for the command (Optional)
     def initialize(args)
       raise ArgumentError, ":name is not given." unless args.has_key?(:name)
+      args[:exec_proc] ||= args[:exec]
+      args[:completion_proc] ||= args[:completion]
+      args[:aliases] ||= [args[:alias]].compact
+
       cfg = {
         :aliases        => [],
         :exec_proc      => lambda {|arg| },
@@ -44,7 +48,7 @@ module Termtter
       end
     end
 
-    def execute(arg)
+    def call(arg)
       arg = case arg
         when nil
           ''

data/lib/termtter/hook.rb

@@ -7,8 +7,8 @@ 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 } : []
-      @exec_proc = args[:exec_proc] || lambda {}
+      @points = args[:points] || [args[:point]].compact
+      @exec_proc = args[:exec_proc] || args[:exec] || lambda {}
     end
 
     def match?(point)
@@ -25,7 +25,7 @@ module Termtter
     end
 
     # TODO: need spec
-    def execute(*args)
+    def call(*args)
       self.exec_proc.call(*args)
     end
   end

data/lib/termtter/system_extensions.rb

@@ -6,13 +6,8 @@ def plugin(name, init = {})
       config.plugins.__refer__(name.to_sym).__assign__(key.to_sym, value)
     end
   end
-  # 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
+  load "plugins/#{name}.rb"
+rescue Exception => e
   Termtter::Client.handle_error(e)
 end
 

data/lib/termtter/version.rb

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

data/spec/termtter/client_spec.rb

@@ -6,7 +6,7 @@ module Termtter
 
   describe Client do
 
-    it 'should take new_command' do
+    it 'should take command' do
       command = Command.new(:name => :test)
       Client.register_command(command)
       Client.get_command(:test).should == command
@@ -17,7 +17,7 @@ module Termtter
       Client.get_command(:test).name.should == :test
     end
 
-    it 'should call new_command' do
+    it 'should call command' do
       command_arg = nil
       command = Command.new(:name => :test, :exec_proc => lambda {|arg| command_arg = arg})
       Client.register_command(command)
@@ -49,7 +49,7 @@ module Termtter
       hook_called = false
       Client.register_hook(:name => :test1, :points => [:point1], :exec_proc => lambda {hook_called = true})
       hook_called.should == false
-      Client.call_new_hooks(:point1)
+      Client.call_hooks(:point1)
       hook_called.should == true
     end
 
@@ -59,7 +59,7 @@ module Termtter
       Client.register_hook(:name => :test1, :points => [:point1], :exec_proc => lambda {|a1, a2| arg1 = a1; arg2 = a2})
       arg1.should == nil
       arg2.should == nil
-      Client.call_new_hooks(:point1, 'foo', 'bar')
+      Client.call_hooks(:point1, 'foo', 'bar')
       arg1.should == 'foo'
       arg2.should == 'bar'
     end
@@ -180,7 +180,7 @@ module Termtter
       Client.should_receive(:load_config)
       Termtter::API.should_receive(:setup)
       Client.should_receive(:post_config_load)
-      Client.should_receive(:call_new_hooks)
+      Client.should_receive(:call_hooks)
       Client.should_receive(:setup_update_timeline_task)
       Client.should_receive(:start_input_thread)
       Client.run

data/spec/termtter/command_spec.rb

@@ -81,18 +81,18 @@ module Termtter
       lambda { Command.new(:aliases => ['u']) }.should raise_error(ArgumentError)
     end
 
-    it 'should call exec_proc when call method "execute"' do
-      @command.execute('test').should == 'test'
-      @command.execute(' test').should == ' test'
-      @command.execute(' test ').should == ' test '
-      @command.execute('test test').should == 'test test'
+    it 'should call exec_proc when call method "call"' do
+      @command.call('test').should == 'test'
+      @command.call(' test').should == ' test'
+      @command.call(' test ').should == ' test '
+      @command.call('test test').should == 'test test'
     end
 
-    it 'should raise ArgumentError at execute' do
-      lambda { @command.execute(nil) }.should_not raise_error(ArgumentError)
-      lambda { @command.execute('foo') }.should_not raise_error(ArgumentError)
-      lambda { @command.execute(false) }.should raise_error(ArgumentError)
-      lambda { @command.execute(Array.new) }.should raise_error(ArgumentError)
+    it 'should raise ArgumentError at call' do
+      lambda { @command.call(nil) }.should_not raise_error(ArgumentError)
+      lambda { @command.call('foo') }.should_not raise_error(ArgumentError)
+      lambda { @command.call(false) }.should raise_error(ArgumentError)
+      lambda { @command.call(Array.new) }.should raise_error(ArgumentError)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-21 00:00:00 +09:00
+date: 2009-03-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
@@ -74,6 +74,7 @@ extra_rdoc_files:
 - README.rdoc
 - History.txt
 files: 
+- lib/plugins/addspace.rb
 - lib/plugins/april_fool.rb
 - lib/plugins/bomb.rb
 - lib/plugins/clear.rb