earthquake 0.7.0 → 0.7.1

data/README.md

@@ -130,6 +130,10 @@ Blue is excluded.
       :url => [4, 34]
     }
 
+### HTTP proxy support
+
+Please set environment variable *http_proxy* if you want earthquake to use http proxy.
+    
 Desktop Notifications
 ----
 
@@ -245,7 +249,7 @@ The 'm' is a MatchData.
 TODO
 ----
 
-* improve completion
+* alias
 * mark my tweet
 * Earthquake should parse ARGV
 * ruby1.9nize

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/bin/earthquake

@@ -10,7 +10,10 @@ 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 'pathname'
+eq_dir = Pathname.new(File.expand_path('../..', __FILE__)).realpath
+
+$:.unshift eq_dir.join('lib') if $0 == __FILE__
 
 print "\e[31m"
 puts %q{
@@ -20,7 +23,7 @@ puts %q{
 |  __/ (_| | |  | |_| | | | (_| | |_| | (_| |   <  __/
  \___|\__,_|_|   \__|_| |_|\__, |\__,_|\__,_|_|\_\___|
                               |_|           }.
-gsub(/^\n/, '') + "v#{File.read(File.expand_path('../../VERSION', __FILE__))}".rjust(10) + "\n\n"
+gsub(/^\n/, '') + "v#{eq_dir.join('VERSION').read}".rjust(10) + "\n\n"
 print "\e[0m"
 
 require 'earthquake'

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-05-26}
   s.default_executable = %q{earthquake}
   s.description = %q{Twitter Client on Terminal with Twitter Streaming API.}
   s.email = %q{jugyo.org@gmail.com}

data/lib/earthquake/commands.rb

@@ -28,7 +28,7 @@ Earthquake.init do
     input(":update #{m[0]}")
   end
 
-  command %r|^:reply (\d+)\s+(.*)|, :as => :reply do |m|
+  command %r|^:reply\s+(\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"]
@@ -88,7 +88,7 @@ Earthquake.init do
   end
 
   command :search do |m|
-    puts_items twitter.search(m[1])["results"].each { |s|
+    puts_items twitter.search(m[1], config[:search_options] || {})["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|
@@ -247,4 +247,8 @@ Earthquake.init do
   command :edit_config do
     system ENV["EDITOR"] + " #{config[:file]}"
   end
+
+  command %r|^:alias\s+:?(\w+)\s+:?(\w+)|, :as => :alias do |m|
+    alias_command m[1], m[2]
+  end
 end

data/lib/earthquake/core.rb

@@ -130,7 +130,8 @@ module Earthquake
 
       options = {
         :oauth => config.slice(:consumer_key, :consumer_secret).merge(
-          :access_key => config[:token], :access_secret => config[:secret]
+          :access_key => config[:token], :access_secret => config[:secret],
+          :proxy => ENV['http_proxy']
         )
       }.merge(options)
 

data/lib/earthquake/get_access_token.rb

@@ -4,7 +4,8 @@ module Earthquake
       consumer = OAuth::Consumer.new(
         self.config[:consumer_key],
         self.config[:consumer_secret],
-        :site => 'https://api.twitter.com'
+        :site => 'https://api.twitter.com',
+        :proxy => ENV['http_proxy']
       )
       request_token = consumer.get_request_token
 
@@ -28,4 +29,4 @@ module Earthquake
   end
 
   extend GetAccessToken
-end
+end

data/lib/earthquake/input.rb

@@ -27,6 +27,15 @@ module Earthquake
       completions << block
     end
 
+    def command_aliases
+      @command_aliases ||= {}
+    end
+
+    def alias_command(name, target)
+      command_aliases[name.to_s] = target.to_s
+      command_names << ":#{name}"
+    end
+
     def input(text)
       return if text.empty?
 
@@ -107,20 +116,29 @@ module Earthquake
 
     completion do |text|
       regexp = /^#{Regexp.quote(text)}/
-
       results = command_names.grep(regexp)
-
-      Readline::HISTORY.reverse_each.take(config[:history_size]).inject(results){|r, line|
+      history = Readline::HISTORY.reverse_each.take(config[:history_size]) | @tweets_for_completion
+      history.inject(results){|r, line|
         r | line.split.grep(regexp)
       }
     end
 
+    @tweets_for_completion ||= []
+
+    output do |item|
+      next unless item["text"]
+      @tweets_for_completion << [item["user"]["screen_name"], item["text"]].join(" ")
+      @tweets_for_completion.shift if @tweets_for_completion.size > config[:history_size]
+    end
+
     input_filter do |text|
-      if text =~ %r|^:|
-        text.gsub(/\$\w+/) { |var| var2id(var) || var }
-      else
-        text
+      if text =~ %r|^:(\w+)|
+        if target = command_aliases[$1]
+          text = text.sub(%r|^:\w+|, ":#{target}")
+        end
+        text = text.gsub(/\$\w+/) { |var| var2id(var) || var }
       end
+      text
     end
   end
 

data/lib/earthquake/twitter.rb

@@ -31,8 +31,26 @@ module Earthquake
         end
         alias_method_chain m, :cache
       end
+
+      def initialize(options = {})
+        @consumer_key = options[:consumer_key]
+        @consumer_secret = options[:consumer_secret]
+        @token = options[:token]
+        @secret = options[:secret]
+        @proxy = ENV['http_proxy']
+      end
+
+      def consumer
+        options = { :site => 'http://api.twitter.com' }
+        options.update( :proxy => @proxy ) if @proxy
+        @consumer ||= OAuth::Consumer.new(
+          @consumer_key,
+          @consumer_secret,
+          options
+        )
+      end
     end
   end
 
   extend Twitter
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 +09:00
+date: 2011-05-26 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency