t 0.5.1 → 0.6.0

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
   - 1.9.3
   - rbx-18mode
   - rbx-19mode
+  - ruby-head

data/lib/t/cli.rb

@@ -3,14 +3,17 @@ require 'active_support/core_ext/array/grouping'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/integer/time'
 require 'active_support/core_ext/numeric/time'
-require 'highline'
+require 'geokit'
 require 'launchy'
 require 'oauth'
+require 'open-uri'
 require 't/collectable'
 require 't/core_ext/string'
 require 't/delete'
 require 't/list'
+require 't/printable'
 require 't/rcfile'
+require 't/requestable'
 require 't/search'
 require 't/set'
 require 't/version'
@@ -23,10 +26,11 @@ module T
   class CLI < Thor
     include ActionView::Helpers::DateHelper
     include ActionView::Helpers::NumberHelper
+    include ActionView::Helpers::TextHelper
     include T::Collectable
+    include T::Printable
+    include T::Requestable
 
-    DEFAULT_HOST = 'api.twitter.com'
-    DEFAULT_PROTOCOL = 'https'
     DEFAULT_NUM_RESULTS = 20
     MAX_SCREEN_NAME_SIZE = 20
     MAX_USERS_PER_REQUEST = 100
@@ -95,7 +99,7 @@ module T
     def block(screen_name, *screen_names)
       screen_names.unshift(screen_name)
       screen_names.threaded_each do |screen_name|
-        screen_name.strip_at
+        screen_name.strip_ats
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.block(screen_name, :include_entities => false)
         end
@@ -107,8 +111,8 @@ module T
 
     desc "direct_messages", "Returns the #{DEFAULT_NUM_RESULTS} most recent Direct Messages sent to you."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
-    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
+    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."
     def direct_messages
       count = options['number'] || DEFAULT_NUM_RESULTS
       direct_messages = client.direct_messages(:count => count, :include_entities => false)
@@ -116,11 +120,11 @@ module T
       if 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.to_s, created_at, direct_message.sender.screen_name, direct_message.text.gsub(/\n+/, ' ')]
+          [number_with_delimiter(direct_message.id), created_at, direct_message.sender.screen_name, direct_message.text.gsub(/\n+/, ' ')]
         end
         if STDOUT.tty?
-          headings = ["ID", "Created at", "Screen name", "Text"]
-          array.unshift(headings)
+          headings = ["ID", "Posted at", "Screen name", "Text"]
+          array.unshift(headings) unless direct_messages.empty?
         end
         print_table(array)
       else
@@ -133,8 +137,8 @@ module T
 
     desc "direct_messages_sent", "Returns the #{DEFAULT_NUM_RESULTS} most recent Direct Messages sent to you."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
-    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
+    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."
     def direct_messages_sent
       count = options['number'] || DEFAULT_NUM_RESULTS
       direct_messages = client.direct_messages_sent(:count => count, :include_entities => false)
@@ -142,11 +146,11 @@ module T
       if 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.to_s, created_at, direct_message.recipient.screen_name, direct_message.text.gsub(/\n+/, ' ')]
+          [number_with_delimiter(direct_message.id), created_at, direct_message.recipient.screen_name, direct_message.text.gsub(/\n+/, ' ')]
         end
         if STDOUT.tty?
-          headings = ["ID", "Created at", "Screen name", "Text"]
-          array.unshift(headings)
+          headings = ["ID", "Posted at", "Screen name", "Text"]
+          array.unshift(headings) unless direct_messages.empty?
         end
         print_table(array)
       else
@@ -159,7 +163,7 @@ module T
 
     desc "dm SCREEN_NAME MESSAGE", "Sends that person a Direct Message."
     def dm(screen_name, message)
-      screen_name = screen_name.strip_at
+      screen_name = screen_name.strip_ats
       direct_message = client.direct_message_create(screen_name, message, :include_entities => false)
       say "Direct Message sent from @#{@rcfile.default_profile[0]} to @#{direct_message.recipient.screen_name} (#{time_ago_in_words(direct_message.created_at)} ago)."
     end
@@ -168,6 +172,7 @@ module T
     desc "favorite STATUS_ID [STATUS_ID...]", "Marks Tweets as favorites."
     def favorite(status_id, *status_ids)
       status_ids.unshift(status_id)
+      status_ids.map!(&:strip_commas).map!(&:to_i)
       favorites = status_ids.threaded_map do |status_id|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.favorite(status_id, :include_entities => false)
