jugyo-termtter 0.8.5 → 0.8.6

data/README.rdoc

@@ -16,7 +16,7 @@ Run:
 
 == REQUIREMENTS:
 
-* json
+* json_pure
 * configatron
 
 == INSTALL:
@@ -62,7 +62,6 @@ http://wiki.github.com/jugyo/termtter/home (in Japanese)
 
 == TODO:
 
-- newgem を使わないようにする
 - rubytter を使うようにする
 - filter と plugin を統一する
 - plugin => plugins （ディレクトリ名変更）

data/lib/plugin/me.rb

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+module Termtter::Client
+  register_command(
+    :name => :me, :aliases => [],
+    :exec_proc => lambda {|arg|
+      myname = configatron.user_name
+      call_hooks(Termtter::API.twitter.get_user_timeline(myname), :list_user_timeline)
+    },
+    :help => ['me', 'show my timeline']
+  )
+end

data/lib/plugin/random.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+module Termtter::Client
+  register_command(
+    :name => :random, :aliases => [:rand],
+    :exec_proc => lambda {|_|
+
+      unless public_storage[:log]
+        puts 'Error: You should load "log" plugin!'
+        return
+      end
+
+      status = public_storage[:log][rand(public_storage[:log].size)]
+      unless status
+        puts 'No status.'
+        return
+      end
+
+      call_commands("update #{status.text}")
+
+    },
+    :help => ['random', 'random post']
+  )
+end

data/lib/termtter.rb

@@ -14,13 +14,6 @@ require 'readline'
 require 'enumerator'
 require 'configatron'
 
-Thread.abort_on_exception = true
-
-configatron.set_default(:update_interval, 300)
-configatron.set_default(:prompt, '> ')
-configatron.set_default(:enable_ssl, false)
-configatron.proxy.set_default(:port, '8080')
-
 require 'termtter/twitter'
 require 'termtter/connection'
 require 'termtter/status'
@@ -31,6 +24,7 @@ require 'termtter/task'
 require 'termtter/task_manager'
 require 'termtter/client'
 require 'termtter/api'
+require 'termtter/system_extensions'
 require 'termtter/version'
 
 module Termtter
@@ -45,95 +39,6 @@ if RUBY_VERSION < '1.8.7'
   end
 end
 
