t 2.2.1 → 2.3.0

data/lib/t/delete.rb

@@ -17,7 +17,7 @@ module T
     end
 
     desc 'block USER [USER...]', 'Unblock users.'
-    method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify input as Twitter user IDs instead of screen names.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify input as Twitter user IDs instead of screen names.'
     method_option 'force', :aliases => '-f', :type => :boolean, :default => false
     def block(user, *users)
       unblocked_users, number = fetch_users(users.unshift(user), options) do |users_to_unblock|
@@ -25,7 +25,7 @@ module T
       end
       say "@#{@rcfile.active_profile[0]} unblocked #{pluralize(number, 'user')}."
       say
-      say "Run `#{File.basename($PROGRAM_NAME)} block #{unblocked_users.map { |unblocked_user| "@#{unblocked_user.screen_name}" }.join(' ')}` to block."
+      say "Run `#{File.basename($PROGRAM_NAME)} block #{unblocked_users.collect { |unblocked_user| "@#{unblocked_user.screen_name}" }.join(' ')}` to block."
     end
 
     desc 'dm [DIRECT_MESSAGE_ID] [DIRECT_MESSAGE_ID...]', 'Delete the last Direct Message sent.'
@@ -33,7 +33,7 @@ module T
     def dm(direct_message_id, *direct_message_ids)
       direct_message_ids.unshift(direct_message_id)
       require 't/core_ext/string'
-      direct_message_ids.map!(&:to_i)
+      direct_message_ids.collect!(&:to_i)
       if options['force']
         direct_messages = client.destroy_direct_message(direct_message_ids)
         direct_messages.each do |direct_message|
@@ -55,7 +55,7 @@ module T
     def favorite(status_id, *status_ids)
       status_ids.unshift(status_id)
       require 't/core_ext/string'
-      status_ids.map!(&:to_i)
+      status_ids.collect!(&:to_i)
       if options['force']
         tweets = client.unfavorite(status_ids)
         tweets.each do |status|
@@ -74,7 +74,7 @@ module T
 
     desc 'list LIST', 'Delete a list.'
     method_option 'force', :aliases => '-f', :type => :boolean, :default => false
-    method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify list via ID instead of slug.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify list via ID instead of slug.'
     def list(list)
       if options['id']
         require 't/core_ext/string'
@@ -93,7 +93,7 @@ module T
     def status(status_id, *status_ids)
       status_ids.unshift(status_id)
       require 't/core_ext/string'
-      status_ids.map!(&:to_i)
+      status_ids.collect!(&:to_i)
       if options['force']
         tweets = client.destroy_status(status_ids, :trim_user => true)
         tweets.each do |status|

data/lib/t/list.rb

@@ -25,7 +25,7 @@ module T
     end
 
     desc 'add LIST USER [USER...]', 'Add members to a list.'
-    method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify input as Twitter user IDs instead of screen names.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify input as Twitter user IDs instead of screen names.'
     def add(list, user, *users)
       added_users, number = fetch_users(users.unshift(user), options) do |users_to_add|
         client.add_list_members(list, users_to_add)
@@ -36,7 +36,7 @@ module T
       if options['id']
         say "Run `#{File.basename($PROGRAM_NAME)} list remove --id #{list} #{added_users.join(' ')}` to undo."
       else
-        say "Run `#{File.basename($PROGRAM_NAME)} list remove #{list} #{added_users.map { |added_user| "@#{added_user}" }.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list remove #{list} #{added_users.collect { |added_user| "@#{added_user}" }.join(' ')}` to undo."
       end
     end
 
@@ -50,7 +50,7 @@ module T
     end
 
     desc 'information [USER/]LIST', 'Retrieves detailed information about a Twitter list.'
-    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
     def information(list)
       owner, list = extract_owner(list, options)
       list = client.list(owner, list)
@@ -76,12 +76,12 @@ module T
     map %w[details] => :information
 
     desc 'members [USER/]LIST', 'Returns the members of a Twitter list.'
-    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 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
+    method_option 'reverse', :aliases => '-r', :type => :boolean, :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.'
+    method_option 'unsorted', :aliases => '-u', :type => :boolean, :desc => 'Output is not sorted.'
     def members(list)
       owner, list = extract_owner(list, options)
       users = client.list_members(owner, list).to_a
@@ -89,7 +89,7 @@ module T
     end
 
     desc 'remove LIST USER [USER...]', 'Remove members from a list.'
