termtter 1.1.1 → 1.1.3

data/Rakefile

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.version = '#{Termtter::VERSION}'
   s.summary = "Terminal based Twitter client"
   s.description = "Termtter is a terminal based Twitter client"
-  s.files = %w( #{Dir['lib/**/*.rb'].join(' ')}
+  s.files = %w( #{Dir['lib/**/*.rb', 'lib/**/*.erb'].join(' ')}
                 #{Dir['spec/**/*.rb'].join(' ')}
                 #{Dir['test/**/*.rb', 'test/**/*.json'].join(' ')}
                 README.rdoc

data/lib/plugins/irc_gw.rb

@@ -33,10 +33,6 @@ class TermtterIrcGateway < Net::IRC::Server::Session
   def initialize(*args)
     super
     @@listners << self
-    Thread.start do
-      sleep 1
-      self.call(@@last_statuses || [], :update_friends_timeline)
-    end
   end
 
   def call(statuses, event)
@@ -49,25 +45,23 @@ class TermtterIrcGateway < Net::IRC::Server::Session
       end
 
     statuses.each do |s|
-      post s.user.screen_name, msg_type, main_channel, s.text
+      post s.user.screen_name, msg_type, main_channel, [s.text, s.id].join(' ')
     end
   end
 
   def on_message(m)
-    begin
-      termtter_command = m.command.downcase + ' ' + m.params.join(' ')
-      unless Termtter::Client.find_commands(termtter_command).empty?
-        post '#termtter', NOTICE, main_channel, '> ' + termtter_command
-        Termtter::Client.call_commands(termtter_command)
-      end
-    rescue Termtter::CommandNotFound => e
-      super
+    termtter_command = m.command.downcase + ' ' + m.params.join(' ')
+    unless Termtter::Client.find_commands(termtter_command).empty?
+      post '#termtter', NOTICE, main_channel, '> ' + termtter_command
+      Termtter::Client.call_commands(termtter_command)
     end
   end
 
   def on_user(m)
     super
     post @prefix, JOIN, main_channel
+    post server_name, MODE, main_channel, "+o", @prefix.nick
+    self.call(@@last_statuses || [], :update_friends_timeline)
   end
 
   def on_privmsg(m)

data/lib/plugins/mark.rb

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+config.plugins.mark.set_default(
+  :text, '<on_green>' + (' ' * 30) + '#mark' + (' ' * 30) + '</on_green>')
+
+Termtter::Client.register_command(
+  :name => :mark, :alias => :m, 
+  :exec => lambda {|arg|
+    puts TermColor.parse(config.plugins.mark.text)
+  }
+)

data/lib/plugins/standard_commands.rb

@@ -38,7 +38,7 @@ module Termtter::Client
     :exec_proc => lambda {|arg|
       unless arg.empty?
         result = Termtter::API.twitter.update(arg)
-        puts "updated => ##{result.id} #{result.text}"
+        puts TermColor.parse("updated => #{result.text} <90>#{result.id}</90>")
       end
     },
     :completion_proc => lambda {|cmd, args|
@@ -61,7 +61,7 @@ module Termtter::Client
         end
       if id
         result = Termtter::API.twitter.remove_status(id)
-        puts "deleted => ##{result.id} #{result.text}"
+        puts TermColor.parse("deleted => #{result.text} <90>#{result.id}</90>")
       end
     },
     :help => ['delete,del [STATUS ID]', 'Delete a status']
@@ -451,9 +451,10 @@ module Termtter::Client
         update_with_user_and_id(text, user.screen_name, id) if user
         public_storage.delete :log4re
       when /^\s*(\d+)\s+(.+)$/
-        id, text = $1, $2
-        user = public_storage[:log].select {|l| l.id == id.to_i }.first.user
-        update_with_user_and_id(text, user.screen_name, id) if user
+        s = Termtter::API.twitter.show($1) rescue nil
+        if s
+          update_with_user_and_id($2, s.user.screen_name, id)
+        end
       when /^\s*@(\w+)/
         in_reply_to_status_id = Termtter::API.twitter.user($1).status.id rescue nil
         params = in_reply_to_status_id ? {:in_reply_to_status_id => in_reply_to_status_id} : {}
@@ -497,10 +498,9 @@ module Termtter::Client
   )
 
   def self.update_with_user_and_id(text, username, id)
-    text = ERB.new("@#{username} #{text}").result(binding).gsub(/\n/, ' ')
+    text = "@#{username} #{text}"
     result = Termtter::API.twitter.update(text, {'in_reply_to_status_id' => id})
-    puts "=> #{text}"
-    result
+    puts TermColor.parse("replied => #{result.text} <90>#{result.id}</90>")
   end
 
 =begin

data/lib/plugins/stdout.rb

@@ -4,14 +4,12 @@ require 'termcolor'
 require 'erb'
 require 'tempfile'
 
-config.plugins.stdout.set_default(
-  :colors,
-  [:none, :red, :green, :yellow, :blue, :magenta, :cyan])
+config.plugins.stdout.set_default(:colors, (31..36).to_a + (91..96).to_a)
 config.plugins.stdout.set_default(
   :timeline_format,
-  '<90><%=time%></90> <<%=status_color%>><%=status%></<%=status_color%>> <90><%=id%></90>')
-config.plugins.stdout.set_default(:search_highlight_format, '<on_magenta><white>\1</white></on_magenta>')
-
+  '<90><%=time%></90> <<%=color%>><%=s.user.screen_name%>: <%=text%></<%=color%>> ' +
+  '<90><%=reply_to ? reply_to + " " : ""%><%=s.id%> <%=source%></90>'
+)
 config.plugins.stdout.set_default(:enable_pager, true)
 config.plugins.stdout.set_default(:pager, 'less -R -f +G')
 config.plugins.stdout.set_default(:window_height, 50)
