t 0.8.3 → 0.9.0

data/README.md

@@ -121,6 +121,9 @@ follows you:
 ### Output the last 200 tweets in your timeline to a CSV file
     t timeline -n 200 --csv > timeline.csv
 
+### Start streaming a real-time sample of all Tweets (Control-C to stop)
+    t stream all
+
 ### Count the number of employees who work for Twitter
     t list members twitter team | wc -l
 
@@ -155,7 +158,7 @@ follows you:
   like grep, cut, awk, bc, wc, and xargs for advanced text processing.
 * Generate spreadsheets: Convert the output of any command to CSV format simply
   by adding the `--csv` flag.
-* 98% C0 Code Coverage: Well tested, with a 3:1 test-to-code ratio.
+* 95% C0 Code Coverage: Well tested, with a 2.5:1 test-to-code ratio.
 
 [search]: https://dev.twitter.com/docs/using-search
 
@@ -210,7 +213,7 @@ Here are some ways *you* can contribute:
 * by writing code (**no patch is too small**: fix typos, add comments, clean up
   inconsistent whitespace)
 * by refactoring code
-* by closing [issues][]
+* by fixing [issues][]
 * by reviewing patches
 
 [issues]: https://github.com/sferik/t/issues
@@ -218,11 +221,10 @@ Here are some ways *you* can contribute:
 ## Submitting an Issue
 We use the [GitHub issue tracker][issues] to track bugs and features. Before
 submitting a bug report or feature request, check to make sure it hasn't
-already been submitted. You can indicate support for an existing issue by
-voting it up. When submitting a bug report, please include a [Gist][] that
-includes a stack trace and any details that may be necessary to reproduce the
-bug, including your gem version, Ruby version, and operating system. Ideally, a
-bug report should include a pull request with failing specs.
+already been submitted. When submitting a bug report, please include a [Gist][]
+that includes a stack trace and any details that may be necessary to reproduce
+the bug, including your gem version, Ruby version, and operating system.
+Ideally, a bug report should include a pull request with failing specs.
 
 [gist]: https://gist.github.com/
 
@@ -235,8 +237,8 @@ bug report should include a pull request with failing specs.
 6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
 7. Run `open coverage/index.html`. If your changes are not completely covered
    by your tests, return to step 3.
-6. Add, commit, and push your changes.
-7. [Submit a pull request.][pr]
+8. Add, commit, and push your changes.
+9. [Submit a pull request.][pr]
 
 [fork]: http://help.github.com/fork-a-repo/
 [branch]: http://learn.github.com/p/branching.html

data/lib/t/authorizable.rb

@@ -0,0 +1,27 @@
+module T
+  module Authorizable
+
+    def consumer
+      OAuth::Consumer.new(
+        options['consumer-key'],
+        options['consumer-secret'],
+        :site => base_url
+      )
+    end
+
+    def generate_authorize_url(request_token)
+      request = consumer.create_signed_request(:get, consumer.authorize_path, request_token, pin_auth_parameters)
+      params = request['Authorization'].sub(/^OAuth\s+/, '').split(/,\s+/).map do |param|
+        key, value = param.split('=')
+        value =~ /"(.*?)"/
+        "#{key}=#{CGI::escape($1)}"
+      end.join('&')
+      "#{base_url}#{request.path}?#{params}"
+    end
+
+    def pin_auth_parameters
+      {:oauth_callback => 'oob'}
+    end
+
+  end
+end

data/lib/t/cli.rb

@@ -10,6 +10,7 @@ require 'geokit'
 require 'launchy'
 require 'oauth'
 require 'open-uri'
+require 't/authorizable'
 require 't/collectable'
 require 't/core_ext/string'
 require 't/delete'
@@ -19,6 +20,7 @@ require 't/rcfile'
 require 't/requestable'
 require 't/search'
 require 't/set'
+require 't/stream'
 require 't/version'
 require 'thor'
 require 'time'
