earthquake 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-03-30}
+  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}
@@ -60,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.6.2}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Twitter Client on Terminal.}
   s.test_files = [
     "spec/earthquake_spec.rb",

data/lib/earthquake/commands.rb

@@ -170,15 +170,13 @@ module Earthquake
     end
 
     command :thread do |m|
-      indent = 0
-      tweet = twitter.status(m[1])
-      puts_items tweet
-      while tweet["in_reply_to_status_id"]
-        indent += 1
-        tweet = twitter.status(tweet["in_reply_to_status_id"])
-        tweet["_mark"] = "  " * indent
-        puts_items tweet
+      thread = [twitter.status(m[1])]
+      while reply = thread.last["in_reply_to_status_id"]
+        thread << twitter.status(reply)
       end
+      puts_items thread.reverse_each.with_index{|tweet, indent|
+        tweet["_mark"] = "  " * indent
+      }
     end
 
     command :sh do

data/lib/earthquake/core.rb

@@ -48,12 +48,12 @@ module Earthquake
 
     def load_config
       # TODO: parse argv
-      config.merge!(
-        :dir             => File.expand_path('~/.earthquake'),
-        :plugin_dir      => File.expand_path('~/.earthquake/plugin'),
-        :consumer_key    => 'RmzuwQ5g0SYObMfebIKJag',
-        :consumer_secret => 'V98dYYmWm9JoG7qfOF0jhJaVEVW3QhGYcDJ9JQSXU'
-      )
+      config[:dir]              ||= File.expand_path(ARGV[0] || '~/.earthquake')
+      config[:time_format]      ||= Time::DATE_FORMATS[:short]
+      config[:plugin_dir]       ||= File.join(config[:dir], 'plugin')
+      config[:file]             ||= File.join(config[:dir], 'config')
+      config[:consumer_key]     ||= 'RmzuwQ5g0SYObMfebIKJag'
+      config[:consumer_secret]  ||= 'V98dYYmWm9JoG7qfOF0jhJaVEVW3QhGYcDJ9JQSXU'
 
       [config[:dir], config[:plugin_dir]].each do |dir|
         unless File.exists?(dir)
@@ -61,14 +61,12 @@ module Earthquake
         end
       end
 
-      config[:file] ||= File.join(config[:dir], 'config')
-
-      unless File.exists?(config[:file])
+      if File.exists?(config[:file])
+        load config[:file]
+      else
         File.open(config[:file], 'w')
       end
 
-      load config[:file]
-
       get_access_token unless self.config[:token] && self.config[:secret]
     end
 
@@ -83,8 +81,8 @@ module Earthquake
     end
 
     def start(*argv)
-      _once
       _init
+      _once
       restore_history
 
       EventMachine::run do
@@ -154,7 +152,6 @@ module Earthquake
     def stop
       stop_stream
       EventMachine.stop_event_loop
-      store_history
     end
 
     def store_history
@@ -191,8 +188,10 @@ module Earthquake
     end
 
     def notify(message, options = {:title => 'earthquake'})
+      message = message.is_a?(String) ? message : message.inspect
       Notify.notify options[:title], message
     end
+    alias_method :n, :notify
   end
 
   extend Core

data/lib/earthquake/get_access_token.rb

@@ -12,7 +12,7 @@ module Earthquake
       Launchy::Browser.run(request_token.authorize_url)
 
       print "2) Enter the PIN: "
-      pin = gets.strip
+      pin = STDIN.gets.strip
 
       access_token = request_token.get_access_token(:oauth_verifier => pin)
       config[:token] = access_token.token

data/lib/earthquake/input.rb

@@ -26,6 +26,8 @@ module Earthquake
         error e
       end
 
+      return if text.empty?
+
       begin
         text = text.gsub(/\$\w+/) do |var|
           var2id(var) || var
@@ -36,6 +38,8 @@ module Earthquake
         elsif !text.empty?
           puts "Command not found".c(43)
         end
+
+        store_history
       rescue Exception => e
         error e
       end
@@ -98,9 +102,7 @@ module Earthquake
       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 += Readline::HISTORY.to_a[range].map { |line| line.split(/\s+/) }.flatten.grep(regexp)
 
       results
     end

data/lib/earthquake/output.rb

@@ -76,8 +76,7 @@ module Earthquake
       elsif item["retweeted_status"]
         info << "(retweet of #{id2var(item["retweeted_status"]["id"])})"
       end
-      # NOTE: customizing time format: Time::DATE_FORMATS[:short] = '%m/%d/%y %H:%M %p'
-      info << Time.parse(item["created_at"]).to_s(:short)
+      info << Time.parse(item["created_at"]).strftime(config[:time_format])
       if item["_detail"] && item["source"]
         info << (item["source"].u =~ />(.*)</ ? $1 : 'web')
       end

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +09:00
+date: 2011-03-28 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Twitter Client on Terminal.