@@ -67,11 +67,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) lib/plugins/defaults/command_line.rb @@ -29,7 +29,7 @@ module Termtter::Client :name => :update, :alias => :u, :exec => lambda {|arg| unless arg.empty? - params = + 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 @@ -406,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( lib/plugins/defaults/standard_commands.rb b8676928476941da94110f7aac7ebca083630257 nanki nanki@dotswitch.net http://github.com/ohac/termtter/commit/a7fadc0ee628b09aa2c3b60655661dc9edd24c9b a7fadc0ee628b09aa2c3b60655661dc9edd24c9b 2009-11-09T06:45:21-08:00 2009-11-09T06:45:21-08:00 fix completion for :plug command. 46ca7d81256a3cb78f203f8fa30867826e14426d nanki nanki@dotswitch.net