-    method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify input as Twitter user IDs instead of screen names.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify input as Twitter user IDs instead of screen names.'
     def remove(list, user, *users)
       removed_users, number = fetch_users(users.unshift(user), options) do |users_to_remove|
         client.remove_list_members(list, users_to_remove)
@@ -100,17 +100,18 @@ module T
       if options['id']
         say "Run `#{File.basename($PROGRAM_NAME)} list add --id #{list} #{removed_users.join(' ')}` to undo."
       else
-        say "Run `#{File.basename($PROGRAM_NAME)} list add #{list} #{removed_users.map { |removed_user| "@#{removed_user}" }.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list add #{list} #{removed_users.collect { |removed_user| "@#{removed_user}" }.join(' ')}` to undo."
       end
     end
 
     desc 'timeline [USER/]LIST', 'Show tweet timeline for members of the specified list.'
-    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
-    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
-    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 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :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 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
+    method_option 'reverse', :aliases => '-r', :type => :boolean, :desc => 'Reverse the order of the sort.'
     def timeline(list)
       owner, list = extract_owner(list, options)
       count = options['number'] || DEFAULT_NUM_RESULTS

data/lib/t/printable.rb

@@ -16,7 +16,7 @@ module T
     end
 
     def build_long_user(user)
-      [user.id, ls_formatted_time(user), ls_formatted_time(user.status), user.statuses_count, user.favorites_count, user.listed_count, user.friends_count, user.followers_count, "@#{user.screen_name}", user.name, user.verified? ? 'Yes' : 'No', user.protected? ? 'Yes' : 'No', user.description.gsub(/\n+/, ' '), user.status ? decode_full_text(user.status, options['decode_uris']).gsub(/\n+/, ' ') : nil, user.location, user.website.to_s]
+      [user.id, ls_formatted_time(user), ls_formatted_time(user.status), user.statuses_count, user.favorites_count, user.listed_count, user.friends_count, user.followers_count, "@#{user.screen_name}", user.name, user.verified? ? 'Yes' : 'No', user.protected? ? 'Yes' : 'No', user.description.gsub(/\n+/, ' '), user.status? ? decode_full_text(user.status, options['decode_uris']).gsub(/\n+/, ' ') : nil, user.location, user.website.to_s]
     end
 
     def csv_formatted_time(object, key = :created_at)
@@ -49,7 +49,7 @@ module T
 
     def print_csv_user(user)
       require 'csv'
-      say [user.id, csv_formatted_time(user), csv_formatted_time(user.status), user.statuses_count, user.favorites_count, user.listed_count, user.friends_count, user.followers_count, user.screen_name, user.name, user.verified?, user.protected?, user.description, user.status ? user.status.full_text : nil, user.location, user.website].to_csv
+      say [user.id, csv_formatted_time(user), csv_formatted_time(user.status), user.statuses_count, user.favorites_count, user.listed_count, user.friends_count, user.followers_count, user.screen_name, user.name, user.verified?, user.protected?, user.description, user.status? ? user.status.full_text : nil, user.location, user.website].to_csv
     end
 
     def print_lists(lists)
@@ -73,10 +73,10 @@ module T
           print_csv_list(list)
         end
       elsif options['long']
-        array = lists.map do |list|
+        array = lists.collect do |list|
           build_long_list(list)
         end
-        format = options['format'] || LIST_HEADINGS.size.times.map { '%s' }
+        format = options['format'] || LIST_HEADINGS.size.times.collect { '%s' }
         print_table_with_headings(array, LIST_HEADINGS, format)
       else
         print_attribute(lists, :full_name)
@@ -85,7 +85,7 @@ module T
 
     def print_attribute(array, attribute)
       if STDOUT.tty?
-        print_in_columns(array.map(&attribute.to_sym))
+        print_in_columns(array.collect(&attribute.to_sym))
       else
         array.each do |element|
           say element.send(attribute.to_sym)
@@ -98,8 +98,8 @@ module T
       if STDOUT.tty?
         array.unshift(headings)
         require 't/core_ext/kernel'
-        array.map! do |row|
-          row.each_with_index.map do |element, index|
+        array.collect! do |row|
+          row.each_with_index.collect do |element, index|
             Kernel.send(element.class.name.to_sym, format[index] % element)
           end
         end
