earthquake 0.4.2 → 0.4.3

data/Gemfile

@@ -8,7 +8,6 @@ gem 'awesome_print'
 gem 'launchy'
 gem 'oauth'
 gem 'twitter_oauth'
-gem 'termcolor'
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/README.md

@@ -5,6 +5,8 @@ Twitter Client on Terminal with Streaming API.
 
 It supports ruby 1.9 only.
 
+![http://images.instagram.com/media/2011/03/21/862f3b8d119b4eeb9c52e690a0087f5e_7.jpg](http://images.instagram.com/media/2011/03/21/862f3b8d119b4eeb9c52e690a0087f5e_7.jpg)
+
 Install
 ----
 
@@ -149,8 +151,9 @@ TODO
 ----
 
 * more intelligent completion
+* caching statuses
 * typable id
-* keyword highlight
+* request asynchronously
 * spec
 
 Copyright

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/earthquake.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "bin/earthquake",
     "earthquake.gemspec",
     "lib/earthquake.rb",
+    "lib/earthquake/cache.rb",
     "lib/earthquake/commands.rb",
     "lib/earthquake/core.rb",
     "lib/earthquake/ext.rb",

data/lib/earthquake.rb

@@ -4,18 +4,19 @@
   readline
   active_support/core_ext
   active_support/dependencies
+  active_support/cache
   twitter/json_stream
   notify
   ap
   launchy
   oauth
   twitter_oauth
-  termcolor
 ).each { |lib| require lib }
 
 %w(
   ext
   core
+  cache
   output
   input
   get_access_token

data/lib/earthquake/cache.rb

@@ -0,0 +1,11 @@
+module Earthquake
+  module Cache
+    attr_reader :cache
+  end
+
+  init do
+    @cache ||= config[:cache] || ActiveSupport::Cache::MemoryStore.new
+  end
+
+  extend Cache
+end

data/lib/earthquake/commands.rb

@@ -21,12 +21,14 @@ module Earthquake
 
     # update
     command %r|^[^:].*| do |m|
-      twitter.update(m[0]) if confirm("update '#{m[0]}'")
+      async { twitter.update(m[0]) } if confirm("update '#{m[0]}'")
     end
 
     command %r|^:reply (\d+)\s+(.*)|, :as => :reply do |m|
       # TODO: fill the user name to reply
-      twitter.update(m[2], :in_reply_to_status_id => m[1]) if confirm("reply '#{m[2]}' to #{m[1]}")
+      async do
+        twitter.update(m[2], :in_reply_to_status_id => m[1]) if confirm("reply '#{m[2]}' to #{m[1]}")
+      end
     end
 
     command :status do |m|
@@ -34,7 +36,8 @@ module Earthquake
     end
 
     command :delete do |m|
-      twitter.status_destroy(m[1])
+      # TODO: confirm
+      async { twitter.status_destroy(m[1]) }
     end
 
     command :mentions do
@@ -42,11 +45,11 @@ module Earthquake
     end
 
     command :follow do |m|
-      twitter.friend(m[1])
+      async { twitter.friend(m[1]) }
     end
 
     command :unfollow do |m|
-      twitter.unfriend(m[1])
+      async { twitter.unfriend(m[1]) }
     end
 
     command :list do |m|
@@ -66,15 +69,15 @@ module Earthquake
     end
 
     command :retweet do |m|
-      twitter.retweet(m[1])
+      async { twitter.retweet(m[1]) }
     end
 
     command :favorite do |m|
-      twitter.favorite(m[1])
+      async { twitter.favorite(m[1]) }
     end
 
     command :unfavorite do |m|
-      twitter.unfavorite(m[1])
+      async { twitter.unfavorite(m[1]) }
     end
 
     command :retweeted_by_me do
@@ -90,15 +93,15 @@ module Earthquake
     end
 
     command :block do |m|
-      twitter.block(m[1])
+      async { twitter.block(m[1]) }
     end
 
     command :unblock do |m|
-      twitter.unblock(m[1])
+      async { twitter.unblock(m[1]) }
     end
 
     command :report_spam do |m|
-      twitter.report_spam(m[1])
+      async { twitter.report_spam(m[1]) }
     end
 
     command :reconnect do

data/lib/earthquake/core.rb

@@ -17,6 +17,18 @@ module Earthquake
       inits << block
     end
 
+    def onces
+      @once ||= []
+    end
+
+    def once(&block)
+      onces << block
+    end
+
+    def _once
+      onces.each { |block| class_eval(&block) }
+    end
+
     def _init
       load_config
       load_plugins
@@ -68,6 +80,7 @@ module Earthquake
     end
 
     def start(*argv)
+      _once
       _init
       restore_history
 
@@ -154,6 +167,10 @@ module Earthquake
       end
     end
 
+    def async(&block)
+      Thread.start(&block)
+    end
+
     def error(e)
       notify "[ERROR] #{e.message}\n#{e.backtrace.join("\n")}"
     end

data/lib/earthquake/ext.rb

@@ -1,7 +1,5 @@
 class String
-  alias_method :t, :termcolor
-
-  def e
-    TermColor.escape(self)
+  def c(*codes)
+    "\e[#{codes.join;}m#{self}\e[0m"
   end
 end

data/lib/earthquake/input.rb

@@ -23,7 +23,7 @@ module Earthquake
         if command = commands.detect { |c| c[:pattern] =~ text }
           command[:block].call($~)
         elsif !text.empty?
-          puts "<yellow>Command not found</yellow>".t
+          puts "Command not found".c(43)
         end
       rescue Exception => e
         error e

data/lib/earthquake/output.rb

@@ -83,24 +83,28 @@ module Earthquake
 
       source = item["source"] =~ />(.*)</ ? $1 : 'web'
       user_color = color_of(item["user"]["screen_name"])
-      text = item["text"].e.gsub(/[@#]([0-9A-Za-z_]+)/) do |i|
-        c = color_of($1)
-        "<#{c}>#{i}</#{c}>"
+      text = item["text"].gsub(/[@#]([0-9A-Za-z_]+)/) do |i|
+        i.c(color_of($1))
       end
 
       if item["highlights"]
         item["highlights"].each do |h|
           c = color_of(h).to_i + 10
           text = text.gsub(/#{h}/i) do |i|
-            "<#{c}>#{i}</#{c}>"
+            i.c(c)
           end
         end
       end
 
-      status = "<90>#{statuses.join(" ").e}</90> " +
-               "<#{user_color}>#{item["user"]["screen_name"].e}</#{user_color}>: " +
-               "#{text}<90>#{misc.e} #{source.e}</90>"
-      puts status.t
+      mark = item["mark"] || ""
+
+      status =  [
+                  "#{mark}#{statuses.join(" ")}".c(90),
+                  item["user"]["screen_name"].c(user_color),
+                  "#{text}",
+                  "#{misc} #{source}".c(90)
+                ].join(" ")
+      puts status
     end
 
     output do |item|

data/lib/earthquake/twitter.rb

@@ -7,5 +7,19 @@ module Earthquake
     @twitter = TwitterOAuth::Client.new(config.slice(:consumer_key, :consumer_secret, :token, :secret))
   end
 
+  once do
+    class ::TwitterOAuth::Client
+      def status_with_cache(id)
+        key = "status:#{id}"
+        unless s = Earthquake.cache.read(key)
+          s = status_without_cache(id)
+          Earthquake.cache.write(key, s, :expires_in => 1.hour.ago)
+        end
+        s
+      end
+      alias_method_chain :status, :cache
+    end
+  end
+
   extend Twitter
 end

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - jugyo
@@ -166,6 +166,7 @@ files:
 - bin/earthquake
 - earthquake.gemspec
 - lib/earthquake.rb
+- lib/earthquake/cache.rb
 - lib/earthquake/commands.rb
 - lib/earthquake/core.rb
 - lib/earthquake/ext.rb