earthquake 0.1.1 → 0.2.0

data/README.md

@@ -13,17 +13,91 @@ Install
 Usage
 ----
 
-### Run
+### Launch
 
     $ earthquake
 
+Commands
+----
+
+### Tweet
+
+    ⚡ Hello World!
+
+### Searth
+
+    ⚡ :search #ruby
+
+### Eval
+
+    ⚡ :eval Time.now
+
+### Exit
+
+    ⚡ :exit
+
+### Restart
+
+    ⚡ :restart
+
+And there are more commands!
+
+Customize
+----
+
+The config file is '~/.earthquake/config'.
+
+### Changing the colors
+
+    Earthquake.config[:colors] = (31..36).to_a - [34]
+
+The blue is excluded.
+
+### Running on debug mode
+
+    Earthquake.config[:debug] = true
+
+デバッグモードで動作しているとき、コードの修正は即座に反映される（正確にはコマンドの実行の直前にリロードされる）。
+
+### Defining your commands
+
+A command named 'foo':
+
+    Earthquake.init do
+      command :foo do
+        puts "foo!"
+      end
+    end
+
+Handle the command args:
+
+    Earthquake.init do
+      command :hi do |m|
+        puts "Hi #{m[1]}!"
+      end
+    end
+
+The 'm' is a MatchData.
+
+Using regexp:
+
+    Earthquake.init do
+      # Usage: :add 10 20
+      command %r|^:add (\d+)\s+(\d+)|, :as => :add do |m|
+        puts m[1].to_i + m[2].to_i
+      end
+    end
+
 TODO
 ----
 
 * plugin system
- * filter
+* filter
 * reconnect
 * show more events
+* show retweeted status id
+* keyword tracking
+* more intelligent completion
 
 Copyright
 ----

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-03-16}
+  s.date = %q{2011-03-19}
   s.default_executable = %q{earthquake}
   s.description = %q{Twitter Client on Terminal with Twitter Streaming API.}
   s.email = %q{jugyo.org@gmail.com}
@@ -61,6 +61,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
       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_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"])
@@ -73,6 +75,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<awesome_print>, [">= 0"])
       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<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -86,6 +90,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<awesome_print>, [">= 0"])
     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<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,15 +1,15 @@
 # encoding: UTF-8
 module Earthquake
   init do
-    command :exit do |m|
+    command :exit do
       stop
     end
 
-    command :help do |m|
+    command :help do
       puts "TODO..."
     end
 
-    command :restart do |m|
+    command :restart do
       puts 'restarting...'
       exec File.expand_path('../../..//bin/earthquake', __FILE__)
     end
@@ -19,23 +19,47 @@ module Earthquake
     end
 
     # update
-    command %r|^[^/].*| do |m|
-      twitter.update(m[0]) if confirm("'#{m[0]}'")
+    command %r|^[^:].*| do |m|
+      twitter.update(m[0]) if confirm("update '#{m[0]}'")
     end
 
-    command %r|^/reply (\d+)\s+(.*)|, :as => :reply do |m|
-      # TODO
-      ap m
+    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]}")
     end
 
     command :status do |m|
-      puts_item twitter.status(m[1])
+      puts_items twitter.status(m[1])
     end
 
     command :delete do |m|
       twitter.status_destroy(m[1])
     end
 
+    command :mentions do
+      puts_items twitter.mentions.reverse
+    end
+
+    command :follow do |m|
+      twitter.friend(m[1])
+    end
+
+    command :unfollow do |m|
+      twitter.unfriend(m[1])
+    end
+
+    command :list do |m|
+      puts_items twitter.user_timeline(:screen_name => m[1]).reverse
+    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"]} }.reverse
+    end
+
     command :retweet do |m|
       twitter.retweet(m[1])
     end
@@ -47,5 +71,29 @@ module Earthquake
     command :unfavorite do |m|
       twitter.unfavorite(m[1])
     end
+
+    command :retweeted_by_me do
+      puts_items twitter.retweeted_by_me.reverse
+    end
+
+    command :retweeted_to_me do
+      puts_items twitter.retweeted_to_me.reverse
+    end
+
+    command :retweets_of_me do
+      puts_items twitter.retweets_of_me.reverse
+    end
+
+    command :block do |m|
+      twitter.block(m[1])
+    end
+
+    command :unblock do |m|
+      twitter.unblock(m[1])
+    end
+
+    command :report_spam do |m|
+      twitter.report_spam(m[1])
+    end
   end
 end

data/lib/earthquake/core.rb

@@ -15,8 +15,9 @@ module Earthquake
       inits << block
     end
 
-    def init_all
-      inits.each { |block| block.call }
+    def _init
+      load_config
+      inits.each { |block| class_eval(&block) }
       inits.clear
     end
 
