earthquake 0.5.6 → 0.5.7

data/Gemfile

@@ -8,6 +8,7 @@ gem 'awesome_print'
 gem 'launchy'
 gem 'oauth'
 gem 'twitter_oauth'
+gem 'slop'
 
 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)
+    slop (1.3.1)
     twitter-stream (0.1.12)
       eventmachine (>= 0.12.8)
       roauth (>= 0.0.2)
@@ -50,5 +51,6 @@ DEPENDENCIES
   notify
   oauth
   rspec (~> 2.3.0)
+  slop
   twitter-stream
   twitter_oauth

data/README.md

@@ -19,7 +19,7 @@ Features
 Install
 ----
 
-    gem install earthquake
+    $ gem install earthquake
 
 Usage
 ----
@@ -91,18 +91,27 @@ And there are more commands!
 Configuration
 ----
 
+The default earthquake director is ~/.earthquake.
+
 The config file is **~/.earthquake/config**.
 
+### Changing the earthquake directory
+
+You can change the directory at launch as below:
+
+    $ earthquake ~/.earthquake_foo
+
 ### Changing the colors
 
+    # ~/.earthquake/config
     Earthquake.config[:colors] = (31..36).to_a - [34]
 
-The blue is excluded.
+Blue is excluded.
 
-Desktop Notification
+Desktop Notifications
 ----
 
-To enable desktop notification, install whichever below:
+To enable desktop notifications, install one of the following:
 
 * ruby-growl (gem install ruby-growl)
 * growlnotify (http://growl.info/extras.php#growlnotify)
@@ -199,7 +208,8 @@ The 'm' is a MatchData.
 TODO
 ----
 
-* change the config dir by ARGV
+* ssl for twitter_oauth
+* deal proxy
 * spec
 
 Copyright

data/Rakefile

@@ -24,8 +24,8 @@ Jeweler::Tasks.new do |gem|
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
   gem.post_install_message = %{
-The Application info as Twitter Client has been updated at 2011-03-20 15:00:00 UTC.
-Accordingly that, You should renew the access token if it is old.
+The Twitter Client application info has been updated at 2011-03-20 15:00:00 UTC.
+Accordingly, you should renew the access token if it is old.
 
 1) In ~/.earthquake/config, remove these lines:
 

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/bin/earthquake

@@ -1,4 +1,13 @@
 #!/usr/bin/env ruby
+require 'slop'
+opts = Slop.parse! :help => true do
+  banner "Usage: earthquake [options] [directory]"
+  on :d, :debug, 'Enable debug mode'
+end
+options = opts.to_hash(true)
+options.delete(:help)
+options[:dir] = ARGV.shift unless ARGV.empty?
+
 $:.unshift(File.expand_path('../../lib', __FILE__)) if $0 == __FILE__
 require 'earthquake'
-Earthquake.start(ARGV)
+Earthquake.start(options)

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-03-31}
   s.default_executable = %q{earthquake}
   s.description = %q{Twitter Client on Terminal with Twitter Streaming API.}
   s.email = %q{jugyo.org@gmail.com}
@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jugyo/earthquake}
   s.licenses = ["MIT"]
   s.post_install_message = %q{
-The Application info as Twitter Client has been updated at 2011-03-20 15:00:00 UTC.
-Accordingly that, You should renew the access token if it is old.
+The Twitter Client application info has been updated at 2011-03-20 15:00:00 UTC.
+Accordingly, you should renew the access token if it is old.
 
 1) In ~/.earthquake/config, remove these lines:
 
