termtter 1.6.0 → 1.7.0

data/lib/termtter/active_rubytter.rb

@@ -43,5 +43,9 @@ module Termtter
         memo
       end
     end
+
+    def retweeted_status
+      nil
+    end
   end
 end

data/lib/termtter/api.rb

@@ -1,9 +1,26 @@
 # -*- coding: utf-8 -*-
 
 config.set_default(:host, 'twitter.com')
-config.proxy.set_default(:port, '8080')
-config.proxy.set_default(:host, nil)
-config.proxy.set_default(:port, nil)
+if ENV.has_key?('HTTP_PROXY')
+  require 'uri'
+  proxy = ENV['HTTP_PROXY']
+  proxy = "http://" + proxy if proxy !~ /^http:\/\//
+  u = URI.parse(proxy)
+  config.proxy.set_default(:host, u.host)
+  config.proxy.set_default(:port, u.port.to_s)
+
+  if u.userinfo.nil?
+    config.proxy.set_default(:host, nil)
+    config.proxy.set_default(:port, nil)
+  else
+    user_name,password = u.userinfo.split(/:/)
+    config.proxy.set_default(:user_name, user_name)
+    config.proxy.set_default(:password, password)
+  end
+else
+  config.proxy.set_default(:host, nil)
+  config.proxy.set_default(:port, nil)
+end
 config.proxy.set_default(:user_name, nil)
 config.proxy.set_default(:password, nil)
 config.set_default(:enable_ssl, false)
@@ -13,7 +30,6 @@ module Termtter
     class << self
       attr_reader :connection, :twitter
       def setup
-
         3.times do
           begin
             if twitter = try_auth
@@ -40,6 +56,8 @@ module Termtter
 
         if config.user_name.empty?
           config.user_name = ui.ask('Username: ')
+        else
+          puts "Username: #{config.user_name}"
         end
         if config.password.empty?
           config.password = ui.ask('Password: ') { |q| q.echo = false}
@@ -50,7 +68,6 @@ module Termtter
           twitter.verify_credentials
           return twitter
         rescue Rubytter::APIError
-          config.__clear__(:user_name)
           config.__clear__(:password)
         end
         return nil

data/lib/termtter/client.rb

@@ -15,12 +15,6 @@ module Termtter
     @filters = []
     @since_id = nil
 
-    config.set_default(:logger, nil)
-    config.set_default(:update_interval, 120)
-    config.set_default(:prompt, '> ')
-    config.set_default(:devel, false)
-    config.set_default(:timeout, 5)
-
     Thread.abort_on_exception = true
 
     class << self
@@ -33,6 +27,11 @@ module Termtter
           name.each {|i| plug(i, options) }
           return
         end
+
+        name = name.to_s
+
+        return if config.system.disable_plugins.include?(name.gsub('defaults/', ''))
+
         options.each do |key, value|
           config.plugins.__refer__(name.gsub(/-/, '_').to_sym).__assign__(key.to_sym, value)
         end
@@ -93,7 +92,7 @@ module Termtter
       def register_macro(name, macro, options = {})
         command = {
           :name => name.to_sym,
-          :exec_proc => lambda {|arg| call_commands(macro % arg)}
+          :exec_proc => lambda {|arg| execute(macro % arg)}
         }.merge(options)
         register_command(command)
       end
@@ -137,11 +136,8 @@ module Termtter
         }
       end
 
-      def call_commands(text)
-        # status
-        #   0: done
-        #   1: canceled
-        status = 0
+      def execute(text)
+        text = text.strip
 
         @task_manager.invoke_and_wait do
           # FIXME: This block can become Maybe Monad
@@ -151,29 +147,30 @@ module Termtter
           }
           return if text.empty?
 
-          commands = find_commands(text)
-          raise CommandNotFound, text if commands.empty?
-
-          commands.each do |command|
-            command_str, command_arg = command.split_command_line(text)
-
-            modified_arg = command_arg
-            # FIXME: This block can become Maybe Monad
-            get_hooks("modify_arg_for_#{command.name.to_s}").each {|hook|
-              break if modified_arg == false # interrupt if hook return false
-              modified_arg = hook.call(command_str, modified_arg)
-            }
-
-            begin
-              call_hooks("pre_exec_#{command.name.to_s}", command, modified_arg)
-              result = command.call(command_str, modified_arg, text) # exec command
-              call_hooks("post_exec_#{command.name.to_s}", command_str, modified_arg, result)
-            rescue CommandCanceled
-              status = 1
-            end
+          command = find_command(text)
+          raise CommandNotFound, text unless command
+
+          command_str, modified_arg = command.split_command_line(text)
+          command_str.strip!
+          modified_arg ||= ''
+
+          # FIXME: This block can become Maybe Monad
+          get_hooks("modify_arg_for_#{command.name.to_s}").each {|hook|
+            break if modified_arg == false # interrupt if hook return false
+            modified_arg.strip!
+            modified_arg = hook.call(command_str, modified_arg) || ''
+          }
+          modified_arg.strip!
+
+          begin
+            call_hooks("pre_exec_#{command.name.to_s}", command, modified_arg)
+            result = command.call(command_str, modified_arg, text) # exec command
+            call_hooks("post_exec_#{command.name.to_s}", command_str, modified_arg, result)
+            call_hooks("post_command", text)
+          rescue CommandCanceled
+            return false
           end
