termtter 1.6.0 → 1.7.0

data/lib/plugins/me.rb

@@ -3,7 +3,7 @@ module Termtter::Client
   register_command(
     :name => :me, :aliases => [],
     :exec_proc => lambda {|arg|
-      call_commands('list ' + config.user_name)
+      execute('list ' + config.user_name)
     },
     :help => ['me', 'show my timeline']
   )

data/lib/plugins/notify-send.rb

@@ -15,7 +15,7 @@ Termtter::Client.register_hook(
 
       text << %Q|\n<a href="http://twitter.com/">more...</a>| if statuses.size > max
 
-      system 'notify-send', '-t', '60000', '--', 'Termtter', text
+      system 'notify-send', '-t', '60000', '--', 'Termtter', text unless text.empty?
     end
   }
 )

data/lib/plugins/notify-send3.rb

@@ -26,7 +26,7 @@ def get_icon_path(s)
         rimage = Magick::Image.from_blob(image).first
         rimage = rimage.resize_to_fill(48, 48)
         f << rimage.to_blob
-      rescue Net::ProtocolError
+      rescue Net::ProtocolError, Magick::ImageMagickError
         return nil
       end
     end

data/lib/plugins/open.rb

@@ -8,7 +8,7 @@ module Termtter
       :exec_proc => proc {|arg|
         sid, n = arg.split(/ +/)
         if sid.nil?
-          call_commands "uri-open"
+          execute "uri-open"
         else
           target = (n || 1).to_i
           target_uri = nil

data/lib/plugins/open_url.rb

@@ -9,7 +9,11 @@ module Termtter::Client
     else
       case RUBY_PLATFORM
       when /linux/
-        system 'firefox', uri
+        if %x{echo $BROWSER}.strip.empty?
+          system 'firefox', uri
+        else
+          system '$BROWSER', uri
+        end
       when /mswin(?!ce)|mingw|bccwin/
         system 'explorer', uri
       else

data/lib/plugins/pool.rb

@@ -12,7 +12,7 @@ Thread.new do
   loop do
     statement = pool.take([:statement, nil])
     print 'pool: '
-    Termtter::Client.call_commands("update #{statement[1]}")
+    Termtter::Client.execute("update #{statement[1]}")
     STDOUT.flush
   end
 end

data/lib/plugins/random.rb

@@ -15,7 +15,7 @@ module Termtter::Client
         return
       end
 
-      call_commands("update #{status.text}")
+      execute("update #{status.text}")
 
     },
     :help => ['random', 'random post']

data/lib/plugins/reply_retweet.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+config.plugins.reply_retweet.set_default(:format, '<%= comment %>RT @<%=s.user.screen_name%>: <%=text%>')
+config.plugins.reply_retweet.set_default(:confirm_protected, true)
+
+module Termtter::Client
+  def self.post_reply_retweet(s, comment = nil)
+    if s.user.protected && config.plugins.reply_retweet.confirm_protected &&
+        !confirm("#{s.user.screen_name} is protected! Are you sure?", false)
+      return
+    end
+
+    text = s.text.gsub(/RT.+\z/, '')
+    comment += ' ' unless comment.nil?
+    text = ERB.new(config.plugins.reply_retweet.format).result(binding)
+    Termtter::API.twitter.update(text)
+    puts "=> #{text}"
+
+    return text
+  end
+
+  help = ['reply_retweet,rrt (ID|@USER)', 'Post a reply retweet message'],
+  register_command(:reply_retweet, :help => help, :alias => :rrt) do |arg|
+
+    arg, comment = arg.split(/\s/, 2)
+
+    if public_storage[:typable_id] && s = typable_id_status(arg)
+      post_reply_retweet(s, comment)
+    else
+      case arg
+      when /(\d+)/
+        post_reply_retweet(Termtter::API.twitter.show(arg), comment)
+      when /@([A-Za-z0-9_]+)/
+        user = $1
+        statuses = Termtter::API.twitter.user_timeline(user)
+        return if statuses.empty?
+        post_reply_retweet(statuses[0], comment)
+      end
+    end
+  end
+end
+

data/lib/plugins/screen-notify.rb

