jugyo-termtter 0.7.5 → 0.7.6

data/lib/plugin/group.rb

@@ -4,6 +4,12 @@ module Termtter::Client
   if public_storage[:log]
     add_help 'group,g GROUPNAME', 'Filter by group members'
 
+    add_command /^(?:group|g)\s*$/ do |m, t|
+      configatron.plugins.group.groups.each_pair do |key, value|
+        puts "#{key}: #{value.join(',')}"
+      end
+    end
+
     add_command /^(?:group|g)\s+(.+)/ do |m, t|
       group_name = m[1].to_sym
       group = configatron.plugins.group.groups[group_name]

data/lib/plugin/sl.rb

@@ -1,3 +1,31 @@
 module Termtter::Client
-  add_macro /^sl$/, 'eval system "sl"'
+  public_storage[:current] = ''
+
+  add_macro /^sl\s*$/, 'eval system "sl"'
+
+  add_help 'pwd', 'Show current direcroty'
+  add_macro /^pwd\s*$/, 'eval public_storage[:current]'
+
+  add_help 'ls', 'Show list in current directory'
+  add_command /^ls\s*$/ do |m, t|
+    call_commands "list #{public_storage[:current]}", t
+  end
+
+  add_help 'cd USER', 'Change current directory'
+  add_command /^cd\s+(.*)/ do |m, t|
+    directory = m[1].strip
+    direcroty = '' if /~/ =~ direcroty
+    public_storage[:current] = direcroty
+    puts "=> #{direcroty}"
+  end
+  add_macro /^cd$/, 'eval public_storage[:current] = ""'
+
+  add_completion do |input|
+    case input
+    when /^(cd)\s+(.*)/
+      find_user_candidates $2, "#{$1} %s"
+    else
+      %w[ sl ls cd pwd ].grep(/^#{Regexp.quote input}/)
+    end
+  end
 end

data/lib/plugin/stdout.rb

@@ -12,20 +12,49 @@ $highline = HighLine.new
 
 if win?
   require 'kconv'
-  def color(str, num)
-    str.to_s.tosjis
-  end
+  require 'Win32API'
+  STD_OUTPUT_HANDLE = 0xFFFFFFF5
+  $wSetConsoleTextAttribute = Win32API.new('kernel32','SetConsoleTextAttribute','II','I')
+  $wGetConsoleScreenBufferInfo = Win32API.new("kernel32", "GetConsoleScreenBufferInfo", ['l', 'p'], 'i')
+  $wGetStdHandle = Win32API.new('kernel32','GetStdHandle','I','I')
+
+  $hStdOut = $wGetStdHandle.call(STD_OUTPUT_HANDLE)
+  lpBuffer = ' ' * 22
+  $wGetConsoleScreenBufferInfo.call($hStdOut, lpBuffer)
+  $oldColor = lpBuffer.unpack('SSSSSssssSS')[4]
+
+  $colorMap = {
+       0 => 7,     # black/white
+      37 => 8,     # white/intensity
+      31 => 4 + 8, # red/red
+      32 => 2 + 8, # green/green
+      33 => 6 + 8, # yellow/yellow
+      34 => 1 + 8, # blue/blue
+      35 => 5 + 8, # magenta/purple
+      36 => 3 + 8, # cyan/aqua
+      90 => 7,     # erase/white
+  }
   def puts(str)
-    STDOUT.puts(str.tosjis)
-  end
-else
-  def color(str, value)
-    case value
-    when String, Symbol
-      $highline.color(str, value)
-    else
-      "\e[#{value}m#{str}\e[0m"
+    str = str.tosjis
+    tokens = str.split(/(\e\[\d+m)/)
+    tokens.each do |token|
+      if token =~ /\e\[(\d+)m/
+        $wSetConsoleTextAttribute.call $hStdOut, $colorMap[$1.to_i].to_i
+      else
+        STDOUT.print token
+      end
     end
+    $wSetConsoleTextAttribute.call $hStdOut, $oldColor
+    STDOUT.puts
+  end
+end
+
+def color(str, value)
+  case value
+  when String, Symbol
+    $highline.color(str, value)
+  else
+    "\e[#{value}m#{str}\e[0m"
   end
 end
 

data/lib/plugin/yhara.rb

@@ -125,14 +125,29 @@ end
 module Termtter::Client
 
   add_help 'yhara', 'Post a new Yharian sentence'
+  add_help 'yhara USER', 'Speak to the user in Yharian'
   
-  add_command /^(yhara|y)\s*/ do |m, t|
+  add_command /^(yhara)\s*$/ do |m, t|
     text = Yharian::text
-    unless text.empty?
-      t.update_status(text)
-      puts "=> #{text}"
+    t.update_status(text)
+    puts "=> #{text}"
+  end
+
+  add_command /^(yhara)\s+(\w+)/ do |m, t|
+    text = "@#{m[2]} #{Yharian::text}"
+    t.update_status(text)
+    puts "=> #{text}"
+  end
+
+  add_completion do |input|
+    case input
+    when /^(yhara)\s+(.*)/
+      find_user_candidates $2, "#{$1} %s"
+    else
+      %w[ yhara ].grep(/^#{Regexp.quote input}/)
     end
   end
+
 end
 
 # yhara.rb

data/lib/termtter.rb

@@ -74,7 +74,7 @@ unless defined? original_require
 end
 
 module Termtter
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
   APP_NAME = 'termtter'
 
   class Connection
@@ -425,6 +425,7 @@ module Termtter
               puts e.backtrace.join("\n")
             end
           end
+          exit # exit when press Control-D
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-termtter
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - bubblegum