earthquake 0.7.4 → 0.7.5

data/README.md

@@ -1,8 +1,8 @@
 Earthquake
 ====
 
-Terminal-based Twitter Client with Streaming API.  
-It supports only Ruby 1.9.
+Terminal-based Twitter Client with Streaming API support.
+Only supports Ruby 1.9.
 
 Homepage: [https://github.com/jugyo/earthquake](https://github.com/jugyo/earthquake)  
 Twitter: [http://twitter.com/earthquakegem](http://twitter.com/earthquakegem)  
@@ -16,16 +16,16 @@ Slide: [http://www.slideshare.net/jugyo/earthquakegem](http://www.slideshare.net
 Features
 ----
 
-* You can use Twitter entirely in your Terminal.
-* You can receive data in real time with Streaming API.
-* You can easily extend by using Ruby.
+* Use Twitter entirely in your Terminal.
+* Receive data in real time with Streaming API.
+* Easily extend using Ruby.
 
 Install
 ----
 
     $ gem install earthquake
 
-**Ubuntu:** The EventMachine needs the package libssl-dev.
+**Ubuntu:** EventMachine needs the package libssl-dev.
 
     $ sudo apt-get install libssl-dev
 
@@ -102,28 +102,27 @@ Commands
 
     ⚡ :alias rt retweet
 
-And there are more commands!
+And more!
 
 Configuration
 ----
 
-The default earthquake director is ~/.earthquake.
+The default earthquake directory is ~/.earthquake.
 
 The config file is **~/.earthquake/config**.
 
 ### Changing the earthquake directory
 
-You can change the directory at launch as below:
+You can change the directory at launch by entering a directory as an argument. For example:
 
     $ earthquake ~/.earthquake_foo
 
 ### Changing the colors for user name
 
     # ~/.earthquake/config
+    # For example, to exclude blue:
     Earthquake.config[:colors] = (31..36).to_a - [34]
 
-Blue is excluded.
-
 ### Changing the color scheme
 
     # ~/.earthquake/config
@@ -141,7 +140,7 @@ Blue is excluded.
 
 ### HTTP proxy support
 
-Please set environment variable *http_proxy* if you want earthquake to use http proxy.
+Please set environment variable *http_proxy* if you want earthquake to use an http proxy.
     
 Desktop Notifications
 ----
@@ -161,9 +160,9 @@ You can try it by using the :eval command:
 Plugins
 ----
 
-see [https://github.com/jugyo/earthquake/wiki](https://github.com/jugyo/earthquake/wiki)
+See [https://github.com/jugyo/earthquake/wiki](https://github.com/jugyo/earthquake/wiki)
 
-Making Plugin
+Making Plugins
 ----
 
 **~/.earthquake/plugin** is the directory for plugins.
@@ -188,7 +187,7 @@ The block that is specified for Earthquake.init will be reloaded at any command
       end
     end
 
-The 'm' is a MatchData.
+'m' is a [http://www.ruby-doc.org/core/classes/MatchData.html](MatchData) object.
 
 #### Using regexp:
 

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.7.3"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-06-18}
+  s.date = %q{2011-07-22}
   s.default_executable = %q{earthquake}
   s.description = %q{Twitter Client on Terminal with Twitter Streaming API.}
   s.email = %q{jugyo.org@gmail.com}

data/lib/earthquake/commands.rb

@@ -206,9 +206,13 @@ Earthquake.init do
     end
   end
 
-  command %r|^:open\s+(\w+)$|, :as => :open do |m|
-    url = "https://twitter.com/#{m[1]}"
-    puts "Open: #{url}".c(:info)
+  command :browse do |m|
+    url = case m[1]
+      when /^\d+$/
+        "https://twitter.com/#{twitter.status(m[1])['user']['screen_name']}/status/#{m[1]}"
+      else
+        "https://twitter.com/#{m[1][/[^'"]+/]}"
+      end
     browse url
   end
 
@@ -248,10 +252,11 @@ Earthquake.init do
   end
 
   command :edit_config do
-    system ENV["EDITOR"] + " #{config[:file]}"
+    editor = ENV["EDITOR"] || 'vim'
+    system "#{editor} #{config[:file]}"
   end
 
-  command %r|^:alias\s+:?(\w+)\s+:?(\w+)|, :as => :alias do |m|
+  command %r|^:alias\s+?(:\w+)\s+(.+)|, :as => :alias do |m|
     alias_command m[1], m[2]
   end
 end

data/lib/earthquake/core.rb

@@ -182,8 +182,14 @@ module Earthquake
 
     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 }
+      begin
+        File.read(history_file, :encoding => "BINARY").
+          encode!(:invalid => :replace, :undef => :replace).
+          split(/\n/).
+          each { |line| Readline::HISTORY << line }
+      rescue Errno::ENOENT
+      rescue Errno::EACCES => e
+        error(e)
       end
     end
 
@@ -216,12 +222,12 @@ module Earthquake
       title = args.delete(:title)
       message = message.is_a?(String) ? message : message.inspect
       # FIXME: Escaping should be done at Notify.notify
-      Notify.notify title, message.e, args
+      Notify.notify title, message.e
     end
     alias_method :n, :notify
 
     def browse(url)
-      Launchy::Browser.run(url)
+      Launchy.open(url)
     end
   end
 

data/lib/earthquake/input.rb

@@ -115,7 +115,7 @@ module Earthquake
 
     completion do |text|
       regexp = /^#{Regexp.quote(text)}/
-      results = (command_names + command_aliases.keys.map {|i| ":#{i}"}).grep(regexp)
+      results = (command_names + command_aliases.keys).grep(regexp)
       history = Readline::HISTORY.reverse_each.take(config[:history_size]) | @tweets_for_completion
       history.inject(results){|r, line|
         r | line.split.grep(regexp)
@@ -131,9 +131,9 @@ module Earthquake
     end
 
     input_filter do |text|
-      if text =~ %r|^:(\w+)|
+      if text =~ %r|^(:\w+)|
         if target = command_aliases[$1]
-          text = text.sub(%r|^:\w+|, ":#{target}")
+          text = text.sub(%r|^:\w+|, target)
         end
         text = text.gsub(/\$\w+/) { |var| var2id(var) || var }
       end

data/lib/earthquake/output.rb

@@ -93,7 +93,7 @@ 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 = (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 = text.coloring(/@[0-9A-Za-z_]+/) { |i| color_of(i) }
       text = text.coloring(/(^#[^\s]+)|(\s+#[^\s]+)/) { |i| color_of(i) }

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-18 00:00:00 +09:00
+date: 2011-07-22 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency