termtter 1.5.0 → 1.6.0

data/Rakefile

@@ -23,7 +23,6 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("highline", ">= 1.5.0")
   s.add_dependency("termcolor", ">= 1.0.0")
   s.add_dependency("rubytter", ">= 0.9.2")
-  s.add_dependency("oauth", ">= 0.3.6")
   s.authors = %w(jugyo ujihisa)
   s.email = 'jugyo.org@gmail.com'
   s.homepage = 'http://termtter.org/'
@@ -61,12 +60,14 @@ end
 desc 'run all specs'
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files.sort!  # FIXME: Spec depends order.
   t.spec_opts = ['-c']
 end
 desc "Run all examples with RCov"
 
 Spec::Rake::SpecTask.new('rcov') do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files.sort!  # FIXME: Spec depends order.
   t.spec_opts = ['-c', '-fs']
   t.rcov = true
   t.rcov_opts = ['-x', 'spec', '--exclude', 'lib/plugins']

data/bin/termtter

@@ -3,4 +3,5 @@
 
 require 'rubygems'
 require 'termtter'
+Termtter::OptParser.parse!(ARGV)
 Termtter::Client.run

data/lib/plugins/another_prompt.rb

@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+config.plugins.another_prompt.
+  set_default(:shortcut_setting,
+              { ':' => '',
+                'd' => 'direct',
+                'D' => 'delete',
+                'f' => 'fib',
+                'F' => 'favorite',
+                'l' => 'list',
+                'o' => 'open',
+                'p' => 'profile',
+                'R' => 'reply',
+                's' => 'search',
+                't' => 'retweet',
+                'u' => 'update',
+                'c' => lambda do
+                  system('clear')
+                end,
+                'L' => lambda do
+                  puts '-' *
+                    `stty size`.chomp.
+                    sub(/^\d+\s(\d+)$/, '\\1').to_i
+                end,
+                'q' => lambda do
+                  Termtter::Client.call_commands('quit')
+                end,
+                'r' => lambda do
+                  Termtter::Client.call_commands('replies')
+                end,
+                '?' => lambda do
+                  Termtter::Client.call_commands('help')
+                end,
+                "\e" => lambda do
+                  system('screen', '-X', 'eval', 'copy')
+                end
+              })
+
+Termtter::Client.plug 'curry'
+
+module Termtter::Client
+  add_task(:name => :auto_reload,
+           :interval => config.update_interval,
+           :after => config.update_interval) do
+    begin
+      call_commands('reload')
+    rescue Exception => e
+      handle_error(e)
+    end
+  end
+
+  register_hook(
+    :name => :auto_reload_init,
+    :point => :initialize,
+    :exec => lambda {
+      begin
+        call_commands('reload')
+      rescue Exception => e
+        handle_error(e)
+      end
+    }
+  )
+end
+
+module Termtter
+  class CommandLine
+    include Singleton
+
+    STTY_ORIGIN = `stty -g`.chomp
+
+    def start_input_thread
+      setup_readline()
+      trap_setting()
+      @input_thread = Thread.new do
+        loop do
+          begin
+            value = config.plugins.another_prompt.shortcut_setting[wait_keypress]
+            Client.pause
+            case value
+            when String
+              call_prompt(value)
+            when Proc
+              value.call
+            end
+          ensure
+            Client.resume
+          end
+        end
+      end
+      @input_thread.join
+    end
+
+    def call_prompt(command)
+      Client.call_commands("curry #{command}")
+      if buf = Readline.readline(ERB.new(prompt).result(Termtter::API.twitter.__send__(:binding)), true)
+        Readline::HISTORY.pop if buf.empty?
+        begin
+          call(buf)
+        rescue Exception => e
+          Client.handle_error(e)
+        end
+      else
+        puts
+      end
+    ensure
+      Client.call_commands('uncurry')
+    end
+
+    def wait_keypress
+      system('stty', '-echo', '-icanon')
+      c = STDIN.getc
+      return [c].pack('c')
+    ensure
+      system('stty', STTY_ORIGIN)
+    end
+
+    def trap_setting()
+      begin
+        trap("INT") do
+          begin
+            system "stty", STTY_ORIGIN
+          ensure
+            Client.call_commands('exit')
+          end
+        end
+      rescue ArgumentError
+      rescue Errno::ENOENT
+      end
+    end
+  end
+end

