earthquake 0.8.3 → 0.8.4

data/README.md

@@ -113,6 +113,35 @@ Commands
 
     ⚡ :alias :rt :retweet
 
+### Tweet Ascii Art
+
+    ⚡ :update[ENTER]
+    [input EOF (e.g. Ctrl+D) at the last]
+        ⚡
+       ⚡
+        ⚡
+       ⚡
+    ^D
+
+### View Ascii Art
+
+    # permanently
+    ⚡ :eval config[:raw_text] = true
+
+    # temporarily(with :status, :recent or :thread etc...)
+    ⚡ :aa :status $aa
+
+### Stream Filter Tracking
+
+    # keywords
+    ⚡ :filter keyword earthquakegem twitter
+
+    # users
+    ⚡ :filter user jugyo matsuu
+
+    # return to normal user stream
+    ⚡ :filter off
+
 And more!
 
 Configuration
@@ -173,6 +202,11 @@ You can change the directory at launch by entering a directory as an argument. F
     # ~/.earthquake/config
     Earthquake.alias_command :rt, :retweet
 
+### Default confirmation type
+
+    # ~/.earthquake/config
+    Earthquake.config[:confirm_type] = :n
+
 ### HTTP proxy support
 
 Please set environment variable *http_proxy* if you want earthquake to use an http proxy.

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/bin/earthquake

@@ -6,7 +6,7 @@ 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 an command and exit", true
+slop.on :c, :command, "Invoke a command and exit", true
 slop.on :l, :lolize, 'enable lolize (see: https://github.com/miaout17/lolize)'
 begin
   slop.parse!(argv)
@@ -14,7 +14,7 @@ rescue => e
   puts e
   exit!
 end
-options = slop.to_hash(true)
+options = slop.to_hash
 options.delete(:help)
 options[:dir] = argv.shift unless argv.empty?
 

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "earthquake"
-  s.version = "0.8.3"
+  s.version = "0.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = "2011-10-23"
+  s.date = "2012-02-03"
   s.description = "Twitter Client on Terminal with Twitter Streaming API."
   s.email = "jugyo.org@gmail.com"
   s.executables = ["earthquake"]
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Twitter Client on Terminal."
   s.test_files = [
     "spec/earthquake_spec.rb",

data/lib/earthquake/commands.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'uri'
 require 'open-uri'
+require 'shellwords'
 Earthquake.init do
 
   # :exit
@@ -63,6 +64,27 @@ Earthquake.init do
     ⚡ :eval 1 + 1
   HELP
 
+  command :aa do |m|
+    begin
+      raw_text, config[:raw_text] = config[:raw_text], true
+      input(m[1])
+    ensure
+      config[:raw_text] = raw_text
+    end
+  end
+
+  help :aa, 'executes a command with raw text', <<-HELP
+    ⚡ :aa :status $aa
+  HELP
+
+  command %r|^:update$|, :as => :update do
+    puts "[input EOF (e.g. Ctrl+D) at the last]".c(:info)
+    text = STDIN.gets(nil)
+    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]}'")
   end
@@ -71,6 +93,16 @@ Earthquake.init do
     input(":update #{m[0]}")
   end
 
+  help :update, 'update status', <<-HELP
+    ⚡ :update this is my new status
+    ⚡ :update[ENTER]
+        ⚡   
+       ⚡   
+         ⚡   
+        ⚡   
+    ^D
+  HELP
+
   command %r|^:reply\s+(\d+)\s+(.*)|, :as => :reply do |m|
     in_reply_to_status_id = m[1]
     target = twitter.status(in_reply_to_status_id)
@@ -81,6 +113,12 @@ Earthquake.init do
     end
   end
 
+  help :reply, "replys a tweet", <<-HELP
+    [$aa] hello world
+    ⚡ :reply $aa goodbye world
+    ⚡ $aa goodbye world
+  HELP
+
   # $xx hi!
   command %r|^(\$[^\s]+)\s+(.*)$| do |m|
     input(":reply #{m[1..2].join(' ')}")
@@ -95,23 +133,43 @@ Earthquake.init do
     input(":status #{m[1]}")
   end
 
+  help :status, "shows status", <<-HELP
+    [$aa] hello world
+    ⚡ :status $aa
+     [$aa] hello world
+    ⚡ $aa
+     [$aa] hello world
+  HELP
+
   command :delete do |m|
     tweet = twitter.status(m[1])
     async_e { twitter.status_destroy(m[1]) } if confirm("delete '#{tweet["text"]}'")
   end
 