@@ -35,6 +37,7 @@ module T
     include ActionView::Helpers::DateHelper
     include ActionView::Helpers::NumberHelper
     include ActionView::Helpers::TextHelper
+    include T::Authorizable
     include T::Collectable
     include T::Printable
     include T::Requestable
@@ -142,7 +145,7 @@ module T
       elsif options['long']
         array = direct_messages.map do |direct_message|
           created_at = direct_message.created_at > 6.months.ago ? direct_message.created_at.strftime("%b %e %H:%M") : direct_message.created_at.strftime("%b %e  %Y")
-          [direct_message.id, created_at, "@#{direct_message.sender.screen_name}", direct_message.text.gsub(/\n+/, ' ')]
+          [direct_message.id, created_at, "@#{direct_message.sender.screen_name}", HTMLEntities.new.decode(direct_message.text).gsub(/\n+/, ' ')]
         end
         if STDOUT.tty?
           headings = ["ID", "Posted at", "Screen name", "Text"]
@@ -176,7 +179,7 @@ module T
       elsif options['long']
         array = direct_messages.map do |direct_message|
           created_at = direct_message.created_at > 6.months.ago ? direct_message.created_at.strftime("%b %e %H:%M") : direct_message.created_at.strftime("%b %e  %Y")
-          [direct_message.id, created_at, "@#{direct_message.recipient.screen_name}", direct_message.text.gsub(/\n+/, ' ')]
+          [direct_message.id, created_at, "@#{direct_message.recipient.screen_name}", HTMLEntities.new.decode(direct_message.text).gsub(/\n+/, ' ')]
         end
         if STDOUT.tty?
           headings = ["ID", "Posted at", "Screen name", "Text"]
@@ -199,7 +202,7 @@ module T
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
     method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "listed", :aliases => "-s", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
@@ -361,7 +364,7 @@ module T
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
     method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "listed", :aliases => "-s", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
@@ -392,7 +395,7 @@ module T
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
     method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "listed", :aliases => "-s", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
@@ -423,7 +426,7 @@ module T
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
     method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "listed", :aliases => "-s", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
@@ -458,7 +461,7 @@ module T
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
     method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "listed", :aliases => "-s", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
@@ -636,11 +639,11 @@ module T
       end
       if options['csv']
         say ["ID", "Text", "Screen name", "Posted at", "Location", "Retweets", "Source", "URL"].to_csv
-        say [status.id, status.text, status.user.screen_name, status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), location, status.retweet_count, strip_tags(status.source), "https://twitter.com/#{status.user.screen_name}/status/#{status.id}"].to_csv
+        say [status.id, HTMLEntities.new.decode(status.text), status.user.screen_name, status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), location, status.retweet_count, strip_tags(status.source), "https://twitter.com/#{status.user.screen_name}/status/#{status.id}"].to_csv
       else
         array = []
         array << ["ID", status.id.to_s]
-        array << ["Text", status.text.gsub(/\n+/, ' ')]
+        array << ["Text", HTMLEntities.new.decode(status.text).gsub(/\n+/, ' ')]
         array << ["Screen name", "@#{status.user.screen_name}"]
         posted_at = status.created_at > 6.months.ago ? status.created_at.strftime("%b %e %H:%M") : status.created_at.strftime("%b %e  %Y")
         array << ["Posted at", posted_at]
@@ -658,7 +661,7 @@ module T
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
     method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "listed", :aliases => "-s", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => "Limit the number of results."
     method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
@@ -790,7 +793,7 @@ module T
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
     method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify input as Twitter user IDs instead of screen names."
-    method_option "listed", :aliases => "-s", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
@@ -826,7 +829,7 @@ module T
       user = client.user(user, :include_entities => false)
       if options['csv']
         say ["ID", "Verified", "Name", "Screen name", "Bio", "Location", "Following", "Last update", "Lasted updated at", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "URL"].to_csv