@@ -183,8 +188,8 @@ module T
 
     desc "favorites", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets you favorited."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
-    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
+    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."
     def favorites
       count = options['number'] || DEFAULT_NUM_RESULTS
       statuses = client.favorites(:count => count, :include_entities => false)
@@ -208,14 +213,14 @@ module T
 
     desc "followings", "Returns a list of the people you follow on Twitter."
     method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
-    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
+    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
+    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
     method_option :reverse, :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by total number of Tweets."
+    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
     method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
     def followings
       following_ids = collect_with_cursor do |cursor|
         client.friend_ids(:cursor => cursor)
@@ -230,14 +235,14 @@ module T
 
     desc "followers", "Returns a list of the people who follow you on Twitter."
     method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
-    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
+    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
+    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
     method_option :reverse, :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by total number of Tweets."
+    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
     method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
     def followers
       follower_ids = collect_with_cursor do |cursor|
         client.follower_ids(:cursor => cursor)
@@ -252,14 +257,14 @@ module T
 
     desc "friends", "Returns the list of people who you follow and follow you back."
     method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
-    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
+    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
+    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
     method_option :reverse, :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by total number of Tweets."
+    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
     method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
     def friends
       following_ids = collect_with_cursor do |cursor|
         client.friend_ids(:cursor => cursor)
@@ -278,14 +283,14 @@ module T
 
     desc "leaders", "Returns the list of people who you follow but don't follow you back."
     method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
-    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
+    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
+    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
     method_option :reverse, :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by total number of Tweets."
+    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
     method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
     def leaders
       following_ids = collect_with_cursor do |cursor|
         client.friend_ids(:cursor => cursor)
@@ -302,30 +307,10 @@ module T
       print_user_list(users)
     end
 
-    desc "members [SCREEN_NAME] LIST_NAME", "Returns the members of a Twitter list."
-    method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
-    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
-    method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
-    method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
-    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by total number of Tweets."
-    method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
-    def members(*args)
-      list = args.pop
-      owner = args.pop || @rcfile.default_profile[0]
-      users = collect_with_cursor do |cursor|
-        client.list_members(owner, list, :cursor => cursor, :include_entities => false, :skip_status => true)
-      end
-      print_user_list(users)
-    end
-
     desc "mentions", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets mentioning you."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
-    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
+    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."
     def mentions
       count = options['number'] || DEFAULT_NUM_RESULTS
       statuses = client.mentions(:count => count, :include_entities => false)
@@ -336,13 +321,14 @@ module T
     desc "open SCREEN_NAME", "Opens that user's profile in a web browser."
     method_option :dry_run, :type => :boolean
     def open(screen_name)
-      screen_name = screen_name.strip_at
+      screen_name = screen_name.strip_ats
       Launchy.open("https://twitter.com/#{screen_name}", :dry_run => options.fetch('dry_run', false))
     end
 
     desc "reply STATUS_ID MESSAGE", "Post your Tweet as a reply directed at another person."
     method_option :location, :aliases => "-l", :type => :boolean, :default => false
     def reply(status_id, message)
+      status_id = status_id.strip_commas
       status = client.status(status_id, :include_entities => false, :include_my_retweet => false, :trim_user => true)
       opts = {:in_reply_to_status_id => status.id, :include_entities => false, :trim_user => true}
       opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
@@ -356,7 +342,7 @@ module T
     def report_spam(screen_name, *screen_names)
       screen_names.unshift(screen_name)
       screen_names.threaded_each do |screen_name|
-        screen_name.strip_at
+        screen_name.strip_ats
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.report_spam(screen_name, :include_entities => false)
         end
@@ -368,6 +354,7 @@ module T
     desc "retweet STATUS_ID [STATUS_ID...]", "Sends Tweets to your followers."
     def retweet(status_id, *status_ids)
       status_ids.unshift(status_id)
+      status_ids.map!(&:strip_commas).map!(&:to_i)
       retweets = status_ids.threaded_map do |status_id|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.retweet(status_id, :include_entities => false, :trim_user => true)
@@ -383,39 +370,52 @@ module T
 
     desc "retweets [SCREEN_NAME]", "Returns the #{DEFAULT_NUM_RESULTS} most recent Retweets by a user."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
-    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
+    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."
     def retweets(screen_name=nil)
