jugyo-termtter 0.3.6 → 0.3.7

data/lib/termtter.rb

@@ -10,7 +10,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Termtter
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 
   class CommandNotFound < StandardError; end
 
@@ -147,7 +147,7 @@ module Termtter
         if key =~ text
           command_found = true
           begin
-            command.call(self, $~)
+            command.call($~, self)
           rescue => e
             puts "Error: #{e}"
             puts e.backtrace.join("\n")

data/lib/termtter/standard_commands.rb

@@ -1,48 +1,48 @@
 class Termtter::Client
 
-  add_command /^(update|u)\s+(.*)/ do |t, m|
+  add_command /^(update|u)\s+(.*)/ do |m, t|
     text = m[2]
     next if text.empty?
     t.update_status(text)
     puts "=> #{text}"
   end
 
-  add_command /^(list|l)\s*$/ do |t, m|
+  add_command /^(list|l)\s*$/ do |m, t|
     t.list_friends_timeline()
   end
 
-  add_command /^(list|l)\s+([^\s]+)/ do |t, m|
+  add_command /^(list|l)\s+([^\s]+)/ do |m, t|
     t.get_user_timeline(m[2])
   end
 
-  add_command /^(search|s)\s+(.*)/ do |t, m|
+  add_command /^(search|s)\s+(.*)/ do |m, t|
     query = m[2]
     unless query.empty?
       t.search(query)
     end
   end
 
-  add_command /^(replies|r)\s*$/ do |t, m|
+  add_command /^(replies|r)\s*$/ do |m, t|
     t.replies()
   end
 
-  add_command /^show\s+([^\s]+)/ do |t, m|
+  add_command /^show\s+([^\s]+)/ do |m, t|
     t.show($1)
   end
 
-  add_command /^pause\s*$/ do |t, m|
+  add_command /^pause\s*$/ do |m, t|
     t.pause
   end
 
-  add_command /^resume\s*$/ do |t, m|
+  add_command /^resume\s*$/ do |m, t|
     t.resume
   end
 
-  add_command /^exit\s*$/ do |t, m|
+  add_command /^exit\s*$/ do |m, t|
     t.exit
   end
 
-  add_command /^help\s*$/ do |t, m|
+  add_command /^help\s*$/ do |m, t|
     puts <<-EOS
 exit            Exit
 help            Print this help message
@@ -57,7 +57,7 @@ show ID         Show a single status
 EOS
   end
 
-  add_command /^eval\s+(.*)$/ do |t, m|
+  add_command /^eval\s+(.*)$/ do |m, t|
     result = t.instance_eval m[1] unless m[1].empty?
     puts "=> #{result.inspect}"
   end

data/lib/termtter/stdout.rb

@@ -13,7 +13,7 @@ Termtter::Client.add_hook do |statuses, event|
         text = s.text.gsub("\n", '')
         color_num = colors[s.user_screen_name.hash % colors.size]
         status = "#{s.user_screen_name}: #{text}"
-        unless s.in_reply_to_status_id && s.in_reply_to_status_id.nil?
+        unless s.in_reply_to_status_id.nil?
           status += " (reply to #{s.in_reply_to_status_id})"
         end
 

data/lib/termtter/uri-open.rb

@@ -8,7 +8,7 @@ Termtter::Client.add_hook do |statuses, event, t|
 end
 
 class Termtter::Client
-  add_command /^uri-open\s*$/ do |t, m|
+  add_command /^uri-open\s*$/ do |m, t|
     t.public_storage[:uris] ||= [] # It's not DRY
     t.public_storage[:uris].each do |uri|
       # FIXME: works only in OSX and other *NIXs

data/test/test_termtter.rb

@@ -73,7 +73,7 @@ class TestTermtter < Test::Unit::TestCase
   def test_add_command
     command_text = nil
     matche_text = nil
-    Termtter::Client.add_command /foo\s+(.*)/ do |termtter, matche|
+    Termtter::Client.add_command /foo\s+(.*)/ do |matche, termtter|
       command_text = matche[0]
       matche_text = matche[1]
     end

metadata

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