-        say [user.id, user.verified?, user.name, user.screen_name, user.description, user.location, user.following?, user.status.text, user.status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), user.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.url].to_csv
+        say [user.id, user.verified?, user.name, user.screen_name, user.description, user.location, user.following?, HTMLEntities.new.decode(user.status.text), user.status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), user.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.url].to_csv
       else
         array = []
         name_label = user.verified ? "Name (Verified)" : "Name"
@@ -836,7 +839,7 @@ module T
         array << ["Location", user.location] unless user.location.nil?
         status = user.following ? "Following" : "Not following"
         array << ["Status", status]
-        array << ["Last update", "#{user.status.text.gsub(/\n+/, ' ')} (#{time_ago_in_words(user.status.created_at)} ago)"] unless user.status.nil?
+        array << ["Last update", "#{HTMLEntities.new.decode(user.status.text).gsub(/\n+/, ' ')} (#{time_ago_in_words(user.status.created_at)} ago)"] unless user.status.nil?
         created_at = user.created_at > 6.months.ago ? user.created_at.strftime("%b %e %H:%M") : user.created_at.strftime("%b %e  %Y")
         array << ["Since", created_at]
         array << ["Tweets", number_with_delimiter(user.statuses_count)]
@@ -862,25 +865,10 @@ module T
     desc "set SUBCOMMAND ...ARGS", "Change various account settings."
     subcommand 'set', T::Set
 
-  private
-
-    def consumer
-      OAuth::Consumer.new(
-        options['consumer-key'],
-        options['consumer-secret'],
-        :site => base_url
-      )
-    end
+    desc "stream SUBCOMMAND ...ARGS", "Commands for streaming Tweets."
+    subcommand 'stream', T::Stream
 
-    def generate_authorize_url(request_token)
-      request = consumer.create_signed_request(:get, consumer.authorize_path, request_token, pin_auth_parameters)
-      params = request['Authorization'].sub(/^OAuth\s+/, '').split(/,\s+/).map do |param|
-        key, value = param.split('=')
-        value =~ /"(.*?)"/
-        "#{key}=#{CGI::escape($1)}"
-      end.join('&')
-      "#{base_url}#{request.path}?#{params}"
-    end
+  private
 
     def location
       return @location if @location
@@ -890,9 +878,5 @@ module T
       @location = Geokit::Geocoders::MultiGeocoder.geocode(ip_address)
     end
 
-    def pin_auth_parameters
-      {:oauth_callback => 'oob'}
-    end
-
   end
 end

data/lib/t/list.rb

@@ -107,7 +107,7 @@ module T
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
     method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
-    method_option "listed", :aliases => "-s", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."

data/lib/t/printable.rb

@@ -3,6 +3,7 @@ require 'csv'
 # 'fastercsv' required on Ruby versions < 1.9
 require 'fastercsv' unless Array.new.respond_to?(:to_csv)
 require 'highline'
+require 'htmlentities'
 require 'thor/shell/color'
 
 module T
@@ -14,6 +15,36 @@ module T
 
     private
 
+      def build_long_list(list)
+        created_at = list.created_at > 6.months.ago ? list.created_at.strftime("%b %e %H:%M") : list.created_at.strftime("%b %e  %Y")
+        [list.id, created_at, list.full_name, number_with_delimiter(list.member_count), number_with_delimiter(list.subscriber_count), list.mode, list.description]
+      end
+
+      def build_long_status(status)
+        created_at = status.created_at > 6.months.ago ? status.created_at.strftime("%b %e %H:%M") : status.created_at.strftime("%b %e  %Y")
+        [status.id, created_at, "@#{status.user.screen_name}", HTMLEntities.new.decode(status.text).gsub(/\n+/, ' ')]
+      end
+
+      def build_long_user(user)
+        created_at = user.created_at > 6.months.ago ? user.created_at.strftime("%b %e %H:%M") : user.created_at.strftime("%b %e  %Y")
+        [user.id, created_at, number_with_delimiter(user.statuses_count), number_with_delimiter(user.favourites_count), number_with_delimiter(user.listed_count), number_with_delimiter(user.friends_count), number_with_delimiter(user.followers_count), "@#{user.screen_name}", user.name]
+      end
+
+      def print_csv_list(list)
+        created_at = list.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z")
+        say [list.id, created_at, list.user.screen_name, list.slug, list.member_count, list.subscriber_count, list.mode, list.description].to_csv
+      end
+
+      def print_csv_status(status)
+        created_at = status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z")
+        say [status.id, created_at, status.user.screen_name, HTMLEntities.new.decode(status.text)].to_csv
+      end
+
+      def print_csv_user(user)
+        created_at = user.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z")
+        say [user.id, created_at, user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.screen_name, user.name].to_csv
+      end
+
       def print_in_columns(array)
         cols = HighLine::SystemExtensions.terminal_size[0]
         width = (array.map{|el| el.to_s.size}.max || 0) + 2
