termtter 1.2.0 → 1.3.0

data/spec/termtter/client_spec.rb

@@ -1,27 +1,24 @@
 # -*- coding: utf-8 -*-
-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 module Termtter
-
   describe Client do
-
     before do
       Client.setup_logger
     end
 
-    it 'should take command' do
+    it 'takes command' do
       command = Command.new(:name => :test)
       Client.register_command(command)
       Client.get_command(:test).should == command
     end
 
-    it 'should take command as Hash' do
+    it 'takes command as Hash' do
       Client.register_command(:name => :test)
       Client.get_command(:test).name.should == :test
     end
 
-    it 'should take register_command as block' do
+    it 'takes register_command as block' do
       process = lambda {}
       Client.register_command('test', &process)
       command = Client.get_command(:test)
@@ -29,7 +26,7 @@ module Termtter
       command.exec_proc.should == process
     end
 
-    it 'should take register_command as block with options' do
+    it 'takes register_command as block with options' do
       process = lambda {}
       Client.register_command('test', :help => 'help', &process)
       command = Client.get_command(:test)
@@ -38,7 +35,13 @@ module Termtter
       command.help.should == 'help'
     end
 
-    it 'should take add_command as block' do
+    it 'takes register command as block with symbol name' do
+      lambda {
+        Client.register_command(:name) {}
+      }.should_not raise_error
+    end
+
+    it 'takes add_command as block' do
       Client.add_command('test') do |c|
         c.aliases = ['t']
         c.help = 'test command is a test'
@@ -49,7 +52,7 @@ module Termtter
       command.help.should == 'test command is a test'
     end
 
-    it 'should take add_command as block without past config' do
+    it 'takes add_command as block without past config' do
       Client.add_command('past') do |c|
         c.help = 'past help'
       end
@@ -62,7 +65,7 @@ module Termtter
       lambda { Client.add_command('past') }.should raise_error(ArgumentError)
     end
 
-    it 'should call command' do
+    it 'calls command' do
       command_arg = nil
       command = Command.new(:name => :test, :exec_proc => lambda {|arg| command_arg = arg})
       Client.register_command(command)
@@ -79,18 +82,18 @@ module Termtter
       end
     end
 
-    it 'should take new_hook' do
+    it 'takes new_hook' do
       hook = Hook.new(:name => :test)
       Client.register_hook(hook)
       Client.get_hook(:test).should == hook
     end
 
-    it 'should take hook as Hash' do
+    it 'takes hook as Hash' do
       Client.register_hook(:name => :test)
       Client.get_hook(:test).name.should == :test
     end
 
-    it 'should call new_hook' do
+    it 'calls new_hook' do
       hook_called = false
       Client.register_hook(:name => :test1, :points => [:point1], :exec_proc => lambda {hook_called = true})
       hook_called.should == false
@@ -98,7 +101,7 @@ module Termtter
       hook_called.should == true
     end
 
-    it 'should call new_hook with args' do
+    it 'calls new_hook with args' do
       arg1 = nil
       arg2 = nil
       Client.register_hook(:name => :test1, :points => [:point1], :exec_proc => lambda {|a1, a2| arg1 = a1; arg2 = a2})
@@ -109,7 +112,7 @@ module Termtter
       arg2.should == 'bar'
     end
 
-    it 'should return hooks when call get_hooks' do
+    it 'return hooks when call get_hooks' do
       hook1 = Client.register_hook(:name => :test1, :points => [:point1])
       hook2 = Client.register_hook(:name => :test2, :points => [:point1])
       hook3 = Client.register_hook(:name => :test3, :points => [:point2])
@@ -121,7 +124,7 @@ module Termtter
       hooks.include?(hook3).should == false
     end
 
-    it 'should call decide_arg hooks' do
+    it 'calls decide_arg hooks' do
       input_command = nil
       input_arg = nil
       decided_arg = nil
@@ -131,7 +134,7 @@ module Termtter
       Client.register_hook( :name => :test2,
                             :points => [:pre_exec_update],
                             :exec_proc => lambda {|cmd, arg| decided_arg = arg})
-      Client.register_command(:name => :update, :aliases => [:u])
+      Client.register_command(:name => :update, :aliases => [:u], :exec => lambda{|arg|})
 
       input_command.should == nil
       input_arg.should == nil
