earthquake 0.5.7 → 0.5.8

data/README.md

@@ -101,13 +101,23 @@ You can change the directory at launch as below:
 
     $ earthquake ~/.earthquake_foo
 
-### Changing the colors
+### Changing the colors for user name
 
     # ~/.earthquake/config
     Earthquake.config[:colors] = (31..36).to_a - [34]
 
 Blue is excluded.
 
+### Changing the color scheme
+
+    # ~/.earthquake/config
+    Earthquake.config[:color] = {
+      :info => 34,
+      :notice => 41,
+      :event  => 46,
+      :url => [4, 34]
+    }
+
 Desktop Notifications
 ----
 
@@ -208,6 +218,7 @@ The 'm' is a MatchData.
 TODO
 ----
 
+* guideline for plugin
 * ssl for twitter_oauth
 * deal proxy
 * spec

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/earthquake.gemspec

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

data/lib/earthquake/ext.rb

@@ -1,6 +1,14 @@
 class String
   def c(*codes)
-    "\e[#{codes.join;}m#{self}\e[0m"
+    codes = codes.map { |code|
+      case code
+      when String, Symbol
+        Earthquake.config[:color][code.to_sym] rescue nil
+      else
+        code
+      end
+    }.compact.unshift(0)
+    "\e[#{codes.join(';')}m#{self}\e[0m"
   end
 
   def u

data/lib/earthquake/output.rb

@@ -53,11 +53,7 @@ module Earthquake
     end
 
     def color_of(screen_name)
-      colors[screen_name.to_i(36) % colors.size]
-    end
-
-    def colors
-      config[:colors]
+      config[:colors][screen_name.to_i(36) % config[:colors].size]
     end
   end
 
@@ -66,6 +62,13 @@ module Earthquake
     output_filters.clear
 
     config[:colors] ||= (31..36).to_a + (91..96).to_a
+    config[:color] ||= {}
+    config[:color].reverse_merge!(
+      :info   => 90,
+      :notice => 31,
+      :event  => 42,
+      :url    => [4, 36]
+    )
 
     output do |item|
       next unless item["text"]
@@ -91,7 +94,7 @@ module Earthquake
         i.c(color_of($1 || $2))
       end
       text.gsub!(URI.regexp(["http", "https"])) do |i|
-        i.c(4).c(36)
+        i.c(:url)
       end
 
       if item["_highlights"]
@@ -106,11 +109,11 @@ module Earthquake
       mark = item["_mark"] || ""
 
       status =  [
-                  "#{mark}" + "[#{id}]".c(90),
+                  "#{mark}" + "[#{id}]".c(:info),
                   "#{item["user"]["screen_name"].c(color_of(item["user"]["screen_name"]))}:",
                   "#{text}",
-                  (item["user"]["protected"] ? "[P]".c(31) : nil),
-                  info.join(' - ').c(90)
+                  (item["user"]["protected"] ? "[P]".c(:notice) : nil),
+                  info.join(' - ').c(:info)
                 ].compact.join(" ")
       puts status
     end
@@ -121,11 +124,11 @@ module Earthquake
       # TODO: handle 'list_member_added' and 'list_member_removed'
       case item["event"]
       when "follow", "block", "unblock"
-        puts "[#{item["event"]}]".c(42) + " #{item["source"]["screen_name"]} => #{item["target"]["screen_name"]}"
+        puts "[#{item["event"]}]".c(:event) + " #{item["source"]["screen_name"]} => #{item["target"]["screen_name"]}"
       when "favorite", "unfavorite"
-        puts "[#{item["event"]}]".c(42) + " #{item["source"]["screen_name"]} => #{item["target"]["screen_name"]} : #{item["target_object"]["text"].u}"
+        puts "[#{item["event"]}]".c(:event) + " #{item["source"]["screen_name"]} => #{item["target"]["screen_name"]} : #{item["target_object"]["text"].u}"
       when "delete"
-        puts "[deleted]".c(42) + " #{item["delete"]["status"]["id"]}"
+        puts "[deleted]".c(:event) + " #{item["delete"]["status"]["id"]}"
       else
         if config[:debug]
           ap item

metadata

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