+  help :delete, "deletes status", <<-HELP
+    [$aa] hello world
+    ⚡ :delete $aa
+    delete 'hello world' [Yn] Y
+  HELP
+
   command :mentions do
     puts_items twitter.mentions
   end
 
+  help :mentions, "show mentions timeline"
+
   command :follow do |m|
     async_e { twitter.friend(m[1]) }
   end
 
+  help :follow, "follow user"
+
   command :unfollow do |m|
     async_e { twitter.unfriend(m[1]) }
   end
 
+  help :unfollow, "unfollow user"
+
   command :recent do
     puts_items twitter.home_timeline(:count => config[:recent_count])
   end
@@ -126,10 +184,22 @@ Earthquake.init do
     puts_items twitter.list_statuses(m[1], m[2])
   end
 
+  help :recent, "show recent tweets", <<-HELP
+    ⚡ :recent
+    ⚡ :recent user
+    ⚡ :recent user/list
+  HELP
+
   command :user do |m|
-    ap twitter.show(m[1]).slice(*%w(id screen_name name profile_image_url description url location time_zone lang protected))
+    user = twitter.show(m[1])
+    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))
   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|
@@ -147,6 +217,49 @@ Earthquake.init do
     }
   end
 
+  help :search, "searches term"
+
+  default_stream = {
+    method: "POST",
+    host: "userstream.twitter.com",
+    path: "/2/user.json",
+    ssl: true,
+  }
+
+  filter_stream = {
+    method: "POST",
+    host: "stream.twitter.com",
+    path: "/1/statuses/filter.json",
+    ssl: true,
+  }
+
+  command %r!^:filter off$!, as: :filter do
+    config[:api] = default_stream
+    reconnect
+  end
+
+  command %r!^:filter keyword (.*)$!, as: :filter do |m|
+    keywords = Shellwords.split(m[1])
+    config[:api] = filter_stream.merge(filters: keywords)
+    reconnect
+  end
+
+  command %r!:filter user (.*)$!, as: :filter do |m|
+    users = m[1].split.map{|user|
+      twitter.show(user)["id"]
+    }.compact.join(",")
+    unless users.empty?
+      config[:api] = filter_stream.merge(params: {follow: users})
+      reconnect
+    end
+  end
+
+  help :filter, "manages filters", <<-HELP
+    ⚡ :filter off
+    ⚡ :filter keyword annoyingsubject
+    ⚡ :filter user annoyinguser
+  HELP
+
   command %r|^:retweet\s+(\d+)$|, :as => :retweet do |m|
     target = twitter.status(m[1])
     if confirm("retweet 'RT @#{target["user"]["screen_name"]}: #{target["text"]}'")
@@ -162,6 +275,11 @@ Earthquake.init do
     end
   end
 
+  help :retweet, "retweets or quote status", <<-HELP
+    ⚡ :retweet $aa
+    ⚡ :retweet $aa // LOL
+  HELP
+
   command :favorite do |m|
     tweet = twitter.status(m[1])
     if confirm("favorite '#{tweet["user"]["screen_name"]}: #{tweet["text"]}'")
@@ -169,6 +287,8 @@ Earthquake.init do
     end
   end
 
+  help :favorite, "marks status as favorite"
+
   command :unfavorite do |m|
     tweet = twitter.status(m[1])
     if confirm("unfavorite '#{tweet["user"]["screen_name"]}: #{tweet["text"]}'")
@@ -176,30 +296,44 @@ Earthquake.init do
     end
   end
 
+  help :unfavorite, "unmarks status as favorite"
+
   command :retweeted_by_me do
     puts_items twitter.retweeted_by_me
   end
 
+  help :retweeted_by_me, "shows the latest retweets you made"
+
   command :retweeted_to_me do
     puts_items twitter.retweeted_to_me
   end
 
+  help :retweeted_to_me, "shows the latest retweets someone you follow made"
+
   command :retweets_of_me do
     puts_items twitter.retweets_of_me
   end
 
+  help :retweets_of_me, "shows your latest status somebody retweeted"
+
   command :block do |m|
     async_e { twitter.block(m[1]) }
   end
 
+  help :block, "blocks user"
+
   command :unblock do |m|
     async_e { twitter.unblock(m[1]) }
   end
 
+  help :unblock, "unblocks user"
+
   command :report_spam do |m|
     async_e { twitter.report_spam(m[1]) }
   end
 