@@ -7,7 +7,7 @@ module Termtter::Client
     :name => :screen_notify,
     :points => [:output],
     :exec_proc => lambda{|statuses, event|
-      return unless event = :update_friends_timeline
+      return unless event == :update_friends_timeline
       Thread.new(statuses) do |ss|
         ss.each do |s|
           msg = config.screen_notify.format % s.user.screen_name

data/lib/plugins/sl.rb

@@ -24,11 +24,11 @@ module Termtter
       :name => :ls, :aliases => [],
       :exec_proc => lambda {|arg|
         if arg.empty? && /\A#/ =~ public_storage[:current]
-          call_commands("search #{public_storage[:current]}")
+          execute("search #{public_storage[:current]}")
         elsif /\A#/ =~ arg
-          call_commands("search #{arg}")
+          execute("search #{arg}")
         else
-          call_commands("list #{arg.empty? ? public_storage[:current] : arg}")
+          execute("list #{arg.empty? ? public_storage[:current] : arg}")
         end
       },
       :help => ['ls', 'Show list in current directory']

data/lib/plugins/storage.rb

@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 
-require 'pp'
 require 'time'
-
-require File.dirname(__FILE__) + '/storage/status'
+require File.dirname(__FILE__) + '/storage/db'
 
 module Termtter::Client
-  public_storage[:log] = []
-
+  @db = Termtter::Storage::DB.new
   register_hook(
     :name => :storage,
     :points => [:pre_filter],
     :exec_proc => lambda {|statuses, event|
       statuses.each do |s|
-        Termtter::Storage::Status.insert(
+        @db.update(
           :post_id => s.id,
           :created_at => Time.parse(s.created_at).to_i,
           :in_reply_to_status_id => s.in_reply_to_status_id,
@@ -31,8 +28,8 @@ module Termtter::Client
     :aliases => [:ss],
     :exec_proc => lambda {|arg|
       unless arg.strip.empty?
-        key = arg.strip
-        statuses = Termtter::Storage::Status.search({:text => key})
+        text = arg.strip
+        statuses = @db.find_text(text)
         output(statuses, :search)
       end
     },
@@ -44,8 +41,8 @@ module Termtter::Client
     :aliases => [:ssu],
     :exec_proc => lambda {|arg|
       unless arg.strip.empty?
-        key = arg.strip.gsub(/^@/, '')
-        statuses = Termtter::Storage::Status.search_user({:user => key})
+        user = arg.strip.gsub(/^@/, '')
+        statuses = @db.find_user(user)
         output(statuses, :search)
       end
     },

data/lib/plugins/storage/sqlite3.rb

@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+
+require 'sqlite3'
+require 'lib/termtter/active_rubytter'
+
+module Termtter::Storage
+  class SQLite3
+
+    def initialize(file = Termtter::CONF_DIR + '/storage.db')
+      @db = ::SQLite3::Database.new(file)
+      @db.type_translation = true
+      create_table
+    end
+
+    def name
+      "sqlite3"
+    end
+
+    CREATE_TABLE = <<-SQL
+CREATE TABLE IF NOT EXISTS user (
+    id          int NOT NULL,
+    screen_name text,
+    PRIMARY KEY (id)
+);
+CREATE TABLE IF NOT EXISTS post (
+    post_id          int NOT NULL,  -- twitter側のpostのid
+    created_at	     int,    	    -- 日付(RubyでUNIX時間に変換)
+    in_reply_to_status_id int, 	    -- あったほうがよいらしい
+    in_reply_to_user_id int,  	    -- あったほうがよいらしい
+    post_text text,
+    user_id int NOT NULL,
+    PRIMARY KEY (post_id)
+);
+    SQL
+    def create_table
+      @db.execute_batch(CREATE_TABLE)
+    end
+
+    def update(status)
+      @db.transaction
+      begin
+        return nil if find_id(status[:post_id])
+        insert(status)
+      ensure
+        @db.commit
+      end
+    end
+
+    def update_user(user_id, screen_name)
+      return nil if find_user_id(user_id)
+      @db.execute(
+        "insert into user values(?,?)",
+        status[:user_id],
+        status[:screen_name])
+    end
+
+    FIND_USER_ID = <<-EOS
+select id, screen_name
+ from user where id = ?
+EOS
+    def find_user_id(user_id)
+      result = nil
+      @db.execute(FIND_USER_ID, user_id) do |id, screen_name|
+        result = { :id => id, :screen_name => screen_name}
+      end
+      result
+    end
+
+    def insert(status)
+      return nil unless status[:text]
+      @db.execute(
+        "insert into post values(?,?,?,?,?,?)",
+        status[:post_id],
+        status[:created_at],
+        status[:in_reply_to_status_id],
+        status[:in_reply_to_user_id],
+        status[:text],
+        status[:user_id])
+      update_user(status[:user_id], status[:screen_name])
+    end
+
+    FIND_ID = <<-EOS
+select created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id
+ from post inner join user on post.user_id = user.id where post_id = ?
+EOS
+    def find_id(id)
+      result = nil
+      @db.execute(FIND_ID, id) do |created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id|
+        result = Termtter::ActiveRubytter.new({
+            :id => post_id,
+            :created_at => created_at,
+            :text => post_text,
+            :in_reply_to_status_id => in_reply_to_status_id,
+            :in_reply_to_user_id => nil,
+            :user => {
+              :id => user_id,
+              :screen_name => screen_name
+            }
+          })
+      end
+      result
+    end
+
+    FIND = <<-EOS
+select created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id
+ from post inner join user on post.user_id = user.id where post_text like '%' || ? || '%'
+EOS
+    def find_text(text = '')
+      result = []
+      @db.execute(FIND, text) do |created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id|
+        created_at = Time.at(created_at).to_s
+        result << Termtter::ActiveRubytter.new({
+            :id => post_id,
+            :created_at => created_at,
+            :text => post_text,
+            :in_reply_to_status_id => in_reply_to_status_id,
+            :in_reply_to_user_id => nil,
+            :user => {
+              :id => user_id,
+              :screen_name => screen_name
+            }
+          })
+      end
+      result
+    end
+
+    FIND_USER = <<-EOS
+select created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id 
+from post inner join user on post.user_id = user.id where 
+EOS
+    def find_user(user = "")
+      result = []
+      sql = FIND_USER + user.split(' ').map!{|que| que.gsub(/(\w+)/, 'screen_name like \'%\1%\'')}.join(' or ')
+      @db.execute(sql) do |created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id|
+        created_at = Time.at(created_at).to_s
+        result << Termtter::ActiveRubytter.new({
+            :id => post_id,
+            :created_at => created_at,
+            :text => post_text,
+            :in_reply_to_status_id => in_reply_to_status_id,
+            :in_reply_to_user_id => nil,
+            :user => {
+              :id => user_id,
+              :screen_name => screen_name
+            }
+          })
+      end
+      result
+    end
+
+    def size
+      @db.get_first_value("select count(*) from post").to_i
+    end
+  end
+end

data/lib/plugins/storage/status.rb

@@ -25,6 +25,7 @@ module Termtter::Storage
       DB.instance.db.execute(sql,
                              query[:text]) do |created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id|
         created_at = Time.at(created_at).to_s
+        post_text.force_encoding('UTF-8') if post_text.respond_to?(:force_encoding)
         result << {
           :id => post_id,
           :created_at => created_at,
@@ -48,6 +49,7 @@ module Termtter::Storage
       sql += query[:user].split(' ').map!{|que| que.gsub(/(\w+)/, 'screen_name like \'%\1%\'')}.join(' or ')
       DB.instance.db.execute(sql) do |created_at, screen_name, post_text, in_reply_to_status_id, post_id, user_id|
         created_at = Time.at(created_at).to_s
+        post_text.force_encoding('UTF-8') if post_text.respond_to?(:force_encoding)
         result << {
           :id => post_id,
           :created_at => created_at,

data/lib/plugins/stream.rb

@@ -129,7 +129,7 @@ module Termtter::Client
   help = ['hash_stream HASHTAG', 'Tracking hashtag using Stream API']
   register_command(:hash_stream, :help => help) do |arg|
     arg = "##{arg}" unless /^#/ =~ arg
-    call_commands("keyword_stream #{arg}")
+    execute("keyword_stream #{arg}")
   end
 
   help = ['stream USERNAME', 'Tracking users using Stream API']

data/lib/plugins/tinyurl.rb

@@ -3,7 +3,6 @@
 SHORTURL_MAKERS = [
   { :host => "api.bit.ly",
     :format => '/shorten?version=2.0.1&longUrl=%s&login=termtter&apiKey=R_e7f22d523a803dbff7f67de18c109856' },
-  { :host => "to.ly", :format => '/api.php?longurl=%s' },
   { :host => "is.gd", :format => '/api.php?longurl=%s' },
   { :host => "tinyurl.com", :format => '/api-create.php?url=%s' },
 ]
@@ -16,18 +15,13 @@ Termtter::Client.register_hook(
     "modify_arg_for_#{cmd.to_s}".to_sym
   },
   :exec_proc => lambda {|cmd, arg|
-    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
     arg.gsub(URI_REGEXP) do |url|
       url_enc = URI.escape(url)
       result = url
       SHORTURL_MAKERS.each do |site|
-        res = http_class.new(site[:host]).get(site[:format] % url_enc)
+        res = Termtter::HTTPpool.start(site[:host]) do |h|
+          h.get(site[:format] % url_enc)
+        end
         if res.code == '200'
           result = res.body
           if result =~ /"shortUrl": "(http.*)"/

data/lib/plugins/trends.rb

@@ -57,11 +57,11 @@ module Termtter::Client
     when 'show'
       raise 'need number or word' if first.nil?
       word = public_storage[:trends][first.to_i] || first
-      call_commands "search #{word}"
+      execute "search #{word}"
     when /^\d$/
       word = public_storage[:trends][command.to_i]
       raise 'no such trend' unless word
-      call_commands "search #{word}"
+      execute "search #{word}"
     when 'open'
       raise 'nees number or word' if first.nil?
       word = public_storage[:trends][first.to_i] || first

data/lib/plugins/truncate.rb

@@ -19,7 +19,7 @@ Termtter::RubytterProxy.register_hook(
     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)
+    if Termtter::Client::confirm("Your status is longer than 140 characters. Is it OK to abbreviate it?", true)
       args[0] = truncate(status)
     else
       puts 'canceled.'

data/lib/plugins/w3mimg.rb

@@ -27,7 +27,7 @@ def get_icon_path(s)
         rimage = Magick::Image.from_blob(image).first
         rimage = rimage.resize_to_fill(48, 48)
         f << rimage.to_blob
-      rescue Net::ProtocolError
+      rescue Net::ProtocolError, Magick::ImageMagickError
         return nil
       end
     end

data/lib/termtter.rb

@@ -18,26 +18,25 @@ gem 'rubytter', '>= 0.9.2'
 require 'rubytter'
 require 'timeout'
 
-require 'termtter/config'
-require 'termtter/version'
-require 'termtter/optparse'
-require 'termtter/command'
-require 'termtter/hook'
-require 'termtter/task'
-require 'termtter/task_manager'
-require 'termtter/hookable'
-require 'termtter/rubytter_proxy'
-require 'termtter/client'
-require 'termtter/api'
-require 'termtter/system_extensions'
-
 module Termtter
+  VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION'))
   APP_NAME = 'termtter'
-
-  config.system.set_default :conf_dir, File.expand_path('~/.termtter')
-  CONF_DIR = config.system.conf_dir
-
-  config.system.set_default :conf_file, CONF_DIR + '/config'
-  CONF_FILE = config.system.conf_file
-  $:.unshift(Termtter::CONF_DIR)
+  CONF_DIR = File.expand_path('~/.termtter')
+  CONF_FILE = File.join(Termtter::CONF_DIR, 'config')
+  $:.unshift(CONF_DIR)
+
+  require 'termtter/config'
+  require 'termtter/default_config'
+  require 'termtter/optparse'
+  require 'termtter/command'
+  require 'termtter/hook'
+  require 'termtter/task'
+  require 'termtter/task_manager'
+  require 'termtter/hookable'
+  require 'termtter/memory_cache'
+  require 'termtter/rubytter_proxy'
+  require 'termtter/client'
+  require 'termtter/api'
+  require 'termtter/system_extensions'
+  require 'termtter/httppool'
 end