termtter 1.9.0 → 1.10.0

data/lib/plugins/defaults/retweet.rb

@@ -8,6 +8,8 @@ config.plugins.retweet.set_default(
   :official_retweet, true)
 config.plugins.retweet.set_default(
   :quotetweet, false)
+config.plugins.retweet.set_default(
+  :as_reply, false)
 
 module Termtter::Client
   def self.post_retweet(s, comment = nil)
@@ -27,13 +29,16 @@ module Termtter::Client
       rescue Rubytter::APIError  # XXX: just for transition period
         if $!.to_s == 'Not found'
           Termtter::Client.logger.warn "Failed official retweet. Set twitter langage to English in https://twitter.com/account/settings or set config.plugins.retweet.official_retweet to false."
+        else
+          raise
         end
       end
     end
     comment += ' ' unless comment.nil?
     rt_or_qt = (config.plugins.retweet.quotetweet and comment) ? 'QT' : 'RT'
     text = ERB.new(config.plugins.retweet.format).result(binding)
-    Termtter::API.twitter.update(text)
+    params = config.plugins.retweet.as_reply ? {:in_reply_to_status_id => s.id} : {}
+    Termtter::API.twitter.update(text, params)
     puts "=> #{text}"
   end
 

data/lib/plugins/defaults/standard_commands.rb

@@ -20,7 +20,7 @@ module Termtter::Client
       args = @since_id ? [{:since_id => @since_id}] : []
       statuses = Termtter::API.twitter.home_timeline(*args)
       unless statuses.empty?
-        print "\e[0G" + "\e[K" unless win?
+        Termtter::Client.clear_line
         @since_id = statuses[0].id
         output(statuses, Termtter::Event.new(:update_friends_timeline, :type => :main))
         Readline.refresh_line if arg =~ /\-r/
@@ -47,8 +47,15 @@ module Termtter::Client
       # "u $aa msg" is likely to be a mistake of
       # "re $aa msg".
       if /^\s*\d+\s/ =~ arg
-        puts "Does it mean `re[ply] #{arg}`?"
-        break
+        case HighLine.new.ask("Does it mean `re[ply] #{arg}` [N/y]? ")
+        when /^[yY]$/
+          Termtter::Client.execute("re #{arg}")
+          break
+        when /^[nN]?$/
+        else
+          puts "Invalid answer. Please input [yYnN] or nothing."
+          break
+        end
       end
 
       result = Termtter::API.twitter.update(arg, params)
@@ -125,7 +132,7 @@ module Termtter::Client
   end
 
   def self.get_friends(user_name, max)
-    self.get_friends_or_followers(:followers, user_name, max)
+    self.get_friends_or_followers(:friends, user_name, max)
   end
 
   def self.get_followers(user_name, max)
@@ -184,7 +191,11 @@ module Termtter::Client
     }
   end
 
-  class SearchEvent < Termtter::Event; attr_reader :query; def initialize(query); @query = query end; end
+  class SearchEvent < Termtter::Event
+    def initialize(query)
+      super :search, {:query => query, :type => :search}
+    end
+  end
   public_storage[:search_keywords] = Set.new
   register_command(
     :name => :search, :aliases => [:s],
@@ -309,36 +320,48 @@ module Termtter::Client
     :help => ['unblock USER', 'Unblock user']
   )
 
-  help = ['favorite_list USERNAME', 'show user favorites']
+  help = ['favorites,favlist USERNAME', 'show user favorites']
   register_command(:favorites, :alias => :favlist, :help => help) do |arg|