+  help :report_spam, "blocks user and report as spam"
+
   command :messages do
     puts_items twitter.messages.each { |s|
       s["user"] = {"screen_name" => s["sender_screen_name"]}
@@ -207,6 +341,8 @@ Earthquake.init do
     }
   end
 
+  help :messages, "list direct messages received"
+
   command :sent_messages do
     puts_items twitter.sent_messages.each { |s|
       s["user"] = {"screen_name" => s["sender_screen_name"]}
@@ -214,10 +350,14 @@ Earthquake.init do
     }
   end
 
+  help :sent_messages, "list direct messages sent"
+
   command %r|^:message (\w+)\s+(.*)|, :as => :message do |m|
     async_e { twitter.message(*m[1, 2]) } if confirm("message '#{m[2]}' to @#{m[1]}")
   end
 
+  help :message, "sent a direct message"
+
   command :reconnect do
     reconnect
   end
@@ -234,19 +374,28 @@ Earthquake.init do
     }
   end
 
+  help :thread, "displays conversation thread"
+
   command :update_profile_image do |m|
     image_path = File.expand_path(m[1].gsub('\\', ''))
     async_e { twitter.update_profile_image(File.open(image_path, 'rb')) }
   end
 
+  help :update_profile_image, "updates profile image from local file path"
+
   command %r|^:open\s+(\d+)$|, :as => :open do |m|
-    if match = twitter.status(m[1])["text"].match(URI.regexp(["http", "https"]))
-      browse match[0]
+    matches = URI.extract(twitter.status(m[1])["text"],["http", "https"])
+    unless matches.empty?
+      matches.each do |match_url|
+        browse match_url
+      end
     else
       puts "no link found".c(41)
     end
   end
 
+  help :open, "opens all links in a tweet"
+
   command :browse do |m|
     url = case m[1]
       when /^\d+$/
@@ -257,16 +406,32 @@ Earthquake.init do
     browse url
   end
 
+  help :browse, "opens the browser on a tweet or a user", <<-HELP
+    ⚡ :browse $aa
+    ⚡ :browse username
+  HELP
+
   command :sh do
     system ENV["SHELL"] || 'sh'
   end
 
-  command :'!' do |m|
-    system eval("\"#{m[1]}\"").to_s
+  help :sh, "opens a shell"
+
+  command %r|:!(.+)| do |m|
+    command = m[1].strip
+    puts "`#{command}`"
+    system eval("\"#{command}\"").to_s
   end
 
   command :plugin_install do |m|
     uri = URI.parse(m[1])
+    if uri.host == "t.co"
+      begin
+        open(uri, redirect: false)
+      rescue OpenURI::HTTPRedirect => e
+        uri = URI.parse(e.io.meta["location"])
+      end
+    end
     unless uri.host == "gist.github.com"
       puts "the host must be gist.github.com".c(41)
     else
@@ -285,23 +450,39 @@ Earthquake.init do
       if confirm("Install to '#{filepath}'?")
         File.open(File.join(config[:plugin_dir], filename), 'w') do |file|
           file << raw
-          file << "\n# #{m[1]}"
+          file << "\n# #{uri}\n"
         end
         reload
       end
     end
   end
 
+  help :plugin_install, "installs a plugin from gist.github.com"
+
   command :edit_config do
     editor = ENV["EDITOR"] || 'vim'
     system "#{editor} #{config[:file]}"
   end
 
+  help :edit_config, "edit your config; note that changes may require to :restart"
+
   command %r|^:alias\s+?(:\w+)\s+(.+)|, :as => :alias do |m|
     alias_command m[1], m[2]
   end
 
+  help :alias, "creates a new command aliasing to an existing one", <<-HELP
+    ⚡ :alias :rt :retweet
+  HELP
+
+  command :aliases do
+    ap command_aliases
+  end
+
+  help :aliases, "shows aliases"
+
   command :reauthorize do
     get_access_token
   end
+
+  help :reauthorize, "prompts for new oauth credentials"
 end

data/lib/earthquake/core.rb

@@ -59,6 +59,8 @@ module Earthquake
       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[:dir], config[:plugin_dir]].each do |dir|
         unless File.exists?(dir)

data/lib/earthquake/input.rb

@@ -32,7 +32,9 @@ module Earthquake
     end
 
     def alias_command(name, target)
-      command_aliases[name.to_s] = target.to_s
+      name = name.is_a?(Symbol) ? ":#{name}" : name.to_s
+      target = target.is_a?(Symbol) ? ":#{target}" : target.to_s
+      command_aliases[name] = target
     end
 
     def input(text)
