earthquake 0.4.6 → 0.4.7

data/Gemfile

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

data/Gemfile.lock

@@ -29,6 +29,7 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    ruby-growl (3.0)
     twitter-stream (0.1.12)
       eventmachine (>= 0.12.8)
       roauth (>= 0.0.2)
@@ -50,5 +51,6 @@ DEPENDENCIES
   notify
   oauth
   rspec (~> 2.3.0)
+  ruby-growl
   twitter-stream
   twitter_oauth

data/README.md

@@ -119,7 +119,7 @@ The 'm' is a MatchData.
 
     Earthquake.init do
       output do |item|
-        next unless item["stream"]
+        next unless item["_stream"]
         if item["text"] =~ /ruby/i
           notify "#{item["user"]["screen_name"]}: #{item["text"]}"
         end
@@ -143,7 +143,7 @@ The 'm' is a MatchData.
 
     Earthquake.init do
       filter do |item|
-        if item["stream"] && item["text"]
+        if item["_stream"] && item["text"]
           item["text"] =~ /ruby/i
         else
           true

data/Rakefile

@@ -37,6 +37,7 @@ Accordingly that, You should renew the access token if it is old.
     $ earthquake
 
 }
+  gem.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/bin/earthquake

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-$:.unshift(File.expand_path('../../lib', __FILE__))
+$:.unshift(File.expand_path('../../lib', __FILE__)) if $0 == __FILE__
 require 'earthquake'
 Earthquake.start(ARGV)

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-03-21}
+  s.date = %q{2011-03-26}
   s.default_executable = %q{earthquake}
   s.description = %q{Twitter Client on Terminal with Twitter Streaming API.}
   s.email = %q{jugyo.org@gmail.com}
