jugyo-termtter 0.8.2 → 0.8.3

data/lib/termtter/client.rb

@@ -79,11 +79,11 @@ module Termtter
       end
 
       def register_macro(name, macro, options = {})
-        arg = {
+        command = {
           :name => name.to_sym,
-          :exec_proc => proc {|arg| call_commands(macro % arg)}
+          :exec_proc => lambda {|arg| call_commands(macro % arg)}
         }.merge(options)
-        register_command(arg)
+        register_command(command)
       end
 
       def add_help(name, desc)
@@ -204,6 +204,10 @@ module Termtter
       def load_default_plugins
         plugin 'standard_plugins'
         plugin 'stdout'
+        configatron.set_default(:devel, false)
+        if configatron.devel
+          plugin 'devel'
+        end
       end
 
       def load_config
@@ -213,8 +217,7 @@ module Termtter
             load conf_file
           end
         else
-          HighLine.track_eof = false
-          ui = HighLine.new
+          ui = create_highline
           username = ui.ask('your twitter username: ')
           password = ui.ask('your twitter password: ') { |q| q.echo = false }
 
@@ -248,7 +251,7 @@ module Termtter
 
       def setup_readline
         Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
-        Readline.completion_proc = proc {|input|
+        Readline.completion_proc = lambda {|input|
           begin
             # FIXME: when migrate to Termtter::Command
             completions = @@completions.map {|completion|
@@ -271,7 +274,7 @@ module Termtter
       def setup_update_timeline_task()
         register_command(
           :name => :_update_timeline,
-          :exec_proc => proc {|arg|
+          :exec_proc => lambda {|arg|
             begin
               statuses = Termtter::API.twitter.get_friends_timeline(@@since_id)
               unless statuses.empty?
@@ -353,6 +356,20 @@ module Termtter
         end
       end
 
+      def create_highline
+        HighLine.track_eof = false
+        if $stdin.respond_to?(:getbyte) # for ruby1.9
+          require 'delegate'
+          stdin_for_highline = SimpleDelegator.new($stdin)
+          def stdin_for_highline.getc
+            getbyte
+          end
+        else
+          stdin_for_highline = $stdin
+        end
+        return HighLine.new(stdin_for_highline)
+      end
+
       def handle_error(e)
         call_new_hooks("on_error", e)
       rescue => e

data/lib/termtter/command.rb

@@ -14,8 +14,8 @@ module Termtter
       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] || proc {|arg|}
-      @completion_proc = args[:completion_proc] || proc {|command, arg| [] }
+      @exec_proc = args[:exec_proc] || lambda {|arg|}
+      @completion_proc = args[:completion_proc] || lambda {|command, arg| [] }
       @help = args[:help]
     end
 

data/lib/termtter/hook.rb

@@ -8,7 +8,7 @@ module Termtter
       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 } : []
-      @exec_proc = args[:exec_proc] || proc {}
+      @exec_proc = args[:exec_proc] || lambda {}
     end
 
     def match?(point)

data/lib/termtter/task.rb

@@ -7,7 +7,7 @@ module Termtter
       @name = args[:name]
       @exec_at = Time.now + (args[:after] || 0)
       @interval = args[:interval]
-      @exec_proc = block || proc {}
+      @exec_proc = block || lambda {}
     end
     def execute
       exec_proc.call

data/lib/termtter/twitter.rb

@@ -6,14 +6,15 @@ require 'time'
 module Termtter
   class Twitter
 
-    def initialize(user_name, password, connection)
+    def initialize(user_name, password, connection, host = "twitter.com")
       @user_name = user_name
       @password = password
       @connection = connection
+      @host = host
     end
 
     def update_status(status)
-      @connection.start("twitter.com", @connection.port) do |http|
+      @connection.start(@host, @connection.port) do |http|
         uri = '/statuses/update.xml'
         http.request(post_request(uri), "status=#{CGI.escape(status)}&source=#{APP_NAME}")
       end
@@ -21,7 +22,7 @@ module Termtter
     end
 
     def direct_message(user, status)
-      @connection.start("twitter.com", @connection.port) do |http|
+      @connection.start(@host, @connection.port) do |http|
         uri = '/direct_messages/new.xml'
         http.request(post_request(uri), "user=#{CGI.escape(user)}&text=#{CGI.escape(status)}&source=#{APP_NAME}")
       end
@@ -29,26 +30,18 @@ module Termtter
     end
 
     def get_user_profile(screen_name)
-      uri = "#{@connection.protocol}://twitter.com/users/show/#{screen_name}.json"
-      result = JSON.parse(open(uri, :http_basic_authentication => [user_name, password], :proxy => @connection.proxy_uri).read)
-      user = User.new
-      %w[ name favourites_count url id description protected utc_offset time_zone
-          screen_name notifications statuses_count followers_count friends_count
-          profile_image_url location following created_at
-      ].each do |attr|
-        user.__send__("#{attr}=".to_sym, result[attr])
-      end
-      return user
+      result = fetch_as_json(url_for("/users/show/#{screen_name}.json"))
+      return hash_to_user(result)
     end
 
     def get_friends_timeline(since_id = nil)
-      uri =  "#{@connection.protocol}://twitter.com/statuses/friends_timeline.json"
+      uri =  url_for("/statuses/friends_timeline.json")
       uri << "?since_id=#{since_id}" if since_id
       return get_timeline(uri)
     end
 
     def get_user_timeline(screen_name)
-      return get_timeline("#{@connection.protocol}://twitter.com/statuses/user_timeline/#{screen_name}.json")
+      return get_timeline(url_for("/statuses/user_timeline/#{screen_name}.json"))
     rescue OpenURI::HTTPError => e
       puts "No such user: #{screen_name}"
       nears = near_users(screen_name)
@@ -57,7 +50,7 @@ module Termtter
     end
 
     def search(query)
-      results = JSON.parse(open("#{@connection.protocol}://search.twitter.com/search.json?q=" + CGI.escape(query)).read, :proxy => @connection.proxy_uri)['results']
+      results = fetch_as_json(search_url_for("/search.json?q=#{CGI.escape(query)}"))['results']
       return results.map do |s|
         status = Status.new
         status.id = s['id']
@@ -69,7 +62,7 @@ module Termtter
     end
 
     def show(id, rth = false)
-      get_status = lambda { get_timeline("#{@connection.protocol}://twitter.com/statuses/show/#{id}.json")[0] }
+      get_status = lambda { get_timeline(url_for("/statuses/show/#{id}.json"))[0] }
       statuses = []
       statuses << status = Array(Client.public_storage[:log]).detect(get_status) {|s| s.id == id.to_i }
       statuses << show(id, true) if rth && id = status.in_reply_to_status_id
@@ -77,11 +70,20 @@ module Termtter
     end
 
     def replies
-      return get_timeline("#{@connection.protocol}://twitter.com/statuses/replies.json")
+      return get_timeline(url_for("/statuses/replies.json"))
+    end
+
+    def followers
+      users = []
+      page = 0
+      begin
+        users += tmp = fetch_as_json(url_for("/statuses/followers.json?page=#{page+=1}"))
+      end until tmp.empty?
+      return users.map{|u| hash_to_user(u)}
     end
 
     def get_timeline(uri)
-      data = JSON.parse(open(uri, :http_basic_authentication => [user_name, password], :proxy => @connection.proxy_uri).read)
+      data = fetch_as_json(uri)
       data = [data] unless data.instance_of? Array
       return data.map do |s|
         status = Status.new
@@ -100,9 +102,7 @@ module Termtter
     # note: APILimit.reset_time_in_seconds == APILimit.reset_time.to_i
     APILIMIT = Struct.new("APILimit", :reset_time, :reset_time_in_seconds, :remaining_hits, :hourly_limit)
     def get_rate_limit_status
-      uri = 'http://twitter.com/account/rate_limit_status.json'
-      data = JSON.parse(open(uri, :http_basic_authentication => [user_name, password], :proxy => @connection.proxy_uri).read)
-
+      data = fetch_as_json(url_for("/account/rate_limit_status.json"))
       reset_time = Time.parse(data['reset_time'])
       reset_time_in_seconds = data['reset_time_in_seconds'].to_i
       
@@ -113,18 +113,43 @@ module Termtter
 
     private
 
+    def hash_to_user(hash)
+      user = User.new
+      %w[ name favourites_count url id description protected utc_offset time_zone
+          screen_name notifications statuses_count followers_count friends_count
+          profile_image_url location following created_at
+      ].each do |attr|
+        user.__send__("#{attr}=".to_sym, hash[attr])
+      end
+      return user
+    end
+
+    def fetch_as_json(uri)
+      JSON.parse(open_uri(uri).read)
+    end
+
+    def open_uri(uri)
+      return open(uri, :http_basic_authentication => [user_name, password], :proxy => @connection.proxy_uri)
+    end
+
+    def url_for(path)
+      return "#{@connection.protocol}://#{@host}/#{path.sub(/^\//, '')}"
+    end
+
+    def search_url_for(path)
+      return "#{@connection.protocol}://search.#{@host}/#{path.sub(/^\//, '')}"
+    end
+
     def user_name
       unless @user_name.instance_of? String
-        HighLine.track_eof = false
-        @user_name = HighLine.new.ask('your twitter username: ')
+        Termtter::Client.create_highline.ask('your twitter username: ')
       end
       @user_name
     end
 
     def password
       unless @password.instance_of? String
-        HighLine.track_eof = false
-        @password = HighLine.new.ask('your twitter password: ') { |q| q.echo = false }
+        @password = Termtter::Client.create_highline.ask('your twitter password: ') { |q| q.echo = false }
       end
       @password
     end
@@ -146,4 +171,3 @@ module Termtter
     end
   end
 end
-

data/lib/termtter/version.rb

@@ -1,3 +1,3 @@
 module Termtter
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/spec/plugin/cool_spec.rb

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

data/spec/plugin/fib_spec.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+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+)/)
+    plugin 'fib'
+  end
+
+  it 'should define fib method' do
+    plugin 'fib'
+    (0..10).map {|i| fib i }.should == [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
+  end
+end

data/spec/plugin/filter_spec.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module Termtter
+  describe Client, 'when the filter plugin is loaded' do
+    it 'should add command filter, filters and unfilter' do
+      Termtter::Client.should_receive(:register_command).exactly(3)
+      plugin 'filter'
+    end
+
+    it 'should set public_storage[:filters]' do
+      plugin 'filter'
+      Client::public_storage.keys.should be_include(:filters)
+    end
+  end
+end
+

data/spec/plugin/plugin_spec.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../../lib/termtter'
+
+module Termtter
+  describe Client, 'when the plugin plugin is loaded' do
+    it 'should add command plugin and plugins' do
+      Termtter::Client.should_receive(:register_command).twice
+      plugin 'plugin'
+    end
+
+    it 'should set public_storage[:plugins]' do
+      plugin 'plugin'
+      Client::public_storage[:plugins].should_not be_empty
+    end
+
+    describe 'after the plugin plugin is loaded' do
+      before { plugin 'plugin' }
+
+      it 'should load the given plugin in the command plugin'
+      # hmm... How can I write it...?
+    end
+  end
+end
+

data/spec/plugin/shell_spec.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+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'
+  end
+end

data/spec/plugin/spam_spec.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+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

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+plugin 'standard_plugins'
+
+module Termtter
+  describe Client do
+    it 'shold return registerd commands' do
+      [
+        [:update,  [:u]],  [:direct,  [:d]],
+        [:profile, [:p]],  [:list,    [:l]],
+        [:search,  [:s]],  [:replies, [:r]],
+        [:show,    [  ]],  [:shows,   [  ]],
+        [:limit,   [:lm]], [:pause,   [  ]],
+        [:resume,  [  ]],  [:exit,    [:e]],
+      ].each do |name, aliases|
+        command = Client.get_command(name)
+        command.name.should == name
+        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/spec_helper.rb

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

data/spec/termtter/client_spec.rb

@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module Termtter
+
+  describe Client do
+
+    it 'should take new_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
+      Client.register_command(:name => :test)
+      Client.get_command(:test).name.should == :test
+    end
+
+    it 'should call new_command' do
+      command_arg = nil
+      command = Command.new(:name => :test, :exec_proc => lambda {|arg| command_arg = arg})
+      Client.register_command(command)
+      command_arg.should == nil
+
+      [
+        ['test',            ''],
+        ['test foo bar',    'foo bar'],
+        ['test  foo bar ',  'foo bar'],
+        ['test  foo  bar ', 'foo  bar'],
+      ].each do |input, args|
+        Client.call_commands(input, nil)
+        command_arg.should == args
+      end
+    end
+
+    it 'should take 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
+      Client.register_hook(:name => :test)
+      Client.get_hook(:test).name.should == :test
+    end
+
+    it 'should call new_hook' do
+      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)
+      hook_called.should == true
+    end
+
+    it 'should call 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})
+      arg1.should == nil
+      arg2.should == nil
+      Client.call_new_hooks(:point1, 'foo', 'bar')
+      arg1.should == 'foo'
+      arg2.should == 'bar'
+    end
+
+    it 'should 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])
+
+      hooks = Client.get_hooks(:point1)
+      hooks.size.should == 2
+      hooks.include?(hook1).should == true
+      hooks.include?(hook2).should == true
+      hooks.include?(hook3).should == false
+    end
+
+    it 'should call decide_arg hooks' do
+      input_command = nil
+      input_arg = nil
+      decided_arg = nil
+      Client.register_hook( :name => :test1,
+                            :points => [:modify_arg_for_update],
+                            :exec_proc => lambda {|cmd, arg| input_command = cmd; input_arg = arg; arg.upcase})
+      Client.register_hook( :name => :test2,
+                            :points => [:pre_exec_update],
+                            :exec_proc => lambda {|cmd, arg| decided_arg = arg})
+      Client.register_command(:name => :update, :aliases => [:u])
+
+      input_command.should == nil
+      input_arg.should == nil
+      decided_arg.should == nil
+      Client.call_commands('u foo')
+      input_command.should == 'u'
+      input_arg.should == 'foo'
+      decided_arg.should == 'FOO'
+    end
+
+    it 'should call 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)
+
+      hook_called.should == false
+      Client.call_commands('update foo')
+      hook_called.should == true
+    end
+
+    it 'should 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})
+
+      command_called.should == false
+      Client.call_commands('update foo')
+      command_called.should == false
+    end
+
+    it 'should call post_exec hooks' do
+      command_result = nil
+      Client.register_hook( :name => :test,
+                            :points => [:post_exec_update],
+                            :exec_proc => lambda {|cmd, arg, result| command_result = result })
+      Client.register_command(:name => :update, :exec_proc => lambda {|arg| 'foo'})
+
+      command_result.should == nil
+      Client.call_commands('update foo')
+      command_result.should == 'foo'
+    end
+
+    it 'should call exit hooks' do
+      hook_called = false
+      Client.register_hook(
+        :name => :test,
+        :points => [:exit],
+        :exec_proc => lambda { hook_called = true }
+      )
+
+      hook_called.should == false
+      Client.exit
+      hook_called.should == true
+    end
+
+    it 'should call plural hooks' do
+      hook1_called = false
+      hook2_called = false
+      Client.register_hook(:name => :hook1, :points => [:exit], :exec_proc => lambda {hook1_called = true})
+      Client.register_hook(:name => :hook2, :points => [:exit], :exec_proc => lambda {hook2_called = true})
+
+      hook1_called.should == false
+      hook2_called.should == false
+      Client.exit
+      hook1_called.should == true
+      hook2_called.should == true
+    end
+
+    it 'should able to override hooks' do
+      hook1_called = false
+      hook2_called = false
+      Client.register_hook(:name => :hook, :points => [:exit], :exec_proc => lambda {hook1_called = true})
+      Client.register_hook(:name => :hook, :points => [:exit], :exec_proc => lambda {hook2_called = true})
+
+      hook1_called.should == false
+      hook2_called.should == false
+      Client.exit
+      hook1_called.should == false
+      hook2_called.should == true
+    end
+  end
+end