jugyo-termtter 0.8.14 → 1.0.0

data/spec/termtter/command_spec.rb

@@ -17,22 +17,6 @@ module Termtter
       @command = Command.new(params)
     end
 
-    it 'should execute' do
-      [
-        ['update test test',   'test test'],
-        ['update   test test', 'test test'],
-        ['update test   test', 'test   test'],
-      ].each do |input, args|
-        result = @command.exec_if_match(input)
-        result.should == args
-      end
-    end
-
-    it 'should failed on execute' do
-      result = @command.exec_if_match('upda test test')
-      result.should == nil
-    end
-
     it 'should return command regex' do
       @command.pattern.should == /^((update|u|up)|(update|u|up)\s+(.*?))\s*$/
     end
@@ -64,46 +48,28 @@ module Termtter
         ['upd',       ['update']],
         [' upd',      []],
         [' upd ',     []],
-        ['update',    ['complete1', 'complete2']],
-        ['update ',   ['complete1', 'complete2']],
+        ['update a',    ['complete1', 'complete2']],
         [' update  ', []],
         ['u foo',     ['complete1', 'complete2']],
-        ['u',         ['complete1', 'complete2']],
-        ['up',        ['complete1', 'complete2']],
       ].each do |input, comp|
         @command.complement(input).should == comp
       end
     end
 
-    it 'should can redefine exec_proc' do
-      # redefine exec_proc
-      command_arg = nil
-      @command.exec_proc = lambda {|arg|
-        command_arg = arg
-        'result'
-      }
-      command_arg.should == nil
-
-      # exec command
-      result = @command.exec_if_match('update test test')
-      command_arg.should == 'test test'
-      result.should == 'result'
-    end
-
     it 'should return command_info when call method "match?"' do
       [
         ['update',       ['update', nil]],
         ['up',           ['up', nil]],
         ['u',            ['u', nil]],
         ['update ',      ['update', nil]],
-        [' update ',     nil],
+        [' update ',     [nil, nil]],
         ['update foo',   ['update', 'foo']],
-        [' update foo',  nil],
-        [' update foo ', nil],
+        [' update foo',  [nil, nil]],
+        [' update foo ', [nil, nil]],
         ['u foo',        ['u', 'foo']],
         ['up foo',       ['up', 'foo']],
-        ['upd foo',      nil],
-        ['upd foo',      nil],
+        ['upd foo',      [nil, nil]],
+        ['upd foo',      [nil, nil]],
       ].each do |input, result|
         @command.match?(input).should == result
       end
@@ -115,11 +81,6 @@ module Termtter
       lambda { Command.new(:aliases => ['u']) }.should raise_error(ArgumentError)
     end
 
-    it 'should return true with the exec_proc return nil' do
-      command = Command.new(:name => :test, :exec_proc => lambda {|args|})
-      command.exec_if_match('test').should == true
-    end
-
     it 'should call exec_proc when call method "execute"' do
       @command.execute('test').should == 'test'
       @command.execute(' test').should == ' test'
@@ -127,29 +88,6 @@ module Termtter
       @command.execute('test test').should == 'test test'
     end
 
-    it 'should redefine method "exec_if_match"' do
-      # add method
-      class << @command
-        def exec_if_match(input)
-          case input
-          when /^update\s+foo\s*(.*)/
-            foo($1)
-          when /^update\s+bar\s*(.*)/
-            bar($1)
-          end
-        end
-        def foo(arg)
-          "foo(#{arg})"
-        end
-        def bar(arg)
-          "bar(#{arg})"
-        end
-      end
-
-      @command.exec_if_match('update foo xxx').should == 'foo(xxx)'
-      @command.exec_if_match('update bar xxx').should == 'bar(xxx)'
-    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)

data/spec/termtter/config_spec.rb