@@ -79,6 +79,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<slop>, [">= 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"])
@@ -91,6 +92,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<slop>, [">= 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,6 +106,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<slop>, [">= 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

@@ -1,190 +1,197 @@
 # encoding: UTF-8
-module Earthquake
-  init do
-    command :exit do
-      stop
-    end
+Earthquake.init do
+  command :exit do
+    stop
+  end
 
-    command :help do
-      system 'less', File.expand_path('../../../README.md', __FILE__)
-    end
+  command :help do
+    system 'less', File.expand_path('../../../README.md', __FILE__)
+  end
 
-    command :restart do
-      puts 'restarting...'
-      stop
-      exec File.expand_path('../../../bin/earthquake', __FILE__)
-    end
+  command :restart do
+    puts 'restarting...'
+    stop
+    exec File.expand_path('../../../bin/earthquake', __FILE__)
+  end
 
-    command :eval do |m|
-      ap eval(m[1])
-    end
+  command :eval do |m|
+    ap eval(m[1])
+  end
 
-    # update
-    command %r|^[^:\$].*| do |m|
-      async { twitter.update(m[0]) } if confirm("update '#{m[0]}'")
-    end
+  command :update do |m|
+    async { twitter.update(m[1]) } if confirm("update '#{m[1]}'")
+  end
 
-    command %r|^:reply (\d+)\s+(.*)|, :as => :reply do |m|
-      in_reply_to_status_id = m[1]
-      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}'", "reply '#{text}'"].join("\n"))
-        async { twitter.update(text, :in_reply_to_status_id => in_reply_to_status_id) }
-      end
-    end
+  command %r|^[^:\$].*| do |m|
+    input(":update #{m[0]}")
+  end
 
-    # $xx hi!
-    command %r|^(\$[^\s]+)\s+(.*)$| do |m|
-      input(":reply #{m[1..2].join(' ')}")
+  command %r|^:reply (\d+)\s+(.*)|, :as => :reply do |m|
+    in_reply_to_status_id = m[1]
+    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"]}'", "reply '#{text}'"].join("\n"))
+      async { twitter.update(text, :in_reply_to_status_id => in_reply_to_status_id) }
     end
+  end
 
-    command :status do |m|
-      # TODO: show reply to statuses
-      puts_items twitter.status(m[1]).tap { |s| s["_detail"] = true }
-    end
+  # $xx hi!
+  command %r|^(\$[^\s]+)\s+(.*)$| do |m|
+    input(":reply #{m[1..2].join(' ')}")
+  end
 
-    # $xx
-    command %r|^(\$[^\s]+)$| do |m|
-      input(":status #{m[1]}")
-    end
+  command :status do |m|
+    # TODO: show reply to statuses
+    puts_items twitter.status(m[1]).tap { |s| s["_detail"] = true }
+  end
 
-    command :delete do |m|
-      tweet = twitter.status(m[1])
-      async { twitter.status_destroy(m[1]) } if confirm("delete '#{tweet["text"]}'")
-    end
+  # $xx
+  command %r|^(\$[^\s]+)$| do |m|
+    input(":status #{m[1]}")
+  end
 
-    command :mentions do
-      puts_items twitter.mentions
-    end
+  command :delete do |m|
+    tweet = twitter.status(m[1])
+    async { twitter.status_destroy(m[1]) } if confirm("delete '#{tweet["text"]}'")
+  end
 
-    command :follow do |m|
-      async { twitter.friend(m[1]) }
-    end
+  command :mentions do
+    puts_items twitter.mentions
+  end
 
-    command :unfollow do |m|
-      async { twitter.unfriend(m[1]) }
-    end
+  command :follow do |m|
+    async { twitter.friend(m[1]) }
+  end
 
-    command :recent do
-      puts_items twitter.home_timeline
-    end
+  command :unfollow do |m|
+    async { twitter.unfriend(m[1]) }
+  end
 
-    # :recent jugyo
-    command %r|^:recent\s+([^\/\s]+)$|, :as => :recent do |m|
-      puts_items twitter.user_timeline(:screen_name => m[1])
-    end
+  command :recent do
+    puts_items twitter.home_timeline
+  end
 
-    # :recent yugui/ruby-committers
-    command %r|^:recent\s+([^\s]+)\/([^\s]+)$|, :as => :recent do |m|
-      puts_items twitter.list_statuses(m[1], m[2])
-    end
+  # :recent jugyo
+  command %r|^:recent\s+([^\/\s]+)$|, :as => :recent do |m|
+    puts_items twitter.user_timeline(:screen_name => m[1])
+  end
 
-    command :user do |m|
-      ap twitter.show(m[1]).slice(*%w(id screen_name name profile_image_url description url location time_zone lang protected))
-    end
+  # :recent yugui/ruby-committers
+  command %r|^:recent\s+([^\s]+)\/([^\s]+)$|, :as => :recent do |m|
+    puts_items twitter.list_statuses(m[1], m[2])
+  end
+
+  command :user do |m|
+    ap twitter.show(m[1]).slice(*%w(id screen_name name profile_image_url description url location time_zone lang protected))
+  end
 