@@ -130,10 +130,10 @@ module T
           print_csv_tweet(tweet)
         end
       elsif options['long']
-        array = tweets.map do |tweet|
+        array = tweets.collect do |tweet|
           build_long_tweet(tweet)
         end
-        format = options['format'] || TWEET_HEADINGS.size.times.map { '%s' }
+        format = options['format'] || TWEET_HEADINGS.size.times.collect { '%s' }
         print_table_with_headings(array, TWEET_HEADINGS, format)
       else
         tweets.each do |tweet|
@@ -169,10 +169,10 @@ module T
           print_csv_user(user)
         end
       elsif options['long']
-        array = users.map do |user|
+        array = users.collect do |user|
           build_long_user(user)
         end
-        format = options['format'] || USER_HEADINGS.size.times.map { '%s' }
+        format = options['format'] || USER_HEADINGS.size.times.collect { '%s' }
         print_table_with_headings(array, USER_HEADINGS, format)
       else
         print_attribute(users, :screen_name)

data/lib/t/rcfile.rb

@@ -20,7 +20,7 @@ module T
       if possibilities.size == 1
         possibilities.first
       else
-        fail ArgumentError, "Username #{username} is #{possibilities.size < 1 ? 'not found.' : 'ambiguous, matching ' + possibilities.join(', ')}"
+        fail(ArgumentError.new("Username #{username} is #{possibilities.size < 1 ? 'not found.' : 'ambiguous, matching ' + possibilities.join(', ')}"))
       end
     end
 

data/lib/t/requestable.rb

@@ -2,7 +2,7 @@ require 'twitter'
 
 module T
   module Requestable
-    private
+  private
 
     def client
       return @client if @client

data/lib/t/search.rb

@@ -25,10 +25,11 @@ module T
     end
 
     desc 'all QUERY', "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets that match the specified query."
-    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
-    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
-    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     def all(query)
       count = options['number'] || DEFAULT_NUM_RESULTS
       opts = {:count => MAX_SEARCH_RESULTS}
@@ -42,10 +43,10 @@ module T
           say [tweet.id, csv_formatted_time(tweet), tweet.user.screen_name, decode_full_text(tweet, options['decode_uris'])].to_csv
         end
       elsif options['long']
-        array = tweets.map do |tweet|
+        array = tweets.collect do |tweet|
           [tweet.id, ls_formatted_time(tweet), "@#{tweet.user.screen_name}", decode_full_text(tweet, options['decode_uris']).gsub(/\n+/, ' ')]
         end
-        format = options['format'] || TWEET_HEADINGS.size.times.map { '%s' }
+        format = options['format'] || TWEET_HEADINGS.size.times.collect { '%s' }
         print_table_with_headings(array, TWEET_HEADINGS, format)
       else
         say unless tweets.empty?
@@ -56,10 +57,11 @@ module T
     end
 
     desc 'favorites [USER] QUERY', "Returns Tweets you've favorited that match the specified query."
-    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
-    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
-    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 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     def favorites(*args)
       query = args.pop
       user = args.pop
@@ -86,10 +88,11 @@ module T
     map %w[faves] => :favorites
 
     desc 'list [USER/]LIST QUERY', 'Returns Tweets on a list that match the specified query.'
-    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
-    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
-    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 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     def list(list, query)
       owner, list = extract_owner(list, options)
       opts = {:count => MAX_NUM_RESULTS}
@@ -105,9 +108,10 @@ module T
     end
 
     desc 'mentions QUERY', 'Returns Tweets mentioning you that match the specified query.'
-    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
-    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
-    method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     def mentions(query)
       opts = {:count => MAX_NUM_RESULTS}
       opts[:include_entities] = !!options['decode_uris']
@@ -123,10 +127,11 @@ module T
     map %w[replies] => :mentions
 
     desc 'retweets [USER] QUERY', "Returns Tweets you've retweeted that match the specified query."
-    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
-    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
-    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 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     def retweets(*args)
       query = args.pop
       user = args.pop
@@ -153,12 +158,13 @@ module T
     map %w[rts] => :retweets
 
     desc 'timeline [USER] QUERY', 'Returns Tweets in your timeline that match the specified query.'
-    method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
-    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'exclude', :aliases => '-e', :type => :string, :enum => %w[replies retweets], :desc => 'Exclude certain types of Tweets from the results.', :banner => 'TYPE'
-    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 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :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 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'since_id', :aliases => '-s', :type => :numeric, :desc => 'Returns only the results with an ID greater than the specified ID.'
     def timeline(*args)
       query = args.pop