@@ -142,31 +145,62 @@ module Termtter
       decided_arg.should == 'FOO'
     end
 
-    it 'should call pre_exec hooks' do
+    it 'calls pre_command hooks' do
+      hook_called = false
+      Client.register_hook( :name => :test,
+                            :points => [:pre_command],
+                            :exec_proc => lambda {|text| hook_called = true; text})
+      Client.register_command(:name => :update, :exec => lambda{|arg|})
+
+      hook_called.should == false
+      Client.call_commands('')
+      hook_called.should == true
+
+      hook_called = false
+      Client.call_commands('update foo')
+      hook_called.should == true
+    end
+
+    it 'calls post_command hooks' do
+      hook_called = false
+      Client.register_hook( :name => :test,
+                            :points => [:post_command],
+                            :exec_proc => lambda {|text| hook_called = true})
+      Client.register_command(:name => :update, :exec => lambda{|arg|})
+
+      hook_called.should == false
+      Client.call_commands('')
+      hook_called.should == false
+
+      Client.call_commands('update foo')
+      hook_called.should == true
+    end
+
+    it 'calls pre_exec hooks' do
       hook_called = false
       Client.register_hook( :name => :test,
                             :points => [:pre_exec_update],
                             :exec_proc => lambda {|cmd, arg| hook_called = true})
-      Client.register_command(:name => :update)
+      Client.register_command(:name => :update, :exec => lambda{|arg|})
 
       hook_called.should == false
       Client.call_commands('update foo')
       hook_called.should == true
     end
 
-    it 'should able to cancel exec command' do
+    it 'able to cancel exec command' do
       command_called = false
       Client.register_hook( :name => :test,
                             :points => [:pre_exec_update],
-                            :exec_proc => lambda {|cmd, arg| false})
-      Client.register_command(:name => :update, :exec_proc => lambda {|cmd, arg| command_called = true})
+                            :exec_proc => lambda {|cmd, arg| raise CommandCanceled})
+      Client.register_command(:name => :update, :exec_proc => lambda {|arg| command_called = true})
 
       command_called.should == false
       Client.call_commands('update foo')
       command_called.should == false
     end
 
