earthquake 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-04-06}
+  s.date = %q{2011-04-08}
   s.default_executable = %q{earthquake}
   s.description = %q{Twitter Client on Terminal with Twitter Streaming API.}
   s.email = %q{jugyo.org@gmail.com}
@@ -60,7 +60,7 @@ Accordingly, you should renew the access token if it is old.
 }
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.rubygems_version = %q{1.6.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Twitter Client on Terminal.}
   s.test_files = [
     "spec/earthquake_spec.rb",

data/lib/earthquake/core.rb

@@ -53,6 +53,7 @@ module Earthquake
       config[:time_format]      ||= Time::DATE_FORMATS[:short]
       config[:plugin_dir]       ||= File.join(config[:dir], 'plugin')
       config[:file]             ||= File.join(config[:dir], 'config')
+      config[:prompt]           ||= '⚡ '
       config[:consumer_key]     ||= 'RmzuwQ5g0SYObMfebIKJag'
       config[:consumer_secret]  ||= 'V98dYYmWm9JoG7qfOF0jhJaVEVW3QhGYcDJ9JQSXU'
 
@@ -89,7 +90,7 @@ module Earthquake
 
       EventMachine::run do
         Thread.start do
-          while buf = Readline.readline("⚡ ", true)
+          while buf = Readline.readline(config[:prompt], true)
             unless Readline::HISTORY.count == 1
               Readline::HISTORY.pop if buf.empty? || Readline::HISTORY[-1] == Readline::HISTORY[-2]
             end

data/lib/earthquake/output.rb

@@ -13,9 +13,10 @@ module Earthquake
       @outputs ||= []
     end
 
-    def output(&block)
+    def output(name = nil, &block)
       if block
-        outputs << block
+        outputs.delete_if { |o| o[:name] == name } if name
+        outputs << {:name => name, :block => block}
       else
         return if item_queue.empty?
         insert do
@@ -32,7 +33,7 @@ module Earthquake
         next if output_filters.any? { |f| f.call(item) == false }
         outputs.each do |o|
           begin
-            o.call(item)
+            o[:block].call(item)
           rescue => e
             error e
           end
@@ -71,7 +72,7 @@ module Earthquake
     )
     config[:raw_text] ||= false
 
-    output do |item|
+    output :tweet do |item|
       next unless item["text"]
 
       info = []
@@ -80,7 +81,9 @@ module Earthquake
       elsif item["retweeted_status"]
         info << "(retweet of #{id2var(item["retweeted_status"]["id"])})"
       end
-      info << Time.parse(item["created_at"]).strftime(config[:time_format])
+      if !config[:hide_time] && item["created_at"]
+        info << Time.parse(item["created_at"]).strftime(config[:time_format])
+      end
       if !config[:hide_app_name] && item["source"]
         info << (item["source"].u =~ />(.*)</ ? $1 : 'web')
       end
@@ -124,7 +127,7 @@ module Earthquake
       puts status
     end
 
-    output do |item|
+    output :event do |item|
       next unless item["event"]
 
       # TODO: handle 'list_member_added' and 'list_member_removed'

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +09:00
+date: 2011-04-08 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Twitter Client on Terminal.