t 1.7.2 → 2.0.0

data/README.md

@@ -6,7 +6,7 @@
 [![Build Status](https://secure.travis-ci.org/sferik/t.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/sferik/t.png?travis)][gemnasium]
 [![Coverage Status](https://coveralls.io/repos/sferik/t/badge.png?branch=master)][coveralls]
-[![Pledgie](http://www.pledgie.com/campaigns/17330.png)][pledgie]
+[![Pledgie](https://pledgie.com/campaigns/17330.png)][pledgie]
 [![Flattr](http://api.flattr.com/button/flattr-badge-large.png)][flattr]
 
 [gem]: https://rubygems.org/gems/t
@@ -38,6 +38,16 @@ If the output looks more like this, you need to [install Ruby][ruby]:
 
     ruby: command not found
 
+**On Linux**, for Debian-based systems, open a terminal and type:
+
+    sudo apt-get install ruby-dev
+
+or for Red Hat-based distros like Fedora and CentOS, type:
+
+    sudo yum install ruby-devel
+
+(if necessary, adapt for your package manager)
+
 **On Windows**, you can install Ruby with [RubyInstaller][].
 [rubyinstaller]: http://rubyinstaller.org/
 
@@ -49,7 +59,7 @@ To ensure the code you're installing hasn't been tampered with, it's
 recommended that you verify the signature. To do this, you need to add my
 public key as a trusted certificate (you only need to do this once):
 
-    gem cert --add <(curl -Ls https://gist.github.com/sferik/4701180/raw/public_cert.pem)
+    gem cert --add <(curl -Ls https://raw.github.com/sferik/t/master/certs/sferik.pem)
 
 Then, install the gem with the high security trust policy:
 
@@ -157,7 +167,7 @@ example, send a user a direct message only if he already follows you:
     t leaders | xargs t unfollow
 
 #### Unfollow 10 people who haven't tweeted in the longest time
-    t followings -l --sort=tweets | head -10 | awk '{print $1}' | xargs t unfollow
+    t followings -l --sort=tweeted | head -10 | awk '{print $1}' | xargs t unfollow -i 
 
 #### Twitter roulette: randomly follow someone who follows you (who you don't already follow)
     t groupies | shuf | head -1 | xargs t follow
@@ -172,7 +182,7 @@ example, send a user a direct message only if he already follows you:
     t stream timeline
 
 #### Count the number of employees who work for Twitter
-    t list members twitter team | wc -l
+    t list members twitter/team | wc -l
 
 #### Search Twitter for the 20 most recent Tweets that match a specified query
     t search all "query"
@@ -218,8 +228,12 @@ your Twitter account.
 
 `t` was also mentioned on [an episode of the Ruby 5 podcast][ruby5].
 
+`t` was also discussed on [an episode of the Ruby Rogues podcast][rubyrogues].
+
 [ruby5]: http://ruby5.envylabs.com/episodes/273-episode-269-may-4th-2012/stories/2400-t-command-line-power-tool-for-twitter
 
+[rubyrogues]: http://rubyrogues.com/127-rr-erik-michaels-ober/
+
 If you discuss `t` in a blog post or podcast, [let me know][email] and I'll
 link it here.
 
@@ -258,8 +272,8 @@ flags.
 Don't run Zsh? Why not [contribute][] completion support for your favorite
 shell?
 
-[completion]: etc
-[contribute]: CONTRIBUTING.md
+[completion]: https://github.com/sferik/t/tree/master/etc
+[contribute]: https://github.com/sferik/t/blob/master/CONTRIBUTING.md
 
 ## History
 The [twitter gem][gem] previously contained a command-line interface, up until
@@ -275,7 +289,6 @@ the original code.
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
@@ -302,5 +315,5 @@ If you are running t on a remote computer you can use the flag --display-url dur
 Copyright (c) 2011-2013 Erik Michaels-Ober. See [LICENSE][] for details.
 Application icon by [@nvk][nvk].
 
-[license]: LICENSE.md
+[license]: https://github.com/sferik/t/blob/master/LICENSE.md
 [nvk]: http://rodolfonovak.com

data/lib/t.rb

@@ -6,7 +6,7 @@ module T
 
     # Convert time to local time by applying the `utc_offset` setting.
     def local_time(time)
-      utc_offset ? (time.utc + utc_offset) : time.localtime
+      utc_offset ? (time.dup.utc + utc_offset) : time.localtime
     end
 
     # UTC offset in seconds to apply time instances before displaying.

data/lib/t/cli.rb

@@ -5,6 +5,7 @@ require 'thor'
 require 'twitter'
 require 't/collectable'
 require 't/delete'
+require 't/editor'
 require 't/list'
 require 't/printable'
 require 't/rcfile'
@@ -28,9 +29,7 @@ module T
 
     check_unknown_options!
 
-    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
     class_option "color", :aliases => "-C", :type => :string, :enum => %w(auto never), :default => "auto", :desc => "Control how color is used in output"
-    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
     class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
 
     def initialize(*)
@@ -50,7 +49,7 @@ module T
     end
 
     desc "authorize", "Allows an application to request user authorization"
-    method_option "display-url", :aliases => "-d", :type => :boolean, :default => false, :desc => "Display the authorization URL instead of attempting to open it."
+    method_option "display-uri", :aliases => "-d", :type => :boolean, :default => false, :desc => "Display the authorization URL instead of attempting to open it."
     def authorize
       @rcfile.path = options['profile'] if options['profile']
       if @rcfile.empty?
@@ -79,12 +78,12 @@ module T
         say
       end
       require 'launchy'
-      open_or_print( "https://dev.twitter.com/apps", :dry_run => options['display-url'] )
+      open_or_print( "https://dev.twitter.com/apps", :dry_run => options['display-uri'] )
       key = ask "Enter your consumer key:"
       secret = ask "Enter your consumer secret:"
-      consumer = OAuth::Consumer.new(key, secret, :site => base_url)
+      consumer = OAuth::Consumer.new(key, secret, :site => Twitter::REST::Client::ENDPOINT)
       request_token = consumer.get_request_token
-      url = generate_authorize_url(consumer, request_token)
+      uri = generate_authorize_uri(consumer, request_token)
       say
       say "In a moment, you will be directed to the Twitter app authorization page."
       say "Perform the following steps to complete the authorization process:"
@@ -94,7 +93,7 @@ module T
       say
       ask "Press [Enter] to open the Twitter app authorization page."
       say
-      open_or_print(url, :dry_run => options['display-url'])
+      open_or_print(uri, :dry_run => options['display-uri'])
       pin = ask "Enter the supplied PIN:"
       access_token = request_token.get_access_token(:oauth_verifier => pin.chomp)
       oauth_response = access_token.get('/1.1/account/verify_credentials.json?include_entities=false&skip_status=true')
@@ -137,7 +136,6 @@ module T
       require 'htmlentities'
       if options['csv']
         require 'csv'
-        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
         say DIRECT_MESSAGE_HEADINGS.to_csv unless direct_messages.empty?
         direct_messages.each do |direct_message|
           say [direct_message.id, csv_formatted_time(direct_message), direct_message.sender.screen_name, HTMLEntities.new.decode(direct_message.text)].to_csv
@@ -170,7 +168,6 @@ module T
       require 'htmlentities'
       if options['csv']
         require 'csv'
-        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
         say DIRECT_MESSAGE_HEADINGS.to_csv unless direct_messages.empty?
         direct_messages.each do |direct_message|
           say [direct_message.id, csv_formatted_time(direct_message), direct_message.recipient.screen_name, HTMLEntities.new.decode(direct_message.text)].to_csv
@@ -208,18 +205,14 @@ module T
         client.verify_credentials.screen_name
       end
       follower_ids = Thread.new do
-        collect_with_cursor do |cursor|
-          client.follower_ids(user, :cursor => cursor)
-        end
+        client.follower_ids(user).to_a
       end
       following_ids = Thread.new do
-        collect_with_cursor do |cursor|
-          client.friend_ids(user, :cursor => cursor)
-        end
+        client.friend_ids(user).to_a
       end
       disciple_ids = (follower_ids.value - following_ids.value)
       require 'retryable'
-      users = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         client.users(disciple_ids)
       end
       print_users(users)
@@ -295,7 +288,7 @@ module T
       status_ids.unshift(status_id)
       status_ids.map!(&:to_i)
       require 'retryable'
-      favorites = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      favorites = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         client.favorite(status_ids)
       end
       number = favorites.length
@@ -309,9 +302,17 @@ module T
     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 "max_id", :aliases => "-m", :type => :numeric, :desc => "Returns only the results with an ID less than the specified ID."
     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 "since_id", :aliases => "-s", :type => :numeric, :desc => "Returns only the results with an ID greater than the specified ID."
     def favorites(user=nil)
+      count = options['number'] || DEFAULT_NUM_RESULTS
+      opts = {}
+      opts[:exclude_replies] = true if options['exclude'] == 'replies'
+      opts[:include_rts] = false if options['exclude'] == 'retweets'
+      opts[:max_id] = options['max_id'] if options['max_id']
+      opts[:since_id] = options['since_id'] if options['since_id']
       if user
         require 't/core_ext/string'
         user = if options['id']
@@ -320,9 +321,8 @@ module T
           user.strip_ats
         end
       end
-      count = options['number'] || DEFAULT_NUM_RESULTS
       tweets = collect_with_count(count) do |count_opts|
-        client.favorites(user, count_opts)
+        client.favorites(user, count_opts.merge(opts))
       end
       print_tweets(tweets)
     end
@@ -355,11 +355,9 @@ module T
           user.strip_ats
         end
       end
-      following_ids = collect_with_cursor do |cursor|
-        client.friend_ids(user, :cursor => cursor)
-      end
+      following_ids = client.friend_ids(user).to_a
       require 'retryable'
-      users = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         client.users(following_ids)
       end
       print_users(users)
@@ -381,11 +379,9 @@ module T
           user.strip_ats
         end
       end
-      follower_ids = collect_with_cursor do |cursor|
-        client.follower_ids(user, :cursor => cursor)
-      end
+      follower_ids = client.follower_ids(user).to_a
       require 'retryable'
-      users = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         client.users(follower_ids)
       end
       print_users(users)
@@ -410,18 +406,14 @@ module T
         client.verify_credentials.screen_name
       end
       following_ids = Thread.new do
-        collect_with_cursor do |cursor|
-          client.friend_ids(user, :cursor => cursor)
-        end
+        client.friend_ids(user).to_a
       end
       follower_ids = Thread.new do
-        collect_with_cursor do |cursor|
-          client.follower_ids(user, :cursor => cursor)
-        end
+        client.follower_ids(user).to_a
       end
       friend_ids = (following_ids.value & follower_ids.value)
       require 'retryable'
-      users = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         client.users(friend_ids)
       end
       print_users(users)
@@ -446,18 +438,14 @@ module T
         client.verify_credentials.screen_name
       end
       following_ids = Thread.new do
-        collect_with_cursor do |cursor|
-          client.friend_ids(user, :cursor => cursor)
-        end
+        client.friend_ids(user).to_a
       end
       follower_ids = Thread.new do
-        collect_with_cursor do |cursor|
-          client.follower_ids(user, :cursor => cursor)
-        end
+        client.follower_ids(user).to_a
       end
       leader_ids = (following_ids.value - follower_ids.value)
       require 'retryable'
-      users = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         client.users(leader_ids)
       end
       print_users(users)
@@ -503,29 +491,29 @@ module T
     map %w(replies) => :mentions
 
     desc "open USER", "Opens that user's profile in a web browser."
-    method_option "display-url", :aliases => "-d", :type => :boolean, :default => false, :desc => "Display the requested URL instead of attempting to open it."
+    method_option "display-uri", :aliases => "-d", :type => :boolean, :default => false, :desc => "Display the requested URL instead of attempting to open it."
     method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "status", :aliases => "-s", :type => :boolean, :default => false, :desc => "Specify input as a Twitter status ID instead of a screen name."
     def open(user)
       require 'launchy'
       if options['id']
         user = client.user(user.to_i)
-        open_or_print("https://twitter.com/#{user.screen_name}", :dry_run => options['display-url'])
+        open_or_print(user.website, :dry_run => options['display-uri'])
       elsif options['status']
         status = client.status(user.to_i, :include_my_retweet => false)
-        open_or_print("https://twitter.com/#{status.from_user}/status/#{status.id}", :dry_run => options['display-url'])
+        open_or_print(status.uri, :dry_run => options['display-uri'])
       else
         require 't/core_ext/string'
-        open_or_print("https://twitter.com/#{user.strip_ats}", :dry_run => options['display-url'])
+        open_or_print("https://twitter.com/#{user.strip_ats}", :dry_run => options['display-uri'])
       end
     end
 
     desc "reply TWEET_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
+    method_option "location", :aliases => "-l", :type => :string, :default => "location", :desc => "Add location information. If the optional 'latitude,longitude' parameter is not supplied, looks up location by IP address."
     def reply(status_id, message)
       status = client.status(status_id.to_i, :include_my_retweet => false)
-      users = Array(status.from_user)
+      users = Array(status.user.screen_name)
       if options['all']
         users += extract_mentioned_screen_names(status.full_text)
         users.uniq!
@@ -533,7 +521,7 @@ module T
       require 't/core_ext/string'
       users.map!(&:prepend_at)
       opts = {:in_reply_to_status_id => status.id, :trim_user => true}
-      opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
+      add_location!(options, opts)
       reply = client.update("#{users.join(' ')} #{message}", opts)
       say "Reply posted by @#{@rcfile.active_profile[0]} to #{users.join(' ')}."
       say
@@ -555,7 +543,7 @@ module T
       status_ids.unshift(status_id)
       status_ids.map!(&:to_i)
       require 'retryable'
-      retweets = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      retweets = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         client.retweet(status_ids, :trim_user => true)
       end
       number = retweets.length
@@ -595,7 +583,8 @@ module T
     desc "ruler", "Prints a 140-character ruler"
     method_option "indent", :aliases => "-i", :type => :numeric, :default => 0, :desc => "The number of space to print before the ruler."
     def ruler
-      say "#{' ' * options['indent'].to_i}----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|"
+      markings = '----|'.chars.cycle.take(140).join
+      say "#{' ' * options['indent'].to_i}#{markings}"
     end
 
     desc "status TWEET_ID", "Retrieves detailed information about a Tweet."
@@ -603,8 +592,7 @@ module T
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def status(status_id)
       status = client.status(status_id.to_i, :include_my_retweet => false)
-      status_activity = client.status_activity(status_id.to_i)
-      location = if status.place
+      location = if status.place?
         if status.place.name && status.place.attributes && status.place.attributes[:street_address] && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
           [status.place.name, status.place.attributes[:street_address], status.place.attributes[:locality], status.place.attributes[:region], status.place.country].join(", ")
         elsif status.place.name && status.place.attributes && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
@@ -618,28 +606,26 @@ module T
         else
           status.place.name
         end
-      elsif status.geo
+      elsif status.geo?
         reverse_geocode(status.geo)
       end
-      status_headings = ["ID", "Posted at", "Screen name", "Text", "Retweets", "Favorites", "Replies", "Source", "Location"]
+      status_headings = ["ID", "Posted at", "Screen name", "Text", "Retweets", "Favorites", "Source", "Location"]
       if options['csv']
         require 'csv'
-        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
         say status_headings.to_csv
-        say [status.id, csv_formatted_time(status), status.from_user, decode_full_text(status), status.retweet_count, status_activity.favoriters_count, status_activity.repliers_count, strip_tags(status.source), location].to_csv
+        say [status.id, csv_formatted_time(status), status.user.screen_name, decode_full_text(status), status.retweet_count, status.favorite_count, strip_tags(status.source), location].to_csv
       elsif options['long']
-        array = [status.id, ls_formatted_time(status), "@#{status.from_user}", decode_full_text(status).gsub(/\n+/, ' '), status.retweet_count, status_activity.favoriters_count, status_activity.repliers_count, strip_tags(status.source), location]
+        array = [status.id, ls_formatted_time(status), "@#{status.user.screen_name}", decode_full_text(status).gsub(/\n+/, ' '), status.retweet_count, status.favorite_count, strip_tags(status.source), location]
         format = options['format'] || status_headings.size.times.map{"%s"}
         print_table_with_headings([array], status_headings, format)
       else
         array = []
         array << ["ID", status.id.to_s]
         array << ["Text", decode_full_text(status).gsub(/\n+/, ' ')]
-        array << ["Screen name", "@#{status.from_user}"]
+        array << ["Screen name", "@#{status.user.screen_name}"]
         array << ["Posted at", "#{ls_formatted_time(status)} (#{time_ago_in_words(status.created_at)} ago)"]
         array << ["Retweets", number_with_delimiter(status.retweet_count)]
-        array << ["Favorites", number_with_delimiter(status_activity.favoriters_count)]
-        array << ["Replies", number_with_delimiter(status_activity.repliers_count)]
+        array << ["Favorites", number_with_delimiter(status.favorite_count)]
         array << ["Source", strip_tags(status.source)]
         array << ["Location", location] unless location.nil?
         print_table(array)
@@ -713,7 +699,6 @@ module T
       places.reverse! if options['reverse']
       if options['csv']
         require 'csv'
-        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
         say TREND_HEADINGS.to_csv unless places.empty?
         places.each do |place|
           say [place.woeid, place.parent_id, place.place_type, place.name, place.country].to_csv
@@ -741,12 +726,13 @@ module T
       say "Run `#{File.basename($0)} follow #{users.map{|user| "@#{user.screen_name}"}.join(' ')}` to follow again."
     end
 
-    desc "update MESSAGE", "Post a Tweet."
-    method_option "location", :aliases => "-l", :type => :boolean, :default => false
+    desc "update [MESSAGE]", "Post a Tweet."
+    method_option "location", :aliases => "-l", :type => :string, :default => "location", :desc => "Add location information. If the optional 'latitude,longitude' parameter is not supplied, looks up location by IP address."
     method_option "file", :aliases => "-f", :type => :string, :desc => "The path to an image to attach to your tweet."
-    def update(message)
+    def update(message=nil)
+      message = T::Editor.gets if message.nil? || message.empty?
       opts = {:trim_user => true}
-      opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
+      add_location!(options, opts)
       status = if options['file']
         client.update_with_media(message, File.new(File.expand_path(options['file'])), opts)
       else
@@ -808,13 +794,13 @@ module T
         array << ["Screen name", "@#{user.screen_name}"]
         array << [user.verified ? "Name (Verified)" : "Name", user.name] unless user.name.nil?
         array << ["Tweets", number_with_delimiter(user.statuses_count)]
-        array << ["Favorites", number_with_delimiter(user.favourites_count)]
+        array << ["Favorites", number_with_delimiter(user.favorites_count)]
         array << ["Listed", number_with_delimiter(user.listed_count)]
         array << ["Following", number_with_delimiter(user.friends_count)]
         array << ["Followers", number_with_delimiter(user.followers_count)]
         array << ["Bio", user.description.gsub(/\n+/, ' ')] unless user.description.nil?
         array << ["Location", user.location] unless user.location.nil?
-        array << ["URL", user.url] unless user.url.nil?
+        array << ["URL", user.website] unless user.website.nil?
         print_table(array)
       end
     end
@@ -853,24 +839,27 @@ module T
       end
     end
 
-    def base_url
-      "#{protocol}://#{host}"
-    end
-
-    def generate_authorize_url(consumer, request_token)
+    def generate_authorize_uri(consumer, 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}"
+      "#{Twitter::REST::Client::ENDPOINT}#{request.path}?#{params}"
     end
 
     def pin_auth_parameters
       {:oauth_callback => 'oob'}
     end
 
+    def add_location!(options, opts)
+      if options['location']
+        lat, lng = options['location'] == 'location' ? [location.lat, location.lng] : options['location'].split(',').map(&:to_f)
+        opts.merge!(:lat => lat, :long => lng)
+      end
+    end
+
     def location
       return @location if @location
       require 'geokit'