@@ -58,6 +58,7 @@ Accordingly that, 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.summary = %q{Twitter Client on Terminal.}
   s.test_files = [
@@ -77,7 +78,7 @@ Accordingly that, You should renew the access token if it is old.
       s.add_runtime_dependency(%q<launchy>, [">= 0"])
       s.add_runtime_dependency(%q<oauth>, [">= 0"])
       s.add_runtime_dependency(%q<twitter_oauth>, [">= 0"])
-      s.add_runtime_dependency(%q<termcolor>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-growl>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -90,7 +91,7 @@ Accordingly that, You should renew the access token if it is old.
       s.add_dependency(%q<launchy>, [">= 0"])
       s.add_dependency(%q<oauth>, [">= 0"])
       s.add_dependency(%q<twitter_oauth>, [">= 0"])
-      s.add_dependency(%q<termcolor>, [">= 0"])
+      s.add_dependency(%q<ruby-growl>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -104,7 +105,7 @@ Accordingly that, You should renew the access token if it is old.
     s.add_dependency(%q<launchy>, [">= 0"])
     s.add_dependency(%q<oauth>, [">= 0"])
     s.add_dependency(%q<twitter_oauth>, [">= 0"])
-    s.add_dependency(%q<termcolor>, [">= 0"])
+    s.add_dependency(%q<ruby-growl>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/earthquake/commands.rb

@@ -6,13 +6,13 @@ module Earthquake
     end
 
     command :help do
-      puts "TODO..."
+      system 'less', File.expand_path('../../../README.md', __FILE__)
     end
 
     command :restart do
       puts 'restarting...'
       stop
-      exec File.expand_path('../../..//bin/earthquake', __FILE__)
+      exec File.expand_path('../../../bin/earthquake', __FILE__)
     end
 
     command :eval do |m|
@@ -29,7 +29,7 @@ module Earthquake
       target = twitter.status(in_reply_to_status_id)
       screen_name = target["user"]["screen_name"]
       text = "@#{screen_name} #{m[2]}"
-      if confirm(["'@#{screen_name}: #{target["text"].u}'".c(36), "reply '#{text}'"].join("\n"))
+      if confirm(["'@#{screen_name}: #{target["text"].u}'", "reply '#{text}'"].join("\n"))
         async { twitter.update(text, :in_reply_to_status_id => in_reply_to_status_id) }
       end
     end
@@ -79,7 +79,7 @@ module Earthquake
             x
           end
         }
-        s["highlights"] = words
+        s["_highlights"] = words
       }.reverse
     end
 

data/lib/earthquake/core.rb

@@ -3,7 +3,9 @@ require 'fileutils'
 
 module Earthquake
   module Core
-    attr_accessor :config
+    def config
+      @config ||= {}
+    end
 
     def item_queue
       @item_queue ||= []
@@ -46,12 +48,12 @@ module Earthquake
 
     def load_config
       # TODO: parse argv
-      self.config = {
+      config.merge!(
         :dir             => File.expand_path('~/.earthquake'),
         :plugin_dir      => File.expand_path('~/.earthquake/plugin'),
         :consumer_key    => 'RmzuwQ5g0SYObMfebIKJag',
         :consumer_secret => 'V98dYYmWm9JoG7qfOF0jhJaVEVW3QhGYcDJ9JQSXU'
-      }
+      )
 
       [config[:dir], config[:plugin_dir]].each do |dir|
         unless File.exists?(dir)

data/lib/earthquake/input.rb

@@ -51,6 +51,7 @@ module Earthquake
     end
 
     def confirm(message, type = :y)
+      message = message.c(36)
       case type
       when :y
         print "#{message} [Yn] "
@@ -66,9 +67,10 @@ module Earthquake
 
   init do
     commands.clear
+    command_names.clear
     completions.clear
 
-    Readline.basic_word_break_characters = " \t\n\"\\'`$><=;|&{("
+    Readline.basic_word_break_characters = " \t\n\"\\'`$><=;|&{(@"
 
     Readline.completion_proc = lambda do |text|
       completions.inject([]) do |results, completion|

data/lib/earthquake/output.rb

@@ -20,7 +20,7 @@ module Earthquake
         return if item_queue.empty?
         insert do
           while item = item_queue.shift
-            item["stream"] = true
+            item["_stream"] = true
             puts_items(item)
           end
         end
@@ -79,7 +79,7 @@ module Earthquake
       end
 
       statuses = ["[#{item["id"].to_s}]"]
-      unless item["stream"]
+      unless item["_stream"]
         statuses.insert(0, "[#{Time.parse(item["created_at"]).strftime('%Y.%m.%d %X')}]")
       end
 
@@ -89,8 +89,8 @@ module Earthquake
         i.c(color_of($1))
       end
 
-      if item["highlights"]
-        item["highlights"].each do |h|
+      if item["_highlights"]
+        item["_highlights"].each do |h|
           c = color_of(h).to_i + 10
           text = text.gsub(/#{h}/i) do |i|
             i.c(c)
@@ -114,11 +114,11 @@ module Earthquake
 
       case item["event"]
       when "follow", "block", "unblock"
-        puts "[#{item["event"]}] #{item["source"]["screen_name"]} => #{item["target"]["screen_name"]}"
+        puts "[#{item["event"]}]".c(42) + " #{item["source"]["screen_name"]} => #{item["target"]["screen_name"]}"
       when "favorite", "unfavorite"
-        puts "[#{item["event"]}] #{item["source"]["screen_name"]} => #{item["target"]["screen_name"]} : #{item["target_object"]["text"]}"
+        puts "[#{item["event"]}]".c(42) + " #{item["source"]["screen_name"]} => #{item["target"]["screen_name"]} : #{item["target_object"]["text"].u}"
       when "delete"
-        puts "[deleted] #{item["delete"]["status"]["id"]}"
+        puts "[deleted]".c(42) + " #{item["delete"]["status"]["id"]}"
       else
         if config[:debug]
           ap item

data/lib/earthquake/twitter.rb

@@ -9,7 +9,9 @@ module Earthquake
 
     filter do |item|
       next if item["text"].nil? || item["disable_cache"]
-      Earthquake.cache.write("status:#{item["id"]}", item.dup, :expires_in => 1.hour.ago)
+      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)
     end
   end
 
@@ -22,7 +24,7 @@ module Earthquake
             result.dup
           else
             result = __send__(:"#{m}_without_cache", *args)
-            Earthquake.cache.write(key, result.dup, :expires_in => 1.hour.ago)
+            Earthquake.cache.write(key, result.dup)
             result
           end
         end

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +09:00
+date: 2011-03-26 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,7 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: termcolor
+  name: ruby-growl
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -194,10 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4509587911112698358
-      segments: 
-      - 0
-      version: "0"
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: