t 1.1.1 → 1.2.0

data/README.md

@@ -44,7 +44,7 @@ Once you've verified that Ruby is installed:
 
 ## Configuration
 
-Twitter requires OAuth for most of its functionality, so you'll need a
+Twitter API v1.1 requires OAuth for all of its functionality, so you'll need a
 registered Twitter application. If you've never registered a Twitter
 application before, it's easy! Just sign-in using your Twitter account and the
 fill out the short form at <http://dev.twitter.com/apps/new>. If you've

data/lib/t/cli.rb

@@ -319,10 +319,10 @@ module T
         end
       end
       count = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = collect_with_count(count) do |opts|
+      tweets = collect_with_count(count) do |opts|
         client.favorites(user, opts)
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(faves favourites) => :favorites
 
@@ -491,10 +491,10 @@ module T
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     def mentions
       count = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = collect_with_count(count) do |opts|
+      tweets = collect_with_count(count) do |opts|
         client.mentions(opts)
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(replies) => :mentions
 
@@ -516,25 +516,6 @@ module T
       end
     end
 
-    desc "rate_limit", "Returns information related to Twitter API rate limiting."
-    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    def rate_limit
-      rate_limit_status = client.rate_limit_status
-      if options['csv']
-        require 'csv'
-        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-        say ["Hourly limit", "Remaining hits", "Reset time"].to_csv
-        say [rate_limit_status.hourly_limit, rate_limit_status.remaining_hits, csv_formatted_time(rate_limit_status, :reset_time)].to_csv
-      else
-        array = []
-        array << ["Hourly limit", number_with_delimiter(rate_limit_status.hourly_limit)]
-        array << ["Remaining hits", number_with_delimiter(rate_limit_status.remaining_hits)]
-        array << ["Reset time", "#{ls_formatted_time(rate_limit_status, :reset_time)} (#{time_from_now_in_words(rate_limit_status.reset_time)} from now)"]
-        print_table(array)
-      end
-    end
-    map %w(ratelimit rl) => :rate_limit
-
     desc "reply STATUS_ID MESSAGE", "Post your Tweet as a reply directed at another person."
     method_option "all", :aliases => "-a", :type => "boolean", :default => false, :desc => "Reply to all users mentioned in the Tweet."
     method_option "location", :aliases => "-l", :type => :boolean, :default => false
@@ -588,7 +569,7 @@ module T
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     def retweets(user=nil)
       count = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = if user
+      tweets = if user
         require 't/core_ext/string'
         user = if options['id']
           user.to_i
@@ -603,7 +584,7 @@ module T
           client.retweeted_by_me(opts)
         end
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(rts) => :retweets
 
@@ -654,28 +635,6 @@ module T
       end
     end
 
-    desc "suggest [USER]", "Returns a listing of Twitter users' accounts you might enjoy following."
-    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."
-    method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => "Limit the number of results."
-    method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option "sort", :aliases => "-s", :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => "screen_name", :desc => "Specify the order of the results.", :banner => "ORDER"
-    method_option "unsorted", :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    def suggest(user=nil)
-      if user
-        require 't/core_ext/string'
-        user = if options['id']
-          user.to_i
-        else
-          user.strip_ats
-        end
-      end
-      limit = options['number'] || DEFAULT_NUM_RESULTS
-      users = client.recommendations(user, :limit => limit)
-      print_users(users)
-    end
-
     desc "timeline [USER]", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets posted by a user."
     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."
@@ -691,15 +650,15 @@ module T
         else
           user.strip_ats
         end
-        statuses = collect_with_count(count) do |opts|
+        tweets = collect_with_count(count) do |opts|
           client.user_timeline(user, opts)
         end
       else
-        statuses = collect_with_count(count) do |opts|
+        tweets = collect_with_count(count) do |opts|
           client.home_timeline(opts)
         end
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(tl) => :timeline
 
@@ -716,10 +675,22 @@ module T
     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."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
+    method_option "sort", :aliases => "-s", :type => :string, :enum => %w(country name parent type woeid), :default => "name", :desc => "Specify the order of the results.", :banner => "ORDER"
     method_option "unsorted", :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
     def trend_locations
       places = client.trend_locations
-      places = places.sort_by{|places| places.name.downcase} unless options['unsorted']
+      places = case options['sort']
+      when 'country'
+        places.sort_by{|places| places.country.downcase}
+      when 'parent'
+        places.sort_by{|places| places.parent_id.to_i}
+      when 'type'
+        places.sort_by{|places| places.place_type.downcase}
+      when 'woeid'
+        places.sort_by{|places| places.woeid.to_i}
+      else
+        places.sort_by{|places| places.name.downcase}
+      end unless options['unsorted']
       places.reverse! if options['reverse']
       if options['csv']
         require 'csv'

data/lib/t/collectable.rb

@@ -12,19 +12,19 @@ module T
 
     def collect_with_cursor(collection=[], cursor=-1, &block)
       object = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-        yield cursor
+        yield(cursor)
       end
       collection += object.collection
       object.last? ? collection.flatten : collect_with_cursor(collection, object.next_cursor, &block)
     end
 
     def collect_with_max_id(collection=[], max_id=nil, &block)
-      array = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-        yield max_id
+      tweets = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+        yield(max_id)
       end
-      return collection if array.nil?
-      collection += array
-      array.empty? ? collection.flatten : collect_with_max_id(collection, array.last.id - 1, &block)
+      return collection if tweets.nil?
+      collection += tweets
+      tweets.empty? ? collection.flatten : collect_with_max_id(collection, tweets.last.id - 1, &block)
     end
 
     def collect_with_number(number, key, &block)
@@ -34,9 +34,9 @@ module T
         opts[:max_id] = max_id unless max_id.nil?
         opts[key] = number unless number >= MAX_NUM_RESULTS
         if number > 0
-          statuses = yield opts
-          number -= statuses.length
-          statuses
+          tweets = yield opts
+          number -= tweets.length
+          tweets
         end
       end.flatten.compact
     end
@@ -50,12 +50,12 @@ module T
     end
 
     def collect_with_page(collection=[], page=1, &block)
-      array = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      tweets = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
         yield page
       end
-      return collection if array.nil?
-      collection += array
-      array.empty? ? collection.flatten.uniq : collect_with_page(collection, page + 1, &block)
+      return collection if tweets.nil?
+      collection += tweets
+      tweets.empty? ? collection.flatten.uniq : collect_with_page(collection, page + 1, &block)
     end
 
   end

data/lib/t/delete.rb

@@ -58,8 +58,8 @@ module T
       require 't/core_ext/string'
       status_ids.map!(&:to_i)
       if options['force']
-        statuses = client.unfavorite(status_ids)
-        statuses.each do |status|
+        tweets = client.unfavorite(status_ids)
+        tweets.each do |status|
           say "@#{@rcfile.active_profile[0]} unfavorited @#{status.from_user}'s status: \"#{status.full_text}\""
         end
       else
@@ -96,16 +96,16 @@ module T
       require 't/core_ext/string'
       status_ids.map!(&:to_i)
       if options['force']
