jugyo-termtter 0.5.6 → 0.5.7

data/Manifest.txt

@@ -9,7 +9,7 @@ bin/termtter
 lib/termtter.rb
 lib/plugin/stdout.rb
 lib/plugin/notify-send.rb
-lib/plugin/standard_commands.rb
+lib/plugin/standard_plugins.rb
 lib/plugin/uri-open.rb
 lib/plugin/growl.rb
 lib/plugin/say.rb

data/bin/termtter

@@ -5,7 +5,7 @@ $KCODE = 'u'
 require 'rubygems'
 require 'termtter'
 require 'configatron'
-plugin 'standard_commands'
+plugin 'standard_plugins'
 plugin 'stdout'
 
 conf_file = File.expand_path('~/.termtter')
@@ -20,7 +20,7 @@ else
     plugins = Dir.glob(File.dirname(__FILE__) + "/../lib/plugin/*.rb").map  {|f|
       f.match(%r|lib/plugin/(.*?).rb$|)[1]
     }
-    plugins -= %w[stdout standard_commands]
+    plugins -= %w[stdout standard_plugins]
     plugins.each do |p|
       io.puts "#plugin '#{p}'"
     end

data/lib/plugin/{standard_commands.rb → standard_plugins.rb}

@@ -1,5 +1,7 @@
 module Termtter::Client
 
+  # standard commands
+
   add_command /^(update|u)\s+(.*)/ do |m, t|
     text = m[2]
     unless text.empty?
@@ -66,4 +68,51 @@ show ID           Show a single status
     end
   end
 
+  # completion for standard commands
+
+  require 'set'
+  public_storage[:users] ||= Set.new
+  public_storage[:status_ids] ||= Set.new
+
+  add_hook do |statuses, event, t|
+    statuses.each do |s|
+      public_storage[:users].add(s.user_screen_name)
+      public_storage[:users] += s.text.scan(/@([a-zA-Z_0-9]*)/).flatten
+      public_storage[:status_ids].add(s.id.to_s)
+      public_storage[:status_ids].add(s.in_reply_to_status_id.to_s) if s.in_reply_to_status_id
+    end
+  end
+
+  def self.find_status_id_candidates(a, b)
+    if a.empty?
+      public_storage[:status_ids].to_a
+    else
+      public_storage[:status_ids].grep(/#{Regexp.quote a}/)
+    end.
+    map {|u| b % u }
+  end
+
+  def self.find_user_candidates(a, b)
+    if a.empty?
+      public_storage[:users].to_a
+    else
+      public_storage[:users].grep(/^#{Regexp.quote a}/i)
+    end.
+    map {|u| b % u }
+  end
+
+  add_completion do |input|
+    standard_commands = %w[exit help list pause update resume replies search show]
+    case input
+    when /^(list|l)?\s+(.*)/
+      find_user_candidates $2, "#{$1} %s"
+    when /^(update|u)\s+(.*)@([^\s]*)$/
+      find_user_candidates $3, "#{$1} #{$2}@%s"
+    when /^show\s+(.*)/
+      find_status_id_candidates $1, "show %s"
+    else
+      standard_commands.grep(/^#{Regexp.quote input}/)
+    end
+  end
+
 end

data/lib/plugin/uri-open.rb

@@ -9,26 +9,48 @@ module Termtter::Client
     end
   end
 
+  def self.open_uri(uri)
+    # FIXME: works only in OSX and other *NIXs
+    if /linux/ =~ RUBY_PLATFORM
+      system 'firefox', uri
+    else
+      system 'open', uri
+    end
+  end
+
   add_command /^uri-open\s*$/ do |m, t|
     public_storage[:uris].each do |uri|
-      # FIXME: works only in OSX and other *NIXs
-      if /linux/ =~ RUBY_PLATFORM
-        system 'firefox', uri
-      else
-        system 'open', uri
-      end
+      open_uri(uri)
     end
     public_storage[:uris].clear
   end
 
+  add_command /^uri-open\s+(\d+)$/ do |m, t|
+    if m[1]
+      index = m[1].to_i
+      open_uri(public_storage[:uris][index])
+      public_storage[:uris].delete_at(index)
+    end
+  end
+
   add_command /^uri-open\s+list\s*$/ do |m, t|
-    puts public_storage[:uris]
+    public_storage[:uris].each_with_index do |uri, index|
+      puts "#{index}: #{uri}"
+    end
+  end
+
+  add_command /^uri-open\s+delete\s+(\d+)$/ do |m, t|
+    public_storage[:uris].delete_at(m[1].to_i) if m[1]
   end
 
   add_command /^uri-open\s+clear\s*$/ do |m, t|
     public_storage[:uris].clear
     puts "clear uris"
   end
+
+  add_completion do |input|
+    ['uri-open ', 'uri-open list', 'uri-open delete', 'uri-open clear'].grep(/^#{Regexp.quote input}/)
+  end
 end
 # ~/.termtter
 # plugin 'uri-open'

data/lib/termtter.rb

@@ -28,7 +28,7 @@ def require(s)
 end
 
 module Termtter
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 
   class Twitter
 
@@ -99,6 +99,7 @@ module Termtter
 
     @@hooks = []
     @@commands = {}
+    @@completions = []
 
     class << self
       def add_hook(&hook)
@@ -117,6 +118,21 @@ module Termtter
         @@commands.clear
       end
 
+      def add_completion(&completion)
+        @@completions << completion
+      end
+
+      def clear_completions
+        @@completions.clear
+      end
+
+      Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
+      Readline.completion_proc = proc {|input|
+        @@completions.map {|completion|
+          completion.call(input)
+        }.flatten.compact
+      }
+
       def public_storage
         @@public_storage ||= {}
         return @@public_storage
@@ -210,7 +226,9 @@ module Termtter
 
         @@input_thread.join
       end
+
     end
+
   end
 
   class CommandNotFound < StandardError; end

data/run_termtter.rb

@@ -11,7 +11,7 @@ self_file =
 $:.unshift(File.dirname(self_file) + "/lib")
 
 require 'termtter'
-plugin 'standard_commands'
+plugin 'standard_plugins'
 plugin 'stdout'
 
 configatron.update_interval

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - jugyo
@@ -64,7 +64,7 @@ files:
 - lib/termtter.rb
 - lib/plugin/stdout.rb
 - lib/plugin/notify-send.rb
-- lib/plugin/standard_commands.rb
+- lib/plugin/standard_plugins.rb
 - lib/plugin/uri-open.rb
 - lib/plugin/growl.rb
 - lib/plugin/say.rb