termtter 1.0.7 → 1.0.8

data/lib/termtter/api.rb

@@ -13,28 +13,43 @@ config.set_default(:enable_ssl, false)
 module Termtter
   module API
     class << self
-      attr_reader :connection, :twitter, :twitter_old
+      attr_reader :connection, :twitter
       def setup
         @connection = Connection.new
-        @twitter = Rubytter.new(
-                    config.user_name,
-                    config.password,
-                    {
-                      :app_name => Termtter::APP_NAME,
-                      :host => config.host,
-                      :header => {
-                        'User-Agent' => 'Termtter http://github.com/jugyo/termtter',
-                        'X-Twitter-Client' => 'Termtter',
-                        'X-Twitter-Client-URL' => 'http://github.com/jugyo/termtter',
-                        'X-Twitter-Client-Version' => Termtter::VERSION
-                      },
-                      :enable_ssl => config.enable_ssl,
-                      :proxy_host => config.proxy.host,
-                      :proxy_port => config.proxy.port,
-                      :proxy_user_name => config.proxy.user_name,
-                      :proxy_password => config.proxy.password
-                    }
-                  )
+        @twitter = create_twitter(config.user_name, config.password)
+      end
+
+      def restore_user
+        @twitter = create_twitter(config.user_name, config.password)
+      end
+
+      def switch_user(username = nil)
+        highline = create_highline
+        username = highline.ask('your twitter username: ') if username.nil? || username.empty?
+        password = highline.ask('your twitter password: ') { |q| q.echo = false }
+        @twitter = create_twitter(username, password)
+      end
+
+      def create_twitter(user_name, password)
+        Rubytter.new(
+          user_name,
+          password,
+          {
+            :app_name => config.app_name.empty? ? Termtter::APP_NAME : config.app_name,
+            :host => config.host,
+            :header => {
+              'User-Agent' => 'Termtter http://github.com/jugyo/termtter',
+              'X-Twitter-Client' => 'Termtter',
+              'X-Twitter-Client-URL' => 'http://github.com/jugyo/termtter',
+              'X-Twitter-Client-Version' => Termtter::VERSION
+            },
+            :enable_ssl => config.enable_ssl,
+            :proxy_host => config.proxy.host,
+            :proxy_port => config.proxy.port,
+            :proxy_user_name => config.proxy.user_name,
+            :proxy_password => config.proxy.password
+          }
+        )
       end
     end
   end

data/lib/termtter/client.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'fileutils'
 require 'logger'
+require 'termcolor'
 
 module Termtter
 
@@ -148,7 +149,7 @@ module Termtter
 
           @task_manager.invoke_and_wait do
             begin
-              call_hooks("pre_exec_#{command.name.to_s}", command_str, modified_arg)
+              call_hooks("pre_exec_#{command.name.to_s}", command, modified_arg)
               # exec command
               result = command.call(command_str, modified_arg, text)
               if result
@@ -216,7 +217,7 @@ module Termtter
       end
 
       def post_config_load()
-        if config.system.devel
+        if config.devel
           plugin 'devel'
         end
       end
@@ -309,7 +310,30 @@ module Termtter
       end
 
       def setup_logger
-        @logger = config.logger || Logger.new(STDOUT)
+        @logger = config.logger || default_logger
+      end
+
+      def default_logger
+        logger = Logger.new(STDOUT)
+        logger.formatter = lambda { |severity, time, progname, message|
+          color =
+            case severity
+            when /^DEBUG/
+              'blue'
+            when /^INFO/
+              'cyan'
+            when /^WARN/
+              'magenta'
+            when /^ERROR/
+              'red'
+            when /^FATAL/
+              'on_red'
+            else
+              'white'
+            end
+          TermColor.parse("<#{color}>" + TermColor.escape("[#{severity}] #{message}\n") + "</#{color}>")
+        }
+        logger
       end
 
       def run
@@ -328,6 +352,12 @@ module Termtter
       end
 
       def handle_error(e)
+        if logger
+          logger.error("#{e.class.to_s}: #{e.message}")
+          logger.error(e.backtrace.join("\n")) if config.devel
+        else
+          raise e
+        end
         get_hooks(:on_error).each {|hook| hook.call(e) }
       rescue Exception => e
         puts "Error: #{e}"

data/lib/termtter/command.rb

@@ -36,9 +36,9 @@ module Termtter
     end
 
     def complement(input)
-      command_str, command_arg = Command.split_command_line(input)
-      if command_arg
+      if match?(input) && input =~ /^[^\s]+\s/
         if completion_proc
+          command_str, command_arg = Command.split_command_line(input)
           [completion_proc.call(command_str, command_arg || '')].flatten.compact
         else
           []
@@ -48,7 +48,7 @@ module Termtter
       end
     end
 
-    def call(cmd, arg, original_text)
+    def call(cmd = nil, arg = nil, original_text = nil)
       arg = case arg
         when nil
           ''
@@ -78,4 +78,3 @@ module Termtter
     end
   end
 end
