earthquake 0.5.3 → 0.5.4

data/README.md

@@ -37,17 +37,17 @@ Commands
 
 ### Show
 
-    ⚡ :status $xx
+    ⚡ $xx
 
 **$xx** is the alias of tweet id.
 
-### Delete
+### Reply
 
-    ⚡ :delete $xx
+    ⚡ $xx hi!
 
-### Reply
+### Delete
 
-    ⚡ :reply $xx hi!
+    ⚡ :delete $xx
 
 ### Retweet
 
@@ -174,12 +174,12 @@ The 'm' is a MatchData.
       end
     end
 
-### Defining filters
+### Defining filters for output
 
 #### Filtering by keywords
 
     Earthquake.init do
-      filter do |item|
+      output_filter do |item|
         if item["_stream"] && item["text"]
           item["text"] =~ /ruby/i
         else

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/earthquake.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]

data/lib/earthquake/commands.rb

@@ -20,7 +20,7 @@ module Earthquake
     end
 
     # update
-    command %r|^[^:].*| do |m|
+    command %r|^[^:\$].*| do |m|
       async { twitter.update(m[0]) } if confirm("update '#{m[0]}'")
     end
 
@@ -34,11 +34,21 @@ module Earthquake
       end
     end
 
+    # $xx hi!
+    command %r|^(\$[^\s]+)\s+(.*)$| do |m|
+      input(":reply #{m[1..2].join(' ')}")
+    end
+
     command :status do |m|
       # TODO: show reply to statuses
       puts_items twitter.status(m[1]).tap { |s| s["_detail"] = true }
     end
 
+    # $xx
+    command %r|^(\$[^\s]+)$| do |m|
+      input(":status #{m[1]}")
+    end
+
     command :delete do |m|
       # TODO: confirm
       async { twitter.status_destroy(m[1]) }
@@ -61,12 +71,12 @@ module Earthquake
     end
 
     # :recent jugyo
-    command %r|^:recent\s+([^\/\s]+)\s*$|, :as => :recent do |m|
+    command %r|^:recent\s+([^\/\s]+)$|, :as => :recent do |m|
       puts_items twitter.user_timeline(:screen_name => m[1])
     end
 
     # :recent yugui/ruby-committers
-    command %r|^:recent\s+([^\s]+)\/([^\s]+)\s*$|, :as => :recent do |m|
+    command %r|^:recent\s+([^\s]+)\/([^\s]+)$|, :as => :recent do |m|
       puts_items twitter.list_statuses(m[1], m[2])
     end
 

data/lib/earthquake/input.rb

@@ -29,7 +29,7 @@ module Earthquake
       begin
         text = text.gsub(/\$\w+/) do |var|
           var2id(var) || var
-        end
+        end if text =~ %r|^:|
 
         if command = command(text)
           command[:block].call(command[:pattern].match(text))
@@ -94,13 +94,14 @@ module Earthquake
     completion do |text|
       results = []
       regexp = /^#{Regexp.quote(text)}/
-      if Readline.line_buffer =~ /^\s*:\w*$/
-        results += command_names.grep(regexp)
-      end
+
+      results += command_names.grep(regexp)
+
       range = Readline::HISTORY.count >= 100 ? -100..-1 : 0..-1
       results += Readline::HISTORY.to_a[range].map { |line|
         line.gsub(/^\s*:\w/, '').split(/\s+/)
       }.flatten.grep(regexp)
+
       results
     end
   end

data/lib/earthquake/output.rb

@@ -1,12 +1,12 @@
 # encoding: UTF-8
 module Earthquake
   module Output
-    def filters
-      @filters ||= []
+    def output_filters
+      @output_filters ||= []
     end
 
-    def filter(&block)
-      filters << block
+    def output_filter(&block)
+      output_filters << block
     end
 
     def outputs
@@ -29,7 +29,7 @@ module Earthquake
 
     def puts_items(items)
       [items].flatten.reverse_each do |item|
-        next if filters.any? { |f| f.call(item) == false }
+        next if output_filters.any? { |f| f.call(item) == false }
         outputs.each do |o|
           begin
             o.call(item)
@@ -63,7 +63,7 @@ module Earthquake
 
   init do
     outputs.clear
-    filters.clear
+    output_filters.clear
 
     config[:colors] ||= (31..36).to_a + (91..96).to_a
 

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - jugyo