data/lib/plugins/async.rb

@@ -0,0 +1,23 @@
+module Termtter::Client
+  register_command(
+    :async,
+    :alias => :a,
+    :help => ['async COMMAND', 'asynchronously execute the command'],
+    :completion => lambda {|cmd, arg|
+      commands.map{|name, command| command.complement(arg)}.
+        flatten.
+        compact.
+        map{|i| "#{cmd} #{i}"}
+    },
+    :exec => lambda {|arg|
+      @task_manager.invoke_later do
+        begin
+          call_commands(arg)
+        rescue Exception => e
+          handle_error(e)
+        end
+        Readline.refresh_line
+      end
+    }
+  )
+end

data/lib/plugins/confirm.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-config.plugins.confirm.set_default(:commands, [:update, :reply, :direct])
+config.plugins.confirm.set_default(:commands, [:update, :reply, :direct, :retweet])
 config.plugins.confirm.set_default(
   :conditions,
   [

data/lib/plugins/db.rb

@@ -76,7 +76,7 @@ module Termtter
     end
 
     register_command(:db_clear) do |arg|
-      if confirm('Are you shure?')
+      if confirm('Are you sure?')
         User.delete
         Status.delete
       end

data/lib/plugins/defaults/auto_reload.rb

@@ -1,22 +1,23 @@
 # -*- coding: utf-8 -*-
-module Termtter::Client
-  add_task(:name => :auto_reload, :interval => config.update_interval, :after => config.update_interval) do
-    begin
-      call_commands('reload -r')
-    rescue Exception => e
-      handle_error(e)
-    end
+auto_reload_proc = lambda do
+  begin
+    Termtter::Client.call_commands('reload -r')
+  rescue TimeoutError
+    # do nothing
+  rescue Exception => e
+    Termtter::Client.handle_error(e)
   end
-
-  register_hook(
-    :name => :auto_reload_init,
-    :point => :initialize,
-    :exec => lambda {
-      begin
-        call_commands('reload -r')
-      rescue Exception => e
-        handle_error(e)
-      end
-    }
-  )
 end
+
+Termtter::Client.add_task(
+  :name => :auto_reload,
+  :interval => config.update_interval,
+  :after => config.update_interval,
+  &auto_reload_proc
+)
+
+Termtter::Client.register_hook(
+  :name => :auto_reload_init,
+  :point => :initialize,
+  :exec => auto_reload_proc
+)

data/lib/plugins/defaults/command_line.rb

@@ -20,7 +20,7 @@ module Termtter
     end
 
     def stop
-      @input_thread.kill
+      @input_thread.kill if @input_thread
     end
 
     def call(command_text)
@@ -32,6 +32,8 @@ module Termtter
         command_text = hook.call(command_text)
       }
       Client.call_commands(command_text)
+    rescue TimeoutError
+      puts TermColor.parse("<red>Time out :(</red>")
     end
 
     def prompt
@@ -67,11 +69,14 @@ module Termtter
       Readline.completion_case_fold = true
       Readline.completion_proc = lambda {|input|
         begin
-          words = []
-          words << Client.commands.map {|name, command| command.complement(input) }
-          Client.get_hooks(:completion).each do |hook|
-            words << hook.call(input) rescue nil
+          words = Client.commands.map {|name, command| command.complement(input) }.flatten.compact
+
+          if words.empty?
+            Client.get_hooks(:completion).each do |hook|
+              words << hook.call(input) rescue nil
+            end
           end
+
           words.flatten.compact
         rescue Exception => e
           Client.handle_error(e)

data/lib/plugins/defaults/hashtag.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+require 'set'
+
+module Termtter::Client
+  public_storage[:hashtags] ||= Set.new
+  public_storage[:orig_prompt] = config.prompt
+
+  register_hook(:add_hashtags, :point => :modify_arg_for_update) do |cmd, arg|
+    "#{arg} #{public_storage[:hashtags].to_a.join(' ')}"
+  end
+
+  register_command(:raw_update) do |args|
+    temp = public_storage[:hashtags]
+    public_storage[:hashtags].clear
+    call_commands "update #{args}"
+    public_storage[:hashtags] = temp
+  end
+
+  register_command('hashtag add') do |args|
+    args.split(/\s+/).each do |arg|
+      hashtag = /^#/ =~ arg ? arg : "##{arg}"
+      public_storage[:hashtags] << hashtag
+      config.prompt = "#{public_storage[:hashtags].to_a.join(', ')} #{public_storage[:orig_prompt]}"
+    end
+  end
+
+  register_command('hashtag clear') do |args|
+    public_storage[:hashtags].clear
+    config.prompt = public_storage[:orig_prompt]
+  end
+
+  register_command('hashtag list') do |args|
+    puts public_storage[:hashtags].to_a
+  end
+end

data/lib/plugins/defaults/lists.rb

@@ -0,0 +1,14 @@
+module Termtter::Client
+  register_command(
+    :name => :lists,
+    :exec => lambda {|arg|
+      unless arg.empty?
+        user_name = normalize_as_user_name(arg)
+      else
+        user_name = config.user_name
+      end
+      # TODO: show more information of lists
+      puts Termtter::API.twitter.lists(user_name).lists.map{|i| i.slug}
+    }
+  )
+end

data/lib/plugins/defaults/retweet.rb

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
 config.plugins.retweet.set_default(:format, '<%= comment %>RT @<%=s.user.screen_name%>: <%=s.text%>')
+config.plugins.retweet.set_default(:confirm_protected, true)
 
 module Termtter::Client
   def self.post_retweet(s, comment = nil)
-    if s.user.protected &&
+    if s.user.protected && config.plugins.retweet.confirm_protected &&
         !confirm("#{s.user.screen_name} is protected! Are you sure?", false)
       return
     end
@@ -23,21 +24,20 @@ module Termtter::Client
     :help      => ['retweet,rt (ID|@USER)', 'Post a retweet message'],
     :exec_proc => lambda {|arg|
       arg, comment = arg.split(/\s/, 2)
-      txt = if public_storage[:typable_id] && s = typable_id_status(arg)
-              post_retweet(s, comment)
-            else
-              case arg
-              when /(\d+)/
-                post_retweet(Termtter::API.twitter.show(arg), comment)
-              when /@([A-Za-z0-9_]+)/
-                user = $1
-                statuses = Termtter::API.twitter.user_timeline(user)
-                return if statuses.empty?
-                post_retweet(statuses[0], comment)
-              end
-            end
 
-      return txt
+      if public_storage[:typable_id] && s = typable_id_status(arg)
+        post_retweet(s, comment)
+      else
+        case arg
+        when /(\d+)/
+          post_retweet(Termtter::API.twitter.show(arg), comment)
+        when /@([A-Za-z0-9_]+)/
+          user = $1
+          statuses = Termtter::API.twitter.user_timeline(user)
+          return if statuses.empty?
+          post_retweet(statuses[0], comment)
+        end
+      end
     }
   )
 end

data/lib/plugins/defaults/standard_commands.rb

@@ -28,8 +28,8 @@ module Termtter::Client
   register_command(
     :name => :update, :alias => :u,
     :exec => lambda {|arg|
-      unless arg.empty?
-        params = 
+      unless arg.rstrip.empty?
+        params =
           if config.easy_reply && /^\s*(@\w+)/ =~ arg
             user_name = normalize_as_user_name($1)
             in_reply_to_status_id = Termtter::API.twitter.user(user_name).status.id rescue nil
@@ -167,7 +167,8 @@ module Termtter::Client
   register_command(
     :name => :search, :aliases => [:s],
     :exec_proc => lambda {|arg|
-      statuses = Termtter::API.twitter.search(arg)
+      search_option = config.search.option.empty? ? {} : config.search.option
+      statuses = Termtter::API.twitter.search(arg, search_option)
       public_storage[:search_keywords] << arg
       output(statuses, SearchEvent.new(arg))
     },
@@ -256,25 +257,25 @@ 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_name = normalize_as_user_name($1)
-        statuses = Termtter::API.twitter.user_timeline(user_name)
-        return if statuses.empty?
-        id = statuses[0].id
-      when /^\/(.*)$/
-        word = $1
-        raise "Not implemented yet."
-      else
-        if public_storage[:typable_id] && typable_id?(arg)
-          id = typable_id_convert(arg)
+      id =
+        case arg
+        when /^\d+/
+          arg.to_i
+        when /^@([A-Za-z0-9_]+)/
+          user_name = normalize_as_user_name($1)
+          statuses = Termtter::API.twitter.user_timeline(user_name)
+          return if statuses.empty?
+          statuses[0].id
+        when /^\/(.*)$/
+          word = $1
+          raise "Not implemented yet."
         else
-          return
+          if public_storage[:typable_id] && typable_id?(arg)
+            typable_id_convert(arg)
+          else
+            return
+          end
         end
-      end
 
       r = Termtter::API.twitter.favorite id
       puts "Favorited status ##{r.id} on user @#{r.user.screen_name} #{r.text}"
@@ -405,16 +406,9 @@ module Termtter::Client
 
   ## plugin_list :: IO ()
   def self.plugin_list
-    plugin_list = (Dir["#{File.dirname(__FILE__)}/../*.rb"] + Dir["#{Termtter::CONF_DIR}/plugins/*.rb"]).
+    (Dir["#{File.dirname(__FILE__)}/../*.rb"] + Dir["#{Termtter::CONF_DIR}/plugins/*.rb"]).
       map {|f| File.basename(f).sub(/\.rb$/, '')}.
       sort
-    list = plugin_list
-    width = list.map {|i|i.size}.max + 2
-    a = []
-    list.sort.each_slice(4) {|i|
-      a << i.map {|j| j + (" " * (width - j.size))}.join
-    }
-    puts TermColor.parse('<green>' + TermColor.escape(a.join("\n")) + '</green>')
   end
 
   register_command(

data/lib/plugins/defaults/standard_completion.rb

@@ -40,7 +40,7 @@ module Termtter::Client
         if part_of_user_name.nil? || part_of_user_name.empty?
           public_storage[:users].to_a
         else
-          public_storage[:users].grep(/^#{Regexp.quote(part_of_user_name)}/i)
+          public_storage[:users].grep(Regexp.compile("^#{Regexp.quote(part_of_user_name)}", part_of_user_name.downcase == part_of_user_name ? Regexp::IGNORECASE : 0))
         end
 
       users.map {|u| "#{command_str} @%s" % u }
@@ -51,19 +51,19 @@ module Termtter::Client
   # completion for hashtags
   #
 
-  public_storage[:hashtags] ||= Set.new
+  public_storage[:hashtags_for_completion] ||= Set.new
 
   register_hook(:collect_hashtags, :point => :pre_filter) do |statuses, event|
     statuses.each do |s|
-      public_storage[:hashtags] += s.text.scan(/#([^\s]+)/).flatten
+      public_storage[:hashtags_for_completion] += s.text.scan(/#([^\s]+)/).flatten
     end
   end
 
-  register_hook(:hashtagss_completion, :point => :completion) do |input|
+  register_hook(:hashtags_completion, :point => :completion) do |input|
     if /(.*)\s#([^\s]*)$/ =~ input
       command_str = $1
       part_of_hashtag = $2
-      ht = public_storage[:hashtags]
+      ht = public_storage[:hashtags_for_completion]
       (ht.grep(/^#{Regexp.quote(part_of_hashtag)}/) | # prior
        ht.grep(/^#{Regexp.quote(part_of_hashtag)}/i) ).
         map { |i| "#{command_str} ##{i}" }

data/lib/plugins/defaults/switch.rb

@@ -0,0 +1,34 @@
+module Termtter::Client
+  passwords = {}
+
+  register_command(
+    :name => :switch,
+    :alias => :switch_user,
+    :exec_proc => lambda {|arg|
+      user_name = !arg.empty? ? normalize_as_user_name(arg) : nil
+      return if user_name == config.user_name
+
+      passwords[config.user_name] = config.password
+
+      if user_name
+        config.user_name = normalize_as_user_name(arg)
+        if passwords.key?(config.user_name)
+          config.password = passwords[config.user_name]
+        else
+          config.__clear__(:password)
+        end
+      else
+        config.__clear__(:user_name)
+        config.__clear__(:password)
+      end
+
+      Termtter::API.setup
+      call_commands('reload')
+    },
+    :help => ["switch USERNAME", "Switch twitter account."]
+  )
+
+  register_command(:restore_user) do |arg|
+    puts 'Sorry, command "restore_user" was obsoleted, and use command "switch" instead.'
+  end
+end

data/lib/plugins/eject.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+if /linux/ =~ PLATFORM
+  module Termtter::Client
+    help = ['eject [-t]', 'eject or close']
+    register_command(:eject, :help => help) do |flag|
+      if flag.empty?
+        system 'eject'
+      else
+        system 'eject -t'
+      end
+    end
+  end
+end
+

data/lib/plugins/expand-tinyurl.rb

@@ -51,7 +51,7 @@ def expand_url(host, path)
                                   config.proxy.user_name,
                                   config.proxy.password)
   end
-  res = http_class.new(host).head(path)
+  res = http_class.new(host).get(path, { 'User-Agent' => 'Mozilla' })
   return nil unless res.code == "301" or res.code == "302"
   res['Location'].force_encoding(Encoding::UTF_8)
 rescue

data/lib/plugins/favotter.rb

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+
+require 'rubygems'
+require 'nokogiri'
+require 'open-uri'
+
+module Termtter::Client
+
+  public_storage[:favorited_ids] = {}
+
+  class << self
+    def output_favorites(target, threshold)
+      favorites = parse("http://favotter.matope.com/user.php?user=#{target}&threshold=#{threshold}")
+
+      public_storage[:favorited_ids].clear
+      alphabet = '$a'
+      max_amount_width = favorites.map {|f| now = f[2].to_s.size }.max
+      favorites.reverse.each do |id, text, amount, users|
+        public_storage[:favorited_ids][alphabet] = id
+        color = fav_color(amount)
+        fav   = "fav#{amount == 1 ? '' : 's'}"
+        favorites_info = "(#{amount} #{fav})".rjust(max_amount_width + 7)
+        format = "<GREEN>#{favorites_info} #{alphabet}</GREEN> <YELLOW>%s</YELLOW>: <#{color}>%s</#{color}>"
+        values = [users.join(', '), CGI.escape(text)]
+        puts CGI.unescape(TermColor.parse(format % values ))
+        alphabet.succ!
+      end
+    end
+
+    private
+    def parse(url)
+      doc = Nokogiri(open(url).read)
+      doc.css('div.entry').map do |entry|
+        id     = entry['id'].gsub(/\Astatus_/, '')
+        text   = entry.css('span.status_text').first.content
+        amount = entry.css('div.info span.favotters').first.content
+        amount = amount.match(/(\d+)/)[1].to_i
+        users  = entry.css('div.info span.favotters img').map {|u| u['title'] }
+        [id, text, amount, users]
+      end
+    end
+
+    def fav_color(amount)
+      case amount
+        when 1 then 'WHITE'
+        when 2 then 'GREEN'
+        when 3 then 'BLUE'
+        when 4 then 'BLUE'
+        else        'RED'
+      end
+    end
+  end
+
+  help = ['favotter [USERNAME] [THRESHOLD]', 'Show info from favotter']
+  register_command('favotter', :help => help) do |arg|
+    target = if arg.empty?
+       config.user_name
+     else
+       args = arg.split
+       threshold = args.size == 1 ? 1 : args[1]
+       args[0]
+    end
+    if /@(.*)/ =~ target
+      target = $1
+    end
+    output_favorites target, threshold
+  end
+
+  help = ['favotter_fav [FavoritedID]', 'Favorite favorited status']
+  register_command('favotter_fav', :alias => :ffav, :help => help) do |arg|
+    raise 'need favorited_id' if arg.empty?
+    if id = public_storage[:favorited_ids][arg]
+      call_commands("favorite #{id}")
+    end
+  end
+end
+