-

data/lib/termtter/config.rb

@@ -47,6 +47,10 @@ module Termtter
       @store[name] == :undefined ? @store[name] = Termtter::Config.new : @store[name]
     end
 
+    def __values__
+      @store.dup
+    end
+
     __instance = self.new
     (class << self; self end).
       __send__(:define_method, :instance) { __instance }

data/lib/termtter/config_setup.rb

@@ -2,6 +2,7 @@
 
 module Termtter
   module ConfigSetup
+    module_function
     def run
       ui = create_highline
       username = ui.ask('your twitter username: ')
@@ -33,21 +34,5 @@ module Termtter
       puts "generated: ~/.termtter/config"
       puts "enjoy!"
     end
-
-    module_function :run
-
-    def self.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
-      HighLine.new(stdin_for_highline)
-    end
   end
 end

data/lib/termtter/system_extensions.rb

@@ -144,3 +144,18 @@ unless Symbol.instance_methods.include?('to_proc')
     end
   end
 end
+
+require 'highline'
+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
+  HighLine.new(stdin_for_highline)
+end

data/lib/termtter/task_manager.rb

@@ -53,7 +53,7 @@ module Termtter
       synchronize do
         begin
           yield
-        rescue => e
+        rescue Exception => e
           Termtter::Client.handle_error(e)
         end
       end

data/lib/termtter/version.rb

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

data/spec/plugins/standard_plugins_spec.rb

@@ -21,4 +21,3 @@ module Termtter
     end
   end
 end
-

data/spec/termtter/client_spec.rb

@@ -7,6 +7,7 @@ module Termtter
   describe Client do
 
     it 'should take command' do
+      Client.setup_logger
       command = Command.new(:name => :test)
       Client.register_command(command)
       Client.get_command(:test).should == command
@@ -207,28 +208,9 @@ module Termtter
     end
 
     it 'should handle error' do
-      $stderr, old = StringIO.new, $stderr
+      logger = Client.instance_eval{@logger}
+      logger.should_receive(:error).with("StandardError: error")
       Client.handle_error StandardError.new('error')
-      $stderr.string.should == "[ERROR] Something wrong: error\n"
-      $stderr = old
-    end
-
-    it 'should handle Rubytte::APIError' do
-      $stderr, old = StringIO.new, $stderr
-      class Rubytter::APIError < StandardError; end
-      [
-        ['401', "[ERROR] Unauthorized: maybe you tried to show protected user status\n"],
-        ['403', "[ERROR] Access denied: maybe that user is protected\n"],
-        ['404', "[ERROR] Not found: maybe there is no such user\n"],
-      ].each do |code, message|
-        res = mock('res', :code => code)
-        excep = Rubytter::APIError.new('error')
-        excep.should_receive(:response).and_return(res)
-        Client.handle_error excep
-        $stderr.string.should == message
-        $stderr.string = ''
-      end
-      $stderr = old
     end
 
     it 'should cancel command by hook' do
@@ -244,5 +226,30 @@ module Termtter
       command.should_not_receive(:call)
       Client.call_commands('test')
     end
+
+    it 'should get 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
+      help_command.call
+      $stdout.string.should_not == '' # 何がか出力されていること
+      $stdout = old_stdout
+    end
+
+    it 'should get an added help' do
+      Client.register_command(
+        :name => :foo,
+        :help => [
+          ['foo USER', 'foo to USER'],
+          ['foo list', 'list foo'],
+        ]
+      )
+      $stdout, old_stdout = StringIO.new, $stdout # FIXME That suspends any debug informations!
+      help_command = Client.get_command(:help)
+      help_command.should_not be_nil
+      help_command.call
+      $stdout.string.should match(/foo USER/)
+      $stdout.string.should match(/foo list/)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-26 00:00:00 +09:00
+date: 2009-04-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.5
+        version: 0.6.4
     version: 
 description: Termtter is a terminal based Twitter client
 email: jugyo.org@gmail.com
@@ -68,14 +68,18 @@ files:
 - lib/plugins/april_fool.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/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/favorite.rb
 - lib/plugins/fib.rb
 - lib/plugins/fib_filter.rb
 - lib/plugins/filter.rb
@@ -83,10 +87,13 @@ files:
 - lib/plugins/grass.rb
 - lib/plugins/group.rb
 - lib/plugins/growl.rb
+- lib/plugins/growl2.rb
 - lib/plugins/hatebu.rb
+- lib/plugins/hatebu_and_update.rb
 - lib/plugins/history.rb
 - lib/plugins/ignore.rb
 - lib/plugins/keyword.rb
+- lib/plugins/l2.rb
 - lib/plugins/log.rb
 - lib/plugins/me.rb
 - lib/plugins/modify_arg_hook_sample.rb
@@ -94,10 +101,11 @@ files:
 - lib/plugins/multi_reply.rb
 - lib/plugins/notify-send.rb
 - lib/plugins/notify-send2.rb
