termtter 1.3.1 → 1.4.0

data/README.rdoc

@@ -37,6 +37,7 @@ Search
 * json_pure or json
 * termcolor
 * rubytter
+* highline
 
 == INSTALL:
 
@@ -44,14 +45,6 @@ Search
 
 == CONFIGURATION:
 
-Termtter generates a configuration file named '~/.termtter/config'.
-You can edit the file anytime.
-
-  % vim ~/.termtter/config
-
-  config.user_name = 'USERNAME'
-  config.password = 'PASSWORD'
-
 If you would like to use proxy server, add configurations like this:
 
   config.proxy.host = 'PROXYHOST'

data/Rakefile

@@ -21,11 +21,12 @@ spec = Gem::Specification.new do |s|
   s.executables = ["kill_termtter", "termtter"]
   s.add_dependency("json_pure", ">= 1.1.3")
   s.add_dependency("highline", ">= 1.5.0")
-  s.add_dependency("termcolor", ">= 0.3.1")
-  s.add_dependency("rubytter", ">= 0.6.4")
+  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://wiki.github.com/jugyo/termtter'
+  s.homepage = 'http://termtter.org/'
   s.rubyforge_project = 'termtter'
   s.has_rdoc = true
   s.rdoc_options = ["--main", "README.rdoc", "--exclude", "spec"]
@@ -62,6 +63,14 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   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_opts = ['-c', '-fs']
+  t.rcov = true
+  t.rcov_opts = ['-x', 'spec', '--exclude', 'lib/plugins']
+end
 
 Rake::RDocTask.new do |t|
   t.rdoc_dir = 'rdoc'
@@ -72,3 +81,4 @@ Rake::RDocTask.new do |t|
 end
 
 CLEAN.include [ 'pkg', 'rdoc' ]
+

data/lib/plugins/command_plus.rb

@@ -26,22 +26,22 @@ end
 
 module Termtter::Client
   register_command(
-                   :name => :delete_command,
-                   :exec_proc => lambda {|arg|
-                     Termtter::Client.delete_command(arg)
-                   },
-                   :completion_proc => lambda {|cmd, arg|
-                   },
-                   :help => ['delete_command command', 'delete command from command list (this command is experimental!)']
+    :name => :delete_command,
+    :exec_proc => lambda {|arg|
+    Termtter::Client.delete_command(arg)
+  },
+    :completion_proc => lambda {|cmd, arg|
+  },
+    :help => ['delete_command command', 'delete command from command list (this command is experimental!)']
   )
 
   register_command(
-                   :name => :alias_command,
-                   :exec_proc => lambda {|arg|
-                     Termtter::Client.alias_command(arg)
-                   },
-                   :completion_proc => lambda {|cmd, arg|
-                   },
-                   :help => ['alias_command A B', 'alias command A to B (this command is experimental!)']
+    :name => :alias_command,
+    :exec_proc => lambda {|arg|
+    Termtter::Client.alias_command(arg)
+  },
+    :completion_proc => lambda {|cmd, arg|
+  },
+    :help => ['alias_command A B', 'alias command A to B (this command is experimental!)']
   )
 end

data/lib/plugins/confirm.rb