@@ -43,15 +41,10 @@ module Termtter
 
       output_text = ''
       statuses.each do |s|
-        text = s.text
-        status_color = config.plugins.stdout.colors[s.user.id.hash % config.plugins.stdout.colors.size]
-        status = "#{s.user.screen_name}: #{TermColor.escape(text)}"
-        if s.in_reply_to_status_id
-          status += " (reply to #{s.in_reply_to_status_id})"
-        end
-
+        text = TermColor.escape(s.text)
+        color = config.plugins.stdout.colors[s.user.id.to_i % config.plugins.stdout.colors.size]
+        reply_to = s.in_reply_to_status_id ? "(reply to #{s.in_reply_to_status_id})" : nil
         time = "(#{Time.parse(s.created_at).strftime(time_format)})"
-        id = s.id
         source =
           case s.source
           when />(.*?)</ then $1

data/lib/termtter/config_template.erb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+config.user_name = '<%= user_name %>'
+config.password = '<%= password %>'
+#config.update_interval = 120
+#config.proxy.host = 'proxy host'
+#config.proxy.port = '8080'
+#config.proxy.user_name = 'proxy user'
+#config.proxy.password = 'proxy password'
+
+Termtter::Client.init do |t|
+  <%- standard_plugins.each do |plugin| -%>
+  t.plug '<%= plugin %>'
+  <%- end -%>
+  <%- (plugins - standard_plugins).each do |plugin| -%>
+  # t.plug '<%= plugin %>'
+  <%- end -%>
+end

data/lib/termtter/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module Termtter
-  VERSION = '1.1.1'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: termtter
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors: 
 - jugyo
@@ -98,6 +98,7 @@ files:
 - lib/plugins/l2.rb
 - lib/plugins/list_with_opts.rb
 - lib/plugins/log.rb
+- lib/plugins/mark.rb
 - lib/plugins/me.rb
 - lib/plugins/modify_arg_hook_sample.rb
 - lib/plugins/msagent.rb
@@ -160,6 +161,7 @@ files:
 - lib/termtter/task_manager.rb
 - lib/termtter/version.rb
 - lib/termtter.rb
+- lib/termtter/config_template.erb
 - spec/plugins/cool_spec.rb
 - spec/plugins/english_spec.rb
 - spec/plugins/fib_spec.rb