earthquake 0.9.4 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b67d0711b61d5ffd750f5e2c32533b376149337c
+  data.tar.gz: 99b668a42fc0220f3db351f7e74d6d9fb0e63568
+SHA512:
+  metadata.gz: fced4dd9126ee990b0cebdbb81c4ed6f33f72d1ad0aaaf251e04c07da55495cc4ca4ac1713ab4fb1421760f64cbcd2509b4476a67874fee538510fc39f086dcf
+  data.tar.gz: 2a5029a51afe819d0236de6bfc8de7d3d82bf71f0da942e48e8a1fcae0da92444dab9a62adfb4a71b62defa3b668dba9580a9f8e31ecf318fded804936885919

data/README.md

@@ -28,6 +28,7 @@ You'll need openssl and readline support with your 1.9.2. If you are
 using rvm you can run:
 
     $ rvm pkg install openssl
+    $ rvm pkg install readline
     $ rvm remove 1.9.2
     $ rvm install 1.9.2 --with-openssl-dir=$HOME/.rvm/usr \
       --with-readline-dir=$HOME/.rvm/usr

data/bin/earthquake

@@ -1,33 +1,19 @@
 #!/usr/bin/env ruby
-require 'slop'
+require 'pathname'
+$:.unshift Pathname.new(__FILE__).realpath.join('../../lib') if $0 == __FILE__
+require 'earthquake/option_parser'
+require "earthquake/version"
 
-argv = ARGV.dup
-slop = Slop.new(:strict => true, :help => true)
-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"
+option_parser = Earthquake::OptionParser.new(ARGV.dup)
+options = nil
 begin
-  slop.parse!(argv)
+  options = option_parser.parse
+rescue Earthquake::OptionParser::Help
+  exit
 rescue => e
   puts e
   exit!
 end
-options = slop.to_hash
-
-# XXX: work around slop's feature (bug?)
-options.each do |key, val|
-  val = val.nil? ? nil : true if key.to_s =~ /^no-/
-  options[key] = val
-end
-
-options.delete(:help)
-options[:dir] = argv.shift unless argv.empty?
-
-require 'pathname'
-$:.unshift Pathname.new(__FILE__).realpath.join('../../lib') if $0 == __FILE__
-require "earthquake/version"
 
 command = options.delete(:command)
 no_logo = options.delete(:'no-logo')

data/earthquake.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "awesome_print"
   s.add_runtime_dependency "launchy"
   s.add_runtime_dependency "oauth"
-  s.add_runtime_dependency "twitter_oauth", "= 0.4.3"
-  s.add_runtime_dependency "slop", "~> 3.0"
+  s.add_runtime_dependency "jugyo-twitter_oauth", "= 0.5.0.pre5"
+  s.add_runtime_dependency "slop", "~> 3.4.0"
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "bundler"
 

data/lib/earthquake/commands.rb

@@ -112,6 +112,7 @@ Earthquake.init do
     return text unless config[:eval_as_ruby_string_for_update]
     begin
       text = eval(%|"#{text.gsub('"', '\"')}"|)
+    rescue SyntaxError => e
     rescue Exception => e
       puts e.message.c(:notice)
     end
@@ -238,16 +239,14 @@ Earthquake.init do
     if user.key?("error")
       user = twitter.status(m[1])["user"] || {}
     end
-    ap user.slice(*%w(id screen_name name profile_image_url description url location time_zone lang protected))
+    ap user.slice(*%w(id_str screen_name name profile_image_url description url location time_zone lang protected statuses_count followers_count friends_count listed_count created_at))
   end
 
   help :user, "show user info"
 
   command :search do |m|
     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
