earthquake 0.2.2 → 0.2.3

data/README.md

@@ -91,13 +91,12 @@ The 'm' is a MatchData.
 TODO
 ----
 
-* plugin system
 * filter
-* reconnect
-* show more events
-* show retweeted status id
+* plugin system
 * keyword tracking
 * more intelligent completion
+* spec
+* typable id
 
 Copyright
 ----

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/earthquake.gemspec

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

data/lib/earthquake/commands.rb

@@ -11,6 +11,7 @@ module Earthquake
 
     command :restart do
       puts 'restarting...'
+      stop
       exec File.expand_path('../../..//bin/earthquake', __FILE__)
     end
 
@@ -95,5 +96,9 @@ module Earthquake
     command :report_spam do |m|
       twitter.report_spam(m[1])
     end
+
+    command :reconnect do
+      reconnect
+    end
   end
 end

data/lib/earthquake/core.rb

@@ -54,58 +54,90 @@ module Earthquake
 
     def start(*argv)
       _init
+      restore_history
 
-      Thread.start do
-        while buf = Readline.readline("⚡ ", true)
-          input(buf.strip)
+      EventMachine::run do
+        Thread.start do
+          while buf = Readline.readline("⚡ ", true)
+            Readline::HISTORY.pop if buf.empty?
+            input(buf.strip)
+          end
         end
-      end
 
-      Thread.start do
-        loop do
-          if Readline.line_buffer.nil? || Readline.line_buffer.empty?
-            output
-            sleep 1
-          else
-            sleep 2
+        Thread.start do
+          loop do
+            if Readline.line_buffer.nil? || Readline.line_buffer.empty?
+              output
+              sleep 1
+            else
+              sleep 2
+            end
           end
         end
+
+        reconnect
+
+        trap('TERM') { stop }
       end
+    end
+
+    def reconnect
+      item_queue.clear
+      start_stream(:host  => 'userstream.twitter.com', :path  => '/2/user.json', :ssl => true)
+    end
+
+    def start_stream(options)
+      stop_stream
 
-      EventMachine::run {
-        @stream = ::Twitter::JSONStream.connect(
-          :ssl   => true,
-          :host  => 'userstream.twitter.com',
-          :path  => '/2/user.json',
-          :oauth => config.slice(:consumer_key, :consumer_secret).merge(:access_key => config[:token], :access_secret => config[:secret])
+      options = {
+        :oauth => config.slice(:consumer_key, :consumer_secret).merge(
+          :access_key => config[:token], :access_secret => config[:secret]
         )
+      }.merge(options)
 
-        @stream.each_item do |item|
-          item_queue << JSON.parse(item)
-        end
+      @stream = ::Twitter::JSONStream.connect(options)
 
-        @stream.on_error do |message|
-          $stdout.print "error: #{message}\n"
-          $stdout.flush
-        end
+      @stream.each_item do |item|
+        item_queue << JSON.parse(item)
+      end
 
-        @stream.on_reconnect do |timeout, retries|
-          $stdout.print "reconnecting in: #{timeout} seconds\n"
-          $stdout.flush
-        end
+      @stream.on_error do |message|
+        notify "error: #{message}"
+      end
 
-        @stream.on_max_reconnects do |timeout, retries|
-          $stdout.print "Failed after #{retries} failed reconnects\n"
-          $stdout.flush
-        end
+      @stream.on_reconnect do |timeout, retries|
+        notify "reconnecting in: #{timeout} seconds"
+      end
 
-        trap('TERM') { stop }
-      }
+      @stream.on_max_reconnects do |timeout, retries|
+        notify "Failed after #{retries} failed reconnects"
+      end
+    end
+
+    def stop_stream
+      @stream.stop if @stream
     end
 
     def stop
-      @stream.stop
-      EventMachine.stop if EventMachine.reactor_running? 
+      stop_stream
+      EventMachine.stop_event_loop
+      store_history
+    end
+
+    def store_history
+      history_size = config[:history_size] || 1000
+      File.open(File.join(config[:dir], 'history'), 'w') do |file|
+        lines = Readline::HISTORY.to_a[([Readline::HISTORY.size - history_size, 0].max)..-1]
+        puts lines
+        file.print(lines.join("\n"))
+      end
+    end
+
+    def restore_history
+      history_file = File.join(config[:dir], 'history')
+      if File.exists?(history_file)
+        File.read(history_file).split(/\n/).each { |line| Readline::HISTORY << line }
+      end
     end
 
     def notify(message)

data/lib/earthquake/output.rb

@@ -59,7 +59,13 @@ module Earthquake
     output_hander do |item|
       next unless item["text"]
 
-      misc = (item["in_reply_to_status_id"] ? " (reply to #{item["in_reply_to_status_id"]})" : "")
+      if item["in_reply_to_status_id"]
+        misc = " (reply to #{item["in_reply_to_status_id"]})"
+      elsif item["retweeted_status"]
+        misc = " (retweet of #{item["retweeted_status"]["id"]})"
+      else
+        misc = ""
+      end
       source = item["source"] =~ />(.*)</ ? $1 : 'web'
       user_color = color_of(item["user"]["screen_name"])
       text = item["text"].e.gsub(/[@#]([0-9A-Za-z_]+)/) do |i|

metadata

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