termtter 0.8.14 → 1.0.0

data/lib/plugins/storage.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+require 'pp'
+require 'time'
+
+require File.dirname(__FILE__) + '/storage/status'
+
+module Termtter::Client
+  public_storage[:log] = []
+
+  add_hook do |statuses, event|
+    case event
+    when :pre_filter
+      statuses.each do |s|
+        Termtter::Storage::Status.insert(
+          :post_id => s.id,
+          :created_at => Time.parse(s.created_at).to_i,
+          :in_reply_to_status_id => s.in_reply_to_status_id,
+          :in_reply_to_user_id => s.in_reply_to_user_id,
+          :post_text => s.text,
+          :user_id => s.user.id,
+          :screen_name => s.user.screen_name)
+      end
+    end
+  end
+
+  register_command(
+    :name => :search_storage, :aliases => [:ss],
+    :exec_proc => lambda {|arg|
+      unless arg.strip.empty?
+        key = arg.strip
+        Termtter::Storage::Status.search({ :post_text => key})
+=begin
+                       statuses = public_storage[:storage].search({ :post_text => key})
+
+                       statuses.each do |s|
+                         p s
+                       end
+                         call_hooks(statuses, :search)
+=end                       
+                     end
+
+                   },
+                   
+                   :help => [ 'search_storage WORD', 'Search storage for WORD' ]
+                   )
+end

data/lib/plugins/system_status.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+require 'erb'
+
+config.plugins.system_status.set_default(:default_status_proc, lambda { Time.now.strftime("%x %X") })
+config.plugins.system_status.set_default(:interval, 1)
+config.plugins.system_status.set_default(:default_color, :on_blue)
+config.plugins.system_status.set_default(:format, '<%= status %>')
+
+def out_put_status(status, color)
+  formatted_status = ERB.new(config.plugins.system_status.format).result(binding)
+  colored_status = color(formatted_status, color)
+  print "\e[s\e[1000G\e[#{status.size - 1}D#{colored_status}\e[u"
+  $stdout.flush
+end
+
+module Termtter::Client
+  add_task(:name => :system_status, :interval => config.plugins.system_status.interval) do
+    status = (@@task_manager.get_task(:update_timeline).exec_at - Time.now).to_i.to_s
+    color = public_storage[:system_status_color] ||
+                    config.plugins.system_status.default_color
+    out_put_status(status, color)
+  end
+end
+
+# system_status.rb
+#   show system status on left side.
+#   output public_storage[:system_status] or Time.now.strftime("%x %X") if nil
+# example config
+#   config.plugins.system_status.default_status_proc = lambda { Time.now.strftime("%x %X") }
+#   config.plugins.system_status.interval = 1
+#   config.plugins.system_status.default_color = :on_blue
+#   config.plugins.system_status.format = '<%= status %>'

data/lib/{plugin → plugins}/translation.rb

@@ -17,11 +17,21 @@ def translate(text, langpair)
   }
 end
 
-Termtter::Client.add_command /^(en2ja|ja2en)\s+(.*)$/ do |m, t|
-  langpair = m[1].gsub('2', '|')
-  puts "translating..."
-  puts "=> #{translate(m[2], langpair)}"
-end
+Termtter::Client.register_command(
+  :name => :en2ja,
+  :exec_proc => lambda{|arg|
+    puts "translating..."
+    puts "=> #{translate(arg, 'en|ja')}"
+  }
+)
+
+Termtter::Client.register_command(
+  :name => :ja2en,
+  :exec_proc => lambda{|arg|
+    puts "translating..."
+    puts "=> #{translate(arg, 'ja|en')}"
+  }
+)
 
 # This plugin does not work yet.
 # requirements

data/lib/{plugin → plugins}/update_editor.rb

@@ -4,17 +4,17 @@ require 'tempfile'
 
 module Termtter::Client
   if ENV['EDITOR']
-    configatron.plugins.update_editor.set_default('editor', ENV['EDITOR'])
+    config.plugins.update_editor.set_default('editor', ENV['EDITOR'])
   else
-    configatron.plugins.update_editor.set_default('editor', 'vi')
+    config.plugins.update_editor.set_default('editor', 'vi')
   end
-  configatron.plugins.update_editor.set_default('add_completion', false)
+  config.plugins.update_editor.set_default('add_completion', false)
 
   
   def self.input_editor
     file = Tempfile.new('termtter')