@@ -24,11 +25,10 @@ module Earthquake
       loaded = ActiveSupport::Dependencies.loaded.dup
       ActiveSupport::Dependencies.clear
       loaded.each { |lib| require_dependency lib }
-      init_all
+      _init
     end
 
-    def load_config(*argv)
-      # TODO: parse argv
+    def load_config
       self.config = {
         :dir             => File.expand_path('~/.earthquake'),
         :consumer_key    => 'qOdgatiUm6HIRcdoGVqaZg',
@@ -41,9 +41,8 @@ module Earthquake
     end
 
     def start(*argv)
-      load_config(*argv)
-
-      init_all
+      # TODO: parse argv
+      _init
 
       Thread.start do
         while buf = Readline.readline("⚡ ", true)

data/lib/earthquake/input.rb

@@ -25,11 +25,15 @@ module Earthquake
     def command(pattern, options = {}, &block)
       if block
         if pattern.is_a?(String) || pattern.is_a?(Symbol)
-          command_name = "#{config[:command_prefix]}#{pattern}"
+          command_name = ":#{pattern}"
           command_names << command_name
-          pattern = /^#{Regexp.quote(command_name)}\s*(.*)$/
+          if block.arity > 0
+            pattern = %r|^#{command_name}\s+(.*)$|
+          else
+            pattern = %r|^#{command_name}$|
+          end
         end
-        command_names << "#{config[:command_prefix]}#{options[:as]}" if options[:as]
+        command_names << ":#{options[:as]}" if options[:as]
         commands << {:pattern => pattern, :block => block}
       else
         commands.detect { |c| c[:name] == name }
@@ -54,9 +58,6 @@ module Earthquake
     Readline.completion_proc = lambda { |text|
       command_names.grep /^#{Regexp.quote(text)}/
     }
-
-    config[:command_prefix] ||= '/'
-
     commands.clear
   end
 

data/lib/earthquake/output.rb

@@ -1,18 +1,25 @@
+# encoding: UTF-8
 module Earthquake
   module Output
     def output
       return if item_queue.empty?
       insert do
         while item = item_queue.shift
-          puts_item(item)
+          puts_items(item)
         end
       end
     end
 
-    def puts_item(item)
-      output_handers.each { |p| p.call(item) }
-    rescue => e
-      puts e, e.backtrace
+    def puts_items(items)
+      [items].flatten.each do |item|
+        output_handers.each do |p|
+          begin
+            p.call(item)
+          rescue => e
+            puts e, e.backtrace
+          end
+        end
+      end
     end
 
     def output_handers
@@ -36,33 +43,49 @@ module Earthquake
     end
 
     def color_of(screen_name)
-      config[:colors][screen_name.to_i(36) % config[:colors].size]
+      colors[screen_name.to_i(36) % colors.size]
+    end
+
+    def colors
+      config[:colors]
     end
   end
 
   init do
     output_handers.clear
 
-    config[:colors] = (31..36).to_a + (91..96).to_a
+    config[:colors] ||= (31..36).to_a + (91..96).to_a
 
     output_hander do |item|
-      if item["text"]
-        misc = (item["in_reply_to_status_id"] ? " (reply to #{item["in_reply_to_status_id"]})" : "")
-        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}>"
-        end
-        status = "<90>[#{item["id"].to_s.e}]</90> " +
-                 "<#{user_color}>#{item["user"]["screen_name"].e}</#{user_color}>: " +
-                 "#{text}<90>#{misc.e}</90>"
-        puts status.t
+      next unless item["text"]
+
+      misc = (item["in_reply_to_status_id"] ? " (reply to #{item["in_reply_to_status_id"]})" : "")
+      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}>"
       end
+      status = "<90>[#{item["id"].to_s.e}]</90> " +
+               "<#{user_color}>#{item["user"]["screen_name"].e}</#{user_color}>: " +
+               "#{text}<90>#{misc.e} #{source.e}</90>"
+      puts status.t
     end
 
     output_hander do |item|
-      if item["delete"]
+      next unless item["event"]
+
+      case item["event"]
+      when "follow", "block", "unblock"
+        puts "[#{item["event"]}] #{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"]}"
+      when "delete"
         puts "[deleted] #{item["delete"]["status"]["id"]}"
+      else
+        if config[:debug]
+          ap item
+        end
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +09:00
+date: 2011-03-19 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,8 +91,30 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: twitter_oauth
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: termcolor
+  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: 
     - - ~>
@@ -100,10 +122,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,10 +133,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,10 +144,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,7 +155,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id013
 description: Twitter Client on Terminal with Twitter Streaming API.
 email: jugyo.org@gmail.com
 executables: 
@@ -178,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2067108568798120051
+      hash: 2518256249527376929
       segments: 
       - 0
       version: "0"