termtter 1.9.0 → 1.10.0

data/Rakefile

@@ -25,21 +25,21 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
+# require 'spec/rake/spectask'
+# Spec::Rake::SpecTask.new(:spec) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.spec_files = FileList['spec/**/*_spec.rb']
+# end
+# 
+# Spec::Rake::SpecTask.new(:rcov) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.pattern = 'spec/**/*_spec.rb'
+#   spec.rcov = true
+# end
+# 
+# task :spec => :check_dependencies
+# 
+# task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.10.0

data/lib/plugins/appendtitle.rb

@@ -3,32 +3,50 @@ require 'uri'
 require 'open-uri'
 require 'nokogiri'
 require 'timeout'
-require 'memcache'
 require 'digest/sha1'
 
 module Termtter::Client
   config.plugins.appendtitle.set_default(:timeout, 30)
   config.plugins.appendtitle.set_default(:cache_expire, 3600 * 24 * 7)
 
-  def self.fetch_title(uri)
+  def self.fetch_title_data(uri) # returns {:title, :uri} | {:uri} | nil
     return unless uri
-    key = %w{ plugins appendtitle title}.push(Digest::SHA1.hexdigest(uri)).join('-')
+    key = %w{ plugins appendtitle title-data}.push(Digest::SHA1.hexdigest(uri)).join('-')
     if v = memory_cache.get(key)
       logger.debug "appendtitle: cache hit for #{uri}"
       return v
     end
 
-    memory_cache.set(key, '', config.plugins.appendtitle.cache_expire) # to avoid duplicate fetch
+    memory_cache.set(key, {}, config.plugins.appendtitle.cache_expire) # to avoid duplicate fetch
+    logger.debug "appendtitle: fetching title for #{uri}"
+    data = {}
+    uri_fetch = uri
     begin
-      logger.debug "appendtitle: fetching title for #{uri}"
-      source = Nokogiri(open(uri).read)
-      if source and source.at('title')
-        title = source.at('title').text
-        memory_cache.set(key, title, config.plugins.appendtitle.cache_expire)
-        return title
+      io = URI.parse(uri_fetch).read
+      base_uri = io.base_uri.to_s
+      base_uri = uri_fetch if base_uri.length > 1000
+      data[:uri] = base_uri
+      charset = io.scan(/charset="?([^\s"]*)/i).flatten.inject(Hash.new{0}){|a, b| a[b]+=1; a}.to_a.sort_by{|a|a[1]}.reverse.first[0] # XXX: scan charset from source
+      begin # title
+        source = Nokogiri(io, base_uri, charset)
+        title = source.at('title').text rescue nil
+        title ||= source.at('h1').text rescue nil
+        title ||= source.at('h2').text rescue nil
+        title = title.gsub(/\n/, '').gsub(/\s+/, ' ') if title
+        data[:title] = title if title
+      rescue
       end
-      nil
-     rescue Timeout::Error, StandardError
+      memory_cache.set(key, data, config.plugins.appendtitle.cache_expire)
+      data
+    rescue RuntimeError => error
+      # example: redirection forbidden: http://bit.ly/gSarwN -> https://github.com/jugyo/termtter/commit/6e5fa4455a5117fb6c10bdf82bae52cfcf57a91f
+      if error.message =~ /^redirection forbidden/
+        logger.debug "appendtitle: #{error.message}"
+        uri_fetch = error.message.split(/\s+/).last
+        retry
+      end
+    rescue Timeout::Error, StandardError => error
+      logger.debug "appendtitle: error #{uri}, #{error.class.to_s}: #{error.message}"
       nil
     end
   end