-      screen_name = screen_name.strip_at if screen_name
+      screen_name = screen_name.strip_ats if screen_name
       count = options['number'] || DEFAULT_NUM_RESULTS
       statuses = client.retweeted_by(screen_name, :count => count, :include_entities => false)
       print_status_list(statuses)
     end
     map %w(rts) => :retweets
 
-    desc "status MESSAGE", "Post a Tweet."
-    method_option :location, :aliases => "-l", :type => :boolean, :default => false
-    def status(message)
-      opts = {:include_entities => false, :trim_user => true}
-      opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
-      status = client.update(message, opts)
-      say "Tweet created by @#{@rcfile.default_profile[0]} (#{time_ago_in_words(status.created_at)} ago)."
-      say
-      say "Run `#{File.basename($0)} delete status #{status.id}` to delete."
+    desc "status STATUS_ID", "Retrieves detailed information about a Tweet."
+    def status(status_id)
+      status_id = status_id.strip_commas
+      status = client.status(status_id, :include_entities => false, :include_my_retweet => false)
+      created_at = status.created_at > 6.months.ago ? status.created_at.strftime("%b %e %H:%M") : status.created_at.strftime("%b %e  %Y")
+      array = []
+      array << ["Text", status.text.gsub(/\n+/, ' ')]
+      array << ["Screen name", "@#{status.user.screen_name}"]
+      array << ["Posted at", created_at]
+      unless status.geo.nil?
+        location = Geokit::Geocoders::MultiGeocoder.reverse_geocode(status.geo.coordinates)
+        if location.city && location.state && location.country
+          array << ["Location", [location.city, location.state, location.country].join(", ")]
+        elsif location.state && location.country
+          array << ["Location", [location.state, location.country].join(", ")]
+        elsif location.country
+          array << ["Location", [location.country].join(", ")]
+        end
+      end
+      array << ["Retweets", number_with_delimiter(status.retweet_count)] unless status.retweet_count.zero?
+      array << ["Source", strip_tags(status.source)]
+      array << ["URL", "https://twitter.com/#{status.user.screen_name}/status/#{status.id}"]
+      print_table(array)
     end
-    map %w(post tweet update) => :status
 
     desc "suggest", "This command returns a listing of Twitter users' accounts we think you might enjoy following."
     method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
+    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
+    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
-    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
+    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 :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by total number of Tweets."
+    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
     method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
     def suggest
       limit = options['number'] || DEFAULT_NUM_RESULTS
       users = client.recommendations(:limit => limit, :include_entities => false)
@@ -424,12 +424,12 @@ module T
 
     desc "timeline [SCREEN_NAME]", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets posted by a user."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
-    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
+    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."
     def timeline(screen_name=nil)
       count = options['number'] || DEFAULT_NUM_RESULTS
       if screen_name
-        screen_name = screen_name.strip_at
+        screen_name = screen_name.strip_ats
         statuses = client.user_timeline(screen_name, :count => count, :include_entities => false)
       else
         statuses = client.home_timeline(:count => count, :include_entities => false)
@@ -452,17 +452,28 @@ module T
       say "Run `#{File.basename($0)} follow users #{screen_names.join(' ')}` to follow again."
     end
 
+    desc "update MESSAGE", "Post a Tweet."
+    method_option :location, :aliases => "-l", :type => :boolean, :default => false
+    def update(message)
+      opts = {:include_entities => false, :trim_user => true}
+      opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
+      status = client.update(message, opts)
+      say "Tweet created by @#{@rcfile.default_profile[0]} (#{time_ago_in_words(status.created_at)} ago)."
+      say
+      say "Run `#{File.basename($0)} delete status #{status.id}` to delete."
+    end
+    map %w(post tweet) => :update
+
     desc "users SCREEN_NAME [SCREEN_NAME...]", "Returns a list of users you specify."
     method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
-    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
+    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
+    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of friends."
     method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
-    method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
     method_option :reverse, :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by total number of Tweets."
+    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
     method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
     def users(screen_name, *screen_names)
       screen_names.unshift(screen_name)
       users = client.users(screen_names, :include_entities => false)
@@ -478,13 +489,26 @@ module T
 
     desc "whois SCREEN_NAME", "Retrieves profile information for the user."
     def whois(screen_name)
-      screen_name = screen_name.strip_at
+      screen_name = screen_name.strip_ats
       user = client.user(screen_name, :include_entities => false)