@@ -190,11 +196,12 @@ module T
     map %w[tl] => :timeline
 
     desc 'users QUERY', 'Returns users that match the 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.'
-    method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
+    method_option 'reverse', :aliases => '-r', :type => :boolean, :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.'
+    method_option 'unsorted', :aliases => '-u', :type => :boolean, :desc => 'Output is not sorted.'
     def users(query)
       users = collect_with_page do |page|
         client.user_search(query, :page => page)

data/lib/t/set.rb

@@ -49,7 +49,7 @@ module T
     end
 
     desc 'profile_background_image FILE', 'Sets the background image on your Twitter profile.'
-    method_option 'tile', :aliases => '-t', :type => :boolean, :default => false, :desc => 'Whether or not to tile the background image.'
+    method_option 'tile', :aliases => '-t', :type => :boolean, :desc => 'Whether or not to tile the background image.'
     def profile_background_image(file)
       client.update_profile_background_image(File.new(File.expand_path(file)), :tile => options['tile'], :skip_status => true)
       say "@#{@rcfile.active_profile[0]}'s background image has been updated."

data/lib/t/stream.rb

@@ -22,15 +22,15 @@ module T
     end
 
     desc 'all', 'Stream a random sample of all Tweets (Control-C to stop)'
-    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 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     def all
       client.before_request do
         if options['csv']
           require 'csv'
           say TWEET_HEADINGS.to_csv
         elsif options['long'] && STDOUT.tty?
-          headings = TWEET_HEADINGS.size.times.map do |index|
+          headings = TWEET_HEADINGS.size.times.collect do |index|
             TWEET_HEADINGS_FORMATTING[index] % TWEET_HEADINGS[index]
           end
           print_table([headings])
@@ -41,7 +41,7 @@ module T
         if options['csv']
           print_csv_tweet(tweet)
         elsif options['long']
-          array = build_long_tweet(tweet).each_with_index.map do |element, index|
+          array = build_long_tweet(tweet).each_with_index.collect do |element, index|
             TWEET_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
@@ -60,8 +60,8 @@ module T
     end
 
     desc 'search KEYWORD [KEYWORD...]', 'Stream Tweets that contain specified keywords, joined with logical ORs (Control-C to stop)'
-    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 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     def search(keyword, *keywords)
       keywords.unshift(keyword)
       require 't/search'
@@ -77,7 +77,7 @@ module T
         if options['csv']
           print_csv_tweet(tweet)
         elsif options['long']
-          array = build_long_tweet(tweet).each_with_index.map do |element, index|
+          array = build_long_tweet(tweet).each_with_index.collect do |element, index|
             TWEET_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
@@ -88,8 +88,8 @@ module T
     end
 
     desc 'timeline', 'Stream your timeline (Control-C to stop)'
-    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 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     def timeline
       require 't/cli'
       client.before_request do
@@ -104,7 +104,7 @@ module T
         if options['csv']
           print_csv_tweet(tweet)
         elsif options['long']
-          array = build_long_tweet(tweet).each_with_index.map do |element, index|
+          array = build_long_tweet(tweet).each_with_index.collect do |element, index|
             TWEET_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
@@ -115,17 +115,17 @@ module T
     end
 
     desc 'users USER_ID [USER_ID...]', 'Stream Tweets either from or in reply to specified users (Control-C to stop)'
-    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 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     def users(user_id, *user_ids)
       user_ids.unshift(user_id)
-      user_ids.map!(&:to_i)
+      user_ids.collect!(&:to_i)
       client.before_request do
         if options['csv']
           require 'csv'
           say TWEET_HEADINGS.to_csv
         elsif options['long'] && STDOUT.tty?
-          headings = TWEET_HEADINGS.size.times.map do |index|
+          headings = TWEET_HEADINGS.size.times.collect do |index|
             TWEET_HEADINGS_FORMATTING[index] % TWEET_HEADINGS[index]
           end
           print_table([headings])
@@ -136,7 +136,7 @@ module T
         if options['csv']
           print_csv_tweet(tweet)
         elsif options['long']
-          array = build_long_tweet(tweet).each_with_index.map do |element, index|
+          array = build_long_tweet(tweet).each_with_index.collect do |element, index|
             TWEET_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)