-        statuses = client.status_destroy(status_ids, :trim_user => true)
-        statuses.each do |status|
-          say "@#{@rcfile.active_profile[0]} deleted the status: \"#{status.full_text}\""
+        tweets = client.status_destroy(status_ids, :trim_user => true)
+        tweets.each do |status|
+          say "@#{@rcfile.active_profile[0]} deleted the Tweet: \"#{status.full_text}\""
         end
       else
         status_ids.each do |status_id|
           status = client.status(status_id, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to permanently delete @#{status.from_user}'s status: \"#{status.full_text}\"? [y/N]"
           client.status_destroy(status_id, :trim_user => true)
-          say "@#{@rcfile.active_profile[0]} deleted the status: \"#{status.full_text}\""
+          say "@#{@rcfile.active_profile[0]} deleted the Tweet: \"#{status.full_text}\""
         end
       end
     end

data/lib/t/list.rb

@@ -116,10 +116,10 @@ module T
     def timeline(list)
       owner, list = extract_owner(list, options)
       per_page = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = collect_with_per_page(per_page) do |opts|
+      tweets = collect_with_per_page(per_page) do |opts|
         client.list_timeline(owner, list, opts)
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(tl) => :timeline
 

data/lib/t/printable.rb

@@ -11,9 +11,9 @@ module T
       [list.id, ls_formatted_time(list), "@#{list.user.screen_name}", list.slug, list.member_count, list.subscriber_count, list.mode, list.description]
     end
 
-    def build_long_status(status)
+    def build_long_tweet(tweet)
       require 'htmlentities'
-      [status.id, ls_formatted_time(status), "@#{status.from_user}", HTMLEntities.new.decode(status.full_text).gsub(/\n+/, ' ')]
+      [tweet.id, ls_formatted_time(tweet), "@#{tweet.from_user}", HTMLEntities.new.decode(tweet.full_text).gsub(/\n+/, ' ')]
     end
 
     def build_long_user(user)
@@ -42,11 +42,11 @@ module T
       say [list.id, csv_formatted_time(list), list.user.screen_name, list.slug, list.member_count, list.subscriber_count, list.mode, list.description].to_csv
     end
 
-    def print_csv_status(status)
+    def print_csv_tweet(tweet)
       require 'csv'
       require 'fastercsv' unless Array.new.respond_to?(:to_csv)
       require 'htmlentities'
-      say [status.id, csv_formatted_time(status), status.from_user, HTMLEntities.new.decode(status.full_text)].to_csv
+      say [tweet.id, csv_formatted_time(tweet), tweet.from_user, HTMLEntities.new.decode(tweet.full_text)].to_csv
     end
 
     def print_csv_user(user)
@@ -124,24 +124,24 @@ module T
       say
     end
 
-    def print_statuses(statuses)
-      statuses.reverse! if options['reverse']
+    def print_tweets(tweets)
+      tweets.reverse! if options['reverse']
       if options['csv']
         require 'csv'
         require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-        say STATUS_HEADINGS.to_csv unless statuses.empty?
-        statuses.each do |status|
-          print_csv_status(status)
+        say STATUS_HEADINGS.to_csv unless tweets.empty?
+        tweets.each do |tweet|
+          print_csv_tweet(tweet)
         end
       elsif options['long']
-        array = statuses.map do |status|
-          build_long_status(status)
+        array = tweets.map do |tweet|
+          build_long_tweet(tweet)
         end
         format = options['format'] || STATUS_HEADINGS.size.times.map{"%s"}
         print_table_with_headings(array, STATUS_HEADINGS, format)
       else
-        statuses.each do |status|
-          print_message(status.user.screen_name, status.full_text)
+        tweets.each do |tweet|
+          print_message(tweet.user.screen_name, tweet.full_text)
         end
       end
     end
@@ -149,17 +149,17 @@ module T
     def print_users(users)
       users = case options['sort']
       when 'favorites'
-        users.sort_by{|user| user.favourites_count}
+        users.sort_by{|user| user.favourites_count.to_i}
       when 'followers'
-        users.sort_by{|user| user.followers_count}
+        users.sort_by{|user| user.followers_count.to_i}
       when 'friends'
-        users.sort_by{|user| user.friends_count}
+        users.sort_by{|user| user.friends_count.to_i}
       when 'listed'
-        users.sort_by{|user| user.listed_count}
+        users.sort_by{|user| user.listed_count.to_i}
       when 'since'
         users.sort_by{|user| user.created_at}
       when 'tweets'
-        users.sort_by{|user| user.statuses_count}
+        users.sort_by{|user| user.statuses_count.to_i}
       when 'tweeted'
         users.sort_by{|user| user.status.created_at rescue Time.at(0)}
       else

data/lib/t/search.rb

@@ -29,28 +29,28 @@ module T
     method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
     def all(query)
       rpp = options['number'] || DEFAULT_NUM_RESULTS
-      statuses = collect_with_rpp(rpp) do |opts|
+      tweets = collect_with_rpp(rpp) do |opts|
         client.search(query, opts).results
       end
-      statuses.reverse! if options['reverse']
+      tweets.reverse! if options['reverse']
       require 'htmlentities'
       if options['csv']
         require 'csv'
         require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-        say STATUS_HEADINGS.to_csv unless statuses.empty?
-        statuses.each do |status|
-          say [status.id, csv_formatted_time(status), status.from_user, HTMLEntities.new.decode(status.full_text)].to_csv
+        say STATUS_HEADINGS.to_csv unless tweets.empty?
+        tweets.each do |tweet|
+          say [tweet.id, csv_formatted_time(tweet), tweet.from_user, HTMLEntities.new.decode(tweet.full_text)].to_csv
         end
       elsif options['long']
-        array = statuses.map do |status|
-          [status.id, ls_formatted_time(status), "@#{status.from_user}", HTMLEntities.new.decode(status.full_text).gsub(/\n+/, ' ')]
+        array = tweets.map do |tweet|
+          [tweet.id, ls_formatted_time(tweet), "@#{tweet.from_user}", HTMLEntities.new.decode(tweet.full_text).gsub(/\n+/, ' ')]
         end
         format = options['format'] || STATUS_HEADINGS.size.times.map{"%s"}
         print_table_with_headings(array, STATUS_HEADINGS, format)
       else
-        say unless statuses.empty?
-        statuses.each do |status|
-          print_message(status.from_user, status.full_text)
+        say unless tweets.empty?
+        tweets.each do |tweet|
+          print_message(tweet.from_user, tweet.full_text)
         end
       end
     end
@@ -70,20 +70,20 @@ module T
         else
           user.strip_ats
         end
-        statuses = collect_with_max_id do |max_id|
+        tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.favorites(user, opts)
         end
       else
-        statuses = collect_with_max_id do |max_id|
+        tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.favorites(opts)
         end
       end
-      statuses = statuses.select do |status|
-        /#{query}/i.match(status.full_text)
+      tweets = tweets.select do |tweet|
+        /#{query}/i.match(tweet.full_text)
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(faves) => :favorites
 
@@ -94,14 +94,14 @@ module T
     def list(list, query)
       owner, list = extract_owner(list, options)
       opts = {:count => MAX_NUM_RESULTS}
-      statuses = collect_with_max_id do |max_id|
+      tweets = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
         client.list_timeline(owner, list, opts)
       end
-      statuses = statuses.select do |status|
-        /#{query}/i.match(status.full_text)
+      tweets = tweets.select do |tweet|
+        /#{query}/i.match(tweet.full_text)
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
 
     desc "mentions QUERY", "Returns Tweets mentioning you that match the specified query."
@@ -109,14 +109,14 @@ module T
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def mentions(query)
       opts = {:count => MAX_NUM_RESULTS}
-      statuses = collect_with_max_id do |max_id|
+      tweets = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
         client.mentions(opts)
       end
-      statuses = statuses.select do |status|
-        /#{query}/i.match(status.full_text)
+      tweets = tweets.select do |tweet|
+        /#{query}/i.match(tweet.full_text)
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(replies) => :mentions
 
@@ -135,20 +135,20 @@ module T
         else
           user.strip_ats
         end
-        statuses = collect_with_max_id do |max_id|
+        tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.retweeted_by_user(user, opts)
         end
       else
-        statuses = collect_with_max_id do |max_id|
+        tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.retweeted_by_me(opts)
         end
       end
-      statuses = statuses.select do |status|
-        /#{query}/i.match(status.full_text)
+      tweets = tweets.select do |tweet|
+        /#{query}/i.match(tweet.full_text)
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(rts) => :retweets
 
@@ -167,20 +167,20 @@ module T
         else
           user.strip_ats
         end
-        statuses = collect_with_max_id do |max_id|
+        tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.user_timeline(user, opts)
         end
       else
-        statuses = collect_with_max_id do |max_id|
+        tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
           client.home_timeline(opts)
         end
       end
-      statuses = statuses.select do |status|
-        /#{query}/i.match(status.full_text)
+      tweets = tweets.select do |tweet|
+        /#{query}/i.match(tweet.full_text)
       end
-      print_statuses(statuses)
+      print_tweets(tweets)
     end
     map %w(tl) => :timeline