@@ -40,20 +58,22 @@ module Termtter::Client
       threads = statuses.map do |status|
         Thread.new{
           begin
-          status.text.gsub!(URI.regexp(['http', 'https'])) {|uri|
-            title = fetch_title(uri)
-            title = title.gsub(/\n/, '').gsub(/\s+/, ' ') if title
+            status.text.gsub!(URI.regexp(['http', 'https'])) {|uri_before|
+            data  = fetch_title_data(uri_before) || {}
+            title = data[:title]
             body_for_compare = status.text.gsub(/\n/, '').gsub(/\s+/, ' ')
+            uri_after = data[:uri] || uri_before
             if title and not (
                 body_for_compare.include? title or
                 body_for_compare.include? title[0..(title.length/2)] or
                 body_for_compare.include? title[(title.length/2)..-1]) # XXX: heuristic!!!
-              "#{uri} (#{title})"
+              "#{uri_after} (#{title})"
             else
-              uri
+              uri_after
             end
             }
-          rescue
+          rescue => error
+            logger.debug "appendtitle: [ERROR] #{error.class.to_s}: #{error.message}"
           end
         }
       end
@@ -72,4 +92,4 @@ module Termtter::Client
 end
 
 # appendtitle.rb:
-# append title for uri.
+# append title for uri and expand short uri.

data/lib/plugins/basic.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+config.access_token = ''
+config.access_token_secret = ''
+
+module OAuth
+  class AccessToken
+    def initialize(consumer, access_token, access_token_secret)
+    end
+  end
+end
+module Termtter
+  class RubytterProxy
+    def initialize(access_token, twitter_option)
+      user_name = config.plugins.basic.user_name
+      password = config.plugins.basic.password
+      @rubytter = Rubytter.new(user_name, password, twitter_option)
+    end
+  end
+end
+
+# basic.rb
+# Use Basic Auth instead of OAuth
+#
+# config.plugins.basic.user_name = 'your_name'
+# config.plugins.basic.password = 'the secret'

data/lib/plugins/capture.rb

@@ -0,0 +1,22 @@
+require 'stringio'
+module Termtter::Client
+  register_command(
+    'capture',
+    :alias => 'cap',
+    :help => ['capture FILENAME COMMAND', 'capture the output of command to file']
+  ) do |args|
+    org = $stdout
+    begin
+      filename, command = args.split(/\s+/, 2)
+      $stdout = io = StringIO.new
+      execute(command)
+    ensure
+      $stdout = org
+    end
+
+    File.open(filename, 'a') do |file|
+      file << io.string.gsub(/\e\[\d+m/, '')
+    end
+    puts "=> #{filename.inspect}"
+  end
+end

data/lib/plugins/channel.rb

@@ -67,7 +67,6 @@ Termtter::Client.register_command(
     args = @since_id ? [{:since_id => @since_id}] : []
     statuses = Termtter::API.call_by_channel(now_channel, *args)
     unless statuses.empty?
-      print "\e[0G" + "\e[K" unless win?
       @since_id = statuses[0].id
       Termtter::Client.output(statuses, Termtter::Event.new(:update_friends_timeline, :type => :main))
       Readline.refresh_line if arg =~ /\-r/
@@ -94,7 +93,7 @@ Termtter::Client.register_hook(
       when :direct_message, :direct
         :direct
       when :search
-        :"#{e[:search_keyword]}_search"
+        :"#{e[:query]}_search"
       when :reply, :replies
         :replies
       when :show
@@ -117,8 +116,9 @@ Termtter::Client.register_hook(
         config.plugins.channel.channel_to_hash_proc.call(otc.to_s.gsub(/^\//, "")) %
         config.plugins.stdout.colors.size]
     colorize_channel_cache[otc] = ccolor
-    th = "#{config.plugin.channel.colorize ? "<#{ccolor}>":""}#{c.to_s.length > config.plugins.channel.output_length ?
-            otc.to_s[0, config.plugins.channel.output_length] : otc.to_s.rjust(config.plugins.channel.output_length)}#{config.plugin.channe.colorize ? "</#{ccolor}>":""}<90>| </90>"
+    cgray = config.plugins.stdout.gray || config.plugins.stdout.colors.last
+    th = "#{config.plugins.channel.colorize ? "<#{ccolor}>":""}#{c.to_s.length > config.plugins.channel.output_length ?
+            otc.to_s[0, config.plugins.channel.output_length] : otc.to_s.rjust(config.plugins.channel.output_length)}#{config.plugins.channel.colorize ? "</#{ccolor}>":""}<#{cgray}>| </#{cgray}>"
     th + t
   }
 )
@@ -133,7 +133,6 @@ config.plugins.channel.auto_reload_channels.each do |c, i|
         args = since_ids[c] ? [{:since_id => since_ids[c]}] : []
         statuses = Termtter::API.call_by_channel(c, *args)
         unless statuses.empty?
-          print "\e[0G" + "\e[K" unless win?
           since_ids[c] = statuses[0].id
           Termtter::Client.output(statuses, Termtter::Event.new(:"update_#{c}", :type => :channel, :channel => c))
           Readline.refresh_line

data/lib/plugins/copy.rb

@@ -0,0 +1,32 @@
+config.plugins.copy.set_default(:style, "@<%= t.user.screen_name %>: <%= t.text %> [ <%= url %> ]")
+
+def copy_to_clipboard(str)
+  if /darwin/i =~ RUBY_PLATFORM
+    IO.popen("pbcopy", "w") do |io|
+      io.print str
+    end
+  else
+    puts "Sorry, this plugin is only in Mac OS X."
+  end
+  str
+end
+
+Termtter::Client.plug 'url'
+
+Termtter::Client.register_command(:name => :copy,
+                                  :exec => lambda do |arg|
+  t = Termtter::API.twitter.show(arg)
+  url = url_by_tweet(t)
+  erbed_text = ERB.new(config.plugins.copy.style).result(binding)
+
+  puts "Copied=> #{copy_to_clipboard(erbed_text)}"
+end)
+
+Termtter::Client.register_command(:name => :copy_url,
+                                  :exec => lambda do |arg|
+  t = Termtter::API.twitter.show(arg)
+  url = url_by_tweet(t)
+
+  puts "Copied=> #{copy_to_clipboard(url)}"
+  
+end)

data/lib/plugins/defaults/auto_reload.rb

@@ -17,6 +17,10 @@ Termtter::Client.add_task(
   &auto_reload_proc
 )
 
+config.set_assign_hook(:update_interval) do |v|
+  Termtter::Client.task_manager.get_task(:auto_reload).interval = v
+end
+
 Termtter::Client.register_hook(
   :name => :auto_reload_init,
   :point => :initialize,

data/lib/plugins/defaults/cache.rb

@@ -3,14 +3,14 @@ require 'pp'
 module Termtter::Client
   register_command(
     :name => :"cache stats",
-    :help => 'Show Memcached stats.',
+    :help => ['cache stats', 'Show Memcached stats.'],
     :exec_proc => lambda {|arg|
       puts memory_cache.stats.pretty_inspect
     })
 
   register_command(
     :name => :"cache flush",
-    :help => 'Flush all caches.',
+    :help => ['cache flush', 'Flush all caches.'],
     :exec_proc => lambda {|arg|
       memory_cache.flush_all
       logger.info "cache flushed."

data/lib/plugins/defaults/command_line.rb

@@ -64,6 +64,7 @@ module Termtter
             Client.handle_error(e)
           end
         end
+        Client.exit
       end
       @input_thread.join
     end
@@ -126,10 +127,30 @@ module Termtter
         trap("CONT") do
           Readline.refresh_line
         end
+        trap_sigwinch
       rescue ArgumentError
       rescue Errno::ENOENT
       end
     end
+
+    # for Ruby 1.9.2(or later)'s Readline
+    # TODO: support other platforms (like Mac OS X)
+    if Readline.respond_to?(:set_screen_size) && /linux/ =~ RUBY_PLATFORM
+      TIOCGWINSZ = 0x5413         # in Linux
+
+      def trap_sigwinch
+        trap('WINCH') do
+          dat = ''
+          STDOUT.ioctl(TIOCGWINSZ, dat)
+          rows, cols = dat.unpack('S!4')
+          Readline.set_screen_size(rows, cols)
+          ENV['LINES'] = rows.to_s
+          ENV['COLUMNS'] = cols.to_s
+        end
+      end
+    else
+      def trap_sigwinch; end
+    end
   end
 
   Client.register_hook(:initialize_command_line, :point => :init_command_line) do

data/lib/plugins/defaults/keyword.rb

@@ -14,11 +14,34 @@ config.plugins.keyword.set_default(
     ['on_yellow', 'white'],
   ]
 )
-
 config.plugins.keyword.set_default(:keywords, [])
+config.plugins.keyword.set_default(:notify, true)
+config.plugins.keyword.set_default(:filter, false)
+config.plugins.keyword.set_default(:apply_user_name, false)
+
+def select_matched(statuses)
+  regexp = Regexp.union(*public_storage[:keywords].map(&:to_s))
+  statuses.select do |status|
+    /#{regexp}/ =~ status.text ||
+      (config.plugins.keyword.apply_user_name == true && /#{regexp}/ =~ status[:user][:screen_name])
+  end
+end
+
+def load_keywords
+  public_storage[:keywords] += config.plugins.keyword.keywords
+  file = File.expand_path(config.plugins.keyword.file)
+  if File.exists?(file)
+    public_storage[:keywords] += File.read(file).split(/\n/)
+  end
+end
 
 module Termtter::Client
-  public_storage[:keywords] ||= Set.new(config.plugins.keyword.keywords)
+  public_storage[:keywords] ||= Set.new()
+
+  register_hook :initialize_for_keywords, :point => :initialize do
+    config.plugins.keyword.set_default(:file, File.join(Termtter::CONF_DIR, 'keywords'))
+    load_keywords
+  end
 
   register_hook :highlight_keywords, :point => :pre_coloring do |text, event|
     public_storage[:keywords].each_with_index do |keyword, index|
@@ -33,13 +56,18 @@ module Termtter::Client
     text
   end
 
+  register_hook :keyword_filter, :point => :filter_for_output do |statuses, event|
+    if config.plugins.keyword.filter == true && event == :update_friends_timeline
+      select_matched(statuses)
+    else
+      statuses
+    end
+  end
+
   register_hook :notify_for_keywords, :point => :output do |statuses, event|
-    if event == :update_friends_timeline
-      regexp = Regexp.union(*public_storage[:keywords].map(&:to_s))
-      statuses.select { |status|
-        /#{regexp}/ =~ status.text
-      }.each do |status|
-        notify(status.user.screen_name, status.text)
+    if config.plugins.keyword.notify == true && event == :update_friends_timeline
+      select_matched(statuses).each do |status|
+        notify(status.user.screen_name, status.text) unless status[:user][:screen_name] == config.user_name
       end
     end
   end
@@ -66,4 +94,26 @@ module Termtter::Client
   ) do |args|
     p public_storage[:keywords].to_a
   end
+
+  register_command(
+    'keyword save',
+    :help => ['keyword save', 'Save keywords']
+  ) do |args|
+    File.open(config.plugins.keyword.file, 'w') {|f| f << public_storage[:keywords].to_a.join("\n") }
+  end
+
+  register_command(
+    'keyword edit',
+    :help => ['keyword edit', 'Edit keywords']
+  ) do |args|
+    system ENV['EDITOR'], config.plugins.keyword.file
+  end
+
+
+  register_command(
+    'keyword load',
+    :help => ['keyword load', 'load keywords']
+  ) do |args|
+    load_keywords
+  end
 end

data/lib/plugins/defaults/list.rb

@@ -23,6 +23,8 @@ module Termtter::Client
         options = {}
       end
 
+      options[:include_rts] = 1
+
       last_error = nil
       if arg.empty?
         event = :list_friends_timeline
@@ -93,7 +95,7 @@ module Termtter::Client
       users.each{ |screen_name|
         begin
           user = Termtter::API.twitter.cached_user(screen_name) || Termtter::API.twitter.user(screen_name)
-          Termtter::API.twitter.add_member_to_list(slug, user.id)
+          Termtter::API.twitter.add_member_to_list(config.user_name, slug, user.id)
           puts "#{slug} + #{screen_name}"
         rescue => e
           handle_error(e)
@@ -111,7 +113,7 @@ module Termtter::Client
       users.each{ |screen_name|
         begin
           user = Termtter::API.twitter.cached_user(screen_name) || Termtter::API.twitter.user(screen_name)
-          Termtter::API.twitter.remove_member_from_list(slug, user.id)
+          Termtter::API.twitter.remove_member_from_list(config.user_name, slug, user.id)
           puts "#{slug} - #{screen_name}"
         rescue => e
           handle_error(e)
@@ -132,7 +134,7 @@ module Termtter::Client
         opt.on('--private') {|v| param[:mode] = 'private' }
         opt.parse(options)
       }
-      list = Termtter::API.twitter.create_list(slug, param)
+      list = Termtter::API.twitter.create_list(config.user_name, slug, param)
       public_storage[:lists] << list.full_name
       p [list.full_name, param]
     },
@@ -146,7 +148,7 @@ module Termtter::Client
       arg.split(' ').each{ |list_name|
         begin
           slug = list_name_to_slug(list_name)
-          list = Termtter::API.twitter.delete_list(slug)
+          list = Termtter::API.twitter.delete_list(config.user_name, slug)
           public_storage[:lists].delete(list.full_name)
           puts "#{list.full_name} deleted"
         rescue => e