-    command :search do |m|
-      puts_items twitter.search(m[1])["results"].each { |s|
-        s["user"] = {"screen_name" => s["from_user"]}
-        s["_disable_cache"] = true
-        words = m[1].split(/\s+/).reject{|x| x[0] =~ /^-|^(OR|AND)$/ }.map{|x|
-          case x
-          when /^from:(.+)/, /^to:(.+)/
-            $1
-          else
-            x
-          end
-        }
-        s["_highlights"] = words
+  command :search do |m|
+    puts_items twitter.search(m[1])["results"].each { |s|
+      s["user"] = {"screen_name" => s["from_user"]}
+      s["_disable_cache"] = true
+      words = m[1].split(/\s+/).reject{|x| x[0] =~ /^-|^(OR|AND)$/ }.map{|x|
+        case x
+        when /^from:(.+)/, /^to:(.+)/
+          $1
+        else
+          x
+        end
       }
-    end
+      s["_highlights"] = words
+    }
+  end
 
-    command %r|^:retweet\s+(\d+)$|, :as => :retweet do |m|
-      target = twitter.status(m[1])
-      if confirm("retweet 'RT @#{target["user"]["screen_name"]}: #{target["text"].e}'")
-        async { twitter.retweet(m[1]) }
-      end
+  command %r|^:retweet\s+(\d+)$|, :as => :retweet do |m|
+    target = twitter.status(m[1])
+    if confirm("retweet 'RT @#{target["user"]["screen_name"]}: #{target["text"]}'")
+      async { twitter.retweet(m[1]) }
     end
+  end
 
-    command %r|^:retweet\s+(\d+)\s+(.*)$|, :as => :retweet do |m|
-      target = twitter.status(m[1])
-      text = "#{m[2]} RT @#{target["user"]["screen_name"]}: #{target["text"].e} (#{target["id"]})"
-      if confirm("unofficial retweet '#{text}'")
-        async { twitter.update(text) }
-      end
+  command %r|^:retweet\s+(\d+)\s+(.*)$|, :as => :retweet do |m|
+    target = twitter.status(m[1])
+    text = "#{m[2]} RT @#{target["user"]["screen_name"]}: #{target["text"]} (#{target["id"]})"
+    if confirm("unofficial retweet '#{text}'")
+      async { twitter.update(text) }
     end
+  end
 
-    command :favorite do |m|
+  command :favorite do |m|
+    tweet = twitter.status(m[1])
+    if confirm("favorite '#{tweet["user"]["screen_name"]}: #{tweet["text"]}'")
       async { twitter.favorite(m[1]) }
     end
+  end
 
-    command :unfavorite do |m|
+  command :unfavorite do |m|
+    tweet = twitter.status(m[1])
+    if confirm("unfavorite '#{tweet["user"]["screen_name"]}: #{tweet["text"]}'")
       async { twitter.unfavorite(m[1]) }
     end
+  end
 
-    command :retweeted_by_me do
-      puts_items twitter.retweeted_by_me
-    end
+  command :retweeted_by_me do
+    puts_items twitter.retweeted_by_me
+  end
 
-    command :retweeted_to_me do
-      puts_items twitter.retweeted_to_me
-    end
+  command :retweeted_to_me do
+    puts_items twitter.retweeted_to_me
+  end
 
-    command :retweets_of_me do
-      puts_items twitter.retweets_of_me
-    end
+  command :retweets_of_me do
+    puts_items twitter.retweets_of_me
+  end
 
-    command :block do |m|
-      async { twitter.block(m[1]) }
-    end
+  command :block do |m|
+    async { twitter.block(m[1]) }
+  end
 
-    command :unblock do |m|
-      async { twitter.unblock(m[1]) }
-    end
+  command :unblock do |m|
+    async { twitter.unblock(m[1]) }
+  end
 
-    command :report_spam do |m|
-      async { twitter.report_spam(m[1]) }
-    end
+  command :report_spam do |m|
+    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 :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 :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 %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
+  command :reconnect do
+    reconnect
+  end
 
-    command :thread do |m|
-      thread = [twitter.status(m[1])]
-      while reply = thread.last["in_reply_to_status_id"]
-        thread << twitter.status(reply)
-      end
-      puts_items thread.reverse_each.with_index{|tweet, indent|
-        tweet["_mark"] = "  " * indent
-      }
+  command :thread do |m|
+    thread = [twitter.status(m[1])]
+    while reply = thread.last["in_reply_to_status_id"]
+      thread << twitter.status(reply)
     end
+    puts_items thread.reverse_each.with_index{|tweet, indent|
+      tweet["_mark"] = "  " * indent
+    }
+  end
 
-    command :sh do
-      system ENV["SHELL"] || 'sh'
-    end
+  command :sh do
+    system ENV["SHELL"] || 'sh'
+  end
 
-    command :'!' do |m|
-      system m[1]
-    end
+  command :'!' do |m|
+    system m[1]
   end
 end

data/lib/earthquake/core.rb

@@ -47,8 +47,7 @@ module Earthquake
     end
 
     def load_config
-      # TODO: parse argv
-      config[:dir]              ||= File.expand_path(ARGV[0] || '~/.earthquake')
+      config[:dir]              ||= File.expand_path('~/.earthquake')
       config[:time_format]      ||= Time::DATE_FORMATS[:short]
       config[:plugin_dir]       ||= File.join(config[:dir], 'plugin')
       config[:file]             ||= File.join(config[:dir], 'config')
@@ -80,7 +79,8 @@ module Earthquake
       end
     end
 
-    def start(*argv)
+    def start(options = {})
+      config.merge!(options)
       _init
       _once
       restore_history

data/lib/earthquake/input.rb

@@ -3,6 +3,14 @@ require 'set'
 
 module Earthquake
   module Input
+    def input_filters
+      @input_filters ||= []
+    end
+
+    def input_filter(&block)
+      input_filters << block
+    end
+
     def commands
       @commands ||= []
     end
@@ -29,9 +37,7 @@ module Earthquake
       return if text.empty?
 
       begin
-        text = text.gsub(/\$\w+/) do |var|
-          var2id(var) || var
-        end if text =~ %r|^:|
+        input_filters.each { |f| text = f.call(text) }
 
         if command = command(text)
           command[:block].call(command[:pattern].match(text))
@@ -66,10 +72,10 @@ module Earthquake
     def confirm(message, type = :y)
       case type
       when :y
-        print "#{message} [Yn] "
+        print "#{message} [Yn] ".u
         return !(gets.strip =~ /^n$/i)
       when :n
-        print "#{message} [yN] "
+        print "#{message} [yN] ".u
         return !!(gets.strip =~ /^y$/i)
       else
         raise "type must be :y or :n"
@@ -81,6 +87,7 @@ module Earthquake
     commands.clear
     command_names.clear
     completions.clear
+    input_filters.clear
 
     Readline.basic_word_break_characters = " \t\n\"\\'`$><=;|&{(@"
 
@@ -106,6 +113,14 @@ module Earthquake
 
       results
     end
+
+    input_filter do |text|
+      if text =~ %r|^:|
+        text.gsub(/\$\w+/) { |var| var2id(var) || var }
+      else
+        text
+      end
+    end
   end
 
   extend Input

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 +09:00
+date: 2011-03-31 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,8 +102,19 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: slop
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,10 +122,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,10 +133,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,7 +144,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 description: Twitter Client on Terminal with Twitter Streaming API.
 email: jugyo.org@gmail.com
 executables: 
@@ -171,8 +182,8 @@ homepage: http://github.com/jugyo/earthquake
 licenses: 
 - MIT
 post_install_message: "\n\
-  The Application info as Twitter Client has been updated at 2011-03-20 15:00:00 UTC.\n\
-  Accordingly that, You should renew the access token if it is old.\n\n\
+  The Twitter Client application info has been updated at 2011-03-20 15:00:00 UTC.\n\
+  Accordingly, you should renew the access token if it is old.\n\n\
   1) In ~/.earthquake/config, remove these lines:\n\n    Earthquake.config[:token] = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n    Earthquake.config[:secret] = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n\n\
   2) Launch earthquake:\n\n    $ earthquake\n\n"
 rdoc_options: []