+- lib/plugins/notify-send3.rb
+- lib/plugins/open_url.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
@@ -106,6 +114,7 @@ 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/scrape.rb
@@ -120,9 +129,12 @@ files:
 - lib/plugins/storage/status.rb
 - lib/plugins/storage/status_mook.rb
 - lib/plugins/storage.rb
+- lib/plugins/switch_user.rb
 - lib/plugins/system_status.rb
 - lib/plugins/timer.rb
+- lib/plugins/tinyurl.rb
 - lib/plugins/translation.rb
+- lib/plugins/typable_id.rb
 - lib/plugins/update_editor.rb
 - lib/plugins/uri-open.rb
 - lib/plugins/wassr_post.rb
@@ -144,11 +156,9 @@ files:
 - lib/termtter.rb
 - spec/plugins/cool_spec.rb
 - spec/plugins/english_spec.rb
-- spec/plugins/favorite_spec.rb
 - spec/plugins/fib_spec.rb
 - spec/plugins/filter_spec.rb
 - spec/plugins/pause_spec.rb
-- spec/plugins/plugin_spec.rb
 - spec/plugins/primes_spec.rb
 - spec/plugins/shell_spec.rb
 - spec/plugins/sl_spec.rb

data/lib/plugins/favorite.rb

@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-
-def create_favorite(id)
-  r = Termtter::API.twitter.favorite id
-  puts "Favorited status ##{r.id} on user @#{r.user.screen_name} #{r.text}"
-end
-
-module Termtter::Client
-  register_command(
-    :name => :favorite, :aliases => [:fav],
-    :exec_proc => lambda {|arg|
-      id = 0
-      case arg
-      when /^\d+/
-        id = arg.to_i
-      when /^@([A-Za-z0-9_]+)/
-        user = $1
-        statuses = Termtter::API.twitter.user_timeline(user)
-        return if statuses.empty?
-        id = statuses[0].id
-      when /^\/(.*)$/
-        word = $1
-        raise "Not implemented yet."
-      else
-        return
-      end
-
-      create_favorite id
-    },
-    :completion_proc => lambda {|cmd, arg|
-      case arg
-      when /@(.*)/
-        find_user_candidates $1, "#{cmd} @%s"
-      when /(\d+)/
-        find_status_ids(arg).map{|id| "#{cmd} #{$1}"}
-      else
-        %w(favorite).grep(/^#{Regexp.quote arg}/)
-      end
-    },
-    :help => ['favorite,fav (ID|@USER|/WORD)', 'Favorite a status']
-  )
-
-#   TBD: Implement this when database support comes.
-#
-#   if public_storage[:log]
-#     add_help 'favorite,fav /WORD', 'Favorite a status by searching'
-#
-#     add_command %r'^(?:favorite|fav)\s+/(.+)$' do |m, t|
-#       pat = Regexp.new(m[1])
-#       statuses = public_storage[:log].select {|s| pat =~ s.text }
-#       if statuses.size == 1
-#         status = statuses.first
-#         res = t.favorite(status.id)
-#         if res.code == '200'
-#           puts %Q(Favorited "#{status.user.screen_name}: #{status.text}")
-#         else
-#           puts "Failed: #{res}"
-#         end
-#       else
-#         puts "#{pat} does not match single status"
-#       end
-#     end
-end

data/lib/plugins/plugin.rb

@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module Termtter::Client
-
-  public_storage[:plugins] = (Dir["#{File.dirname(__FILE__)}/*.rb"] + Dir["#{Termtter::CONF_DIR}/plugins/*.rb"]).map do |f|
-    f.match(%r|([^/]+).rb$|)[1]
-  end
-
-  register_command(
-    :name      => :plugin, :aliases => [],
-    :exec_proc => lambda {|arg|
-      begin
-        result = plugin arg.strip
-      rescue LoadError
-      ensure
-        puts "=> #{result.inspect}"
-      end
-    },
-    :completion_proc => lambda {|cmd, args|
-      find_user_candidates args, "#{cmd} %s"
-      unless args.empty?
-        find_plugin_candidates args, "#{cmd} %s"
-      else
-        public_storage[:plugins].sort
-      end
-    },
-    :help      => ['plugin FILE', 'Load a plugin']
-  )
-
-  register_command(
-    :name      => :plugins, :aliases => [],
-    :exec_proc => lambda {|arg|
-      puts public_storage[:plugins].sort.join("\n")
-    },
-    :help      => ['plugins', 'Show list of plugins']
-  )
-
-  def self.find_plugin_candidates(a, b)
-    public_storage[:plugins].
-      grep(/^#{Regexp.quote a}/i).
-      map {|u| b % u }
-  end
-end
-
-# plugin.rb
-#   a dynamic plugin loader
-# example
-#   > u <%= not erbed %>
-#   => <%= not erbed %>
-#   > plugin erb
-#   => true
-#   > u <%= 1 + 2 %>
-#   => 3

data/spec/plugins/favorite_spec.rb

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

data/spec/plugins/plugin_spec.rb

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-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
-