earthquake 0.4.7 → 0.4.8

data/README.md

@@ -5,6 +5,8 @@ Twitter Client on Terminal with Streaming API.
 
 It supports ruby 1.9 only.
 
+**We need patches that fix the document to better english!**
+
 ![http://images.instagram.com/media/2011/03/21/862f3b8d119b4eeb9c52e690a0087f5e_7.jpg](http://images.instagram.com/media/2011/03/21/862f3b8d119b4eeb9c52e690a0087f5e_7.jpg)
 
 Features
@@ -71,18 +73,12 @@ The config file is '~/.earthquake/config'.
 
 The blue is excluded.
 
-### Running on debug mode
-
-    Earthquake.config[:debug] = true
-
-デバッグモードで動作しているとき、コードの修正は即座に反映される（正確にはコマンドの実行の直前にリロードされる）。
-
 Plugin
 ----
 
 "~/.earthquake/plugin" is the directory for plugins.
 At launch, Earthquake try to load files under the directory.
-プラグインの初期化処理は Earthquake.init のブロックの中で行うべきである。
+The block that is specified for Earthquake.init will be reloaded at any command line input.
 
 ### Defining your commands
 
@@ -155,7 +151,7 @@ The 'm' is a MatchData.
 
     Earthquake.init do
       completion do |text|
-        ['@jugyo', 'earthquake', '#eqrb'].grep(/^#{Regexp.quote(text)}/)
+        ['jugyo', 'earthquake', '#eqrb'].grep(/^#{Regexp.quote(text)}/)
       end
     end
 

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/earthquake.gemspec

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

data/lib/earthquake/commands.rb

@@ -44,7 +44,7 @@ module Earthquake
     end
 
     command :mentions do
-      puts_items twitter.mentions.reverse
+      puts_items twitter.mentions
     end
 
     command :follow do |m|
@@ -56,11 +56,11 @@ module Earthquake
     end
 
     command :recent do
-      puts_items twitter.home_timeline.reverse
+      puts_items twitter.home_timeline
     end
 
     command :recent do |m|
-      puts_items twitter.user_timeline(:screen_name => m[1]).reverse
+      puts_items twitter.user_timeline(:screen_name => m[1])
     end
 
     command :user do |m|
@@ -70,7 +70,7 @@ module Earthquake
     command :search do |m|
       puts_items twitter.search(m[1])["results"].each { |s|
         s["user"] = {"screen_name" => s["from_user"]}
-        s["disable_cache"] = true
+        s["_disable_cache"] = true
         words = m[1].split(/\s+/).reject{|x| x[0] =~ /^-|^(OR|AND)$/ }.map{|x|
           case x
           when /^from:(.+)/, /^to:(.+)/
@@ -80,7 +80,7 @@ module Earthquake
           end
         }
         s["_highlights"] = words
-      }.reverse
+      }
     end
 
     command %r|^:retweet\s+(\d+)$|, :as => :retweet do |m|
@@ -107,15 +107,15 @@ module Earthquake
     end
 
     command :retweeted_by_me do
-      puts_items twitter.retweeted_by_me.reverse
+      puts_items twitter.retweeted_by_me
     end
 
     command :retweeted_to_me do
-      puts_items twitter.retweeted_to_me.reverse
+      puts_items twitter.retweeted_to_me
     end
 
     command :retweets_of_me do
-      puts_items twitter.retweets_of_me.reverse
+      puts_items twitter.retweets_of_me
     end
 
     command :block do |m|
@@ -130,6 +130,24 @@ module Earthquake
       async { twitter.report_spam(m[1]) }
     end
 
+    command :messages do
+      puts_items twitter.messages.each { |s|
+        s["user"] = {"screen_name" => s["sender_screen_name"]}
+        s["_disable_cache"] = true
+      }
+    end
+
+    command :sent_messages do
+      puts_items twitter.sent_messages.each { |s|
+        s["user"] = {"screen_name" => s["sender_screen_name"]}
+        s["_disable_cache"] = true
+      }
+    end
+
+    command %r|^:message (\w+)\s+(.*)|, :as => :message do |m|
+      async { twitter.message(*m[1, 2]) } if confirm("message '#{m[2]}' to @#{m[1]}")
+    end
+
     command :reconnect do
       reconnect
     end

data/lib/earthquake/core.rb

@@ -90,7 +90,7 @@ module Earthquake
       EventMachine::run do
         Thread.start do
           while buf = Readline.readline("⚡ ", true)
-            Readline::HISTORY.pop if buf.empty?
+            Readline::HISTORY.pop if buf.empty? || Readline::HISTORY[-1] == Readline::HISTORY[-2]
             sync { input(buf.strip) }
           end
         end

data/lib/earthquake/input.rb

@@ -21,7 +21,12 @@ module Earthquake
 
     def input(text)
       begin
-        reload if config[:debug]
+        reload
+      rescue Exception => e
+        error e
+      end
+
+      begin
         if command = command(text)
           command[:block].call(command[:pattern].match(text))
         elsif !text.empty?

data/lib/earthquake/output.rb

@@ -28,7 +28,7 @@ module Earthquake
     end
 
     def puts_items(items)
-      [items].flatten.each do |item|
+      [items].flatten.reverse_each do |item|
         next if filters.any? { |f| f.call(item) == false }
         outputs.each do |o|
           begin
@@ -83,11 +83,15 @@ module Earthquake
         statuses.insert(0, "[#{Time.parse(item["created_at"]).strftime('%Y.%m.%d %X')}]")
       end
 
-      source = item["source"].u =~ />(.*)</ ? $1 : 'web'
-      user_color = color_of(item["user"]["screen_name"])
-      text = item["text"].u.gsub(/[@#]([0-9A-Za-z_]+)/) do |i|
+      source = item["source"].u =~ />(.*)</ ? $1 : 'web' rescue ''
+
+      text = item["text"].u
+      text.gsub!(/@([0-9A-Za-z_]+)/) do |i|
         i.c(color_of($1))
       end
+      text.gsub!(/(?:^#([^\s]+))|(?:\s+#([^\s]+))/) do |i|
+        i.c(color_of($1 || $2))
+      end
 
       if item["_highlights"]
         item["_highlights"].each do |h|
@@ -102,7 +106,7 @@ module Earthquake
 
       status =  [
                   "#{mark}" + "#{statuses.join(" ")}".c(90),
-                  "#{item["user"]["screen_name"].c(user_color)}:",
+                  "#{item["user"]["screen_name"].c(color_of(item["user"]["screen_name"]))}:",
                   "#{text}",
                   "#{misc} #{source}".c(90)
                 ].join(" ")

data/lib/earthquake/twitter.rb

@@ -7,8 +7,8 @@ module Earthquake
   init do
     @twitter = TwitterOAuth::Client.new(config.slice(:consumer_key, :consumer_secret, :token, :secret))
 
-    filter do |item|
-      next if item["text"].nil? || item["disable_cache"]
+    output do |item|
+      next if item["text"].nil? || item["_disable_cache"]
       item = item.dup
       item.keys.select { |key| key =~ /^_/ }.each { |key| item.delete(key) } # remote optional data like "_stream", "_highlights"
       Earthquake.cache.write("status:#{item["id"]}", item)

metadata

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