-    editor = configatron.plugins.update_editor.editor
-    if configatron.plugins.update_editor.add_completion
+    editor = config.plugins.update_editor.editor
+    if config.plugins.update_editor.add_completion
       file.puts "\n"*100 + "__END__\n" + public_storage[:users].to_a.join(' ')
     end
     file.close
@@ -34,7 +34,7 @@ module Termtter::Client
                        text.split("\n").each do |post|
                          break if post =~ /^__END__$/
                          unless post.empty?
-                           Termtter::API.twitter.update_status(post)
+                           Termtter::API.twitter.update(post)
                            puts "=> #{post}"
                          end
                        end

data/lib/plugins/uri-open.rb

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  public_storage[:uris] = []
+
+  add_hook do |statuses, event, t|
+    if event == :update_friends_timeline
+      statuses.each do |s|
+        public_storage[:uris] += s.text.scan(%r|https?://[^\s]+|)
+      end
+    end
+  end
+
+  def self.open_uri(uri)
+    unless config.plugins.uri_open.browser.empty?
+      system config.plugins.uri_open.browser, uri
+    else
+      case RUBY_PLATFORM
+      when /linux/
+        system 'firefox', uri
+      when /mswin(?!ce)|mingw|bccwin/
+        system 'explorer', uri
+      else
+        system 'open', uri
+      end
+    end
+  end
+
+  register_command(
+    :name => :'uri-open', :aliases => [:uo],
+    :exec_proc => lambda{|arg|
+      case arg
+      when /^\s+$/
+        public_storage[:uris].each do |uri|
+          open_uri(uri)
+        end
+        public_storage[:uris].clear
+      when /^\s*list\s*$/
+        public_storage[:uris].each_with_index do |uri, index|
+          puts "#{index}: #{uri}"
+        end
+      when /^\s*delete\s+(\d+)\s*$/
+        puts 'delete'
+        public_storage[:uris].delete_at($1.to_i)
+      when /^\s*clear\s*$/
+        public_storage[:uris].clear
+        puts "clear uris"
+      when /^\s*(\d+)\s*$/
+        open_uri(public_storage[:uris][$1.to_i])
+        public_storage[:uris].delete_at($1.to_i)
+      end
+    },
+    :completion_proc => lambda{|cmd, arg|
+      %w(list delete clear).grep(/^#{Regexp.quote arg}/).map{|a| "#{cmd} #{a}"}
+    }
+  )
+end
+# ~/.termtter
+# plugin 'uri-open'
+#
+# see also: http://ujihisa.nowa.jp/entry/c3dd00c4e0
+#
+# KNOWN BUG
+# * In Debian, exit or C-c in the termtter kills your firefox.

data/lib/{plugin → plugins}/wassr_post.rb

@@ -10,7 +10,7 @@ Termtter::Client.register_hook(
     begin
       Net::HTTP.version_1_2
       req = Net::HTTP::Post.new("/statuses/update.json?")
-      req.basic_auth configatron.plugins.wassr_post.username, configatron.plugins.wassr_post.password
+      req.basic_auth config.plugins.wassr_post.username, config.plugins.wassr_post.password
       Net::HTTP.start('api.wassr.jp', 80) do |http|
         res = http.request(req, "status=#{URI.escape(arg.strip)}&source=Termtter")
       end

data/lib/{plugin → plugins}/yhara.rb

@@ -129,7 +129,7 @@ module Termtter::Client
                    :name => :yhara,
                    :exec_proc => lambda{|arg|
                      text = "#{'@' if arg[0..0] != '@'}#{arg} #{Yharian::text}"
-                     Termtter::API.twitter.update_status(text)
+                     Termtter::API.twitter.update(text)
                      puts "=> #{text}"
                    },
                    :completion_proc => lambda {|cmd, args|

data/lib/plugins/yhara_filter.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+Termtter::Client.add_filter do |statuses, _|
+  statuses.select {|s| /^(?:\s|(y\s)|(?:hara\s))+\s*(?:y|(?:hara))(?:\?|!|\.)?\s*$/ =~ s.text }
+end
+
+# yhara_filter.rb
+#   select Yharian post only

data/lib/plugins/yonda.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  register_command(:name => :yonda,
+                   :aliases => [:y],
+                   :exec_proc => lambda { |arg|
+                     public_storage[:unread_count] = 0
+                     print "\033[2J\033[H" # FIXME
+                     true
+                   },
+                   :help => ['yonda,y', 'Mark as read']
+  )
+
+  register_hook(:name => :yonda,
+                :points => [:post_exec__update_timeline],
+                :exec_proc => lambda { |cmd, arg, result|
+                  public_storage[:unread_count] ||= 0
+                  public_storage[:unread_count]  += result.size
+                }
+  )
+end

data/lib/termtter/api.rb

@@ -1,12 +1,38 @@
 # -*- coding: utf-8 -*-
+require 'rubytter'
+
+config.set_default(:host, 'twitter.com')
+config.proxy.set_default(:port, '8080')
+config.proxy.set_default(:host, nil)
+config.proxy.set_default(:port, nil)
+config.proxy.set_default(:user_name, nil)
+config.proxy.set_default(:password, nil)
+config.set_default(:enable_ssl, false)
 
 module Termtter
   module API
     class << self
-      attr_reader :connection, :twitter
+      attr_reader :connection, :twitter, :twitter_old
       def setup
         @connection = Connection.new
-        @twitter = Termtter::Twitter.new(configatron.user_name, configatron.password, @connection)
+        @twitter = Rubytter.new(
+                    config.user_name,
+                    config.password,
+                    {
+                      :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' => '0.1'
+                      },
+                      :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,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'fileutils'
 
 module Termtter
   class CommandNotFound < StandardError; end
@@ -10,20 +11,16 @@ module Termtter
       def init
         @@hooks = []
         @@new_hooks = {}
-        @@commands = {}
         @@new_commands = {}
         @@completions = []
         @@filters = []
         @@helps = []
         @@since_id = nil
-        @@main_thread = nil
         @@input_thread = nil
         @@task_manager = Termtter::TaskManager.new
-        configatron.set_default(:update_interval, 300)
-        configatron.set_default(:prompt, '> ')
-        configatron.set_default(:enable_ssl, false)
-        configatron.proxy.set_default(:port, '8080')
-        configatron.set_default(:devel, false)
+        config.set_default(:update_interval, 300)
+        config.set_default(:prompt, '> ')
+        config.set_default(:devel, false)
         Thread.abort_on_exception = true
       end
 
@@ -39,13 +36,6 @@ module Termtter
         EOF
       end
 
-      # Deprecated
-      # FIXME: delete when become unnecessary
-      def add_command(regex, &block)
-        warn "Termtter:Client.add_command method will be removed. Use Termtter::Client.register_command() instead. (#{caller.first})"
-        @@commands[regex] = block
-      end
-
       def register_hook(arg)
         hook = case arg
           when Hook
@@ -96,7 +86,7 @@ module Termtter
         @@helps << [name, desc]
       end
 
-      %w[hooks commands completions helps filters].each do |n|
+      %w[hooks completions helps filters].each do |n|
         eval <<-EOF
           def clear_#{n}
             @@#{n}.clear
@@ -105,15 +95,27 @@ module Termtter
       end
 
       # memo: each filter must return Array of Status
-      def apply_filters(statuses)
-        filtered = statuses.map{|s| s.dup }
-        @@filters.each do |f|
-          filtered = f.call(filtered)
+      def apply_filters(result, event = nil)
+        case event
+        when :show
+          result
+        when :search
+          filtered = result.results.map(&:dup)
+          @@filters.each do |f|
+            filtered = f.call(filtered, event)
+          end
+          result.results = filtered
+          result
+        else
+          filtered = result.map(&:dup)
+          @@filters.each do |f|
+            filtered = f.call(filtered, event)
+          end
+          filtered
         end
-        filtered
       rescue => e
         handle_error(e)
-        statuses
+        result
       end
 
       def do_hooks(statuses, event)
@@ -133,7 +135,7 @@ module Termtter
           break if result == false # interrupt if hook return false
           result = hook.exec_proc.call(*args)
         }
-        return result
+        result
       rescue => e
         if point.to_sym == :on_error
           raise
@@ -145,44 +147,40 @@ module Termtter
       # TODO: delete argument "tw" when unnecessary
       def call_hooks(statuses, event, tw = nil)
         do_hooks(statuses, :pre_filter)
-        do_hooks(apply_filters(statuses), event)
+        filtered = apply_filters(statuses, event)
+        do_hooks(filtered, :post_filter)
+        do_hooks(filtered, event)
       end
 
       def call_commands(text, tw = nil)
         return if text.empty?
 
         command_found = false
-        @@commands.each do |key, command|
-          if key =~ text
-            command_found = true
-            @@task_manager.invoke_and_wait do
-              command.call($~, Termtter::API.twitter)
-            end
-          end
-        end
-
         @@new_commands.each do |key, command|
-          command_info = command.match?(text)
-          if command_info
+          command_str, command_arg = command.match?(text)
+          if command_str
             command_found = true
-            input_command, arg = *command_info
 
-            modified_arg = call_new_hooks("modify_arg_for_#{command.name.to_s}", input_command, arg) || arg || ''
+            modified_arg = call_new_hooks(
+                              "modify_arg_for_#{command.name.to_s}",
+                              command_str,
+                              command_arg) || command_arg || ''
 
             @@task_manager.invoke_and_wait do
-              pre_exec_hook_result = call_new_hooks("pre_exec_#{command.name.to_s}", input_command, modified_arg)
-              next if pre_exec_hook_result == false
 
+              pre_exec_hook_result = call_new_hooks("pre_exec_#{command.name.to_s}", command_str, modified_arg)
+              next if pre_exec_hook_result == false
               # exec command
               result = command.execute(modified_arg)
               if result
-                call_new_hooks("post_exec_#{command.name.to_s}", input_command, modified_arg, result)
+                call_new_hooks("post_exec_#{command.name.to_s}", command_str, modified_arg, result)
               end
+
             end
           end
         end
 
-        raise CommandNotFound unless command_found
+        raise CommandNotFound, text unless command_found
       end
 
       def pause
@@ -203,7 +201,6 @@ module Termtter
         call_hooks([], :exit)
         call_new_hooks(:exit)
         @@task_manager.kill
-        @@main_thread.kill if @@main_thread
         @@input_thread.kill if @@input_thread
       end
 
@@ -213,20 +210,19 @@ module Termtter
       end
 
       def load_config
-        conf_file = File.expand_path('~/.termtter')
-        if File.exist? conf_file
-          wrap_require do
-            load conf_file
-          end
+        legacy_config_support() if File.exist? Termtter::CONF_DIR
+        if File.exist? Termtter::CONF_FILE
+          load Termtter::CONF_FILE
         else
           ui = create_highline
           username = ui.ask('your twitter username: ')
           password = ui.ask('your twitter password: ') { |q| q.echo = false }
 
-          File.open(File.expand_path('~/.termtter'), 'w') {|io|
+          Dir.mkdir(Termtter::CONF_DIR)
+          File.open(Termtter::CONF_FILE, 'w') {|io|
             io.puts '# -*- coding: utf-8 -*-'
 
-            plugins = Dir.glob(File.dirname(__FILE__) + "/../lib/plugin/*.rb").map  {|f|
+            plugins = Dir.glob(File.dirname(__FILE__) + "/../lib/plugins/*.rb").map  {|f|
               f.match(%r|lib/plugin/(.*?).rb$|)[1]
             }
             plugins -= %w[stdout standard_plugins]
@@ -235,26 +231,43 @@ module Termtter
             end
 
             io.puts
-            io.puts "configatron.user_name = '#{username}'"
-            io.puts "configatron.password = '#{password}'"
-            io.puts "#configatron.update_interval = 120"
-            io.puts "#configatron.proxy.host = 'proxy host'"
-            io.puts "#configatron.proxy.port = '8080'"
-            io.puts "#configatron.proxy.user_name = 'proxy user'"
-            io.puts "#configatron.proxy.password = 'proxy password'"
+            io.puts "config.user_name = '#{username}'"
+            io.puts "config.password = '#{password}'"
+            io.puts "#config.update_interval = 120"
+            io.puts "#config.proxy.host = 'proxy host'"
+            io.puts "#config.proxy.port = '8080'"
+            io.puts "#config.proxy.user_name = 'proxy user'"
+            io.puts "#config.proxy.password = 'proxy password'"
             io.puts
             io.puts "# vim: set filetype=ruby"
           }
-          puts "generated: ~/.termtter"
+          puts "generated: ~/.termtter/config"
           puts "enjoy!"
-          wrap_require do
-            load conf_file
-          end
+          load Termtter::CONF_FILE
         end
       end
 
+      def legacy_config_support
+        case File.ftype(File.expand_path('~/.termtter'))
+        when 'directory'
+          # nop
+        when 'file'
+          move_legacy_config_file
+        end
+      end
+
+      def move_legacy_config_file
+        FileUtils.mv(
+          Termtter::CONF_DIR,
+          File.expand_path('~/.termtter___'))
+        Dir.mkdir(Termtter::CONF_DIR)
+        FileUtils.mv(
+          File.expand_path('~/.termtter___'),
+          Termtter::CONF_FILE)
+      end
+
       def pre_config_load()
-        if configatron.devel
+        if config.system.devel
           plugin 'devel'
         end
       end
@@ -277,7 +290,7 @@ module Termtter
             handle_error(e)
           end
         }
-        vi_or_emacs = configatron.editing_mode
+        vi_or_emacs = config.editing_mode
         unless vi_or_emacs.empty?
           Readline.__send__("#{vi_or_emacs}_editing_mode")
         end
@@ -288,13 +301,13 @@ module Termtter
           :name => :_update_timeline,
           :exec_proc => lambda {|arg|
             begin
-              statuses = Termtter::API.twitter.get_friends_timeline(@@since_id)
+              args = @@since_id ? [{:since_id => @@since_id}] : []
+              statuses = Termtter::API.twitter.friends_timeline(*args)
               unless statuses.empty?
                 @@since_id = statuses[0].id
               end
-              print "\e[1K\e[0G" if !statuses.empty? && !win?
               call_hooks(statuses, :update_friends_timeline)
-              @@input_thread.kill if @@input_thread && !statuses.empty?
+              statuses
             rescue OpenURI::HTTPError => e
               if e.message == '401 Unauthorized'
                 puts 'Could not login'
@@ -305,7 +318,7 @@ module Termtter
           }
         )
 
-        add_task(:name => :update_timeline, :interval => configatron.update_interval) do
+        add_task(:name => :update_timeline, :interval => config.update_interval) do
           call_commands('_update_timeline')
         end
       end
@@ -327,13 +340,20 @@ module Termtter
       def start_input_thread
         setup_readline()
         trap_setting()
-        @@main_thread = Thread.new do
-          loop do
-            @@input_thread = create_input_thread()
-            @@input_thread.join
+        @@input_thread = Thread.new do
+          while buf = Readline.readline(ERB.new(config.prompt).result(API.twitter.__send__(:binding)), true)
+            Readline::HISTORY.pop if /^(u|update)\s+(.+)$/ =~ buf
+            begin
+              call_commands(buf)
+            rescue CommandNotFound => e
+              warn "Unknown command \"#{e}\""
+              warn 'Enter "help" for instructions'
+            rescue => e
+              handle_error e
+            end
           end
         end
-        @@main_thread.join
+        @@input_thread.join
       end
 
       def run
@@ -354,21 +374,6 @@ module Termtter
         start_input_thread()
       end
 
-      def create_input_thread()
-        Thread.new do
-          while buf = Readline.readline(ERB.new(configatron.prompt).result(API.twitter.__send__(:binding)), true)
-            Readline::HISTORY.pop if /^(u|update)\s+(.+)$/ =~ buf
-            begin
-              call_commands(buf)
-            rescue CommandNotFound => e
-              puts "Unknown command \"#{buf}\""
-              puts 'Enter "help" for instructions'
-            end
-          end
-          exit # exit when press Control-D
-        end
-      end
-
       def create_highline
         HighLine.track_eof = false
         if $stdin.respond_to?(:getbyte) # for ruby1.9
@@ -380,7 +385,7 @@ module Termtter
         else
           stdin_for_highline = $stdin
         end
-        return HighLine.new(stdin_for_highline)
+        HighLine.new(stdin_for_highline)
       end
 
       def handle_error(e)
@@ -389,22 +394,6 @@ module Termtter
         puts "Error: #{e}"
         puts e.backtrace.join("\n")
       end
-
-      def wrap_require
-        # FIXME: delete this method after the major version up
-        alias original_require require
-        def require(s)
-          if %r|^termtter/(.*)| =~ s
-            puts "[WARNING] use plugin '#{$1}' instead of require"
-            puts "  Such a legacy .termtter file will not be supported until version 1.0.0"
-            s = "plugin/#{$1}"
-          end
-          original_require s
-        end
-        yield
-        alias require original_require
-      end
-      private :wrap_require
     end
   end
 end