earthquake 0.9.0 → 0.9.1

data/README.md

@@ -142,6 +142,37 @@ Commands
     # return to normal user stream
     ⚡ :filter off
 
+### Show config
+
+    # All config
+    ⚡ :config
+
+    # config for :key
+    ⚡ :config key
+
+### Set config
+
+    # set config for :key to (evaluated) value
+    ⚡ :config key 1 + 1
+    {
+        :key => 2
+    }
+    ⚡ :config key {foo: 1, bar: 2}
+    {
+        :key => {
+            :foo => 1,
+            :bar => 2
+        }
+    }
+    # merge new config if both are Hash
+    ⚡ :config key {bar: 3}
+    {
+        :key => {
+            :foo => 1,
+            :bar => 3
+        }
+    }
+
 And more!
 
 Configuration

data/bin/earthquake

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+gem 'slop', '~> 2.0'
 require 'slop'
 
 argv = ARGV.dup
@@ -7,6 +8,7 @@ slop.banner "Usage: earthquake [options] [directory]"
 slop.on :d, :debug, 'Enable debug mode'
 slop.on :n, :'no-logo', 'No Logo'
 slop.on :c, :command, "Invoke a command and exit", true
+slop.on :'--no-stream', "No stream mode"
 begin
   slop.parse!(argv)
 rescue => e

data/lib/earthquake/commands.rb

@@ -42,6 +42,29 @@ Earthquake.init do
     ⚡ :help :retweet
   HELP
 
+  # :config
+
+  command :config do
+    ap config
+  end
+
+  command :config do |m|
+    key, value = m[1].split(/\s+/, 2)
+    key = key.to_sym
+    if value
+      value = eval(value)
+      preferred_config.store(key, value)
+      reload
+    end
+    ap config.slice(key)
+  end
+
+  help :config, 'show or set config', <<-HELP
+    ⚡ :config
+    ⚡ :config key
+    ⚡ :config key value
+  HELP
+
   # :restart
 
   command :restart do
@@ -85,16 +108,28 @@ Earthquake.init do
     ⚡ :aa :status $aa
   HELP
 
+  def self._eval_as_ruby_string(text)
+    return text unless config[:eval_as_ruby_string_for_update]
+    begin
+      text = eval(%|"#{text.gsub('"', '\"')}"|)
+    rescue Exception => e
+      puts e.message.c(:notice)
+    end
+    text
+  end
+
   command %r|^:update$|, :as => :update do
     puts "[input EOF (e.g. Ctrl+D) at the last]".c(:info)
     text = STDIN.gets(nil)
+    text = _eval_as_ruby_string(text)
     if text && !text.split.empty?
       async_e{ twitter.update(text) } if confirm("update above AA?")
     end
   end
 
   command :update do |m|
-    async_e { twitter.update(m[1]) } if confirm("update '#{m[1]}'")
+    text = _eval_as_ruby_string(m[1])
+    async_e { twitter.update(text) } if confirm("update '#{text}'")
   end
 
   command %r|^[^:\$].*| do |m|

data/lib/earthquake/core.rb

@@ -7,6 +7,10 @@ module Earthquake
       @config ||= {}
     end
 
+    def preferred_config
+      @preferred_config ||= {}
+    end
+
     def item_queue
       @item_queue ||= []
     end
@@ -49,22 +53,29 @@ module Earthquake
       _init
     end
 
-    def load_config
+    def default_config
       consumer = YAML.load_file(File.expand_path('../../../consumer.yml', __FILE__))
+      dir = config[:dir] || File.expand_path('~/.earthquake')
+      {
+        dir:             dir,
+        time_format:     Time::DATE_FORMATS[:short],
+        plugin_dir:      File.join(dir, 'plugin'),
+        file:            File.join(dir, 'config'),
+        prompt:          '⚡ ',
+        consumer_key:    consumer['key'],
+        consumer_secret: consumer['secret'],
+        output_interval: 1,
+        history_size:    1000,
+        api:             { :host => 'userstream.twitter.com', :path => '/2/user.json', :ssl => true },
+        confirm_type:    :y,
+        expand_url:      false,
+        thread_indent:   "  ",
+        no_data_timeout: 30
+      }
+    end
 