@@ -39,12 +70,11 @@ module T
         if options['csv']
           say ["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"].to_csv unless lists.empty?
           lists.each do |list|
-            say [list.id, list.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), list.user.screen_name, list.slug, list.member_count, list.subscriber_count, list.mode, list.description].to_csv
+            print_csv_list(list)
           end
         elsif options['long']
           array = lists.map do |list|
-            created_at = list.created_at > 6.months.ago ? list.created_at.strftime("%b %e %H:%M") : list.created_at.strftime("%b %e  %Y")
-            [list.id, created_at, list.full_name, number_with_delimiter(list.member_count), number_with_delimiter(list.subscriber_count), list.mode, list.description]
+            build_long_list(list)
           end
           if STDOUT.tty?
             headings = ["ID", "Created at", "Slug", "Members", "Subscribers", "Mode", "Description"]
@@ -64,17 +94,27 @@ module T
         end
       end
 
+      def print_status(status)
+        if STDOUT.tty? && !options['no-color']
+          say("   #{Thor::Shell::Color::BOLD}@#{status.user.screen_name}", :yellow)
+          print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
+        else
+          say("   @#{status.user.screen_name}")
+          print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
+        end
+        say
+      end
+
       def print_statuses(statuses)
-        statuses.reverse! if options['reverse']
+        statuses.reverse! if options['reverse'] || options['stream']
         if options['csv']
           say ["ID", "Posted at", "Screen name", "Text"].to_csv unless statuses.empty?
           statuses.each do |status|
-            say [status.id, status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), status.user.screen_name, status.text].to_csv
+            print_csv_status(status)
           end
         elsif options['long']
           array = statuses.map do |status|
-            created_at = status.created_at > 6.months.ago ? status.created_at.strftime("%b %e %H:%M") : status.created_at.strftime("%b %e  %Y")
-            [status.id, created_at, "@#{status.user.screen_name}", status.text.gsub(/\n+/, ' ')]
+            build_long_status(status)
           end
           if STDOUT.tty?
             headings = ["ID", "Posted at", "Screen name", "Text"]
@@ -84,22 +124,8 @@ module T
             print_table(array)
           end
         else
-          if STDOUT.tty? && !options['no-color']
-            say unless statuses.empty?
-            statuses.each do |status|
-              say("   #{Thor::Shell::Color::BOLD}@#{status.user.screen_name}", :yellow)
-              print_wrapped(status.text, :indent => 3)
-              say("   #{Thor::Shell::Color::BOLD}#{time_ago_in_words(status.created_at)} ago", :black)
-              say
-            end
-          else
-            say unless statuses.empty?
-            statuses.each do |status|
-              say("   @#{status.user.screen_name}")
-              print_wrapped(status.text, :indent => 3)
-              say("   #{time_ago_in_words(status.created_at)} ago")
-              say
-            end
+          statuses.each do |status|
+            print_status(status)
           end
         end
       end
@@ -123,12 +149,11 @@ module T
         if options['csv']
           say ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"].to_csv unless users.empty?
           users.each do |user|
-            say [user.id, user.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.screen_name, user.name].to_csv
+            print_csv_user(user)
           end
         elsif options['long']
           array = users.map do |user|