-          call_hooks("post_command", text)
-          status
+          return true
         end
       rescue TimeoutError
         call_hooks("timeout", text)
@@ -184,8 +181,12 @@ module Termtter
         @commands.values.any? {|command| command.match?(text) }
       end
 
-      def find_commands(text)
-        @commands.values.select {|command| command.match?(text) }
+      def find_command(text)
+        @commands.
+          values.
+          select {|command| command.match?(text) }.
+          sort_by {|command| command.name.to_s.split(' ').size }.
+          last
       end
 
       def pause
@@ -235,11 +236,13 @@ module Termtter
       end
 
       def logger
-        @logger
+        @logger || setup_logger
       end
 
       def setup_logger
         @logger = config.logger || default_logger
+        @logger.level = config.devel ? Logger::DEBUG : Logger::INFO
+        @logger
       end
 
       def default_logger
@@ -282,9 +285,18 @@ module Termtter
         @task_manager = Termtter::TaskManager.new(1)
       end
 
+      def parse_options
+        Termtter::OptParser.parse!(ARGV)
+      end
+
+      def show_splash
+        puts TermColor.parse(config.splash)
+      end
+
       def run
+        show_splash
+        parse_options()
         load_config()
-        setup_logger()
         setup_task_manager()
         load_plugins()
         eval_init_block()
@@ -298,12 +310,15 @@ module Termtter
           end
         end
 
-        config.system.run_commands.each {|cmd| call_commands(cmd) }
+        config.system.run_commands.each {|cmd| execute(cmd) }
 
         unless config.system.cmd_mode
           @task_manager.run()
           call_hooks(:initialize)
-          call_hooks(:launched)
+          add_task(:name => :call_hooks_after_launched, :after => 1) do
+            call_hooks(:launched)
+          end
+          call_hooks(:init_command_line)
         end
       end
 

data/lib/termtter/command.rb

@@ -37,6 +37,7 @@ module Termtter
 
     # complement :: String -> [String]
     def complement(input)
+      input = input.sub(/^\s*/, '')
       if match?(input) && input =~ /^[^\s]+\s/
         if completion_proc
           command_str, command_arg = split_command_line(input)
@@ -45,7 +46,7 @@ module Termtter
           []
         end
       else
