jugyo-termtter 1.1.3 → 1.3.0

data/spec/plugins/pause_spec.rb

@@ -3,6 +3,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Termtter do
   it 'pause plugin' do
     Termtter::Client.should_receive(:pause)
-    plugin 'pause'
+    Termtter::Client.plug 'pause'
   end
 end

data/spec/plugins/primes_spec.rb

@@ -5,11 +5,11 @@ 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'
+    Termtter::Client.plug 'primes'
   end
 
   it 'should define primes method' do
-    plugin 'primes'
+    Termtter::Client.plug '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/plugins/shell_spec.rb

@@ -5,6 +5,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Termtter::Client, 'when the plugin shell is loaded' do
   it 'should add command shell' do
     Termtter::Client.should_receive(:register_command)
-    plugin 'shell'
+    Termtter::Client.plug 'shell'
   end
 end

data/spec/plugins/sl_spec.rb

@@ -3,6 +3,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Termtter do
   it 'plugin sl' do
     Termtter::Client.should_receive(:register_command).exactly(4).times
-    plugin 'sl'
+    Termtter::Client.plug 'sl'
   end
 end

data/spec/plugins/{standard_plugins_spec.rb → standard_commands_spec.rb}

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require File.dirname(__FILE__) + '/../spec_helper'
-plugin 'standard_commands'
+Termtter::Client.plug 'defaults/standard_commands'
 
 module Termtter
   describe Client do
@@ -12,7 +12,7 @@ module Termtter
         [:search,  [:s]],  [:replies, [:r]],
         [:show,    [  ]],  [:shows,   [  ]],
         [:limit,   [:lm]], [:pause,   [  ]],
-        [:resume,  [  ]],  [:exit,    [:e]],
+        [:resume,  [  ]],  [:exit,    [:quit]],
       ].each do |name, aliases|
         command = Client.get_command(name)
         command.name.should == name

data/spec/plugins/whois_spec.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Termtter::Client, 'when the plugin whois is loaded' do
+  it 'should add command whois' do
+    Termtter::Client.should_receive(:register_command).once
+    Termtter::Client.plug 'whois'
+  end
+
+  it 'should be whois define' do
+    Termtter::Client.plug 'whois'
+    name = "jp-in-f104.google.com"
+    ip = "66.249.89.104"
+    
+    whois?(name).should == ip
+    whois?(ip).should == name 
+  end
+  
+end

data/spec/termtter/client_spec.rb

@@ -1,27 +1,71 @@
 # -*- 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 call command' do
+    it 'takes register_command as block' do
+      process = lambda {}
+      Client.register_command('test', &process)
+      command = Client.get_command(:test)
+      command.name.should == :test
+      command.exec_proc.should == process
+    end
+
+    it 'takes register_command as block with options' do
+      process = lambda {}
+      Client.register_command('test', :help => 'help', &process)
+      command = Client.get_command(:test)
+      command.name.should == :test
+      command.exec_proc.should == process
+      command.help.should == 'help'
+    end
+
+    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'
+      end
+      command = Client.get_command(:test)
+      command.name.should == :test
+      command.aliases.should == [:t]
+      command.help.should == 'test command is a test'
+    end
+
+    it 'takes add_command as block without past config' do
+      Client.add_command('past') do |c|
+        c.help = 'past help'
+      end
+      Client.get_command(:past).help.should == 'past help'
+      Client.add_command('new') {}
+      Client.get_command(:new).help.should_not == 'past help'
+    end
+
+    it 'raises ArgumentError when call add_command without block' do
+      lambda { Client.add_command('past') }.should raise_error(ArgumentError)
+    end
+
+    it 'calls command' do
       command_arg = nil
       command = Command.new(:name => :test, :exec_proc => lambda {|arg| command_arg = arg})
       Client.register_command(command)
