termtter 1.5.0 → 1.6.0

data/lib/plugins/truncate.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+def multibyte_string(text)
+  text.unpack('U*')
+end
+
+def truncate(text, length = 140, omission = "...")
+  o = multibyte_string(omission)
+  l = length - o.length
+  chars = multibyte_string(text)
+  chars.length > length ? (chars[0...l] + o).pack('U*') : text
+end
+
+Termtter::RubytterProxy.register_hook(
+  :name => :truncate_status,
+  :points => [:pre_update],
+  :exec_proc => lambda do |*args|
+    return unless args
+    return args if args.length < 1
+    status = args[0]
+    return args if multibyte_string(status).length <= 140
+    if Termtter::Client::confirm("You are status contents more than 140 characters. do end endyou want abbreviation status?", true)
+      args[0] = truncate(status)
+    else
+      puts 'canceled.'
+      raise Termtter::HookCanceled
+    end
+  end
+)

data/lib/plugins/uri-open.rb

@@ -1,14 +1,18 @@
 # -*- coding: utf-8 -*-
 
+require 'uri'
+
 module Termtter::Client
   public_storage[:uris] = []
 
+  PROTOCOLS = %w(http https)
+
   register_hook(
     :name => :uri_open,
     :points => [:output],
     :exec_proc => lambda {|statuses, event|
       statuses.each do |s|
-        public_storage[:uris] = s[:text].scan(%r|https?://[^\s]+|) + public_storage[:uris]
+        public_storage[:uris].unshift *URI.extract(s[:text], PROTOCOLS)
       end
     }
   )
@@ -21,23 +25,24 @@ module Termtter::Client
         case RUBY_PLATFORM
         when /linux/; 'firefox'
         when /mswin(?!ce)|mingw|bccwin/; 'explorer'
+        when /cygwin/; 'cygstart -o'
         else; 'open'
         end
       end
-    system cmd, uri
+    system "#{cmd} #{uri}"
   end
 
   register_command(
     :name => :'uri-open', :aliases => [:uo],
     :exec_proc => lambda {|arg|
-      case arg
+      case arg.strip
       when ''
         open_uri public_storage[:uris].shift
-      when /^\s*all\s*$/
+      when /^all$/
         public_storage[:uris].
           each {|uri| open_uri(uri) }.
           clear
-      when /^\s*list\s*$/
+      when /^list$/
         public_storage[:uris].
           enum_for(:each_with_index).
           to_a.
@@ -45,20 +50,29 @@ module Termtter::Client
           each  do |uri, index|
             puts "#{index}: #{uri}"
           end
-      when /^\s*delete\s+(\d+)\s*$/
+      when /^delete\s+(\d+)$/
         puts 'delete'
         public_storage[:uris].delete_at($1.to_i)
-      when /^\s*clear\s*$/
+      when /^clear$/
         public_storage[:uris].clear
         puts "clear uris"
-      when /^\s*(\d+)\s*$/
+      when /^in\s+(.*)$/
+        $1.split(/\s+/).each do |id|
+          if s = Termtter::API.twitter.show(id) rescue nil
+            URI.extract(s.text, PROTOCOLS).each do |uri|
+              open_uri(uri)
+              public_storage[:uris].delete(uri)
+            end
+          end
+        end
+      when /^(\d+)$/
         open_uri(public_storage[:uris].delete_at($1.to_i))
       else
         puts "**parse error in uri-open**"
       end
     },
     :completion_proc => lambda {|cmd, arg|
-      %w(all list delete clear).grep(/^#{Regexp.quote arg}/).map {|a| "#{cmd} #{a}" }
+      %w(all list delete clear in).grep(/^#{Regexp.quote arg}/).map {|a| "#{cmd} #{a}" }
     }
   )
 end

data/lib/plugins/w3mimg.rb

@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+require 'fileutils'
+require 'RMagick' # apt-get install librmagick-ruby
+require 'uri'
+require 'open3'
+require 'terminfo'
+
+# TODO should be DRY: Copy from notify-send3.rb
+config.plugins.notify_send.set_default(:icon_cache_dir, "#{Termtter::CONF_DIR}/tmp/user_profile_images")
+def get_icon_path(s)
+  FileUtils.mkdir_p(config.plugins.notify_send.icon_cache_dir) unless File.exist?(config.plugins.notify_send.icon_cache_dir)
+  cache_file = "%s/%s%s" % [  config.plugins.notify_send.icon_cache_dir,
+                              s.user.screen_name,
+                              File.extname(s.user.profile_image_url)  ]
+  if !File.exist?(cache_file) || (File.atime(cache_file) + 24*60*60) < Time.now
+    File.open(cache_file, "wb") do |f|
+      begin
+        http_class = Net::HTTP
+        unless config.proxy.host.nil? or config.proxy.host.empty?
+          http_class = Net::HTTP::Proxy(config.proxy.host,
+                                        config.proxy.port,
+                                        config.proxy.user_name,
+                                        config.proxy.password)
+        end
+        uri = URI.parse(URI.escape(s.user.profile_image_url))
+        image = http_class.get(uri.host, uri.path, uri.port)
+        rimage = Magick::Image.from_blob(image).first
+        rimage = rimage.resize_to_fill(48, 48)
+        f << rimage.to_blob
+      rescue Net::ProtocolError
+        return nil
+      end
+    end
+  end
+  cache_file
+end
+
+module Termtter::Client
+
+  W3MIMG = '/usr/lib/w3m/w3mimgdisplay'
+  W3MIMGSTDIN, stdout, stderr = *Open3.popen3(W3MIMG)
+
+  sizestr = `#{W3MIMG} -test`.chomp
+  PW, PH = sizestr.split.map(&:to_i)
+  CH, CW = TermInfo.screen_size()
+  LINEH = PH / CH
+  @w3mimgicons = []
+
+  register_hook(
+    :name => :w3mimg,
+    :points => [:output],
+    :exec_proc => lambda {|statuses, event|
+      return unless event == :update_friends_timeline
+      Thread.start do
+        newicons = statuses.reverse.map do |s|
+          lines = s.text.count("\n") + 1
+          file = get_icon_path(s)
+          [file, lines]
+        end
+        @w3mimgicons = (newicons + @w3mimgicons).take(CH)
+        sleep 0.5
+        w, h = 48, 48
+        x = PW - w
+        y = PH - LINEH
+        @w3mimgicons.each do |i|
+          file, lines = i
+          sh = LINEH * lines
+          y -= sh
+          W3MIMGSTDIN.print "2;3;\n0;1;#{x};#{y};#{w};#{h};0;0;0;#{sh};#{file}\n4\n3;\n"
+          break if y <= 0
+        end
+      end
+    }
+  )
+
+end

data/lib/termtter/active_rubytter.rb

@@ -8,6 +8,14 @@ module Termtter
       self.attributes = data
     end
 
+    def id
+      @data[:id]
+    end
+
+    def [](key)
+      @data[key]
+    end
+
     def method_missing(name, *args)
       if @data.key?(name)
         return @data[name]

data/lib/termtter/api.rb

@@ -13,23 +13,47 @@ module Termtter
     class << self
       attr_reader :connection, :twitter
       def setup
-        @connection = Connection.new
 
-        ui = create_highline
-        config.user_name = ui.ask('Username: ') if config.user_name.empty?
-        config.password = ui.ask('Password: ') { |q| q.echo = false} if config.password.empty?
-        @twitter = Rubytter.new(config.user_name, config.password, twitter_option)
-      end
+        3.times do
+          begin
+            if twitter = try_auth
+              @twitter = twitter
+              # NOTE: for compatible
+              @connection = twitter.instance_variable_get(:@connection)
+              break
+            end
+          rescue Timeout::Error
+            puts TermColor.parse("<red>Time out :(</red>")
+            exit!
+          end
+        end
 
-      def restore_user
-        @twitter = create_twitter(config.user_name, config.password)
+        exit! unless twitter
       end
 
-      def switch_user(username = nil)
-        highline = create_highline
-        username = highline.ask('your twitter username: ') if username.nil? || username.empty?
-        password = highline.ask('your twitter password: ') { |q| q.echo = false }
-        @twitter = create_twitter(username, password)
+      def try_auth
+        if config.user_name.empty? || config.password.empty?
+          puts 'Please enter your Twitter login:'
+        end
+
+        ui = create_highline
+
+        if config.user_name.empty?
+          config.user_name = ui.ask('Username: ')
+        end
+        if config.password.empty?
+          config.password = ui.ask('Password: ') { |q| q.echo = false}
+        end
+
+        twitter = RubytterProxy.new(config.user_name, config.password, twitter_option)
+        begin
+          twitter.verify_credentials
+          return twitter
+        rescue Rubytter::APIError
+          config.__clear__(:user_name)
+          config.__clear__(:password)
+        end
+        return nil
       end
 
       def twitter_option

data/lib/termtter/client.rb

@@ -9,22 +9,23 @@ module Termtter
 
   module Client
 
-    @hooks = {}
+    include Termtter::Hookable
+
     @commands = {}
     @filters = []
     @since_id = nil
-    @task_manager = Termtter::TaskManager.new
 
     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
 
-      attr_reader :commands, :hooks
+      attr_reader :commands
 
       # plug :: Name -> (Hash) -> IO () where NAME = String | Symbol | [NAME]
       def plug(name, options = {})
@@ -53,34 +54,6 @@ module Termtter
         @filters.clear
       end
 
-      def register_hook(arg, opts = {}, &block)
-        hook = case arg
-          when Hook
-            arg
-          when Hash
-            Hook.new(arg)
-          when String, Symbol
-            options = { :name => arg }
-            options.merge!(opts)
-            options[:exec_proc] = block
-            Hook.new(options)
-          else
-            raise ArgumentError, 'must be given Termtter::Hook, Hash, String or Symbol'
-          end
-        @hooks[hook.name] = hook
-      end
-
-      def get_hook(name)
-        @hooks[name]
-      end
-
-      def get_hooks(point)
-        # TODO: sort by alphabet
-        @hooks.values.select do |hook|
-          hook.match?(point)
-        end
-      end
-
       def register_command(arg, opts = {}, &block)
         command = case arg
           when Command
@@ -112,6 +85,7 @@ module Termtter
         @commands.clear
       end
 
+      # MEMO: attr_reader :commands してるからこれいらない気もする
       def get_command(name)
         @commands[name]
       end
@@ -151,7 +125,7 @@ module Termtter
         call_hooks(:post_filter, filtered, event)
         get_hooks(:output).each do |hook|
           hook.call(
-            apply_filters_for_hook("filter_for_#{hook.name}", filtered, event),
+            apply_filters_for_hook(:"filter_for_#{hook.name}", filtered, event),
             event
           )
         end
@@ -163,17 +137,12 @@ module Termtter
         }
       end
 
-      # return last hook return value
-      def call_hooks(point, *args)
-        result = nil
-        get_hooks(point).each {|hook|
-          break if result == false # interrupt if hook return false
-          result = hook.call(*args)
-        }
-        result
-      end
-
       def call_commands(text)
+        # status
+        #   0: done
+        #   1: canceled
+        status = 0
+
         @task_manager.invoke_and_wait do
           # FIXME: This block can become Maybe Monad
           get_hooks("pre_command").each {|hook|
@@ -186,7 +155,7 @@ module Termtter
           raise CommandNotFound, text if commands.empty?
 
           commands.each do |command|
-            command_str, command_arg = Command.split_command_line(text)
+            command_str, command_arg = command.split_command_line(text)
 
             modified_arg = command_arg
             # FIXME: This block can become Maybe Monad
@@ -200,10 +169,15 @@ module Termtter
               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
           end
           call_hooks("post_command", text)
+          status
         end
+      rescue TimeoutError
+        call_hooks("timeout", text)
+        raise
       end
 
       def command_exists?(text)
@@ -304,12 +278,17 @@ module Termtter
         @init_block.call(self) if @init_block
       end
 
+      def setup_task_manager
+        @task_manager = Termtter::TaskManager.new(1)
+      end
+
       def run
         load_config()
-        Termtter::API.setup()
         setup_logger()
+        setup_task_manager()
         load_plugins()
         eval_init_block()
+        Termtter::API.setup()
 
         config.system.eval_scripts.each do |script|
           begin
@@ -331,14 +310,14 @@ module Termtter
       def handle_error(e)
         if logger
           logger.error("#{e.class.to_s}: #{e.message}")
-          logger.error(e.backtrace.join("\n")) if config.devel
+          logger.error(e.backtrace.join("\n")) if (e.backtrace and config.devel)
         else
           raise e
         end
         get_hooks(:on_error).each {|hook| hook.call(e) }
       rescue Exception => e
-        puts "Error: #{e}"
-        puts e.backtrace.join("\n")
+        $stderr.puts "Error: #{e}"
+        $stderr.puts e.backtrace.join("\n")
       end
 
       def confirm(message, default_yes = true, &block)

data/lib/termtter/command.rb

@@ -28,18 +28,18 @@ module Termtter
 
     # set :: Hash -> ()
     def set(cfg)
-      self.name            = cfg[:name].to_sym
-      self.aliases     = cfg[:aliases]
-      self.exec_proc       = cfg[:exec_proc]
-      self.completion_proc = cfg[:completion_proc]
-      self.help            = cfg[:help]
+      self.name             = cfg[:name].to_sym
+      self.aliases          = cfg[:aliases]
+      self.exec_proc        = cfg[:exec_proc]
+      self.completion_proc  = cfg[:completion_proc]
+      self.help             = cfg[:help]
     end
 
     # complement :: String -> [String]
     def complement(input)
       if match?(input) && input =~ /^[^\s]+\s/
         if completion_proc
-          command_str, command_arg = Command.split_command_line(input)
+          command_str, command_arg = split_command_line(input)
           [completion_proc.call(command_str, command_arg || '')].flatten.compact
         else
           []
@@ -64,7 +64,7 @@ module Termtter
 
     # match? :: String -> Boolean
     def match?(input)
-      !(pattern !~input)
+      pattern === input
     end
 
     # pattern :: Regexp
@@ -87,9 +87,15 @@ module Termtter
       self.aliases = [a]
     end
 
+    def command_words
+      name.to_s.split(/\s+/)
+    end
+
     # split_command_line :: String -> (String, String)
-    def self.split_command_line(line)
-      line.strip.split(/\s+/, 2)
+    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]]
     end
   end
 end

data/lib/termtter/config.rb

@@ -54,8 +54,12 @@ module Termtter
       @store.dup
     end
 
-    def __clear__
-      @store.clear
+    def __clear__(name = nil)
+      if name
+        @store[name] = :undefined
+      else
+        @store.clear
+      end
     end
 
     __instance = self.new

data/lib/termtter/hookable.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+
+module Termtter
+  class HookCanceled < StandardError; end
+
+  module Hookable
+    def self.included(base)
+      base.class_eval do
+        @hooks = {}
+
+        class << self
+          attr_reader :hooks
+
+          def register_hook(arg, opts = {}, &block)
+            hook = case arg
+              when Hook
+                arg
+              when Hash
+                Hook.new(arg)
+              when String, Symbol
+                options = { :name => arg }
+                options.merge!(opts)
+                options[:exec_proc] = block
+                Hook.new(options)
+              else
+                raise ArgumentError, 'must be given Termtter::Hook, Hash, String or Symbol'
+              end
+            hooks[hook.name] = hook
+          end
+
+          def get_hook(name)
+            hooks[name]
+          end
+
+          def get_hooks(point)
+            # TODO: sort by alphabet
+            hooks.values.select do |hook|
+              hook.match?(point)
+            end
+          end
+
+          # return last hook return value
+          def call_hooks(point, *args)
+            result = nil
+            get_hooks(point).each {|hook|
+              break if result == false # interrupt if hook return false
+              result = hook.call(*args)
+            }
+            result
+          end
+
+          def clear_hooks
+            hooks.clear
+          end
+        end
+      end
+    end
+  end
+end

data/lib/termtter/optparse.rb

@@ -1,51 +1,63 @@
-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
+module Termtter
+  module OptParser
+    class << self
+      def parse!(argv)
+        @optionparser.parse!(argv)
+      end
+    end
 
-  opt.on('-t', '--termtter-directory directory', 'Set termtter directory') do |val|
-    config.system.__assign__(:conf_dir, val)
-  end
+    @optionparser = OptionParser.new { |opt|
+      opt.program_name = 'Termtter'
 
-  opt.on('-d', '--devel', 'Start in developer mode') do |flg|
-    config.__assign__(:devel, true) if flg
-  end
+      opt.on('-f', '--config-file file', 'Set path to configfile') do |val|
+        config.system.__assign__(:conf_file, val)
+      end
 
-  config.system.cmd_mode = false
-  opt.on('-c', '--command-mode', 'Run as command mode') do |flg|
-    config.system.cmd_mode = flg
-  end
+      opt.on('-t', '--termtter-directory directory', 'Set termtter directory') do |val|
+        config.system.__assign__(:conf_dir, val)
+      end
 
-  config.system.run_commands = []
-  opt.on('-r', '--run-command command', 'Run command') do |cmd|
-    config.system.run_commands << cmd
-  end
+      opt.on('-d', '--devel', 'Start in developer mode') do |flg|
+        config.__assign__(:devel, true) if flg
+      end
 
-  config.system.load_plugins = []
-  opt.on('-p', '--plugin plugin', 'Load plugin') do |plugin|
-    config.system.load_plugins << plugin
-  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.eval_scripts = []
-  opt.on('-e', '--eval-script script', 'Eval script') do |script|
-    config.system.eval_scripts << script
-  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('-m', '--monochrome', 'No shell escapes for color highlightings') do |script|
-    require 'termcolor'
-    module TermColor
-      class << self
-        alias parse_orig parse
-        def parse(o)
-          o.gsub(/<.+?>(.*?)<\/.+?>/, '\1')
+      config.system.eval_scripts = []
+      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
+          class << self
+            alias parse_orig parse
+            def parse(o)
+              o.gsub(/<.+?>(.*?)<\/.+?>/, '\1')
+            end
+          end
         end
       end
-    end
+
+      opt.version = Termtter::VERSION
+    }
+
   end
+end
 
-  opt.version = Termtter::VERSION
-  opt.parse!(ARGV)
-}