@@ -4,7 +4,7 @@ config.plugins.confirm.set_default(:commands, [:update, :reply, :direct])
 config.plugins.confirm.set_default(
   :conditions,
   [
-    lambda { |cmd_name, arg|
+    lambda {|cmd_name, arg|
       if cmd_name == :direct && arg =~ /^(list|sent_list)$/
         false
       else
@@ -18,16 +18,22 @@ Termtter::Client.register_hook(
   :name => :confirm,
   :points => [/^pre_exec_/],
   :exec_proc => lambda {|cmd, arg|
-    if config.plugins.confirm.commands.include?(cmd.name) && 
+    if config.plugins.confirm.commands.include?(cmd.name) &&
         config.plugins.confirm.conditions.any? { |cond|  cond.call(cmd.name, arg) }
 
-      prompt = "\"#{cmd.name} #{arg}".strip + "\" [Y/n] "
+      if arg.match(/^(\d+)\s+(.+)$/) and
+          (s = Termtter::API.twitter.show($1) rescue nil)
+        tmp_arg = "@#{s.user.screen_name} #{$2}"
+      else
+        tmp_arg = arg
+      end
+
+      prompt = "\"#{cmd.name} #{tmp_arg}".strip + "\" [Y/n] "
 
       if /^y?$/i !~ Readline.readline(prompt, false)
         puts 'canceled.'
         raise Termtter::CommandCanceled
       end
-
     end
   }
 )

data/lib/plugins/countter.rb

@@ -1,23 +1,23 @@
 module Termtter::Client
   register_command(
-                   :name => :countter,
-                   :exec_proc => lambda {|arg|
-                     count = {}
-                     public_storage[:log].each do |l|
-                       source = l.source =~ /(?:<a href=\".+?\">)(.+)(?:<\/a>)/ ? $1 : l.source
-                       count[source] = 0 unless count[source]
-                       count[source] += 1
-                     end
+    :name => :countter,
+    :exec_proc => lambda {|arg|
+    count = {}
+    public_storage[:log].each do |l|
+      source = l.source =~ /(?:<a href=\".+?\">)(.+)(?:<\/a>)/ ? $1 : l.source
+      count[source] = 0 unless count[source]
+      count[source] += 1
+    end
 
-                     format = "%24s %6s"
-                     puts format % %w(sources count)
-                     puts format % ['-'*24, '-'*6]
-                     count.to_a.sort{|a,b|b[1]<=>a[1]}.each do |k,v|
-                       puts format % [k, v]
-                     end
-                   },
-                   :completion_proc => lambda {|cmd, arg|
-                   },
-                   :help => ['countter', 'count sources']
+    format = "%24s %6s"
+    puts format % %w(sources count)
+    puts format % ['-'*24, '-'*6]
+    count.to_a.sort{|a,b|b[1]<=>a[1]}.each do |k,v|
+      puts format % [k, v]
+    end
+  },
+    :completion_proc => lambda {|cmd, arg|
+  },
+    :help => ['countter', 'count sources']
   )
 end

data/lib/plugins/db.rb

@@ -58,7 +58,7 @@ module Termtter
           user = {}
           User.columns.each do |col|
             user[col] =
-              if event == :search && col == :protected
+              if event.class == SearchEvent && col == :protected
                 false
               else
                 s.user[col]

data/lib/plugins/defaults/alias.rb

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+#
+# Examples:
+#
+#   ~/termtter/config
+#
+#     config.plugins.alias.aliases = {:ls => 'list', :hoge => 'update hoge'}
+#
+#   command line
+#
+#     > alias ls list
+#     > alias me list @jugyo
+#     > alias st search termtter
+#
+#     > remove_alias ls
+#
+
+config.plugins.alias.set_default(:aliases, {})
+
+module Termtter::Client
+  @aliases = config.plugins.alias.aliases
+
+  class << self
+    def register_alias(alias_name, command)
+      @aliases[alias_name.to_sym] = command.to_s
+    end
+    alias_method :alias, :register_alias
+
+    def remove_alias(alias_name)
+      @aliases.delete alias_name.to_sym
+    end
+  end
+
+  register_command(:alias,
+    :help => ['alias NAME COMMAND', 'Add alias for any operations']) do |text|
+    unless text.empty?
+      alias_name, command = text.split(/\s+/, 2)
+      next unless command
+      register_alias alias_name, command
+      puts "#{alias_name} => #{command}"
+    else
+      @aliases.keys.map{|i|i.to_s}.sort.each do |k|
+        puts "#{k} => #{@aliases[k.to_sym]}"
+      end
+    end
+  end
+
+  register_command(:remove_alias,
+    :help => ['remove_alias NAME', 'Remove alias completely']) do |target|
+    remove_alias target
+  end
+
+  register_hook :aliases, :point => :pre_command do |text|
+    unless text =~ /^\s*$/
+      command = text.scan(/\s*([^\s]*)\s*/).flatten.first
+      if original = @aliases[command.to_sym]
+        text = text.sub(command, original)
+      end
+    end
+    text
+  end
+
+  register_hook(:aliases_completion, :point => :completion) do |input|
+    if /^\s*([^\s]*)$/ =~ input
+      command_str = $1
+      @aliases.keys.map{|i|i.to_s}.grep(/^#{Regexp.quote(command_str)}/i)
+    end
+  end
+end

data/lib/plugins/defaults/auto_reload.rb

@@ -2,7 +2,7 @@
 module Termtter::Client
   add_task(:name => :auto_reload, :interval => config.update_interval, :after => config.update_interval) do
     begin
-      call_commands('reload')
+      call_commands('reload -r')
     rescue Exception => e
       handle_error(e)
     end
@@ -13,7 +13,7 @@ module Termtter::Client
     :point => :initialize,
     :exec => lambda {
       begin
-        call_commands('reload')
+        call_commands('reload -r')
       rescue Exception => e
         handle_error(e)
       end

data/lib/plugins/defaults/command_line.rb

@@ -64,6 +64,7 @@ module Termtter
       if Readline.respond_to?(:basic_word_break_characters=)
         Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
       end
+      Readline.completion_case_fold = true
       Readline.completion_proc = lambda {|input|
         begin
           words = []
@@ -108,4 +109,12 @@ module Termtter
   Client.register_hook(:finalize_command_line, :point => :exit) do
     CommandLine.stop
   end
+
+  Client.register_command(:vi_editing_mode) do |arg|
+    Readline.vi_editing_mode
+  end
+
+  Client.register_command(:emacs_editing_mode) do |arg|
+    Readline.emacs_editing_mode
+  end
 end

data/lib/plugins/defaults/fib.rb

@@ -1,25 +1,7 @@
-# -*- coding: utf-8 -*-
-
 def fib(n)i=0;j=1;n.times{j=i+i=j};i end
-module Termtter::Client
-  register_command(
-    :name => :fib,
-    :exec_proc => lambda {|arg|
-      n = arg.to_i
-      text = "fib(#{n}) = #{fib n}"
-      Termtter::API.twitter.update(text)
-      puts "=> " << text
-    }
-  )
-  register_command(
-    :name => :fibyou,
-    :exec_proc => lambda {|arg|
-      /(\w+)\s(\d+)/ =~ arg
-      name = normalize_as_user_name($1)
-      n = $2.to_i
-      text = "@#{name} fib(#{n}) = #{fib n}"
-      Termtter::API.twitter.update(text)
-      puts "=> " << text
-    }
-  )
+Termtter::Client.register_command(:fib) do |arg|
+  n = arg.to_i
+  text = "fib(#{n}) = #{fib n}"
+  Termtter::API.twitter.update(text)
+  puts "=> " << text
 end

data/lib/plugins/defaults/retweet.rb

@@ -13,6 +13,8 @@ module Termtter::Client
     text = ERB.new(config.plugins.retweet.format).result(binding)
     Termtter::API.twitter.update(text)
     puts "=> #{text}"
+
+    return text
   end
 
   register_command(
@@ -21,19 +23,21 @@ module Termtter::Client
     :help      => ['retweet,rt (ID|@USER)', 'Post a retweet message'],
     :exec_proc => lambda {|arg|
       arg, comment = arg.split(/\s/, 2)
-      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
+      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
     }
   )
 end

data/lib/plugins/defaults/standard_commands.rb

@@ -5,7 +5,7 @@ require 'set'
 
 config.plugins.standard.set_default(
  :limit_format,
- '<<%=remaining_color%>><%=limit.remaining_hits%></<%=remaining_color%>>/<%=limit.hourly_limit%> until <%=limit.reset_time%> (<%=remaining_time%> remaining)')
+ '<<%=remaining_color%>><%=limit.remaining_hits%></<%=remaining_color%>>/<%=limit.hourly_limit%> until <%=Time.parse(limit.reset_time).getlocal%> (<%=remaining_time%> remaining)')
 
 config.set_default(:easy_reply, true)
 
@@ -17,10 +17,10 @@ module Termtter::Client
       args = @since_id ? [{:since_id => @since_id}] : []
       statuses = Termtter::API.twitter.friends_timeline(*args)
       unless statuses.empty?
-        print "\e[1K\e[0G" unless win?
+        print "\e[0G" + "\e[K" unless win?
         @since_id = statuses[0].id
         output(statuses, :update_friends_timeline)
-        Readline.refresh_line
+        Readline.refresh_line if arg =~ /\-r/
       end
     }
   )
@@ -103,7 +103,8 @@ module Termtter::Client
   register_command(
     :name => :profile, :aliases => [:p],
     :exec_proc => lambda {|arg|
-      user = Termtter::API.twitter.user(normalize_as_user_name(arg))
+      user_name = arg.empty? ? config.user_name : arg
+      user = Termtter::API.twitter.user(user_name)
       attrs = %w[ name screen_name url description profile_image_url location protected following
         friends_count followers_count statuses_count favourites_count
         id time_zone created_at utc_offset notifications
@@ -114,7 +115,7 @@ module Termtter::Client
         puts "#{attr.gsub('_', ' ').rjust(label_width)}: #{value}"
       end
     },
-    :help => ["profile,p USERNAME", "Show user's profile"]
+    :help => ["profile,p [USERNAME]", "Show user's profile."]
   )
 
   register_command(
@@ -154,19 +155,29 @@ module Termtter::Client
     :help => ["list,l [USERNAME]", "List the posts"]
   )
 
+  class SearchEvent; attr_reader :query; def initialize(query); @query = query end; end
   public_storage[:search_keywords] = Set.new
   register_command(
     :name => :search, :aliases => [:s],
     :exec_proc => lambda {|arg|
       statuses = Termtter::API.twitter.search(arg)
       public_storage[:search_keywords] << arg
-      output(statuses, :search)
+      output(statuses, SearchEvent.new(arg))
     },
     :completion_proc => lambda {|cmd, arg|
       public_storage[:search_keywords].grep(/^#{Regexp.quote(arg)}/).map { |i| "#{cmd} #{i}" }
     },
     :help => ["search,s TEXT", "Search for Twitter"]
   )
+  register_hook(:highlight_for_search_query, :point => :pre_coloring) do |text, event|
+    case event
+    when SearchEvent
+      query = event.query.split(/\s/).map {|q|Regexp.quote(q)}.join("|")
+      text.gsub(/(#{query})/i, '<on_magenta><white>\1</white></on_magenta>')
+    else
+      text
+    end
+  end
 
   register_command(
     :name => :replies, :aliases => [:r],
@@ -189,7 +200,7 @@ module Termtter::Client
     :completion_proc => lambda {|cmd, arg|
       case arg
       when /(\w+):\s*(\d+)\s*$/
-        find_status_ids($2).map{|id| "#{cmd} #{$1}: #{id}"}
+        find_status_ids($2).map {|id| "#{cmd} #{$1}: #{id}"}
       else
         users = find_users(arg)
         unless users.empty?
@@ -264,7 +275,7 @@ module Termtter::Client
     :completion_proc => lambda {|cmd, arg|
       case arg
       when /(\d+)/
-        find_status_ids(arg).map{|id| "#{cmd} #{id}"}
+        find_status_ids(arg).map {|id| "#{cmd} #{id}"}
       else
         if data = Termtter::Client.typable_id_to_data(arg)
           "#{cmd} #{data}"
@@ -369,7 +380,7 @@ module Termtter::Client
     :alias     => :plugin,
     :exec_proc => lambda {|arg|
       if arg.empty?
-        puts 'Should specify plugin name.'
+        plugin_list
         return
       end
       begin
@@ -380,44 +391,39 @@ module Termtter::Client
       end
     },
     :completion_proc => lambda {|cmd, args|
-      plugin_list.grep(/^#{Regexp.quote(args)}/).map{|i| "#{cmd} #{i}"}
+      plugin_list.grep(/^#{Regexp.quote(args)}/).map {|i| "#{cmd} #{i}"}
     },
     :help => ['plug FILE', 'Load a plugin']
   )
 
+  ## plugin_list :: IO ()
   def self.plugin_list
-    (Dir["#{File.dirname(__FILE__)}/../*.rb"] + Dir["#{Termtter::CONF_DIR}/plugins/*.rb"]).
-      map{|f| File.basename(f).sub(/\.rb$/, '')}.
+    plugin_list = (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(
-    :name => :plugins,
-    :exec_proc => lambda {|arg|
-      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>')
-    },
-    :help => ['plugins', 'Show list of plugins']
-  )
-
   register_command(
     :name => :reply,
     :aliases => [:re],
     :exec_proc => lambda {|arg|
       case arg
       when /^\s*(?:list|ls)\s*(?:\s+(\w+))?\s*$/
-        public_storage[:log4re] = if $1
-                                    public_storage[:log].
-                                      select{|l| l.user.screen_name == $1}.
-                                      sort {|a,b| a.id <=> b.id}
-                                  else
-                                    public_storage[:log].sort {|a,b| a.id <=> b.id}
-                                  end
+        public_storage[:log4re] =
+          if $1
+            public_storage[:log].
+              select {|l| l.user.screen_name == $1}.
+              sort {|a,b| a.id <=> b.id}
+          else
+            public_storage[:log].sort {|a,b| a.id <=> b.id}
+          end
         public_storage[:log4re].each_with_index do |s, i|
           puts "#{i}: #{s.user.screen_name}: #{s.text}"
         end
@@ -445,7 +451,7 @@ module Termtter::Client
     :completion_proc => lambda {|cmd, arg|
       case arg
       when /(\d+)/
-        find_status_ids(arg).map{|id| "#{cmd} #{id}"}
+        find_status_ids(arg).map {|id| "#{cmd} #{id}"}
       end
     },
     :help => ["reply,re @USERNAME or STATUS_ID", "Send a reply"]
@@ -475,35 +481,6 @@ module Termtter::Client
     :help => ["redo,.", "Execute previous command"]
   )
 
-  register_command(:alias,
-    :help => ['alias NAME VALUE', 'Add alias for any operations']) do |text|
-    from, to = text.split(' ', 2)
-    next unless to
-    begin
-      add_alias from, to
-    rescue
-      STDOUT.print 'override? [y/n] '
-      STDOUT.flush
-      next unless /y/ =~ STDIN.gets.chomp
-      add_alias from, to, false
-    end
-    puts "#{from} => #{to}"
-  end
-
-  register_command(:remove_alias,
-    :help => ['remove_alias NAME', 'Remove alias completely']) do |target|
-    remove_alias target
-    STDOUT.puts 'done'
-  end
-
-  register_hook :aliases, :point => :pre_command do |text|
-    command, args = text.split(' ', 2)
-    if original = @aliases[command]
-      text = [original, args].compact.join(' ')
-    end
-    text
-  end
-
   def self.update_with_user_and_id(text, username, id)
     text = "@#{username} #{text}"
     result = Termtter::API.twitter.update(text, {'in_reply_to_status_id' => id})

data/lib/plugins/defaults/standard_completion.rb

@@ -32,9 +32,9 @@ module Termtter::Client
   end
 
   register_hook(:user_names_completion, :point => :completion) do |input|
-    if /(.*)@([^\s]*)$/ =~ input
+    if /(.*)\s([^\s]*)$/ =~ input
       command_str = $1
-      part_of_user_name = $2
+      part_of_user_name = $2.gsub(/^@/, '')
 
       users = 
         if part_of_user_name.nil? || part_of_user_name.empty?
@@ -43,7 +43,7 @@ module Termtter::Client
           public_storage[:users].grep(/^#{Regexp.quote(part_of_user_name)}/i)
         end
 
-      users.map {|u| "#{command_str}@%s" % u }
+      users.map {|u| "#{command_str} @%s" % u }
     end
   end
 
@@ -51,17 +51,22 @@ module Termtter::Client
   # completion for hashtags
   #
 
-  public_storage[:hashtag] ||= Set.new
+  public_storage[:hashtags] ||= Set.new
 
-  register_hook(:collect_hashtags, :point => /^post_exec_/) do |cmd, arg, result|
-    public_storage[:hashtag] += arg.scan(/\s+#([^\s]+)/i).flatten if arg
+  register_hook(:collect_hashtags, :point => :pre_filter) do |statuses, event|
+    statuses.each do |s|
+      public_storage[:hashtags] += s.text.scan(/#([^\s]+)/).flatten
+    end
   end
 
-  register_hook(:hashtags_completion, :point => :completion) do |input|
-    if /(.*)#([^\s]*)$/ =~ input
+  register_hook(:hashtagss_completion, :point => :completion) do |input|
+    if /(.*)\s#([^\s]*)$/ =~ input
       command_str = $1
       part_of_hashtag = $2
-      public_storage[:hashtag].grep(/^#{Regexp.quote(part_of_hashtag)}/i).map { |i| "#{command_str}##{i}" }
+      ht = public_storage[:hashtags]
+      (ht.grep(/^#{Regexp.quote(part_of_hashtag)}/) | # prior
+       ht.grep(/^#{Regexp.quote(part_of_hashtag)}/i) ).
+        map { |i| "#{command_str} ##{i}" }
     end
   end
 end