earthquake 0.6.11 → 0.6.12

data/README.md

@@ -6,7 +6,8 @@ It supports only Ruby 1.9.
 
 Homepage: [https://github.com/jugyo/earthquake](https://github.com/jugyo/earthquake)  
 Twitter: [http://twitter.com/earthquakegem](http://twitter.com/earthquakegem)  
-Demo: [http://www.youtube.com/watch?v=S2KtBGrIe5c](http://www.youtube.com/watch?v=S2KtBGrIe5c)
+Demo: [http://www.youtube.com/watch?v=S2KtBGrIe5c](http://www.youtube.com/watch?v=S2KtBGrIe5c)  
+Slide: [http://www.slideshare.net/jugyo/earthquakegem](http://www.slideshare.net/jugyo/earthquakegem)  
 
 **We need patches that fix the english of the documentation!**
 
@@ -24,6 +25,10 @@ Install
 
     $ gem install earthquake
 
+**Ubuntu:** The EventMachine needs the package libssl-dev.
+
+    $ sudo apt-get install libssl-dev
+
 Usage
 ----
 
@@ -143,7 +148,7 @@ You can try it by using the :eval command:
 Plugins
 ----
 
-=> [https://github.com/jugyo/earthquake/wiki/Plugins](https://github.com/jugyo/earthquake/wiki/Plugins)
+see [https://github.com/jugyo/earthquake/wiki](https://github.com/jugyo/earthquake/wiki)
 
 Making Plugin
 ----

data/VERSION

@@ -1 +1 @@
-0.6.11
+0.6.12

data/earthquake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.6.11"
+  s.version = "0.6.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-04-25}
+  s.date = %q{2011-05-09}
   s.default_executable = %q{earthquake}
   s.description = %q{Twitter Client on Terminal with Twitter Streaming API.}
   s.email = %q{jugyo.org@gmail.com}
@@ -60,7 +60,7 @@ Accordingly, you should renew the access token if it is old.
 }
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.rubygems_version = %q{1.6.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Twitter Client on Terminal.}
   s.test_files = [
     "spec/earthquake_spec.rb",

data/lib/earthquake/commands.rb

@@ -112,7 +112,7 @@ Earthquake.init do
 
   command %r|^:retweet\s+(\d+)\s+(.*)$|, :as => :retweet do |m|
     target = twitter.status(m[1])
-    text = "#{m[2]} RT @#{target["user"]["screen_name"]}: #{target["text"]} (#{target["id"]})"
+    text = "#{m[2]} #{config[:quotetweet] ? "QT" : "RT"} @#{target["user"]["screen_name"]}: #{target["text"]} (#{target["id"]})"
     if confirm("unofficial retweet '#{text}'")
       async_e { twitter.update(text) }
     end

data/lib/earthquake/core.rb

@@ -188,16 +188,24 @@ module Earthquake
     end
 
     def async(&block)
-      Thread.start(&block)
+      Thread.start do
+        begin
+          block.call
+        rescue Exception => e
+          error e
+        end
+      end
     end
 
     def error(e)
       notify "[ERROR] #{e.message}\n#{e.backtrace.join("\n")}"
     end
 
-    def notify(message, options = {:title => 'earthquake'})
+    def notify(message, options = {})
+      args = {:title => 'earthquake'}.update(options)
+      title = args.delete(:title)
       message = message.is_a?(String) ? message : message.inspect
-      Notify.notify options[:title], message
+      Notify.notify title, message.e, args
     end
     alias_method :n, :notify
 

data/lib/earthquake/ext.rb

@@ -51,27 +51,19 @@ class String
     end
   end
 
-  def u
-    gsub(/&(lt|gt|amp|quot|apos);/) do |s|
-      case s
-        when '&' then '&'
-        when '&lt;' then '<'
-        when '&gt;' then '>'
-        when '&apos;' then "'"
-        when '&quot;' then '"'
-      end
-    end
+  t = {
+    ?& => "&amp;",
+    ?< => "&lt;",
+    ?> => "&gt;",
+    ?' => "&apos;",
+    ?" => "&quot;",
+  }
+
+  define_method(:u) do
+    gsub(/(#{Regexp.union(t.values)})/o, t.invert)
   end
 
-  def e
-    gsub(/[&<>'"]/) do |s|
-      case s
-        when '&' then '&amp;'
-        when '<' then '&lt;'
-        when '>' then '&gt;'
-        when "'" then '&apos;'
-        when '"' then '&quot;'
-      end
-    end
+  define_method(:e) do
+    gsub(/[#{t.keys.join}]/o, t)
   end
-end
+end

data/lib/earthquake/id_var.rb

@@ -11,33 +11,33 @@ module Earthquake
     end
 
     class Gen
-      def initialize(vars = ('aa'..'zz').to_a, prefix = '$')
-        if not vars.kind_of?(Array)
-          raise ArgumentError, 'vars should be an Array'
-        elsif vars.empty?
-          raise ArgumentError, 'vars should not be empty'
+      def initialize(vars = "aa".."zz", prefix = "$")
+        unless Range === vars and String === vars.first
+          raise ArgumentError, "vars should be a Range of String"
         end
-        @vars = vars.map { |var| prefix + var }
-        @table = {}
-        @rtable = {}
+        @vars = vars
+        @var = @vars.last.dup
+        @table = ActiveSupport::Cache::MemoryStore.new
         @prefix = prefix
       end
 
       def var2id(var)
-        @table[var]
+        @table.read(var)
       end
 
       def id2var(id)
-        @rtable[id] || self.next(id)
+        @table.read(id) || succ(id)
       end
 
-      def next(id)
-        var = @vars.shift
-        @vars.push var
-        @rtable.delete(@table[var])
-        @table[var] = id
-        @rtable[id] = var
-        var
+      private
+
+      def succ(id)
+        @var.replace(@vars.first.dup) unless @vars.include?(@var.next!)
+        var = @prefix + @var
+        @table.delete(@table.read(var))
+        @table.write(var, id)
+        @table.write(id, var)
+        var.dup
       end
     end
   end
@@ -47,4 +47,4 @@ module Earthquake
   init do
     self.id_var ||= IdVar::Gen.new
   end
-end
+end

data/lib/earthquake/input.rb

@@ -97,7 +97,7 @@ module Earthquake
     Readline.completion_proc = lambda do |text|
       completions.inject([]) do |results, completion|
         begin
-          results + (completion.call(text) || [])
+          results | (completion.call(text) || [])
         rescue Exception => e
           error e
           results
@@ -106,15 +106,13 @@ module Earthquake
     end
 
     completion do |text|
-      results = []
       regexp = /^#{Regexp.quote(text)}/
 
-      results += command_names.grep(regexp)
+      results = command_names.grep(regexp)
 
-      range = Readline::HISTORY.count >= config[:history_size] ? -config[:history_size]..-1 : 0..-1
-      results += Readline::HISTORY.to_a[range].map { |line| line.split(/\s+/) }.flatten.grep(regexp)
-
-      results
+      Readline::HISTORY.reverse_each.take(config[:history_size]).inject(results){|r, line|
+        r | line.split.grep(regexp)
+      }
     end
 
     input_filter do |text|

data/lib/earthquake/output.rb

@@ -93,7 +93,7 @@ module Earthquake
 
       id = id2var(item["id"])
 
-      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.6.11
+  version: 0.6.12
 platform: ruby
 authors: 
 - jugyo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 +09:00
+date: 2011-05-09 00:00:00 +09:00
 default_executable: earthquake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Twitter Client on Terminal.