-      config[:dir]              ||= File.expand_path('~/.earthquake')
-      config[:time_format]      ||= Time::DATE_FORMATS[:short]
-      config[:plugin_dir]       ||= File.join(config[:dir], 'plugin')
-      config[:file]             ||= File.join(config[:dir], 'config')
-      config[:prompt]           ||= '⚡ '
-      config[:consumer_key]     ||= consumer['key']
-      config[:consumer_secret]  ||= consumer['secret']
-      config[:output_interval]  ||= 1
-      config[:history_size]     ||= 1000
-      config[:api]              ||= { :host => 'userstream.twitter.com', :path => '/2/user.json', :ssl => true }
-      config[:confirm_type]     ||= :y
-      config[:expand_url]       ||= false
-      config[:thread_indent]    ||= "  "
+    def load_config
+      config.reverse_update(default_config)
 
       [config[:dir], config[:plugin_dir]].each do |dir|
         unless File.exists?(dir)
@@ -75,7 +86,15 @@ module Earthquake
       if File.exists?(config[:file])
         load config[:file]
       else
-        File.open(config[:file], 'w')
+        File.open(config[:file], mode: 'w', perm: 0600).close
+      end
+
+      config.update(preferred_config) do |key, cur, new|
+        if Hash === cur and Hash === new
+          cur.merge(new)
+        else
+          new
+        end
       end
 
       get_access_token unless self.config[:token] && self.config[:secret]
@@ -106,7 +125,7 @@ module Earthquake
       __init(options)
       restore_history
 
-      EventMachine::run do
+      EM.run do
         Thread.start do
           while buf = Readline.readline(config[:prompt], true)
             unless Readline::HISTORY.count == 1
@@ -118,19 +137,24 @@ module Earthquake
               input(buf.strip)
             }
           end
+          # unexpected
           stop
         end
 
-        Thread.start do
-          loop do
-            if Readline.line_buffer.nil? || Readline.line_buffer.empty?
-              sync { output }
+        EM.add_periodic_timer(config[:output_interval]) do
+          if @last_data_received_at && Time.now - @last_data_received_at > config[:no_data_timeout]
+            begin
+              reconnect
+            rescue EventMachine::ConnectionError => e
+              error(e)
             end
-            sleep config[:output_interval]
+          end
+          if Readline.line_buffer.blank?
+            sync { output }
           end
         end
 
-        reconnect
+        reconnect unless options[:'no-stream'] == true
 
         trap('INT') { stop }
       end
@@ -154,6 +178,7 @@ module Earthquake
       @stream = ::Twitter::JSONStream.connect(options)
 
       @stream.each_item do |item|
+        @last_data_received_at = Time.now # for reconnect when no data
         item_queue << JSON.parse(item)
       end
 
@@ -176,7 +201,7 @@ module Earthquake
 
     def stop
       stop_stream
-      EventMachine.stop_event_loop
+      EM.stop_event_loop
     end
 
     def store_history

data/lib/earthquake/ext.rb

@@ -8,7 +8,7 @@ module Twitter
         reconnect @options[:host], @options[:port]
         start_tls if @options[:ssl]
       else
-        EventMachine.add_timer(timeout) do
+        EM.add_timer(timeout) do
           reconnect @options[:host], @options[:port]
           start_tls if @options[:ssl]
         end

data/lib/earthquake/input.rb

@@ -124,12 +124,12 @@ module Earthquake
 
     completion do |text|
       regexp = /^#{Regexp.quote(text)}/
-      results = (command_names + command_aliases.keys).grep(regexp)
-      next results if text.start_with?(?:) and (Readline.point rescue nil) == text.size
-      history = Readline::HISTORY.reverse_each.take(config[:history_size]) | @tweets_for_completion
-      history.inject(results){|r, line|
-        r | line.split.grep(regexp)
-      }
+      if text.start_with?(?:) && Readline.line_buffer.strip == text
+        (command_names + command_aliases.keys).grep(regexp)
+      else
+        history = Readline::HISTORY.reverse_each.take(config[:history_size]) | @tweets_for_completion
+        history.inject([]){ |r, line| r | line.split.grep(regexp) }
+      end
     end
 
     @tweets_for_completion ||= []

data/lib/earthquake/output.rb

@@ -151,7 +151,7 @@ module Earthquake
           screen_name = twitter.info["screen_name"]
           text = "(direct message)"
         end
-        puts "%s %s: %s" % ["[delete]".c(:event), screen_name, text]
+        puts ("%s %s: %s" % ["[delete]", screen_name, text]).c(:info)
       end
     end
 

data/lib/earthquake/version.rb

@@ -1,3 +1,3 @@
 module Earthquake
-  VERSION = '0.9.0'
-end
+  VERSION = '0.9.1'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earthquake
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter-stream
@@ -231,15 +231,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -948738165396907969
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -948738165396907969
 requirements: []
 rubyforge_project: earthquake
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Terminal Twitter Client