-        [name.to_s, aliases.to_s].grep(/^#{Regexp.quote(input)}/)
+        []
       end
     end
 
@@ -95,7 +96,7 @@ module Termtter
     def split_command_line(line)
       command_words_count = command_words.size
       parts = line.strip.split(/\s+/, command_words_count + 1)
-      [parts[0...command_words_count].join(' '), parts[command_words_count]]
+      [parts[0...command_words_count].join(' '), parts[command_words_count] || '']
     end
   end
 end

data/lib/termtter/config_setup.rb

@@ -12,7 +12,7 @@ module Termtter
       plugins = Dir.glob(File.expand_path(File.dirname(__FILE__) + "/../plugins/*.rb")).map  {|f|
         f.match(%r|lib/plugins/(.*?).rb$|)[1]
       }
-      standard_plugins = %w[stdout standard_commands auto_reload]
+      standard_plugins = %w[stdout standard_commands auto_reload defaults]
 
       template = open(File.dirname(__FILE__) + '/config_template.erb').read
       config = ERB.new(template, nil, '-').result(binding) # trim_mode => '-'

data/lib/termtter/config_template.erb

@@ -2,12 +2,17 @@
 
 config.user_name = '<%= user_name %>'
 #config.update_interval = 120
+#config.timeout = 5
+#config.retry = 3
 #config.enable_ssl = true
 #config.proxy.host = 'proxy host'
 #config.proxy.port = '8080'
 #config.proxy.user_name = 'proxy user'
 #config.proxy.password = 'proxy password'
 
+#config.plugins.keyword.keywords = ["ruby", "termtter"]
+#config.plugins.stdout.colors = (31..36).to_a + (91..96).to_a
+
 Termtter::Client.init do |t|
   <%- (plugins - standard_plugins).each do |plugin| -%>
 #  t.plug '<%= plugin %>'

data/lib/termtter/default_config.rb

@@ -0,0 +1,18 @@
+config.set_default(:logger, nil)
+config.set_default(:update_interval, 120)
+config.set_default(:prompt, '> ')
+config.set_default(:devel, false)
+config.set_default(:timeout, 5)
+config.set_default(:retry, 1)
+config.set_default(:splash, <<SPLASH)
+
+   <cyan>&lt;(@)//_</cyan>  .  .      <on_green> Termtter <underline>#{Termtter::VERSION}</underline> </on_green>
+      <cyan>\\\\</cyan>           <on_green> http://termtter.org/ </on_green>
+
+SPLASH
+
+config.system.set_default :cmd_mode, false
+config.system.set_default :run_commands, []
+config.system.set_default :load_plugins, []
+config.system.set_default :disable_plugins, []
+config.system.set_default :eval_scripts, []

data/lib/termtter/hookable.rb

@@ -41,6 +41,7 @@ module Termtter
 
           # return last hook return value
           def call_hooks(point, *args)
+            Termtter::Client.logger.debug "call_hooks: [:point => #{point}, :args => [#{args.map {|a| a.inspect.split(//)[0..10].join}.join(', ')}]]"
             result = nil
             get_hooks(point).each {|hook|
               break if result == false # interrupt if hook return false

data/lib/termtter/httppool.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require 'net/http'
+
+module Termtter
+  module HTTPpool
+    @@connections = {}
+
+    def self.start(host, port = 80)
+      begin
+        yield(connection(host, port))
+      rescue EOFError
+        finish(host, port)
+        retry
+      end
+    end
+
+    def self.connection(host, port = 80)
+      key = connection_key(host, port)
+      @@connections[key] ||= http_class.start(host, port)
+    end
+
+    def self.finish(host, port = 80)
+      key = connection_key(host, port)
+      @@connections[key] && @@connections[key].do_finish rescue nil
+      @@connections.delete(key)
+    end
+
+    def self.connection_key(host, port)
+      port == 80 ? host : [host, port.to_s].join(':')
+    end
+
+    def self.http_class
+      if config.proxy.host.nil? or config.proxy.host.empty?
+        Net::HTTP
+      else
+        Net::HTTP::Proxy(config.proxy.host,
+                         config.proxy.port,
+                         config.proxy.user_name,
+                         config.proxy.password)
+      end
+    end
+
+  end
+end

data/lib/termtter/memory_cache.rb

@@ -0,0 +1,32 @@
+require 'delegate'
+
+module Termtter
+  class MemoryCache < SimpleDelegator
+    attr_reader :limit
+
+    def initialize(limit = 10000)
+      super(Hash.new)
+      @keys = []
+      @limit = limit
+    end
+
+    def adjust(key)
+      unless @keys.include?(key)
+        @keys << key
+        while @keys.size > limit
+          delete(@keys.shift)
+        end
+      end
+    end
+
+    def []=(key, value)
+      super
+      adjust(key)
+    end
+
+    def store(key, value)
+      super
+      adjust(key)
+    end
+  end
+end

data/lib/termtter/optparse.rb

@@ -1,4 +1,3 @@
-
 module Termtter
   module OptParser
     class << self
@@ -10,39 +9,30 @@ module Termtter
     @optionparser = OptionParser.new { |opt|
       opt.program_name = 'Termtter'
 
-      opt.on('-f', '--config-file file', 'Set path to configfile') do |val|
-        config.system.__assign__(:conf_file, val)
-      end
-
-      opt.on('-t', '--termtter-directory directory', 'Set termtter directory') do |val|
-        config.system.__assign__(:conf_dir, val)
-      end
-
       opt.on('-d', '--devel', 'Start in developer mode') do |flg|
         config.__assign__(:devel, true) if flg
       end
 
-      config.system.cmd_mode = false
       opt.on('-c', '--command-mode', 'Run as command mode') do |flg|
         config.system.cmd_mode = flg
       end
 
-      config.system.run_commands = []
       opt.on('-r', '--run-command command', 'Run command') do |cmd|
         config.system.run_commands << cmd
       end
 
-      config.system.load_plugins = []
       opt.on('-p', '--plugin plugin', 'Load plugin') do |plugin|
         config.system.load_plugins << plugin
       end
 
-      config.system.eval_scripts = []
+      opt.on('-n', '--disable-plugin plugin', 'Disable plugin') do |plugin|
+        config.system.disable_plugins << plugin
+      end
+
       opt.on('-e', '--eval-script script', 'Eval script') do |script|
         config.system.eval_scripts << script
       end
 
-      config.system.eval_scripts = []
       opt.on('-m', '--monochrome', 'No shell escapes for color highlightings') do |script|
         require 'termcolor'
         module ::TermColor
@@ -55,9 +45,12 @@ module Termtter
         end
       end
 
+      opt.on('-u', '--user user', 'Login username') do |val|
+        config.user_name = val
+      end
+
       opt.version = Termtter::VERSION
     }
-
   end
 end