-def win?
-  RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin/
-end
-
-if win?
-  require 'iconv'
-  require 'Win32API'
-  $wGetACP = Win32API.new('kernel32','GetACP','','I')
-
-  module Readline
-    $iconv_sj_to_u8 = Iconv.new('UTF-8', "CP#{$wGetACP.call()}")
-    alias :old_readline :readline
-    def readline(*a)
-      str = old_readline(*a)
-      out = ''
-      loop do
-        begin
-          out << $iconv_sj_to_u8.iconv(str)
-          break
-        rescue Iconv::Failure
-          out << "#{$!.success}?"
-          str = $!.failed[1..-1]
-        end
-      end
-      return out
-    end
-    module_function :old_readline, :readline
-  end
-
-  $wSetConsoleTextAttribute = Win32API.new('kernel32','SetConsoleTextAttribute','II','I')
-  $wGetConsoleScreenBufferInfo = Win32API.new("kernel32", "GetConsoleScreenBufferInfo", ['l', 'p'], 'i')
-  $wGetStdHandle = Win32API.new('kernel32','GetStdHandle','I','I')
-  $wGetACP = Win32API.new('kernel32','GetACP','','I')
-
-  $hStdOut = $wGetStdHandle.call(0xFFFFFFF5)
-  lpBuffer = ' ' * 22
-  $wGetConsoleScreenBufferInfo.call($hStdOut, lpBuffer)
-  $oldColor = lpBuffer.unpack('SSSSSssssSS')[4]
-
-  $colorMap = {
-     0 => 0x07|0x00|0x00|0x00, # black/white
-    37 => 0x08|0x00|0x00|0x00, # white/intensity
-    31 => 0x04|0x08|0x00|0x00, # red/red
-    32 => 0x02|0x08|0x00|0x00, # green/green
-    33 => 0x06|0x08|0x00|0x00, # yellow/yellow
-    34 => 0x01|0x08|0x00|0x00, # blue/blue
-    35 => 0x05|0x08|0x00|0x00, # magenta/purple
-    36 => 0x03|0x08|0x00|0x00, # cyan/aqua
-    39 => 0x07,                # default
-    40 => 0x00|0x00|0xf0|0x00, # background:white
-    41 => 0x07|0x00|0x40|0x00, # background:red
-    42 => 0x07|0x00|0x20|0x00, # background:green
-    43 => 0x07|0x00|0x60|0x00, # background:yellow
-    44 => 0x07|0x00|0x10|0x00, # background:blue
-    45 => 0x07|0x00|0x50|0x80, # background:magenta
-    46 => 0x07|0x00|0x30|0x80, # background:cyan
-    47 => 0x07|0x00|0x70|0x80, # background:gray
-    49 => 0x70,                # default
-    90 => 0x07|0x00|0x00|0x00, # erase/white
-  }
-  $iconv_u8_to_sj = Iconv.new("CP#{$wGetACP.call()}", 'UTF-8')
-  def print(str)
-    str.to_s.gsub("\xef\xbd\x9e", "\xe3\x80\x9c").split(/(\e\[\d*[a-zA-Z])/).each do |token|
-      case token
-      when /\e\[(\d+)m/
-        $wSetConsoleTextAttribute.call $hStdOut, $colorMap[$1.to_i].to_i
-	  when /\e\[\d*[a-zA-Z]/
-        # do nothing
-      else
-        loop do
-          begin
-            STDOUT.print $iconv_u8_to_sj.iconv(token)
-            break
-          rescue Iconv::Failure
-            STDOUT.print "#{$!.success}?"
-            token = $!.failed[1..-1]
-          end
-        end
-      end
-    end
-    $wSetConsoleTextAttribute.call $hStdOut, $oldColor
-    $iconv_u8_to_sj.iconv(nil)
-  end
-  def puts(str)
-    print str
-    STDOUT.puts
-  end
-end
-
 def plugin(s, init = {})
   unless init.empty?
     init.each do |key, value|

data/lib/termtter/client.rb

@@ -19,6 +19,11 @@ module Termtter
         @@main_thread = nil
         @@input_thread = nil
         @@task_manager = Termtter::TaskManager.new
+        configatron.set_default(:update_interval, 300)
+        configatron.set_default(:prompt, '> ')
+        configatron.set_default(:enable_ssl, false)
+        configatron.proxy.set_default(:port, '8080')
+        Thread.abort_on_exception = true
       end
 
       def public_storage
@@ -250,7 +255,9 @@ module Termtter
       end
 
       def setup_readline
-        Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
+        if Readline.respond_to?(:basic_word_break_characters=)
+          Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
+        end
         Readline.completion_proc = lambda {|input|
           begin
             # FIXME: when migrate to Termtter::Command

data/lib/termtter/command.rb

@@ -70,7 +70,7 @@ module Termtter
     end
 
     def commands
-      aliases.unshift(name)
+      [name] + aliases
     end
   end
 end

data/lib/termtter/system_extensions.rb

@@ -0,0 +1,88 @@
+def win?
+  RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin/
+end
+
+if win?
+  require 'iconv'
+  require 'Win32API'
+  $wGetACP = Win32API.new('kernel32','GetACP','','I')
+
+  module Readline
+    $iconv_sj_to_u8 = Iconv.new('UTF-8', "CP#{$wGetACP.call()}")
+    alias :old_readline :readline
+    def readline(*a)
+      str = old_readline(*a)
+      out = ''
+      loop do
+        begin
+          out << $iconv_sj_to_u8.iconv(str)
+          break
+        rescue Iconv::Failure
+          out << "#{$!.success}?"
+          str = $!.failed[1..-1]
+        end
+      end
+      return out
+    end
+    module_function :old_readline, :readline
+  end
+
+  $wSetConsoleTextAttribute = Win32API.new('kernel32','SetConsoleTextAttribute','II','I')
+  $wGetConsoleScreenBufferInfo = Win32API.new("kernel32", "GetConsoleScreenBufferInfo", ['l', 'p'], 'i')
+  $wGetStdHandle = Win32API.new('kernel32','GetStdHandle','I','I')
+  $wGetACP = Win32API.new('kernel32','GetACP','','I')
+
+  $hStdOut = $wGetStdHandle.call(0xFFFFFFF5)
+  lpBuffer = ' ' * 22
+  $wGetConsoleScreenBufferInfo.call($hStdOut, lpBuffer)
+  $oldColor = lpBuffer.unpack('SSSSSssssSS')[4]
+
+  $colorMap = {
+     0 => 0x07|0x00|0x00|0x00, # black/white
+    37 => 0x08|0x00|0x00|0x00, # white/intensity
+    31 => 0x04|0x08|0x00|0x00, # red/red
+    32 => 0x02|0x08|0x00|0x00, # green/green
+    33 => 0x06|0x08|0x00|0x00, # yellow/yellow
+    34 => 0x01|0x08|0x00|0x00, # blue/blue
+    35 => 0x05|0x08|0x00|0x00, # magenta/purple
+    36 => 0x03|0x08|0x00|0x00, # cyan/aqua
+    39 => 0x07,                # default
+    40 => 0x00|0x00|0xf0|0x00, # background:white
+    41 => 0x07|0x00|0x40|0x00, # background:red
+    42 => 0x07|0x00|0x20|0x00, # background:green
+    43 => 0x07|0x00|0x60|0x00, # background:yellow
+    44 => 0x07|0x00|0x10|0x00, # background:blue
+    45 => 0x07|0x00|0x50|0x80, # background:magenta
+    46 => 0x07|0x00|0x30|0x80, # background:cyan
+    47 => 0x07|0x00|0x70|0x80, # background:gray
+    49 => 0x70,                # default
+    90 => 0x07|0x00|0x00|0x00, # erase/white
+  }
+  $iconv_u8_to_sj = Iconv.new("CP#{$wGetACP.call()}", 'UTF-8')
+  def print(str)
+    str.to_s.gsub("\xef\xbd\x9e", "\xe3\x80\x9c").split(/(\e\[\d*[a-zA-Z])/).each do |token|
+      case token
+      when /\e\[(\d+)m/
+        $wSetConsoleTextAttribute.call $hStdOut, $colorMap[$1.to_i].to_i
+	  when /\e\[\d*[a-zA-Z]/
+        # do nothing
+      else
+        loop do
+          begin
+            STDOUT.print $iconv_u8_to_sj.iconv(token)
+            break
+          rescue Iconv::Failure
+            STDOUT.print "#{$!.success}?"
+            token = $!.failed[1..-1]
+          end
+        end
+      end
+    end
+    $wSetConsoleTextAttribute.call $hStdOut, $oldColor
+    $iconv_u8_to_sj.iconv(nil)
+  end
+  def puts(str)
+    print str
+    STDOUT.puts
+  end
+end

data/lib/termtter/task.rb

@@ -2,15 +2,16 @@
 
 module Termtter
   class Task
-    attr_accessor :name, :exec_at, :exec_proc, :interval
+    attr_accessor :name, :exec_at, :exec_proc, :interval, :work
     def initialize(args = {}, &block)
       @name = args[:name]
       @exec_at = Time.now + (args[:after] || 0)
       @interval = args[:interval]
       @exec_proc = block || lambda {}
+      @work = true
     end
     def execute
-      exec_proc.call
+      exec_proc.call(self) if work
     end
   end
 end

data/lib/termtter/task_manager.rb

@@ -34,7 +34,7 @@ module Termtter
     end
 
     def step
-      pull_due_tasks().each do |task|
+      pull_due_tasks.each do |task|
         invoke_and_wait do
           task.execute
         end
@@ -96,7 +96,7 @@ module Termtter
         time_now = Time.now
         due_tasks = []
         @tasks.delete_if do |key, task|
-          if task.exec_at <= time_now
+          if task.work && task.exec_at <= time_now
             due_tasks << task
             if task.interval
               task.exec_at = time_now + task.interval

data/lib/termtter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - jugyo
@@ -83,6 +83,7 @@ files:
 - lib/plugin/history.rb
 - lib/plugin/keyword.rb
 - lib/plugin/log.rb
+- lib/plugin/me.rb
 - lib/plugin/modify_arg_hook_sample.rb
 - lib/plugin/msagent.rb
 - lib/plugin/multi_reply.rb
@@ -95,6 +96,7 @@ files:
 - lib/plugin/pre_exec_hook_sample.rb
 - lib/plugin/primes.rb
 - lib/plugin/quicklook.rb
+- lib/plugin/random.rb
 - lib/plugin/reblog.rb
 - lib/plugin/reload.rb
 - lib/plugin/say.rb
@@ -118,6 +120,7 @@ files:
 - lib/termtter/connection.rb
 - lib/termtter/hook.rb
 - lib/termtter/status.rb
+- lib/termtter/system_extensions.rb
 - lib/termtter/task.rb
 - lib/termtter/task_manager.rb
 - lib/termtter/twitter.rb