@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module Termtter
+  describe Config do
+    before do
+      @config = Config.new
+    end
+
+    it 'should be able to store value to new storage' do
+      @config.new_storage = :value
+      @config.new_storage.should == :value
+    end
+
+    it 'should be able to make subb.key and store value' do
+      @config.subb.key = :value
+      @config.subb.key.should == :value
+    end
+
+    it 'should be able to make multiple storage' do
+      @config.subb.more.for.test = 'value'
+      @config.subb.more.for.test.should == 'value'
+    end
+
+    it 'should be able to change value in storage' do
+      @config.storage = :value1
+      @config.storage = :value2
+      @config.storage.should == :value2
+    end
+
+    it 'should be able to store any data' do
+      [
+        ['string',  'value'   ],
+        ['symbol',  :value    ],
+        ['arrry',   [:a, :b]  ],
+        ['hashes',    {:a => :b}],
+        ['integer', 1         ],
+        ['float',   1.5       ],
+        ['regexp',  /regexp/  ],
+      ].each do |type, value|
+        @config.__send__("#{type}=", value)
+        @config.__send__(type).should == value
+      end
+    end
+
+    it 'should raise error when add by prohibited name' do
+      lambda {
+        @config.set_default('sub.aaa', :value)
+        @config.sub.aaa
+      }.should raise_error
+    end
+
+    it 'should raise error when add subb-storage to existed key' do
+      @config.subb = 'original value'
+      lambda {
+        @config.subb.key = 'invalid subbstitution'
+      }.should raise_error(
+        NoMethodError,
+        %r[undefined method `key=' for "original value":String]
+      )
+    end
+
+    it 'should set intermediate defult configs' do
+      @config.set_default 'subb.more', 'value'
+      @config.subb.class.should == Config
+      @config.subb.more.should == 'value'
+
+      @config.proxy.set_default(:port, 'value')
+      @config.proxy.port.should == 'value'
+    end
+
+    # FIXME: not work
+#     it 'should have :undefined value in un-assigned key' do
+#       @config.aaaa.should == :undefined
+#     end
+
+    it 'should be empty when something is assigned' do
+      @config.empty?.should be_true
+
+      @config.aaa = 1
+      @config.empty?.should be_false
+
+      @config.bbb.empty?.should be_true
+    end
+
+    it 'should be empty when assigned nil' do
+      @config.bbb = nil
+      @config.empty?.should be_false
+    end
+
+    it 'should be empty when set_defaulted' do
+      @config.set_default('aaa', 1)
+      @config.empty?.should be_false
+    end
+
+    it 'should use in expression' do
+      @config.set_default(:ssb, 'hoge')
+      lambda {
+        res = @config.ssb + ' piyo'
+        res.should == 'hoge piyo'
+      }.should_not raise_error
+    end
+
+    it 'should not change value when call set_default twice' do
+      @config.plugins.set_default :only, 'before_value'
+      @config.plugins.set_default :only, 'after_value'
+      @config.plugins.only.should == 'before_value'
+    end
+  end
+end

data/spec/termtter/hook_spec.rb

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module Termtter
+  describe Hook do
+    before do
+    end
+
+    it 'should match' do
+      hook = Hook.new(
+        :name => :span,
+        :points => ['foo'],
+        :exec_proc => lambda{|cmd, arg|
+          puts 'a'
+        }
+      )
+      hook.match?('foo').should == true
+      hook.match?('bar').should == false
+      hook.match?(:foo).should == true
+      hook.match?(:bar).should == false
+    end
+
+    it 'should match when multi points' do
+      hook = Hook.new(
+        :name => :span,
+        :points => ['foo', 'bar'],
+        :exec_proc => lambda{|cmd, arg|
+          puts 'a'
+        }
+      )
+      hook.match?('foo').should == true
+      hook.match?('bar').should == true
+      hook.match?(:foo).should == true
+      hook.match?(:bar).should == true
+    end
+
+    it 'should match when multi points' do
+      hook = Hook.new(
+        :name => :span,
+        :points => ['foo', /bar/],
+        :exec_proc => lambda{|cmd, arg|
+          puts 'a'
+        }
+      )
+      hook.match?('foo').should == true
+      hook.match?('bar').should == true
+      hook.match?('_bar_').should == true
+      hook.match?(:foo).should == true
+      hook.match?(:_bar_).should == true
+    end
+
+    it 'should match when multi points' do
+      hook = Hook.new(
+        :name => :span,
+        :points => ['foo', /^bar/],
+        :exec_proc => lambda{|cmd, arg|
+          puts 'a'
+        }
+      )
+      hook.match?('bar').should == true
+      hook.match?('bar_').should == true
+      hook.match?('_bar_').should == false
+      hook.match?(:'bar').should == true
+      hook.match?(:'bar_').should == true
+      hook.match?(:'_bar_').should == false
+    end
+  end
+end

data/spec/termtter_spec.rb

@@ -2,42 +2,30 @@
 
 require File.dirname(__FILE__) + '/spec_helper'
 
-module Termtter
-  describe Twitter, 'when get_timeline called' do
-    before do
-      connection = mock('connection', :null_object => true)
-      @twitter = Termtter::Twitter.new('test', 'test', connection)
+describe Termtter, 'when plugin is called (without init option)' do
+  it 'should require global plugin if exist' do
+    File.should_receive(:exist?).and_return(false)
+    should_receive(:require).with('plugins/aaa')
+    plugin 'aaa'
+  end
+
+  it 'should require user plugin if not exist' do
+    File.should_receive(:exist?).and_return(true)
+    should_receive(:require).with(File.expand_path('~/.termtter/plugins/aaa'))
+    plugin 'aaa'
+  end
 
-      Termtter::Client.add_hook do |statuses, event|
-        @statuses = statuses
-        @event = event
-      end
-    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'
+  end
+end
 
-    it 'should get timeline' do
-      @twitter.should_receive(:open).
-        and_return(
-          File.open(
-            File.dirname(__FILE__) + "/../test/friends_timeline.json"))
-      statuses = @twitter.get_timeline('')
-      statuses.size.should == 3
-      statuses[0].user_id.should == 102
-      statuses[0].user_screen_name.should == 'test2'
-      statuses[0].user_name.should == 'Test User 2'
-      statuses[0].text.should == 'texttext 2'
-      statuses[0].user_url.should == 'http://twitter.com/test2'
-      statuses[0].user_profile_image_url.should ==
-        'http://s3.amazonaws.com/twitter_production/profile_images/000/102.png'
-      statuses[0].created_at.to_s.should == 'Sat Jan 03 21:13:45 +0900 2009'
+describe Termtter, 'when plugin is called (with init option)' do
+  it 'init option will become config' do
+    should_receive(:require)
 
-      statuses[2].user_id.should == 100
-      statuses[2].user_screen_name.should == 'test0'
-      statuses[2].user_name.should == 'Test User 0'
-      statuses[2].text.should == 'texttext 0'
-      statuses[2].user_url.should == 'http://twitter.com/test0'
-      statuses[2].user_profile_image_url.should ==
-        'http://s3.amazonaws.com/twitter_production/profile_images/000/100.png'
-      statuses[2].created_at.to_s.should == 'Sat Jan 03 21:13:45 +0900 2009'
-    end
+    plugin 'aaa', :bbb => :ccc
+    config.plugins.aaa.bbb.should == :ccc
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.8.14
+  version: 1.0.0
 platform: ruby
 authors: 
 - jugyo
@@ -24,34 +24,34 @@ dependencies:
         version: 1.1.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: configatron
+  name: highline
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: 1.5.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: termcolor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 0.3.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: termcolor
+  name: rubytter
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.4.8
     version: 
 description: Termtter is a terminal based Twitter client
 email: jugyo.org@gmail.com
@@ -64,94 +64,103 @@ extra_rdoc_files:
 - README.rdoc
 - History.txt
 files: 
-- lib/filter/en2ja.rb
-- lib/filter/english.rb
-- lib/filter/expand-tinyurl.rb
-- lib/filter/fib.rb
-- lib/filter/ignore.rb
-- lib/filter/reply.rb
-- lib/filter/reverse.rb
-- lib/filter/url_addspace.rb
-- lib/filter/yhara.rb
-- lib/plugin/april_fool.rb
-- lib/plugin/bomb.rb
-- lib/plugin/clear.rb
-- lib/plugin/confirm.rb
-- lib/plugin/cool.rb
-- lib/plugin/devel.rb
-- lib/plugin/english.rb
-- lib/plugin/erb.rb
-- lib/plugin/favorite.rb
-- lib/plugin/fib.rb
-- lib/plugin/filter.rb
-- lib/plugin/follow.rb
-- lib/plugin/graduatter.rb
-- lib/plugin/grass.rb
-- lib/plugin/group.rb
-- lib/plugin/growl.rb
-- lib/plugin/hatebu.rb
-- lib/plugin/history.rb
-- lib/plugin/keyword.rb
-- lib/plugin/log.rb
-- lib/plugin/me.rb
-- lib/plugin/modify_arg_hook_sample.rb
-- lib/plugin/msagent.rb
-- lib/plugin/multi_reply.rb
-- lib/plugin/notify-send.rb
-- lib/plugin/otsune.rb
-- lib/plugin/outputz.rb
-- lib/plugin/pause.rb
-- lib/plugin/plugin.rb
-- lib/plugin/post_exec_hook_sample.rb
-- lib/plugin/pre_exec_hook_sample.rb
-- lib/plugin/primes.rb
-- lib/plugin/quicklook.rb
-- lib/plugin/random.rb
-- lib/plugin/reblog.rb
-- lib/plugin/reload.rb
-- lib/plugin/say.rb
-- lib/plugin/scrape.rb
-- lib/plugin/screen.rb
-- lib/plugin/shell.rb
-- lib/plugin/sl.rb
-- lib/plugin/spam.rb
-- lib/plugin/standard_plugins.rb
-- lib/plugin/stdout.rb
-- lib/plugin/system_status.rb
-- lib/plugin/translation.rb
-- lib/plugin/update_editor.rb
-- lib/plugin/uri-open.rb
-- lib/plugin/wassr_post.rb
-- lib/plugin/yhara.rb
-- lib/plugin/yonda.rb
+- lib/plugins/april_fool.rb
+- lib/plugins/bomb.rb
+- lib/plugins/clear.rb
+- lib/plugins/confirm.rb
+- lib/plugins/cool.rb
+- lib/plugins/devel.rb
+- lib/plugins/en2ja.rb
+- lib/plugins/english.rb
+- lib/plugins/erb.rb
+- lib/plugins/expand-tinyurl.rb
+- lib/plugins/favorite.rb
+- lib/plugins/fib.rb
+- lib/plugins/fib_filter.rb
+- lib/plugins/filter.rb
+- lib/plugins/graduatter.rb
+- lib/plugins/grass.rb
+- lib/plugins/group.rb
+- lib/plugins/growl.rb
+- lib/plugins/hatebu.rb
+- lib/plugins/history.rb
+- lib/plugins/ignore.rb
+- lib/plugins/keyword.rb
+- lib/plugins/log.rb
+- lib/plugins/me.rb
+- lib/plugins/modify_arg_hook_sample.rb
+- lib/plugins/msagent.rb
+- lib/plugins/multi_reply.rb
+- lib/plugins/notify-send.rb
+- lib/plugins/otsune.rb
+- lib/plugins/outputz.rb
+- lib/plugins/pause.rb
+- lib/plugins/plugin.rb
+- lib/plugins/post_exec_hook_sample.rb
+- lib/plugins/pre_exec_hook_sample.rb
+- lib/plugins/primes.rb
+- lib/plugins/quicklook.rb
+- lib/plugins/random.rb
+- lib/plugins/reblog.rb
+- lib/plugins/reload.rb
+- lib/plugins/reply.rb
+- lib/plugins/reverse.rb
+- lib/plugins/say.rb
+- lib/plugins/scrape.rb
+- lib/plugins/screen-notify.rb
+- lib/plugins/screen.rb
+- lib/plugins/shell.rb
+- lib/plugins/sl.rb
+- lib/plugins/spam.rb
+- lib/plugins/standard_plugins.rb
+- lib/plugins/stdout.rb
+- lib/plugins/storage/DB.rb
+- lib/plugins/storage/status.rb
+- lib/plugins/storage/status_mook.rb
+- lib/plugins/storage.rb
+- lib/plugins/system_status.rb
+- lib/plugins/translation.rb
+- lib/plugins/update_editor.rb
+- lib/plugins/uri-open.rb
+- lib/plugins/url_addspace.rb
+- lib/plugins/wassr_post.rb
+- lib/plugins/yhara.rb
+- lib/plugins/yhara_filter.rb
+- lib/plugins/yonda.rb
 - lib/termtter/api.rb
 - lib/termtter/client.rb
 - lib/termtter/command.rb
+- lib/termtter/config.rb
 - lib/termtter/connection.rb
 - lib/termtter/hook.rb
-- lib/termtter/status.rb
+- lib/termtter/optparse.rb
 - lib/termtter/system_extensions.rb
 - lib/termtter/task.rb
 - lib/termtter/task_manager.rb
-- lib/termtter/twitter.rb
-- lib/termtter/user.rb
 - lib/termtter/version.rb
 - lib/termtter.rb
 - spec/plugin/cool_spec.rb
+- spec/plugin/english_spec.rb
+- spec/plugin/favorite_spec.rb
 - spec/plugin/fib_spec.rb
 - spec/plugin/filter_spec.rb
+- spec/plugin/pause_spec.rb
 - spec/plugin/plugin_spec.rb
+- spec/plugin/primes_spec.rb
 - spec/plugin/shell_spec.rb
+- spec/plugin/sl_spec.rb
 - spec/plugin/spam_spec.rb
 - spec/plugin/standard_plugins_spec.rb
+- spec/plugin/storage/DB_spec.rb
+- spec/plugin/storage/status_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/task_manager_spec.rb
 - spec/termtter/task_spec.rb
-- spec/termtter/user_spec.rb
 - spec/termtter_spec.rb
-- test/test_termtter.rb
 - test/friends_timeline.json
 - test/search.json
 - README.rdoc

data/lib/filter/english.rb

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-Termtter::Client.add_filter do |statuses|
-  statuses.select{|s| s.english? }
-end
-
-# filter-english.rb
-#   select English post only

data/lib/filter/ignore.rb

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-configatron.filters.ignore.set_default(:words, [])
-
-module Termtter::Client
-  add_filter do |statuses|
-    ignore_words = configatron.filters.ignore.words
-    statuses.delete_if do |s|
-      ignore_words.any? {|i| i =~ s.text }
-    end
-  end
-end
-
-# filter/ignore.rb
-#   ignore words
-# setting
-#   configatron.filters.ignore.words = [ /ignore/, /words/ ]
-

data/lib/filter/yhara.rb

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module Termtter
-
-  class Status
-    def yharian?
-      self.text =~ /^(?:\s|(y\s)|(?:hara\s))+\s*(?:y|(?:hara))(?:\?|!|\.)?\s*$/
-    end
-  end
-
-  module Client
-    add_filter do |statuses|
-      statuses.select{|s| s.yharian? }
-    end
-  end
-end
-
-# filter-yhara.rb
-#   select Yharian post only
-

data/lib/plugin/bomb.rb

@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module Termtter
-  class Status
-    def bomb?
-      /爆発|bomb/ =~ self.text
-    end
-  end
-
-  module Client
-    register_command(
-      :name => :bomb, :aliases => [],
-      :exec_proc => lambda {|arg|
-        text = "#{arg.strip} 爆発しろ!"
-        Termtter::API::twitter.update_status(text)
-        puts "=> #{text}"
-      },
-      :help => ['bomb WORD', 'Bomb it']
-    )
-  end
-end
-
-# bomb.rb
-# Bomb it!
-#
-# See http://gyazo.com/4b33517380673d92f51a52e675ecdb02.png .
-# configatron.plugins.stdout.timeline_format =
-#   %q[<90><%=time%></90> <%= s.bomb? ? "<37><41>#{status}</41></37>" : "<#{status_color}>#{status}</#{status_color}>" %> <90><%=id%></90>]
-# vim: fenc=utf8