-    it 'should call post_exec hooks' do
+    it 'calls post_exec hooks' do
       command_result = nil
       Client.register_hook( :name => :test,
                             :points => [:post_exec_update],
@@ -178,7 +212,7 @@ module Termtter
       command_result.should == 'foo'
     end
 
-    it 'should call exit hooks' do
+    it 'calls exit hooks' do
       hook_called = false
       Client.register_hook(
         :name => :test,
@@ -192,7 +226,7 @@ module Termtter
       hook_called.should == true
     end
 
-    it 'should call plural hooks' do
+    it 'calls plural hooks' do
       hook1_called = false
       hook2_called = false
       Client.register_hook(:name => :hook1, :points => [:exit], :exec_proc => lambda {hook1_called = true})
@@ -206,7 +240,7 @@ module Termtter
       hook2_called.should == true
     end
 
-    it 'should be able to override hooks' do
+    it 'is able to override hooks' do
       hook1_called = false
       hook2_called = false
       Client.register_hook(:name => :hook, :points => [:exit], :exec_proc => lambda {hook1_called = true})
@@ -220,7 +254,31 @@ module Termtter
       hook2_called.should == true
     end
 
-    it 'run' do
+    it 'takes register_hook as block' do
+      process = lambda {}
+      Client.register_hook('test', &process)
+      hook = Client.get_hook(:test)
+      hook.name.should == :test
+      hook.exec_proc.should == process
+    end
+
+    it 'takes register_hook as block with options' do
+      process = lambda {}
+      Client.register_hook('test', :point => :foo, &process)
+      hook = Client.get_hook(:test)
+      hook.name.should == :test
+      hook.exec_proc.should == process
+      hook.points.should == [:foo]
+    end
+
+    it 'takes register hook as block with symbol name' do
+      lambda {
+        Client.register_hook(:name) {}
+      }.should_not raise_error
+    end
+
+    it 'runs' do
+      pending
       Client.should_receive(:load_config)
       Termtter::API.should_receive(:setup)
       Client.should_receive(:start_input_thread)
@@ -229,31 +287,31 @@ module Termtter
 
     it 'load_config'
 
-    it 'should do nothing when ~/.termtter is directory' do
+    it 'does 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
+    it 'does "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
+    it 'moves legacy config file' do
       FileUtils.should_receive(:mv).twice
       Dir.should_receive(:mkdir)
       Client.move_legacy_config_file
     end
 
-    it 'should handle error' do
+    it 'handles error' do
       logger = Client.instance_eval{@logger}
       logger.should_receive(:error).with("StandardError: error")
       Client.handle_error StandardError.new('error')
     end
 
-    it 'should cancel command by hook' do
+    it 'cancels command by hook' do
       command = Command.new(:name => :test)
       Client.register_command(command)
       Client.register_hook(
@@ -267,7 +325,7 @@ module Termtter
       Client.call_commands('test')
     end
 
-    it 'should get default help' do
+    it 'gets default help' do
       $stdout, old_stdout = StringIO.new, $stdout # FIXME That suspends any debug informations!
       help_command = Client.get_command(:help)
       help_command.should_not be_nil
@@ -276,7 +334,7 @@ module Termtter
       $stdout = old_stdout
     end
 
-    it 'should get an added help' do
+    it 'gets an added help' do
       Client.register_command(
         :name => :foo,
         :help => [
@@ -304,13 +362,13 @@ module Termtter
         Client.commands.size.should == 3
       end
 
-      it 'should find a command' do
+      it 'finds a command' do
         Client.find_commands('foo1').size.should == 1
         Client.find_commands('foo1')[0].name.should == :foo1
         Client.find_commands('bar').size.should == 1
       end
 
-      it 'should find no command' do
+      it 'finds no command' do
         Client.find_commands('foo').size.should == 0
       end
     end
@@ -320,9 +378,28 @@ module Termtter
         Client.clear_command
       end
 
-      it 'should no command' do
+      it 'no command' do
         Client.commands.size.should == 0
       end
     end
+
+    describe '.plug' do
+      it 'loads a plugin' do
+        Client.should_receive(:load).with('plugins/aaa.rb')
+        Client.plug 'aaa'
+      end
+
+      it 'loads a plugin with plugin name as Symbol' do
+        Client.should_receive(:load).with('plugins/aaa.rb')
+        Client.plug :aaa
+      end
+
+      it 'loads plugins' do
+        Client.should_receive(:load).with('plugins/aaa.rb')
+        Client.should_receive(:load).with('plugins/bbb.rb')
+        Client.should_receive(:load).with('plugins/ccc.rb')
+        Client.plug ['aaa', 'bbb', 'ccc']
+      end
+    end
   end
 end

data/spec/termtter/config_spec.rb

@@ -107,5 +107,15 @@ module Termtter
       @config.plugins.set_default :only, 'after_value'
       @config.plugins.only.should == 'before_value'
     end
+
+    it 'should be called set_default with int multiple times' do
+      @config.set_default(:foo, 1)
+      @config.set_default(:foo, 2)
+    end
+
+    it 'should be called set_default with string multiple times' do
+      @config.set_default(:foo, 'foo')
+      @config.set_default(:foo, 'bar')
+    end
   end
 end

data/spec/termtter/optparse_spec.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'optparse' do
+  def run_termtter(opt)
+    `./run_termtter.rb #{opt}`
+  end
+
+  it 'accepts -h option' do
+    run_termtter('-h').should match(/Usage/)
+  end
+
+  it 'accepts -m option' do
+    pending
+  end
+end

data/spec/termtter_spec.rb

@@ -4,26 +4,25 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Termtter, 'when plugin is called (without init option)' do
   it 'should require global plugin if exist' do
-    should_receive(:load).with('plugins/aaa.rb')
-    plugin 'aaa'
+    Termtter::Client.should_receive(:load).with('plugins/aaa.rb')
+    Termtter::Client.plug 'aaa'
   end
 
   it 'should require user plugin if not exist' do
-    should_receive(:load).with('plugins/aaa.rb')
-    plugin 'aaa'
+    Termtter::Client.should_receive(:load).with('plugins/aaa.rb')
+    Termtter::Client.plug 'aaa'
   end
 
   it 'should handle_error if there are no plugins in global or user' do
     Termtter::Client.should_receive(:handle_error)
-    plugin 'not-exist-plugin-hehehehehehe'
+    Termtter::Client.plug 'not-exist-plugin-hehehehehehe'
   end
 end
 
 describe Termtter, 'when plugin is called (with init option)' do
   it 'init option will become config' do
-    should_receive(:load)
-
-    plugin 'aaa', :bbb => :ccc
+    Termtter::Client.should_receive(:load)
+    Termtter::Client.plug 'aaa', :bbb => :ccc
     config.plugins.aaa.bbb.should == :ccc
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 00:00:00 +09:00
+date: 2009-07-27 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.6.4
     version: 
-description: Termtter is a terminal based Twitter client
+description: Termtter is a terminal based Twitter client.
 email: jugyo.org@gmail.com
 executables: 
 - kill_termtter
@@ -62,28 +62,39 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- History.txt
+- ChangeLog
 files: 
+- Rakefile
+- README.rdoc
+- ChangeLog
 - lib/plugins/addspace.rb
 - lib/plugins/april_fool.rb
-- lib/plugins/auto_reload.rb
 - lib/plugins/bomb.rb
 - lib/plugins/clear.rb
 - lib/plugins/command_plus.rb
 - lib/plugins/confirm.rb
 - lib/plugins/cool.rb
 - lib/plugins/countter.rb
+- lib/plugins/curry.rb
+- lib/plugins/db.rb
+- lib/plugins/defaults/auto_reload.rb
+- lib/plugins/defaults/command_line.rb
+- lib/plugins/defaults/exec.rb
+- lib/plugins/defaults/fib.rb
+- lib/plugins/defaults/retweet.rb
+- lib/plugins/defaults/standard_commands.rb
+- lib/plugins/defaults/standard_completion.rb
+- lib/plugins/defaults/stdout.rb
+- lib/plugins/defaults.rb
 - lib/plugins/devel.rb
-- lib/plugins/direct_messages.rb
 - lib/plugins/en2ja.rb
 - lib/plugins/english.rb
 - lib/plugins/erb.rb
-- lib/plugins/exec.rb
 - lib/plugins/exec_and_update.rb
 - lib/plugins/expand-tinyurl.rb
-- lib/plugins/fib.rb
 - lib/plugins/fib_filter.rb
 - lib/plugins/filter.rb
+- lib/plugins/github-issues.rb
 - lib/plugins/graduatter.rb
 - lib/plugins/grass.rb
 - lib/plugins/group.rb
@@ -92,7 +103,11 @@ files:
 - lib/plugins/hatebu.rb
 - lib/plugins/hatebu_and_update.rb
 - lib/plugins/history.rb
+- lib/plugins/http_server/favicon.ico
+- lib/plugins/http_server/index.html
+- lib/plugins/http_server.rb
 - lib/plugins/ignore.rb
+- lib/plugins/irb.rb
 - lib/plugins/irc_gw.rb
 - lib/plugins/keyword.rb
 - lib/plugins/l2.rb
@@ -111,6 +126,7 @@ files:
 - lib/plugins/otsune.rb
 - lib/plugins/outputz.rb
 - lib/plugins/pause.rb
+- lib/plugins/pool.rb
 - lib/plugins/post_exec_hook_sample.rb
 - lib/plugins/pre_exec_hook_sample.rb
 - lib/plugins/primes.rb
@@ -120,9 +136,9 @@ files:
 - lib/plugins/reblog.rb
 - lib/plugins/reload.rb
 - lib/plugins/reply.rb
-- lib/plugins/retweet.rb
 - lib/plugins/reverse.rb
 - lib/plugins/say.rb
+- lib/plugins/saykanji.rb
 - lib/plugins/scrape.rb
 - lib/plugins/screen-notify.rb
 - lib/plugins/screen.rb
@@ -130,8 +146,6 @@ files:
 - lib/plugins/shell.rb
 - lib/plugins/sl.rb
 - lib/plugins/spam.rb
-- lib/plugins/standard_commands.rb
-- lib/plugins/stdout.rb
 - lib/plugins/storage/DB.rb
 - lib/plugins/storage/status.rb
 - lib/plugins/storage/status_mook.rb
@@ -141,11 +155,14 @@ files:
 - lib/plugins/timer.rb
 - lib/plugins/tinyurl.rb
 - lib/plugins/translation.rb
+- lib/plugins/trends.rb
+- lib/plugins/twitpic.rb
 - lib/plugins/typable_id.rb
 - lib/plugins/update_editor.rb
 - lib/plugins/uri-open.rb
 - lib/plugins/wassr.rb
 - lib/plugins/wassr_post.rb
+- lib/plugins/whois.rb
 - lib/plugins/yhara.rb
 - lib/plugins/yhara_filter.rb
 - lib/plugins/yonda.rb
@@ -154,6 +171,7 @@ files:
 - lib/termtter/command.rb
 - lib/termtter/config.rb
 - lib/termtter/config_setup.rb
+- lib/termtter/config_template.erb
 - lib/termtter/connection.rb
 - lib/termtter/hook.rb
 - lib/termtter/optparse.rb
@@ -162,8 +180,9 @@ files:
 - lib/termtter/task_manager.rb
 - lib/termtter/version.rb
 - lib/termtter.rb
-- lib/termtter/config_template.erb
 - spec/plugins/cool_spec.rb
+- spec/plugins/curry_spec.rb
+- spec/plugins/db_spec.rb
 - spec/plugins/english_spec.rb
 - spec/plugins/fib_spec.rb
 - spec/plugins/filter_spec.rb
@@ -172,24 +191,25 @@ files:
 - spec/plugins/shell_spec.rb
 - spec/plugins/sl_spec.rb
 - spec/plugins/spam_spec.rb
-- spec/plugins/standard_plugins_spec.rb
+- spec/plugins/standard_commands_spec.rb
 - spec/plugins/storage/DB_spec.rb
 - spec/plugins/storage/status_spec.rb
+- spec/plugins/whois_spec.rb
 - spec/spec_helper.rb
 - spec/termtter/client_spec.rb
 - spec/termtter/command_spec.rb
 - spec/termtter/config_spec.rb
 - spec/termtter/hook_spec.rb
+- spec/termtter/optparse_spec.rb
 - spec/termtter/task_manager_spec.rb
 - spec/termtter/task_spec.rb
 - spec/termtter_spec.rb
 - test/friends_timeline.json
 - test/search.json
-- README.rdoc
-- History.txt
-- Rakefile
 has_rdoc: true
 homepage: http://wiki.github.com/jugyo/termtter
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -213,9 +233,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: termtter
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
-summary: Terminal based Twitter client
+specification_version: 3
+summary: Terminal based Twitter client.
 test_files: []
 

data/History.txt

@@ -1,4 +0,0 @@
-== 0.0.1 2008-12-26
-
-* 1 major enhancement:
-  * Initial release

data/lib/plugins/direct_messages.rb

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-module Termtter::Client
-  register_command(
-                   :name => :direct_messages,
-                   :aliases => [:ds],
-                   :exec_proc => lambda {|arg|
-                     event = :list_user_timeline
-                     ds = Termtter::API.twitter.direct_messages
-                     DM = Struct.new :id, :text, :user, :created_at, :in_reply_to_status_id
-                     statuses = ds.map do |d|
-                       DM.new(d.id, d.text, d.sender, d.created_at)
-                     end
-                     output(statuses, event)
-                   },
-                   :completion_proc => lambda {|cmd, arg|
-                   },
-                   :help => ['direct_messages,ds', 'List direct messages for you']
-  )
-
-  register_command(
-                   :name => :sent_direct_messages,
-                   :aliases => [:sds],
-                   :exec_proc => lambda {|arg|
-                     event = :list_user_timeline
-                     ds = Termtter::API.twitter.sent_direct_messages
-                     DM = Struct.new :id, :text, :user, :created_at, :in_reply_to_status_id
-                     statuses = ds.map do |d|
-                       DM.new(d.id, "@#{d.recipient.screen_name} #{d.text}", d.sender,  d.created_at)
-                     end
-                     output(statuses, event)
-                   },
-                   :completion_proc => lambda {|cmd, arg|
-                   },
-                   :help => ['sent_direct_messages, sds', 'List direct messages from you']
-                   )
-end