+    puts_items twitter.search(m[1], search_options)['statuses'].each { |s|
       words = m[1].split(/\s+/).reject{|x| x[0] =~ /^-|^(OR|AND)$/ }.map{|x|
         case x
         when /^from:(.+)/, /^to:(.+)/
@@ -427,7 +426,9 @@ Earthquake.init do
   help :update_profile_image, "updates profile image from local file path"
 
   command %r|^:open\s+(\d+)$|, :as => :open do |m|
-    matches = URI.extract(twitter.status(m[1])["text"],["http", "https"])
+    matches = twitter.status(m[1])['retweeted_status'].nil? ? 
+      URI.extract(twitter.status(m[1])["text"],["http", "https"]) :
+      URI.extract(twitter.status(m[1])['retweeted_status']["text"],["http", "https"]) 
     unless matches.empty?
       matches.each do |match_url|
         browse match_url

data/lib/earthquake/core.rb

@@ -64,6 +64,8 @@ module Earthquake
         prompt:          '⚡ ',
         consumer_key:    consumer['key'],
         consumer_secret: consumer['secret'],
+        api_version:     '1.1',
+        secure:          true,
         output_interval: 1,
         history_size:    1000,
         api:             { :host => 'userstream.twitter.com', :path => '/2/user.json', :ssl => true },
@@ -132,7 +134,7 @@ module Earthquake
               Readline::HISTORY.pop if buf.empty? || Readline::HISTORY[-1] == Readline::HISTORY[-2]
             end
             sync {
-              reload
+              reload unless config[:reload] == false
               store_history
               input(buf.strip)
             }
@@ -246,7 +248,12 @@ module Earthquake
     end
 
     def error(e)
-      puts "[ERROR] #{e.message}\n    #{e.backtrace.join("\n    ")}".c(:notice)
+      case e
+      when Exception
+        insert "[ERROR] #{e.message}\n    #{e.backtrace.join("\n    ")}".c(:notice)
+      else
+        insert "[ERROR] #{e}".c(:notice)
+      end
     end
 
     def notify(message, options = {})

data/lib/earthquake/ext.rb

@@ -17,21 +17,6 @@ module Twitter
   end
 end
 
-module TwitterOAuth
-  class Client
-    [:get, :post, :delete].each { |m| public m }
-
-    private
-    def consumer
-      @consumer ||= OAuth::Consumer.new(
-        @consumer_key,
-        @consumer_secret,
-        { :site => 'https://api.twitter.com', :proxy => @proxy }
-      )
-    end
-  end
-end
-
 class String
   def c(*codes)
     codes = codes.flatten.map { |code|

data/lib/earthquake/input.rb

@@ -63,6 +63,7 @@ module Earthquake
           end
         end
         command_names << ":#{options[:as]}" if options[:as]
+        commands.delete_if { |_| _[:pattern] == pattern }
         commands << {:pattern => pattern, :block => block}
       else
         commands.detect {|c| c[:pattern] =~ pattern}
@@ -72,9 +73,9 @@ module Earthquake
     def confirm(message, type = config[:confirm_type])
       s = case type
           when :y
-            ask("#{message} [Yn] ".u)
+            ask(message.u.c(:notice), "[Yn] ")
           when :n
-            ask("#{message} [yN] ".u)
+            ask(message.u.c(:notice), "[yN] ")
           else
             raise "type must be :y or :n"
           end
@@ -86,9 +87,9 @@ module Earthquake
       end
     end
 
-    def ask(message)
-      print message
-      (STDIN.gets || "").chomp
+    def ask(message, prompt)
+      puts message
+      (Readline.readline(prompt) || "").chomp
     end
 
     def async_e(&block)
@@ -98,7 +99,7 @@ module Earthquake
     def handle_api_error(&block)
       result = block.call
       if result["error"]
-        notify "[ERROR] #{result["error"]}"
+        error result["error"]
       end
     end
   end

data/lib/earthquake/option_parser.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+require 'slop'
+
+module Earthquake
+  class OptionParser
+    Help = Class.new(StandardError)
+
+    def initialize(argv)
+      @argv = argv
+      @slop = setup_slop
+    end
+
+    def parse
+      @slop.parse!(@argv)
+      options = @slop.to_hash
+      raise Help if options.delete(:help)
+      options[:dir] = @argv.shift unless @argv.empty?
+      options
+    end
+
+    private
+
+    def setup_slop
+      Slop.new(:strict => true, :help => true).tap do |s|
+        s.banner 'Usage: earthquake [options] [directory]'
+        s.on :d, :debug, 'Enable debug mode'
+        s.on :n, :'no-logo', 'No Logo'
+        s.on :c, :command, 'Invoke a command and exit', :argument => true
+        s.on :'--no-stream', 'No stream mode'
+      end
+    end
+  end
+end

data/lib/earthquake/output.rb

@@ -80,7 +80,7 @@ module Earthquake
       :event  => 42,
       :url    => [4, 36]
     )
-    config[:raw_text] ||= false
+    config[:raw_text] ||= true
 
     output :tweet do |item|
       next unless item["text"]
@@ -100,9 +100,14 @@ module Earthquake
 
       id = id2var(item["id"])
 
-      text = (item["retweeted_status"] && item["truncated"] ? "RT @#{item["retweeted_status"]["user"]["screen_name"]}: #{item["retweeted_status"]["text"]}" : item["text"]).u
-      text.gsub!(/\s+/, ' ') unless config[:raw_text]
-      text.prepend("\n") if config[:raw_text]
+      text = (item["retweeted_status"] ? "RT @#{item["retweeted_status"]["user"]["screen_name"]}: #{item["retweeted_status"]["text"]}" : item["text"]).u
+      if config[:raw_text] && /\n/ =~ text
+        text.prepend("\n")
+        text.gsub!(/\n/, "\n       " + "|".c(:info))
+        text << "\n      "
+      else
+        text.gsub!(/\s+/, ' ')
+      end
       text = text.coloring(/@[0-9A-Za-z_]+/) { |i| color_of(i) }
       text = text.coloring(/(^#[^\s]+)|(\s+#[^\s]+)/) { |i| color_of(i) }
       if config[:expand_url]

data/lib/earthquake/twitter.rb

@@ -5,7 +5,7 @@ module Earthquake
   end
 
   init do
-    @twitter = TwitterOAuth::Client.new(config.slice(:consumer_key, :consumer_secret, :token, :secret))
+    @twitter = TwitterOAuth::Client.new(config.slice(:consumer_key, :consumer_secret, :token, :secret, :api_version, :secure))
 
     output do |item|
       next if item["text"].nil? || item["_disable_cache"]
@@ -31,24 +31,6 @@ 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
 

data/lib/earthquake/version.rb

@@ -1,3 +1,3 @@
 module Earthquake
-  VERSION = '0.9.4'
+  VERSION = '1.0.0'
 end

data/spec/earthquake_option_parser_spec.rb

@@ -0,0 +1,78 @@
+# encoding: UTF-8
+require 'spec_helper'
+require 'earthquake/option_parser'
+
+describe Earthquake::OptionParser do
+  describe '#parse' do
+    it 'should return an hash' do
+      options = Earthquake::OptionParser.new([]).parse
+    end
+
+    it 'parses debug option' do
+      %w{-d --debug}.each do |opt|
+        options = Earthquake::OptionParser.new([opt]).parse
+        expect(options[:debug]).to be_true
+      end
+    end
+
+    it 'parses no-logo option' do
+      %w{-n --no-logo}.each do |opt|
+        options = Earthquake::OptionParser.new([opt]).parse
+        expect(options[:'no-logo']).to be_true
+      end
+    end
+
+    it 'parses command option' do
+      %w{-c --command}.each do |opt|
+        command = 'dummy'
+        options = Earthquake::OptionParser.new([opt, command]).parse
+        expect(options[:command]).to eq(command)
+      end
+    end
+
+    it 'parses no-stream option' do
+      options = Earthquake::OptionParser.new(['--no-stream']).parse
+      expect(options[:'no-stream']).to be_true
+    end
+
+    def with_test_output_stream(out, &block)
+      old_stdout = $stderr
+      $stderr = out
+      yield
+      out.close
+    ensure
+      $stderr = old_stdout
+    end
+
+    it 'parses help option' do
+      old_stderr = $stderr
+      begin
+        $stderr = out = StringIO.new
+        Earthquake::OptionParser.new(['--help']).parse
+        out.close
+        expect(out.string).to match(/^Usage: /)
+      rescue => e
+        # do nothing
+      ensure
+        $stderr = old_stderr
+      end
+    end
+
+    it 'raises exception for invalid option' do
+      expect {
+        Earthquake::OptionParser.new(['--foo']).parse
+      }.to raise_exception
+    end
+
+    it 'removes help option' do
+      options= Earthquake::OptionParser.new([]).parse
+      expect(options).to_not be_key(:help)
+    end
+
+    it 'adds rest of arguments as :dir' do
+      dir = 'foo'
+      options= Earthquake::OptionParser.new([dir]).parse
+      expect(options[:dir]).to eq(dir)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,11 @@
-require 'rspec'
+# encoding: UTF-8
+require 'rubygems'
+
+require 'bundler'
+Bundler.require
+
+$: << File.expand_path('../../lib', __FILE__)
 require 'earthquake'
 
 RSpec.configure do |config|
-end
+end

metadata

@@ -1,164 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: earthquake
 version: !ruby/object:Gem::Version
-  version: 0.9.4
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - jugyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter-stream
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: notify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter_oauth
+  name: jugyo-twitter_oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0.pre5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0.pre5
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,17 +153,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Twitter Client on Terminal with Twitter Streaming API.
@@ -213,37 +190,37 @@ files:
 - lib/earthquake/help.rb
 - lib/earthquake/id_var.rb
 - lib/earthquake/input.rb
+- lib/earthquake/option_parser.rb
 - lib/earthquake/output.rb
 - lib/earthquake/twitter.rb
 - lib/earthquake/version.rb
-- spec/earthquake_spec.rb
+- spec/earthquake_option_parser_spec.rb
 - spec/spec_helper.rb
 - consumer.yml
 homepage: https://github.com/jugyo/earthquake
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: earthquake
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Terminal Twitter Client
 test_files:
-- spec/earthquake_spec.rb
+- spec/earthquake_option_parser_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/spec/earthquake_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe "Earthquake" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end