earthquake 0.7.1 → 0.7.2

data/README.md

@@ -98,6 +98,10 @@ Commands
 
     ⚡ :plugin_install https://gist.github.com/899506
 
+### Alias
+
+    ⚡ :alias rt retweet
+
 And there are more commands!
 
 Configuration
@@ -130,6 +134,11 @@ Blue is excluded.
       :url => [4, 34]
     }
 
+### Defining aliases
+
+    # ~/.earthquake/config
+    Earthquake.alias_command :rt, :retweet
+
 ### HTTP proxy support
 
 Please set environment variable *http_proxy* if you want earthquake to use http proxy.
@@ -249,7 +258,6 @@ The 'm' is a MatchData.
 TODO
 ----
 
-* alias
 * mark my tweet
 * Earthquake should parse ARGV
 * ruby1.9nize

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/bin/earthquake

@@ -5,26 +5,37 @@ argv = ARGV.dup
 opts = Slop.parse! argv, :help => true do
   banner "Usage: earthquake [options] [directory]"
   on :d, :debug, 'Enable debug mode'
+  on :n, :'no-logo', 'No Logo'
+  on :c, :command, "Invoke an command and exit", true
 end
 options = opts.to_hash(true)
 options.delete(:help)
 options[:dir] = argv.shift unless argv.empty?
 
 require 'pathname'
-eq_dir = Pathname.new(File.expand_path('../..', __FILE__)).realpath
+eq_dir = Pathname.new(__FILE__).realpath.parent.parent
 
 $:.unshift eq_dir.join('lib') if $0 == __FILE__
 
-print "\e[31m"
-puts %q{
+command = options.delete(:command)
+no_logo = options.delete(:'no-logo')
+
+if !no_logo && !command
+  print "\e[31m"
+  puts %q{
                  _   _                       _
   ___  __ _ _ __| |_| |__   __ _ _   _  __ _| | _____
  / _ \/ _` | '__| __| '_ \ / _` | | | |/ _` | |/ / _ \
 |  __/ (_| | |  | |_| | | | (_| | |_| | (_| |   <  __/
  \___|\__,_|_|   \__|_| |_|\__, |\__,_|\__,_|_|\_\___|
                               |_|           }.
-gsub(/^\n/, '') + "v#{eq_dir.join('VERSION').read}".rjust(10) + "\n\n"
-print "\e[0m"
+  gsub(/^\n/, '') + "v#{eq_dir.join('VERSION').read}".rjust(10) + "\n\n"
+  print "\e[0m"
+end
 
 require 'earthquake'
-Earthquake.start(options)
+if command
+  Earthquake.invoke(command, options)
+else
+  Earthquake.start(options)
+end

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-05-26}
+  s.date = %q{2011-06-15}
   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

@@ -13,7 +13,8 @@ Earthquake.init do
   command :restart do
     puts 'restarting...'
     stop
-    exec File.expand_path('../../../bin/earthquake', __FILE__), *ARGV
+    args = ARGV.push '-n' unless ARGV.include?('-n')
+    exec File.expand_path('../../../bin/earthquake', __FILE__), *args
   end
 
   command :eval do |m|
@@ -88,7 +89,8 @@ Earthquake.init do
   end
 
   command :search do |m|
-    puts_items twitter.search(m[1], config[:search_options] || {})["results"].each { |s|
+    search_options = config[:search_options] ? config[:search_options].dup : {}
+    puts_items twitter.search(m[1], 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|

data/lib/earthquake/core.rb

@@ -84,10 +84,19 @@ module Earthquake
       end
     end
 
-    def start(options = {})
+    def __init(options)
       config.merge!(options)
       _init
       _once
+    end
+
+    def invoke(command, options = {})
+      __init(options)
+      input(command)
+    end
+
+    def start(options = {})
+      __init(options)
       restore_history
 
       EventMachine::run do

data/lib/earthquake/input.rb

@@ -33,7 +33,6 @@ module Earthquake
 
     def alias_command(name, target)
       command_aliases[name.to_s] = target.to_s
-      command_names << ":#{name}"
     end
 
     def input(text)
@@ -116,7 +115,7 @@ module Earthquake
 
     completion do |text|
       regexp = /^#{Regexp.quote(text)}/
-      results = command_names.grep(regexp)
+      results = (command_names + command_aliases.keys.map {|i| ":#{i}"}).grep(regexp)
       history = Readline::HISTORY.reverse_each.take(config[:history_size]) | @tweets_for_completion
       history.inject(results){|r, line|
         r | line.split.grep(regexp)

metadata

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