earthquake 0.5.8 → 0.5.9

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/earthquake.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.5.8"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]

data/lib/earthquake/commands.rb

@@ -19,7 +19,7 @@ Earthquake.init do
   end
 
   command :update do |m|
-    async { twitter.update(m[1]) } if confirm("update '#{m[1]}'")
+    async_e { twitter.update(m[1]) } if confirm("update '#{m[1]}'")
   end
 
   command %r|^[^:\$].*| do |m|
@@ -32,7 +32,7 @@ Earthquake.init do
     screen_name = target["user"]["screen_name"]
     text = "@#{screen_name} #{m[2]}"
     if confirm(["'@#{screen_name}: #{target["text"]}'", "reply '#{text}'"].join("\n"))
-      async { twitter.update(text, :in_reply_to_status_id => in_reply_to_status_id) }
+      async_e { twitter.update(text, :in_reply_to_status_id => in_reply_to_status_id) }
     end
   end
 
@@ -53,7 +53,7 @@ Earthquake.init do
 
   command :delete do |m|
     tweet = twitter.status(m[1])
-    async { twitter.status_destroy(m[1]) } if confirm("delete '#{tweet["text"]}'")
+    async_e { twitter.status_destroy(m[1]) } if confirm("delete '#{tweet["text"]}'")
   end
 
   command :mentions do
@@ -61,11 +61,11 @@ Earthquake.init do
   end
 
   command :follow do |m|
-    async { twitter.friend(m[1]) }
+    async_e { twitter.friend(m[1]) }
   end
 
   command :unfollow do |m|
-    async { twitter.unfriend(m[1]) }
+    async_e { twitter.unfriend(m[1]) }
   end
 
   command :recent do
@@ -105,7 +105,7 @@ Earthquake.init do
   command %r|^:retweet\s+(\d+)$|, :as => :retweet do |m|
     target = twitter.status(m[1])
     if confirm("retweet 'RT @#{target["user"]["screen_name"]}: #{target["text"]}'")
-      async { twitter.retweet(m[1]) }
+      async_e { twitter.retweet(m[1]) }
     end
   end
 
@@ -113,21 +113,21 @@ Earthquake.init do
     target = twitter.status(m[1])
     text = "#{m[2]} RT @#{target["user"]["screen_name"]}: #{target["text"]} (#{target["id"]})"
     if confirm("unofficial retweet '#{text}'")
-      async { twitter.update(text) }
+      async_e { twitter.update(text) }
     end
   end
 
   command :favorite do |m|
     tweet = twitter.status(m[1])
     if confirm("favorite '#{tweet["user"]["screen_name"]}: #{tweet["text"]}'")
-      async { twitter.favorite(m[1]) }
+      async_e { twitter.favorite(m[1]) }
     end
   end
 
   command :unfavorite do |m|
     tweet = twitter.status(m[1])
     if confirm("unfavorite '#{tweet["user"]["screen_name"]}: #{tweet["text"]}'")
-      async { twitter.unfavorite(m[1]) }
+      async_e { twitter.unfavorite(m[1]) }
     end
   end
 
@@ -144,15 +144,15 @@ Earthquake.init do
   end
 
   command :block do |m|
-    async { twitter.block(m[1]) }
+    async_e { twitter.block(m[1]) }
   end
 
   command :unblock do |m|
-    async { twitter.unblock(m[1]) }
+    async_e { twitter.unblock(m[1]) }
   end
 
   command :report_spam do |m|
-    async { twitter.report_spam(m[1]) }
+    async_e { twitter.report_spam(m[1]) }
   end
 
   command :messages do
@@ -170,7 +170,7 @@ Earthquake.init do
   end
 
   command %r|^:message (\w+)\s+(.*)|, :as => :message do |m|
-    async { twitter.message(*m[1, 2]) } if confirm("message '#{m[2]}' to @#{m[1]}")
+    async_e { twitter.message(*m[1, 2]) } if confirm("message '#{m[2]}' to @#{m[1]}")
   end
 
   command :reconnect do

data/lib/earthquake/core.rb

@@ -92,6 +92,7 @@ module Earthquake
               Readline::HISTORY.pop if buf.empty? || Readline::HISTORY[-1] == Readline::HISTORY[-2]
             end
             sync { input(buf.strip) }
+            sleep 1 if buf.present?
           end
         end
 
@@ -99,16 +100,14 @@ module Earthquake
           loop do
             if Readline.line_buffer.nil? || Readline.line_buffer.empty?
               sync { output }
-              sleep 1
-            else
-              sleep 2
             end
+            sleep 1
           end
         end
 
         reconnect
 
-        trap('TERM') { stop }
+        trap('INT') { stop }
       end
     end
 

data/lib/earthquake/ext.rb

@@ -1,6 +1,6 @@
 class String
   def c(*codes)
-    codes = codes.map { |code|
+    codes = codes.flatten.map { |code|
       case code
       when String, Symbol
         Earthquake.config[:color][code.to_sym] rescue nil

data/lib/earthquake/get_access_token.rb

@@ -9,7 +9,7 @@ module Earthquake
       request_token = consumer.get_request_token
 
       puts "1) open: #{request_token.authorize_url}"
-      Launchy::Browser.run(request_token.authorize_url)
+      Launchy::Browser.run(request_token.authorize_url) rescue nil
 
       print "2) Enter the PIN: "
       pin = STDIN.gets.strip

data/lib/earthquake/input.rb

@@ -81,6 +81,17 @@ module Earthquake
         raise "type must be :y or :n"
       end
     end
+
+    def async_e(&block)
+      async { handle_api_error(&block) }
+    end
+
+    def handle_api_error(&block)
+      result = block.call
+      if result["error"]
+        notify "[ERROR] #{result["error"]}"
+      end
+    end
   end
 
   init do

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - jugyo