@@ -38,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
@@ -57,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})
@@ -68,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])
@@ -80,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
@@ -90,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
@@ -101,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],
@@ -137,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,
@@ -151,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})
@@ -165,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})
@@ -179,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)
@@ -188,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(
@@ -226,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
@@ -235,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 => [
@@ -263,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
@@ -279,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/command_spec.rb

@@ -3,52 +3,73 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 module Termtter
+  describe 'Command#initialize' do
+    it 'requires the name element in the argument hash' do
+      lambda { Command.new(:nama => 1) }.should raise_error(ArgumentError)
+      lambda { Command.new(:name => 1) }.should_not raise_error(ArgumentError)
+    end
 
-  describe Command do
+    it 'does not destroy the argument hash' do
+      hash = {
+        :name => 1,
+        :exec => 3
+      }
+      Command.new hash
+
+      hash.should eql(hash)
+      hash[:name].should == 1
+      hash[:exec].should == 3
+      hash[:exec_proc].should be_nil
+    end
+  end
 
+  describe Command do
     before do
       params =  {
-          :name            => 'update',
-          :aliases         => ['u', 'up'],
-          :exec_proc       => lambda {|arg| arg },
-          :completion_proc => lambda {|command, arg| ['complete1', 'complete2'] },
-          :help            => ['update,u TEXT', 'test command']
+        :name            => 'update',
+        :aliases         => ['u', 'up'],
+        :exec_proc       => lambda {|arg| arg },
+        :completion_proc => lambda {|command, arg| %w[complete1 complete2] },
+        :help            => ['update,u TEXT', 'test command']
       }
       @command = Command.new(params)
     end
 
-    it 'should return command regex' do
-      @command.pattern.should == /^((update|u|up)|(update|u|up)\s+(.*?))\s*$/
+    describe '#pattern' do
+      it 'returns command regex' do
+        @command.pattern.
+          should == /^((update|u|up)|(update|u|up)\s+(.*?))\s*$/
+      end
     end
 
-    it 'should be given name as String or Symbol' do
+    it 'is given name as String or Symbol' do
       Command.new(:name => 'foo').name.should == :foo
       Command.new(:name => :foo).name.should == :foo
     end
 
-    it 'should return name' do
+    it 'returns name' do
       @command.name.should == :update
     end
 
-    it 'should return aliases' do
+    it 'returns aliases' do
       @command.aliases.should == [:u, :up]
     end
 
-    it 'should return commands' do
+    it 'returns commands' do
       @command.commands.should == [:update, :u, :up]
     end
 
-    it 'should return help' do
+    it 'returns help' do
       @command.help.should == ['update,u TEXT', 'test command']
     end
 
-    it 'should return candidates for completion' do
+    it 'returns candidates for completion' do
       # complement
       [
         ['upd',       ['update']],
         [' upd',      []],
         [' upd ',     []],
-        ['update a',    ['complete1', 'complete2']],
+        ['update a',  ['complete1', 'complete2']],
         [' update  ', []],
         ['u foo',     ['complete1', 'complete2']],
       ].each do |input, comp|
@@ -56,7 +77,7 @@ module Termtter
       end
     end
 
-    it 'should return command_info when call method "match?"' do
+    it 'returns command_info when call method "match?"' do
       [
         ['update',       true],
         ['up',           true],
@@ -75,33 +96,45 @@ module Termtter
       end
     end
 
-    it 'should raise ArgumentError when constructor arguments are deficient' do
-      lambda { Command.new }.should raise_error(ArgumentError)
-      lambda { Command.new(:exec_proc => lambda {|args|}) }.should raise_error(ArgumentError)
-      lambda { Command.new(:aliases => ['u']) }.should raise_error(ArgumentError)
-    end
-
-    it 'should call exec_proc when call method "call"' do
+    it 'calls exec_proc when call method "call"' do
       @command.call('foo', 'test', 'foo test').should == 'test'
       @command.call('foo', ' test', 'foo  test').should == ' test'
       @command.call('foo', ' test ', 'foo  test ').should == ' test '
       @command.call('foo', 'test test', 'foo test test').should == 'test test'
     end
 
-    it 'should raise ArgumentError at call' do
-      lambda { @command.call('foo', nil, 'foo') }.should_not raise_error(ArgumentError)
-      lambda { @command.call('foo', 'foo', 'foo') }.should_not raise_error(ArgumentError)
-      lambda { @command.call('foo', false, 'foo') }.should raise_error(ArgumentError)
-      lambda { @command.call('foo', Array.new, 'foo') }.should raise_error(ArgumentError)
+    it 'raises ArgumentError at call' do
+      lambda { @command.call('foo', nil, 'foo') }.
+        should_not raise_error(ArgumentError)
+      lambda { @command.call('foo', 'foo', 'foo') }.
+        should_not raise_error(ArgumentError)
+      lambda { @command.call('foo', false, 'foo') }.
+        should raise_error(ArgumentError)
+      lambda { @command.call('foo', Array.new, 'foo') }.
+        should raise_error(ArgumentError)
     end
 
-    it 'split command line' do
-      Command.split_command_line('test foo bar').should == ['test', 'foo bar']
-      Command.split_command_line('test   foo bar').should == ['test', 'foo bar']
-      Command.split_command_line('test   foo  bar').should == ['test', 'foo  bar']
-      Command.split_command_line(' test   foo  bar').should == ['test', 'foo  bar']
-      Command.split_command_line(' test   foo  bar ').should == ['test', 'foo  bar']
+    describe '#alias=' do
+      it 'wraps aliases=' do
+        a = :ujihisa
+        @command.should_receive(:aliases=).with([a])
+        @command.alias = a
+      end
+    end
+
+    describe '.split_command_line' do
+      it 'splits from a command line string to the command name and the arg' do
+        Command.split_command_line('test foo bar').
+          should == ['test', 'foo bar']
+        Command.split_command_line('test   foo bar').
+          should == ['test', 'foo bar']
+        Command.split_command_line('test   foo  bar').
+          should == ['test', 'foo  bar']
+        Command.split_command_line(' test   foo  bar').
+          should == ['test', 'foo  bar']
+        Command.split_command_line(' test   foo  bar ').
+          should == ['test', 'foo  bar']
+      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