@@ -67,14 +69,20 @@ module Earthquake
       end
     end
 
-    def confirm(message, type = :y)
-      case type
-      when :y
-        return !(ask("#{message} [Yn] ".u) =~ /^n$/i)
-      when :n
-        return !!(ask("#{message} [yN] ".u) =~ /^y$/i)
+    def confirm(message, type = config[:confirm_type])
+      s = case type
+          when :y
+            ask("#{message} [Yn] ".u)
+          when :n
+            ask("#{message} [yN] ".u)
+          else
+            raise "type must be :y or :n"
+          end
+      s = type.to_s if s.empty?
+      if m = s.match(/^[yn]$/i)
+        return m[0].downcase == 'y'
       else
-        raise "type must be :y or :n"
+        confirm(message, type)
       end
     end
 
@@ -117,6 +125,7 @@ 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)

data/lib/earthquake/output.rb

@@ -102,8 +102,20 @@ module Earthquake
 
       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 = text.coloring(/@[0-9A-Za-z_]+/) { |i| color_of(i) }
       text = text.coloring(/(^#[^\s]+)|(\s+#[^\s]+)/) { |i| color_of(i) }
+      if config[:expand_url]
+        entities = (item["retweeted_status"] && item["truncated"]) ? item["retweeted_status"]["entities"] : item["entities"]
+        if entities
+          entities.values_at("urls", "media").flatten.compact.each do |entity|
+            url, expanded_url = entity.values_at("url", "expanded_url")
+            if url && expanded_url
+              text = text.sub(url, expanded_url)
+            end
+          end
+        end
+      end
       text = text.coloring(URI.regexp(["http", "https"]), :url)
 
       if item["_highlights"]
@@ -126,10 +138,20 @@ module Earthquake
     end
 
     output :delete do |item|
-      if item["delete"] && cache.read("status:#{item["delete"]["status"]["id"]}")
-        tweet = twitter.status(item["delete"]["status"]["id"])
-        puts "[delete]".c(:event) +
-             " #{tweet["user"]["screen_name"]}: #{tweet["text"]}"
+      if deleted = item["delete"]
+        case
+        when deleted.key?("status")
+          if tweet = cache.read("status:#{deleted["status"]["id"]}")
+            screen_name = tweet["user"]["screen_name"]
+            text = tweet["text"]
+          else
+            next
+          end
+        when deleted.key?("direct_message")
+          screen_name = twitter.info["screen_name"]
+          text = "(direct message)"
+        end
+        puts "%s %s: %s" % ["[delete]".c(:event), screen_name, text]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earthquake
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-23 00:00:00.000000000Z
+date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter-stream
-  requirement: &16920980 !ruby/object:Gem::Requirement
+  requirement: &70152961745040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16920980
+  version_requirements: *70152961745040
 - !ruby/object:Gem::Dependency
   name: notify
-  requirement: &16918480 !ruby/object:Gem::Requirement
+  requirement: &70152961734900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16918480
+  version_requirements: *70152961734900
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &16916180 !ruby/object:Gem::Requirement
+  requirement: &70152961734240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16916180
+  version_requirements: *70152961734240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &16907520 !ruby/object:Gem::Requirement
+  requirement: &70152961733620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16907520
+  version_requirements: *70152961733620
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &16904020 !ruby/object:Gem::Requirement
+  requirement: &70152961732480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16904020
+  version_requirements: *70152961732480
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &16901980 !ruby/object:Gem::Requirement
+  requirement: &70152961731100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16901980
+  version_requirements: *70152961731100
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &16899080 !ruby/object:Gem::Requirement
+  requirement: &70152961730460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16899080
+  version_requirements: *70152961730460
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &16897460 !ruby/object:Gem::Requirement
+  requirement: &70152961729340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *16897460
+  version_requirements: *70152961729340
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &16895960 !ruby/object:Gem::Requirement
+  requirement: &70152961715140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16895960
+  version_requirements: *70152961715140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16893820 !ruby/object:Gem::Requirement
+  requirement: &70152961719560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *16893820
+  version_requirements: *70152961719560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16890560 !ruby/object:Gem::Requirement
+  requirement: &70152961717840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16890560
+  version_requirements: *70152961717840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16887700 !ruby/object:Gem::Requirement
+  requirement: &70152961716980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *16887700
+  version_requirements: *70152961716980
 description: Twitter Client on Terminal with Twitter Streaming API.
 email: jugyo.org@gmail.com
 executables:
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Twitter Client on Terminal.