earthquake 0.4.9 → 0.5.0

data/README.md

@@ -35,10 +35,28 @@ Commands
 
     ⚡ Hello World!
 
+### Show
+
+    ⚡ :status $xx
+
+**$xx** is the alias of tweet id.
+
+### Delete
+
+    ⚡ :delete $xx
+
+### Reply
+
+    ⚡ :reply $xx hi!
+
+### Retweet
+
+    ⚡ :retweet $xx
+
 ### Timeline
 
     ⚡ :recent
-    ⚡ :recent twitter
+    ⚡ :recent jugyo
 
 ### Search
 
@@ -65,7 +83,7 @@ And there are more commands!
 Customize
 ----
 
-The config file is '~/.earthquake/config'.
+The config file is **~/.earthquake/config**.
 
 ### Changing the colors
 
@@ -76,7 +94,7 @@ The blue is excluded.
 Plugin
 ----
 
-"~/.earthquake/plugin" is the directory for plugins.
+**~/.earthquake/plugin** is the directory for plugins.
 At launch, Earthquake tries to load files under this directory.
 The block that is specified for Earthquake.init will be reloaded at any command line input.
 
@@ -158,10 +176,9 @@ The 'm' is a MatchData.
 TODO
 ----
 
-* dealing with direct messages
 * more intelligent completion
-* typable id
 * spec
+* change the config dir by ARGV
 
 Copyright
 ----

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.5.0

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.4.9"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-03-27}
+  s.date = %q{2011-03-28}
   s.default_executable = %q{earthquake}
   s.description = %q{Twitter Client on Terminal with Twitter Streaming API.}
   s.email = %q{jugyo.org@gmail.com}
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/earthquake/core.rb",
     "lib/earthquake/ext.rb",
     "lib/earthquake/get_access_token.rb",
+    "lib/earthquake/id_var.rb",
     "lib/earthquake/input.rb",
     "lib/earthquake/output.rb",
     "lib/earthquake/twitter.rb",
@@ -59,7 +60,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.3.7}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Twitter Client on Terminal.}
   s.test_files = [
     "spec/earthquake_spec.rb",
@@ -67,7 +68,6 @@ Accordingly that, You should renew the access token if it is old.
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/earthquake.rb

@@ -22,6 +22,7 @@
   get_access_token
   twitter
   commands
+  id_var
 ).each { |name| require_dependency File.expand_path("../earthquake/#{name}", __FILE__) }
 
 Thread.abort_on_exception = true

data/lib/earthquake/commands.rb

@@ -35,7 +35,8 @@ module Earthquake
     end
 
     command :status do |m|
-      puts_items twitter.status(m[1])
+      # TODO: show reply to statuses
+      puts_items twitter.status(m[1]).tap { |s| s["_detail"] = true }
     end
 
     command :delete do |m|

data/lib/earthquake/id_var.rb

@@ -0,0 +1,50 @@
+module Earthquake
+  module IdVar
+    attr_accessor :id_var
+
+    def id2var(id)
+      id_var.id2var(id)
+    end
+
+    def var2id(var)
+      id_var.var2id(var)
+    end
+
+    class Gen
+      def initialize(vars = ('aa'..'zz').to_a, prefix = '$')
+        if not vars.kind_of?(Array)
+          raise ArgumentError, 'vars should be an Array'
+        elsif vars.empty?
+          raise ArgumentError, 'vars should not be empty'
+        end
+        @vars = vars.map { |var| prefix + var }
+        @table = {}
+        @rtable = {}
+        @prefix = prefix
+      end
+
+      def var2id(var)
+        @table[var]
+      end
+
+      def id2var(id)
+        @rtable[id] || self.next(id)
+      end
+
+      def next(id)
+        var = @vars.shift
+        @vars.push var
+        @rtable.delete(@table[var])
+        @table[var] = id
+        @rtable[id] = var
+        var
+      end
+    end
+  end
+
+  extend IdVar
+
+  init do
+    self.id_var ||= IdVar::Gen.new
+  end
+end

data/lib/earthquake/input.rb

@@ -27,6 +27,10 @@ module Earthquake
       end
 
       begin
+        text = text.gsub(/\$\w+/) do |var|
+          var2id(var) || var
+        end
+
         if command = command(text)
           command[:block].call(command[:pattern].match(text))
         elsif !text.empty?

data/lib/earthquake/output.rb

@@ -70,20 +70,18 @@ module Earthquake
     output do |item|
       next unless item["text"]
 
+      info = []
       if item["in_reply_to_status_id"]
-        misc = " (reply to #{item["in_reply_to_status_id"]})"
+        info << "(reply to #{id2var(item["in_reply_to_status_id"])})"
       elsif item["retweeted_status"]
-        misc = " (retweet of #{item["retweeted_status"]["id"]})"
-      else
-        misc = ""
+        info << "(retweet of #{id2var(item["retweeted_status"]["id"])})"
       end
-
-      statuses = ["[#{item["id"].to_s}]"]
-      unless item["_stream"]
-        statuses.insert(0, "[#{Time.parse(item["created_at"]).strftime('%Y.%m.%d %X')}]")
+      info << Time.parse(item["created_at"]).strftime('%m/%d/%y %H:%M %p')
+      if item["_detail"] && item["source"]
+        info << (item["source"].u =~ />(.*)</ ? $1 : 'web')
       end
 
-      source = item["source"].u =~ />(.*)</ ? $1 : 'web' rescue ''
+      id = id2var(item["id"])
 
       text = item["text"].u
       text.gsub!(/@([0-9A-Za-z_]+)/) do |i|
@@ -102,20 +100,22 @@ module Earthquake
         end
       end
 
-      mark = item["mark"] || ""
+      mark = item["_mark"] || ""
 
       status =  [
-                  "#{mark}" + "#{statuses.join(" ")}".c(90),
+                  "#{mark}" + "[#{id}]".c(90),
                   "#{item["user"]["screen_name"].c(color_of(item["user"]["screen_name"]))}:",
                   "#{text}",
-                  "#{misc} #{source}".c(90)
-                ].join(" ")
+                  (item["user"]["protected"] ? "[P]".c(31) : nil),
+                  info.join(' - ').c(90)
+                ].compact.join(" ")
       puts status
     end
 
     output do |item|
       next unless item["event"]
 
+      # 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"]}"

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: earthquake
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 9
-  version: 0.4.9
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - jugyo
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 +09:00
+date: 2011-03-28 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -37,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -50,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -63,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -76,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -89,8 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -102,8 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -115,8 +97,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -128,8 +108,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -141,10 +119,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   prerelease: false
@@ -156,10 +130,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -171,10 +141,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
   prerelease: false
@@ -205,6 +171,7 @@ files:
 - lib/earthquake/core.rb
 - lib/earthquake/ext.rb
 - lib/earthquake/get_access_token.rb
+- lib/earthquake/id_var.rb
 - lib/earthquake/input.rb
 - lib/earthquake/output.rb
 - lib/earthquake/twitter.rb
@@ -228,23 +195,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Twitter Client on Terminal.