-      say "id: ##{number_with_delimiter(user.id)}"
-      say "#{user.name}, since #{user.created_at.strftime("%b %Y")}."
-      say "bio: #{user.description}"
-      say "location: #{user.location}"
-      say "web: #{user.url}"
+      array = []
+      name_label = user.verified ? "Name (Verified)" : "Name"
+      array << ["ID", number_with_delimiter(user.id)]
+      array << [name_label, user.name] unless user.name.nil?
+      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?
+      following = user.following ? "Following" : "Not following"
+      array << ["Status", following] unless user.following.nil?
+      array << ["Last update", "#{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)]
+      array << ["Favorites", number_with_delimiter(user.favourites_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)]
+      print_table(array)
     end
 
     desc "delete SUBCOMMAND ...ARGS", "Delete Tweets, Direct Messages, etc."
@@ -503,22 +527,6 @@ module T
 
   private
 
-    def base_url
-      "#{protocol}://#{host}"
-    end
-
-    def client
-      return @client if @client
-      @rcfile.path = options['profile'] if options['profile']
-      @client = Twitter::Client.new(
-        :endpoint => base_url,
-        :consumer_key => @rcfile.default_consumer_key,
-        :consumer_secret => @rcfile.default_consumer_secret,
-        :oauth_token => @rcfile.default_token,
-        :oauth_token_secret  => @rcfile.default_secret
-      )
-    end
-
     def consumer
       OAuth::Consumer.new(
         options['consumer_key'],
@@ -537,14 +545,8 @@ module T
       "#{base_url}#{request.path}?#{params}"
     end
 
-    def host
-      options['host'] || DEFAULT_HOST
-    end
-
     def location
       return @location if @location
-      require 'geokit'
-      require 'open-uri'
       ip_address = Kernel::open("http://checkip.dyndns.org/") do |body|
         /(?:\d{1,3}\.){3}\d{1,3}/.match(body.read)[0]
       end
@@ -555,75 +557,5 @@ module T
       {:oauth_callback => 'oob'}
     end
 
-    def print_in_columns(array)
-      cols = HighLine::SystemExtensions.terminal_size[0]
-      width = (array.map{|el| el.to_s.size}.max || 0) + 2
-      array.each_with_index do |value, index|
-        puts if (((index) % (cols / width))).zero? && !index.zero?
-        printf("%-#{width}s", value)
-      end
-      puts
-    end
-
-    def print_status_list(statuses)
-      statuses.reverse! if options['reverse']
-      if 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.to_s, created_at, status.user.screen_name, status.text.gsub(/\n+/, ' ')]
-        end
-        if STDOUT.tty?
-          headings = ["ID", "Created at", "Screen name", "Text"]
-          array.unshift(headings)
-        end
-        print_table(array)
-      else
-        statuses.each do |status|
-          say "#{status.user.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text.gsub(/\n+/, ' ')} (#{time_ago_in_words(status.created_at)} ago)"
-        end
-      end
-    end
-
-    def print_user_list(users)
-      users = users.sort_by{|user| user.screen_name.downcase} unless options['unsorted']
-      if options['created']
-        users = users.sort_by{|user| user.created_at}
-      elsif options['favorites']
-        users = users.sort_by{|user| user.favourites_count}
-      elsif options['followers']
-        users = users.sort_by{|user| user.followers_count}
-      elsif options['friends']
-        users = users.sort_by{|user| user.friends_count}
-      elsif options['listed']
-        users = users.sort_by{|user| user.listed_count}
-      elsif options['tweets']
-        users = users.sort_by{|user| user.statuses_count}
-      end
-      users.reverse! if options['reverse']
-      if 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, user.statuses_count, user.friends_count, user.followers_count, user.favourites_count, user.listed_count, user.screen_name, user.name]
-        end
-        if STDOUT.tty?
-          headings = ["ID", "Created at", "Tweets", "Following", "Followers", "Favorites", "Listed", "Screen name", "Name"]
-          array.unshift(headings)
-        end
-        print_table(array)
-      else
-        if STDOUT.tty?
-          print_in_columns(users.map(&:screen_name))
-        else
-          users.map(&:screen_name).each do |user|
-            say user
-          end
-        end
-      end
-    end
-
-    def protocol
-      options['no_ssl'] ? 'http' : DEFAULT_PROTOCOL
-    end
-
   end
 end