-    output Termtter::API.twitter.favorites(arg), :user_timeline, :type => :favorite
+    output(Termtter::API.twitter.favorites(arg), Termtter::Event.new(:user_timeline, :type => :favorite))
   end
 
   register_command(
     :name => :favorite, :aliases => [:fav],
-    :exec_proc => lambda {|arg|
-      id =
-        case arg
-        when /^\d+/
-          arg.to_i
-        when /^@([A-Za-z0-9_]+)/
-          user_name = normalize_as_user_name($1)
-          statuses = Termtter::API.twitter.user_timeline(user_name)
-          return if statuses.empty?
-          statuses[0].id
-        when /^\/(.*)$/
-          word = $1
-          raise "Not implemented yet."
-        else
-          if public_storage[:typable_id] && typable_id?(arg)
-            typable_id_convert(arg)
+    :exec_proc => lambda {|args|
+      args.split(' ').each do |arg|
+        id =
+          case arg
+          when /^\d+/
+            arg.to_i
+          when /^@([A-Za-z0-9_]+)/
+            user_name = normalize_as_user_name($1)
+            statuses = Termtter::API.twitter.user_timeline(user_name)
+            return if statuses.empty?
+            statuses[0].id
+          when %r{twitter.com/(?:\#!/)[A-Za-z0-9_]+/status(?:es)?/\d+}
+            status_id = URI.parse(arg).path.split(%{/}).last
+          when %r{twitter.com/[A-Za-z0-9_]+}
+            user_name = normalize_as_user_name(URI.parse(arg).path.split(%{/}).last)
+            statuses = Termtter::API.twitter.user_timeline(user_name)
+            return if statuses.empty?
+            statuses[0].id
+          when /^\/(.*)$/
+            word = $1
+            raise "Not implemented yet."
           else
-            return
+            if public_storage[:typable_id] && typable_id?(arg)
+              typable_id_convert(arg)
+            else
+              return
+            end
           end
+        begin
+          r = Termtter::API.twitter.favorite id
+          puts "Favorited status ##{r.id} on user @#{r.user.screen_name} #{r.text}"
+        rescue => e
+          handle_error e
         end
-
-      r = Termtter::API.twitter.favorite id
-      puts "Favorited status ##{r.id} on user @#{r.user.screen_name} #{r.text}"
+      end
     },
     :completion_proc => lambda {|cmd, arg|
       case arg
@@ -507,6 +530,10 @@ module Termtter::Client
           Termtter::API.twitter.update(arg, params)
           puts "=> #{arg}"
         end
+      else
+        text = arg
+        last_reply = Termtter::API.twitter.replies({:count => 1}).first
+        update_with_user_and_id(text, last_reply.user.screen_name, last_reply.id)
       end
     },
     :completion_proc => lambda {|cmd, arg|

data/lib/plugins/defaults/stdout.rb

@@ -4,21 +4,24 @@ require 'termcolor'
 require 'erb'
 require 'tempfile'
 
+config.plugins.stdout.set_default(:gray, 90)
 config.plugins.stdout.set_default(:colors, (31..36).to_a + (91..96).to_a)
 config.plugins.stdout.set_default(
   :timeline_format,
   [
-    '<90><%=time%> [<%=status_id%>]</90> ',
+    '<<%=config.plugins.stdout.gray||config.plugins.stdout.colors.last%>>',
+    '<%=time%> [<%=status_id%>] ',
+    '</<%=config.plugins.stdout.gray||config.plugins.stdout.colors.last%>>',
     '<%= indent_text %>',
     '<<%=color%>><%=s.user.screen_name%>: <%=text%></<%=color%>> ',
-    '<90>',
+    '<<%=config.plugins.stdout.gray||config.plugins.stdout.colors.last%>>',
     '<%=reply_to_status_id ? " (reply_to [#{reply_to_status_id}]) " : ""%>',
     '<%=retweeted_status_id ? " (retweet_to [#{retweeted_status_id}]) " : ""%>',
     '<%=source%><%=s[:user][:protected] ? "[P]" : ""%>',
-    '</90>'
+    '</<%=config.plugins.stdout.gray||config.plugins.stdout.colors.last%>>',
   ].join('')
 )
-config.plugins.stdout.set_default(:sweets, %w[jugyo ujm sora_h lingr_termtter termtter hitode909 nanki sixeight])
+config.plugins.stdout.set_default(:sweets, %w[jugyo ujm sora_h lingr_termtter termtter nanki sixeight])
 config.plugins.stdout.set_default(:sweet_color, 'red')
 config.plugins.stdout.set_default(:time_format_today, '%H:%M:%S')
 config.plugins.stdout.set_default(:time_format_not_today, '%y/%m/%d %H:%M')
@@ -120,6 +123,7 @@ module Termtter
           system "#{config.plugins.stdout.pager} #{file.path}"
           file.close(true)
       else
+        Termtter::Client.clear_line
         print output_text
       end
     end

data/lib/plugins/defaults/switch.rb

@@ -10,18 +10,30 @@ module Termtter::Client
 
       passwords[config.user_name] = config.password
 
-      if user_name
-        config.user_name = normalize_as_user_name(arg)
-        if passwords.key?(config.user_name)
-          config.password = passwords[config.user_name]
-        else
-          config.__clear__(:password)
+      file_name_prefix = File.join(Termtter::CONF_DIR, config.token_file_name)
+      unless user_name
+        choices = [:new, ""]
+        choices += Dir.glob(file_name_prefix + "_*").map{|f| f.gsub(file_name_prefix+'_', '')}
+
+        puts "0. New user"
+        puts "1. Default"
+        choices[2..-1].each_with_index do |c, i| 
+          puts "#{i+2}. #{c}"
+        end
+        ui = create_highline
+        choice = choices[ui.ask("Please choice number: ").to_i]
+        if choice.nil?
+          puts "Invalid number"
+          break
         end
-      else
-        config.__clear__(:user_name)
-        config.__clear__(:password)
+        user_name = (choice == :new) ? ui.ask("Enter user name: ") : choice
       end
 
+      config.token_file = file_name_prefix
+      config.token_file += "_#{user_name}" if user_name != ""
+      config.__clear__(:access_token)
+      config.__clear__(:access_token_secret)
+
       Termtter::API.setup
       execute('reload')
     },

data/lib/plugins/encoding.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+module Termtter::Client
+  config.plugins.encoding.set_default(:output, 'utf-8')
+
+  def self.encode text, encoding
+    return text unless encoding
+
+    if RUBY_VERSION >= '1.9'
+      begin
+        text = text.encode encoding
+      rescue
+        # no encodings exception
+      end
+    else
+      begin 
+        require 'nkf'
+      rescue
+        return text
+      end
+
+      text = case encoding
+             when 'utf-8'
+               NKF.nkf('-w', text)
+             when 'euc-jp'
+               NKF.nkf('-e', text)
+             when 'sjis'
+               NKF.nkf('-s', text)
+             else
+               text
+             end
+    end
+  end
+
+  register_hook(
+                :name => :output_encoding,
+                :points => [:pre_output],
+                :exec_proc => lambda {|result, event|
+                  result = Termtter::Client.encode result, config.plugins.encoding.output
+                })
+  register_hook(
+                :name => :input_encoding,
+                :point => /^modify_arg_for_.*/,
+                :exec_proc => lambda {|cmd, arg|
+                  arg = Termtter::Client.encode arg, 'utf-8'
+                })
+end

data/lib/plugins/english.rb

@@ -2,7 +2,8 @@
 # vim: set fenc=utf-8
 
 module Termtter::English
-  # english? :: String -> Boolean
+  # call-seq:
+  #   english? :: String -> Boolean
   def self.english?(message)
     /[一-龠]+|[ぁ-ん]+|[ァ-ヴー]+|[ａ-ｚＡ-Ｚ０-９]+/ !~ message
   end

data/lib/plugins/friends.rb

@@ -4,14 +4,11 @@ module Termtter::Client
     :name => :diff_follow, :aliases => [:diff],
     :exec_proc => lambda {|arg|
       user_name = arg.empty? ? config.user_name : arg
-      friends = public_storage[:friends]
-      followers = public_storage[:followers]
-      if friends.nil? || followers.nil?
-        puts 'Do followers and friends first.'
-        return
-      end
-      friends = friends.map(&:screen_name)
-      followers = followers.map(&:screen_name)
+      puts "getting friends"
+      friends = get_friends(user_name, 2000).map(&:screen_name)
+      puts "getting followers"
+      followers = get_followers(user_name, 2000).map(&:screen_name)
+      puts
       puts "friends - followers:"
       puts (friends - followers).map{|s|"http://#{config.host}/#{s}"}.join("\n")
       puts

data/lib/plugins/geo.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+config.plugins.geo.set_default(:url, 'http://www.openstreetmap.org/?lat=%s&lon=%s&zoom=18')
+# other setting example: 'http://maps.google.co.jp/maps?q=%s,%s'
+
+Termtter::Client.register_hook(
+  :name => :geo,
+  :points => [:output],
+  :exec_proc => lambda {|statuses, event|
+    config.plugins.geo.path
+    if event == :show
+      statuses.each do |s|
+        next unless s.geo
+        next if s.geo[:type] != 'Point'
+        open_browser(config.plugins.geo.url % s.geo.coordinates)
+      end
+    end
+  }
+)
+
+# geo.rb:
+# show the location of the tweet

data/lib/plugins/http_server.rb

@@ -12,8 +12,16 @@ require 'logger'
 
 config.plugins.http_server.set_default(:port, 5678)
 config.plugins.http_server.set_default(:reload_max_count, 100)
+config.plugins.http_server.set_default(:skin, "default")
 
 module Termtter::Client
+   register_command(
+      :name => :skin,
+      :exec_proc => lambda {|name|
+         config.plugins.http_server.skin = name
+      }
+  )
+
   if @http_server
     @http_server.shutdown # for reload
   end
@@ -53,10 +61,9 @@ module Termtter::Client
   end
 
   @http_server.mount_proc('/') do |req, res|
+    skin_dir = "skin/#{config.plugins.http_server.skin}/"
     request_path = req.path == '/' ? 'index.html' : req.path
-    base_name = Pathname.new(request_path).basename.to_s
-    file_path = File.dirname(__FILE__) + '/http_server/' + base_name
-
+    file_path = File.dirname(__FILE__) + '/http_server/' + skin_dir + request_path.to_s
     if File.file?(file_path)
       # send a file
       res.header["Content-Type"] = MIME::Types.type_for(file_path).first.content_type

data/lib/plugins/http_server/skin/miku/cui/chara/miku/script.js

@@ -0,0 +1,66 @@
+var INTERVAL = 1700;
+//
+// define image.
+//
+var 通常 = 'cui/chara/miku/images/001.png';
+var 怒り = 'cui/chara/miku/images/004.png';
+var 喜び = 'cui/chara/miku/images/003.png';
+
+//
+// define part.
+//
+var 頭 = {"left":180,  "top":40,  "width":100, "height":80};
+var 胸 = {"left":160, "top":300, "width":120,  "height":60};
+
+//
+// define actions.
+//
+var アクション = [
+   {"part":胸, "action":["touch"],                 "img":怒り, "msg":"Hなのはいけないと思います！"},
+   {"part":頭, "action":["nadenade", {"count":5}], "img":喜び, "msg":"♪〜"}
+];
+
+$(function(){
+   // initialize
+   var sprite = new Sprite();
+   sprite.dlg = new Dialog(390, 70, 200, 60, '20px', "#141414", "#98FF68", '24px');
+   sprite.image(通常);
+
+   // regist actions.
+   アクション.map(function(action){ 
+      sprite[action.action[0]](action.part, action.action[1], function(e){
+         sprite.motion(action.img, INTERVAL);
+         sprite.dlg.show(action.msg, INTERVAL);   
+      });            
+   });
+
+	// regist main menu.
+   sprite.bind("dblclick", function(){ 
+		var dlg = new Dialog(390, 70, 270, 50, '20px', "#141414", "#98FF68", '24px');
+var msg =  $('<div id="input_area">' + 
+           '<div id="wrap">' +
+           '  <form id="execute_command">' + 
+           '    <span id="prompt">&gt; </span><input id="execute_text" type="text" size="20" autocomplete=off />' +
+           '  </form>' + 
+           '</div>' + 
+           '<div id="loading" style="display: none;">...</div></div>');
+ 
+		dlg.show(msg, INTERVAL * 5); 
+      $("#execute_command").submit(function () {
+         var command = $("#execute_text").val();
+         $('<div class="status_line"/>').text('> ' + command).prependTo('#result');
+
+         cmd_history.add(command);
+
+         if (command.match(/^\s*$/)) {
+            return false;
+         }
+         $("#execute_text").val('');
+         $("#prompt").hide();
+         execute_command(command);
+
+         return false;
+      })
+	});
+})
+

data/lib/plugins/http_server/skin/miku/cui/core.js

@@ -0,0 +1,198 @@
+/**
+ * Sprite Constracutor.
+ */
+var Sprite = function(){
+   var obj = $("<img />").appendTo("#sprite");
+   obj.css('position', 'absolute').css("buttom", 0);
+
+   // regist dialog move behavor.
+   obj.mousedown(function(e){
+      obj
+         .data("clickPointX" , e.pageX - obj.offset().left)
+         .data("clickPointY" , e.pageY - obj.offset().top);
+        
+      $(document).mousemove(function(e){
+         obj.css({
+            top :e.pageY  - obj.data("clickPointY")+"px",
+            left:e.pageX - obj.data("clickPointX")+"px"
+         })
+      })
+   }).mouseup(function(){
+      $(document).unbind("mousemove")
+   })
+
+
+   /**
+    * proxy sprite image bind event.
+    */
+   this.bind = function(area, event_name, callback){
+      var x = 0;
+	   var y = 0;
+
+		if(arguments.length == 2){
+      	obj.bind(area, event_name);
+			return;
+		}
+
+      obj.bind("touchmove",function(e){
+	      x = event.touches[0].pageX;
+         y = event.touches[0].pageY;
+      });
+      obj.bind("mousemove",function(e){
+         x = e.pageX;
+         y = e.pageY;
+      });
+
+      obj.bind(event_name, function(e){
+			if(
+		  		   (area["left"] <= x && x <= (area["left"] + area["width"]) )
+			   && (area["top"]  <= y && y <= (area["top"]  + area["height"]) )
+			){
+			   callback(e);
+			}
+      });
+   }
+
+
+   /**
+    * change sprite image.
+    * @params<string> image file path.
+    */
+   this.image = function(path){
+	   obj.attr("src", path);
+	   return this;
+   }
+
+   /**
+    * change sprite image for interval time.
+    * @params<string> image file path.
+    * @params<integer> millisecond.
+    */
+   this.motion = function(path, interval){
+	   var current = obj.attr("src");
+	   var self = this;
+	   self.image(path);
+
+	   setTimeout(function(){ self.image(current) } , interval);
+
+      return self;
+   }
+
+   /**
+    * touch action.
+    */
+   this.touch = function(area, args, callback){ this.bind(area, "click", callback) };
+
+   /**
+    * nadenade action.
+    */
+   this.nadenade = function(area, args, callback){ 
+      var step = [true].concat(array(args.count, false));
+      step.idx = 0;
+      step.isDone = function(){ return step.reduce(function(r, x){return r && x}) };
+      step.reset  = function(){
+         for(var i=1;i<step.length;i++){
+            step[i] = false;
+         }
+         step.idx = 0;
+      }
+
+      var isOverPoint = function(idx, x){
+         var buf = 30;
+         var left1 = area["left"];
+         var left2 = left1 + buf;
+         var right1 = left1 + area["width"] - buf;
+         var right2 = right1 + buf;
+
+         return (idx % 2 == 0) ? (step[idx] && left1  <= x && x <= left2)
+                               : (step[idx] && right1 <= x && x <= right2)
+      }
+
+      var action = function(x){
+         if (isOverPoint(step.idx, x)) {
+            step.idx += 1;
+            step[step.idx] = true;
+         }
+
+         if (step.isDone()) {
+            callback();
+            step.reset();
+         }
+      }
+
+      if(isTouch()){
+         this.bind(area, 'touchmove', function(e){
+            action(event.touches[0].pageX);
+         });
+      }else{
+         this.bind(area, 'mousemove', function(e){
+            action(e.pageX);
+         });
+      }
+   }
+}
+	
+
+/**
+ * Dialog Constructor.
+ */
+var Dialog = function(left, top, width, height, padding, bgcolor, textcolor, size){
+   var dlg = $("<div class='dialog'/>").appendTo("#sprite");
+
+   // setting default css.
+   dlg.css("display", "none")
+      .css("position", "absolute")
+      .css("margin", 0)
+      .css("padding", padding)
+      .css("background-color", bgcolor)
+      .css("color", textcolor);
+
+
+   // regist dialog move behavor.
+   dlg.mousedown(function(e){
+      dlg
+         .data("clickPointX" , e.pageX - dlg.offset().left)
+         .data("clickPointY" , e.pageY - dlg.offset().top);
+        
+      $(document).mousemove(function(e){
+         dlg.css({
+            top :e.pageY  - dlg.data("clickPointY")+"px",
+            left:e.pageX - dlg.data("clickPointX")+"px"
+         })
+      })
+   }).mouseup(function(){
+      $(document).unbind("mousemove")
+   })
+
+   /**
+    * show dialog.
+    * @param<string> message.
+    * @param<integer> show interval.
+    */
+   this.show = function(msg, interval){ 
+      dlg 
+         .css("left",   left)
+         .css("top",    top)
+         .css("width",  width)
+         .css("height", height)
+         .css("font-size", size)
+         .fadeIn("fast");
+
+		dlg
+			.empty()
+			.append(msg);
+
+		if(arguments.length >= 2){
+       	setTimeout(function(){dlg.fadeOut("fast")} , interval);
+		}
+   };
+
+	/**
+	 * close dialog.
+	 */
+	this.close = function(){
+   	dlg.fadeOut("fast");
+	}
+}
+
+