-            created_at = user.created_at > 6.months.ago ? user.created_at.strftime("%b %e %H:%M") : user.created_at.strftime("%b %e  %Y")
-            [user.id, created_at, number_with_delimiter(user.statuses_count), number_with_delimiter(user.favourites_count), number_with_delimiter(user.listed_count), number_with_delimiter(user.friends_count), number_with_delimiter(user.followers_count), "@#{user.screen_name}", user.name]
+            build_long_user(user)
           end
           if STDOUT.tty?
             headings = ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]

data/lib/t/search.rb

@@ -2,6 +2,7 @@ require 'action_view'
 require 'csv'
 # 'fastercsv' required on Ruby versions < 1.9
 require 'fastercsv' unless Array.new.respond_to?(:to_csv)
+require 'htmlentities'
 require 'retryable'
 require 't/collectable'
 require 't/printable'
@@ -37,12 +38,12 @@ module T
       if options['csv']
         say ["ID", "Posted at", "Screen name", "Text"].to_csv unless statuses.empty?
         statuses.each do |status|
-          say [status.id, status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), status.from_user, status.text].to_csv
+          say [status.id, status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), status.from_user, HTMLEntities.new.decode(status.text)].to_csv
         end
       elsif options['long']
         array = statuses.map do |status|
           created_at = status.created_at > 6.months.ago ? status.created_at.strftime("%b %e %H:%M") : status.created_at.strftime("%b %e  %Y")
-          [status.id, created_at, "@#{status.from_user}", status.text.gsub(/\n+/, ' ')]
+          [status.id, created_at, "@#{status.from_user}", HTMLEntities.new.decode(status.text).gsub(/\n+/, ' ')]
         end
         if STDOUT.tty?
           headings = ["ID", "Posted at", "Screen name", "Text"]
@@ -52,13 +53,21 @@ module T
           print_table(array)
         end
       else
+        say unless statuses.empty?
         statuses.each do |status|
-          say "#{status.from_user.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text.gsub(/\n+/, ' ')} (#{time_ago_in_words(status.created_at)} ago)"
+          if STDOUT.tty? && !options['no-color']
+            say("   #{Thor::Shell::Color::BOLD}@#{status.from_user}", :yellow)
+            print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
+          else
+            say("   @#{status.from_user}")
+            print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
+          end
+          say
         end
       end
     end
 
-    desc "favorites QUERY", "Returns Tweets you've favorited that mach a specified query."
+    desc "favorites QUERY", "Returns Tweets you've favorited that match a specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def favorites(query)
@@ -76,7 +85,36 @@ module T
     end
     map %w(faves) => :favorites
 
-    desc "mentions QUERY", "Returns Tweets mentioning you that mach a specified query."
+    desc "list [USER/]LIST QUERY", "Returns Tweets on a list that match specified query."
+    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
+    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
+    method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    def list(list, query)
+      owner, list = list.split('/')
+      if list.nil?
+        list = owner
+        owner = @rcfile.active_profile[0]
+      else
+        owner = if options['id']
+          owner.to_i
+        else
+          owner.strip_ats
+        end
+      end
+      opts = {:count => MAX_NUM_RESULTS}
+      statuses = collect_with_max_id do |max_id|
+        opts[:max_id] = max_id unless max_id.nil?
+        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+          client.list_timeline(owner, list, opts)
+        end
+      end.flatten.compact
+      statuses = statuses.select do |status|
+        /#{query}/i.match(status.text)
+      end
+      print_statuses(statuses)
+    end
+
+    desc "mentions QUERY", "Returns Tweets mentioning you that match a specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def mentions(query)
@@ -94,7 +132,7 @@ module T
     end
     map %w(replies) => :mentions
 
-    desc "retweets QUERY", "Returns Tweets you've retweeted that mach a specified query."
+    desc "retweets QUERY", "Returns Tweets you've retweeted that match a specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def retweets(query)