t 0.5.1 → 0.6.0

data/lib/t/core_ext/string.rb

@@ -1,7 +1,11 @@
 class String
 
-  def strip_at
+  def strip_ats
     self.tr('@', '')
   end
 
+  def strip_commas
+    self.tr(',', '')
+  end
+
 end

data/lib/t/delete.rb

@@ -18,7 +18,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.unblock(screen_name, :include_entities => false)
         end
@@ -28,17 +28,17 @@ module T
       say "Run `#{File.basename($0)} block #{screen_names.join(' ')}` to block."
     end
 
-    desc "dm", "Delete the last Direct Message sent."
-    def dm
-      direct_message = client.direct_messages_sent(:count => 1, :include_entities => false).first
-      if direct_message
-        unless parent_options['force']
+    desc "dm [DIRECT_MESSAGE_ID] [DIRECT_MESSAGE_ID...]", "Delete the last Direct Message sent."
+    def dm(direct_message_id, *direct_message_ids)
+      direct_message_ids.unshift(direct_message_id)
+      direct_message_ids.map!(&:strip_commas).map!(&:to_i)
+      direct_message_ids.each do |direct_message_id|
+        unless options['force']
+          direct_message = client.direct_message(direct_message_id, :include_entities => false)
           return unless yes? "Are you sure you want to permanently delete the direct message to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\"? [y/N]"
         end
-        direct_message = client.direct_message_destroy(direct_message.id, :include_entities => false)
-        say "@#{direct_message.sender.screen_name} deleted the direct message sent to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\""
-      else
-        raise Thor::Error, "Direct Message not found"
+        direct_message = client.direct_message_destroy(direct_message_id, :include_entities => false)
+        say "@#{@rcfile.default_profile[0]} deleted the direct message sent to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\""
       end
     end
     map %w(m) => :dm
@@ -47,7 +47,7 @@ module T
     def favorite(status_id, *status_ids)
       status_ids.unshift(status_id)
       status_ids.each do |status_id|
-        unless parent_options['force']
+        unless options['force']
           status = client.status(status_id, :include_entities => false, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to delete the favorite of @#{status.user.screen_name}'s status: \"#{status.text}\"? [y/N]"
         end
@@ -59,7 +59,7 @@ module T
 
     desc "list LIST_NAME", "Delete a list."
     def list(list_name)
-      unless parent_options['force']
+      unless options['force']
         return unless yes? "Are you sure you want to permanently delete the list \"#{list_name}\"? [y/N]"
       end
       status = client.list_destroy(list_name)
@@ -70,7 +70,7 @@ module T
     def status(status_id, *status_ids)
       status_ids.unshift(status_id)
       status_ids.each do |status_id|
-        unless parent_options['force']
+        unless options['force']
           status = client.status(status_id, :include_entities => false, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to permanently delete @#{status.user.screen_name}'s status: \"#{status.text}\"? [y/N]"
         end

data/lib/t/list.rb

@@ -1,8 +1,10 @@
 require 'action_view'
 require 'active_support/core_ext/array/grouping'
 require 'retryable'
+require 't/collectable'
 require 't/core_ext/enumerable'
 require 't/core_ext/string'
+require 't/printable'
 require 't/rcfile'
 require 't/requestable'
 require 'thor'
@@ -10,6 +12,8 @@ require 'thor'
 module T
   class List < Thor
     include ActionView::Helpers::DateHelper
+    include T::Collectable
+    include T::Printable
     include T::Requestable
 
     DEFAULT_NUM_RESULTS = 20
@@ -24,19 +28,19 @@ module T
       @rcfile = RCFile.instance
     end
 
-    desc "add LIST_NAME SCREEN_NAME [SCREEN_NAME...]", "Add users to a list."
+    desc "add LIST_NAME SCREEN_NAME [SCREEN_NAME...]", "Add members to a list."
     def add(list_name, screen_name, *screen_names)
       screen_names.unshift(screen_name)
-      screen_names.map!(&:strip_at)
+      screen_names.map!(&:strip_ats)
       screen_names.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_each do |user_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.list_add_members(list_name, user_id_group)
         end
       end
       number = screen_names.length
-      say "@#{@rcfile.default_profile[0]} added #{number} #{number == 1 ? 'user' : 'users'} to the list \"#{list_name}\"."
+      say "@#{@rcfile.default_profile[0]} added #{number} #{number == 1 ? 'member' : 'members'} to the list \"#{list_name}\"."
       say
-      say "Run `#{File.basename($0)} list remove users #{list_name} #{screen_names.join(' ')}` to undo."
+      say "Run `#{File.basename($0)} list remove #{list_name} #{screen_names.join(' ')}` to undo."
     end
 
     desc "create LIST_NAME [DESCRIPTION]", "Create a new list."
@@ -48,54 +52,57 @@ module T
       say "@#{@rcfile.default_profile[0]} created the list \"#{list_name}\"."
     end
 
-    # Remove
-    desc "remove LIST_NAME SCREEN_NAME [SCREEN_NAME...]", "Remove users from a list."
+    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 :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
+    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total 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 :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
+    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 "remove LIST_NAME SCREEN_NAME [SCREEN_NAME...]", "Remove members from a list."
     def remove(list_name, screen_name, *screen_names)
       screen_names.unshift(screen_name)
-      screen_names.map!(&:strip_at)
+      screen_names.map!(&:strip_ats)
       screen_names.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_each do |user_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.list_remove_members(list_name, user_id_group)
         end
       end
       number = screen_names.length
-      say "@#{@rcfile.default_profile[0]} removed #{number} #{number == 1 ? 'user' : 'users'} from the list \"#{list_name}\"."
+      say "@#{@rcfile.default_profile[0]} removed #{number} #{number == 1 ? 'member' : 'members'} from the list \"#{list_name}\"."
       say
-      say "Run `#{File.basename($0)} list add users #{list_name} #{screen_names.join(' ')}` to undo."
+      say "Run `#{File.basename($0)} list add #{list_name} #{screen_names.join(' ')}` to undo."
     end
 
     desc "timeline [SCREEN_NAME] LIST_NAME", "Show tweet timeline for members of the specified 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 :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
     method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total 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 :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 :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 timeline(*args)
       list = args.pop
       owner = args.pop || @rcfile.default_profile[0]
       per_page = options['number'] || DEFAULT_NUM_RESULTS
       statuses = client.list_timeline(owner, list, :include_entities => false, :per_page => per_page)
-      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
+      print_status_list(statuses)
     end
     map %w(tl) => :timeline
 

data/lib/t/printable.rb

@@ -0,0 +1,82 @@
+require 'action_view'
+require 'highline'
+
+module T
+  module Printable
+    MAX_SCREEN_NAME_SIZE = 20
+    include ActionView::Helpers::NumberHelper
+
+    def self.included(base)
+
+    private
+
+      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")
+            [number_with_delimiter(status.id), created_at, status.user.screen_name, status.text.gsub(/\n+/, ' ')]
+          end
+          if STDOUT.tty?
+            headings = ["ID", "Posted at", "Screen name", "Text"]
+            array.unshift(headings) unless statuses.empty?
+          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")
+            [number_with_delimiter(user.id), created_at, number_with_delimiter(user.statuses_count), number_with_delimiter(user.favourites_count), number_with_delimiter(user.listed_count), number_with_delimiter(user.friends_count), number_with_delimiter(user.followers_count), user.screen_name, user.name]
+          end
+          if STDOUT.tty?
+            headings = ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]
+            array.unshift(headings) unless users.empty?
+          end
+          print_table(array)
+        else
+          if STDOUT.tty?
+            print_in_columns(users.map(&:screen_name))
+          else
+            users.each do |user|
+              say user.screen_name
+            end
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/t/requestable.rb

@@ -15,7 +15,7 @@ module T
 
       def client
         return @client if @client
-        @rcfile.path = parent_options['profile'] if parent_options['profile']
+        @rcfile.path = options['profile'] if options['profile']
         @client = Twitter::Client.new(
           :endpoint => base_url,
           :consumer_key => @rcfile.default_consumer_key,
@@ -26,12 +26,14 @@ module T
       end
 
       def host
-        parent_options['host'] || DEFAULT_HOST
+        options['host'] || DEFAULT_HOST
       end
 
       def protocol
-        parent_options['no_ssl'] ? 'http' : DEFAULT_PROTOCOL
+        options['no_ssl'] ? 'http' : DEFAULT_PROTOCOL
       end
+
     end
+
   end
 end

data/lib/t/search.rb

@@ -1,6 +1,7 @@
 require 'action_view'
 require 'retryable'
 require 't/core_ext/enumerable'
+require 't/printable'
 require 't/rcfile'
 require 't/requestable'
 require 'thor'
@@ -8,6 +9,7 @@ require 'thor'
 module T
   class Search < Thor
     include ActionView::Helpers::DateHelper
+    include T::Printable
     include T::Requestable
 
     DEFAULT_NUM_RESULTS = 20
@@ -27,14 +29,14 @@ module T
     def all(query)
       rpp = options['number'] || DEFAULT_NUM_RESULTS
       statuses = client.search(query, :include_entities => false, :rpp => rpp)
-      if parent_options['long']
+      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.from_user, status.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 statuses.empty?
         end
         print_table(array)
       else
@@ -98,7 +100,7 @@ module T
 
     desc "user SCREEN_NAME QUERY", "Returns Tweets in a user's timeline that match a specified query."
     def user(screen_name, query)
-      screen_name = screen_name.strip_at
+      screen_name = screen_name.strip_ats
       statuses = 1.upto(MAX_PAGES).threaded_map do |page|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.user_timeline(screen_name, :page => page, :count => MAX_NUM_RESULTS).select do |status|
@@ -109,25 +111,5 @@ module T
       print_status_list(statuses)
     end
 
-  private
-
-    def print_status_list(statuses)
-      if parent_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
-
   end
 end

data/lib/t/set.rb

@@ -22,8 +22,8 @@ module T
 
     desc "default SCREEN_NAME [CONSUMER_KEY]", "Set your default account."
     def default(screen_name, consumer_key=nil)
-      screen_name = screen_name.strip_at
-      @rcfile.path = parent_options['profile'] if parent_options['profile']
+      screen_name = screen_name.strip_ats
+      @rcfile.path = options['profile'] if options['profile']
       consumer_key = @rcfile[screen_name].keys.last if consumer_key.nil?
       @rcfile.default_profile = {'username' => screen_name, 'consumer_key' => consumer_key}
       say "Default account has been updated."

data/lib/t/version.rb

@@ -8,12 +8,12 @@ module T
 
     # @return [Integer]
     def self.minor
-      5
+      6
     end
 
     # @return [Integer]
     def self.patch
-      1
+      0
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -6,12 +6,12 @@ describe T::CLI do
   before do
     rcfile = RCFile.instance
     rcfile.path = fixture_path + "/.trc"
-    @t = T::CLI.new
+    @cli = T::CLI.new
     @old_stderr = $stderr
     $stderr = StringIO.new
     @old_stdout = $stdout
     $stdout = StringIO.new
-    Timecop.freeze(Time.local(2011, 11, 24, 16, 20, 0))
+    Timecop.freeze(Time.utc(2011, 11, 24, 16, 20, 0))
   end
 
   after do
@@ -22,20 +22,20 @@ describe T::CLI do
 
   describe "#account" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc")
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
     end
     it "should have the correct output" do
-      @t.accounts
-      $stdout.string.should == <<-eos.gsub(/^ {8}/, '')
-        testcli
-          abc123 (default)
+      @cli.accounts
+      $stdout.string.should == <<-eos
+testcli
+  abc123 (default)
       eos
     end
   end
 
   describe "#authorize" do
     before do
-      @t.options = @t.options.merge(:profile => File.expand_path('/tmp/trc', __FILE__), :consumer_key => "abc123", :consumer_secret => "asdfasd223sd2", :prompt => true, :dry_run => true)
+      @cli.options = @cli.options.merge(:profile => File.expand_path('/tmp/trc', __FILE__), :consumer_key => "abc123", :consumer_secret => "asdfasd223sd2", :prompt => true, :dry_run => true)
       stub_post("/oauth/request_token").
         to_return(:body => fixture("request_token"))
       stub_post("/oauth/access_token").
@@ -48,7 +48,7 @@ describe T::CLI do
       $stdin.should_receive(:gets).and_return("\n")
       $stdout.should_receive(:print).with("Paste in the supplied PIN: ")
       $stdin.should_receive(:gets).and_return("1234567890")
-      @t.authorize
+      @cli.authorize
       a_post("/oauth/request_token").
         should have_been_made
       a_post("/oauth/access_token").
@@ -62,26 +62,26 @@ describe T::CLI do
         $stdin.should_receive(:gets).and_return("\n")
         $stdout.should_receive(:print).with("Paste in the supplied PIN: ")
         $stdin.should_receive(:gets).and_return("1234567890")
-        @t.authorize
+        @cli.authorize
       end.should_not raise_error
     end
   end
 
   describe "#block" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc")
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
       stub_post("/1/blocks/create.json").
         with(:body => {:screen_name => "sferik", :include_entities => "false"}).
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.block("sferik")
+      @cli.block("sferik")
       a_post("/1/blocks/create.json").
         with(:body => {:screen_name => "sferik", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.block("sferik")
+      @cli.block("sferik")
       $stdout.string.should =~ /^@testcli blocked @sferik/
     end
   end
@@ -93,36 +93,81 @@ describe T::CLI do
         to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.direct_messages
+      @cli.direct_messages
       a_get("/1/direct_messages.json").
         with(:query => {:count => "20", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.direct_messages
-      $stdout.string.should == <<-eos.gsub(/^/, ' ' * 6)
-        sferik: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
-        sferik: if you want to add me to your GroupMe group, my phone number is 415-312-2382 (about 1 year ago)
-        sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you?  (about 1 year ago)
-        sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better.  (about 1 year ago)
-        sferik: Just checking in. How's everything going? (about 1 year ago)
-        sferik: Any luck completing graphs this weekend? There have been lots of commits to RailsAdmin since summer ended but none from you. How's it going? (about 1 year ago)
-        sferik: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
-        sferik: Looks good to me. I'm going to pull in the change now. My only concern is that we don't have any tests for auth. (about 1 year ago)
-        sferik: How are the graph enhancements coming? (about 1 year ago)
-        sferik: Changes pushed. You should pull and re-bundle when you have a minute. (about 1 year ago)
-        sferik: Glad to hear the new graphs are coming along. Can't wait to see them! (about 1 year ago)
-        sferik: I figured out what was wrong with the tests: I accidentally unbundled webrat. The problem had nothing to do with rspec-rails. (about 1 year ago)
-        sferik: After the upgrade 54/80 specs are failing. I'm working on fixing them now. (about 1 year ago)
-        sferik: a new version of rspec-rails just shipped with some nice features and fixes http://github.com/rspec/rspec-rails/blob/master/History.md (about 1 year ago)
-        sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
-        sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
-        sferik: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
-        sferik: Can you try upgrading to 1.9.2 final, re-installing Bundler 1.0.0.rc.6 (don't remove 1.0.0) and see if you can reproduce the problem? (about 1 year ago)
-        sferik: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
-        sferik: Let's try to debug that problem during our session in 1.5 hours. In the mean time, try working on the graphs or internationalization. (about 1 year ago)
+      @cli.direct_messages
+      $stdout.string.should == <<-eos
+              sferik: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
+              sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (about 1 year ago)
+              sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (about 1 year ago)
+              sferik: Just checking in. How's everything going? (about 1 year ago)
+              sferik: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
+              sferik: How are the graph enhancements coming? (about 1 year ago)
+              sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
+              sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
+              sferik: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
+              sferik: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
       eos
     end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.direct_messages
+        $stdout.string.should == <<-eos
+ID             Posted at     Screen name  Text
+1,773,478,249  Oct 17  2010  sferik       Sounds good. Meeting Tuesday is fine.
+1,762,960,771  Oct 14  2010  sferik       That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you?
+1,711,812,216  Oct  1  2010  sferik       I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better.
+1,711,417,617  Oct  1  2010  sferik       Just checking in. How's everything going?
+1,653,301,471  Sep 16  2010  sferik       Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend?
+1,645,324,992  Sep 14  2010  sferik       How are the graph enhancements coming?
+1,632,933,616  Sep 11  2010  sferik       How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël.
+1,629,239,903  Sep 10  2010  sferik       Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
+1,629,166,212  Sep 10  2010  sferik       I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts.
+1,624,782,206  Sep  9  2010  sferik       I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running?
+        eos
+      end
+    end
+    context "--number" do
+      before do
+        @cli.options = @cli.options.merge(:number => 1)
+        stub_get("/1/direct_messages.json").
+          with(:query => {:count => "1", :include_entities => "false"}).
+          to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "should limit the number of results" do
+        @cli.direct_messages
+        a_get("/1/direct_messages.json").
+          with(:query => {:count => "1", :include_entities => "false"}).
+          should have_been_made
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.direct_messages
+        $stdout.string.should == <<-eos
+              sferik: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
+              sferik: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
+              sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
+              sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
+              sferik: How are the graph enhancements coming? (about 1 year ago)
+              sferik: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
+              sferik: Just checking in. How's everything going? (about 1 year ago)
+              sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (about 1 year ago)
+              sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (about 1 year ago)
+              sferik: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
+        eos
+      end
+    end
   end
 
   describe "#direct_messages_sent" do
@@ -132,70 +177,115 @@ describe T::CLI do
         to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.direct_messages_sent
+      @cli.direct_messages_sent
       a_get("/1/direct_messages/sent.json").
         with(:query => {:count => "20", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.direct_messages_sent
-      $stdout.string.should == <<-eos.gsub(/^/, ' ' * 3)
-        hurrycane: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
-     technoweenie: if you want to add me to your GroupMe group, my phone number is 415-312-2382 (about 1 year ago)
-        hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you?  (about 1 year ago)
-        hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better.  (about 1 year ago)
-        hurrycane: Just checking in. How's everything going? (about 1 year ago)
-        hurrycane: Any luck completing graphs this weekend? There have been lots of commits to RailsAdmin since summer ended but none from you. How's it going? (about 1 year ago)
-        hurrycane: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
-        hurrycane: Looks good to me. I'm going to pull in the change now. My only concern is that we don't have any tests for auth. (about 1 year ago)
-        hurrycane: How are the graph enhancements coming? (about 1 year ago)
-        hurrycane: Changes pushed. You should pull and re-bundle when you have a minute. (about 1 year ago)
-        hurrycane: Glad to hear the new graphs are coming along. Can't wait to see them! (about 1 year ago)
-        hurrycane: I figured out what was wrong with the tests: I accidentally unbundled webrat. The problem had nothing to do with rspec-rails. (about 1 year ago)
-        hurrycane: After the upgrade 54/80 specs are failing. I'm working on fixing them now. (about 1 year ago)
-        hurrycane: a new version of rspec-rails just shipped with some nice features and fixes http://github.com/rspec/rspec-rails/blob/master/History.md (about 1 year ago)
-        hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
-        hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
-        hurrycane: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
-        hurrycane: Can you try upgrading to 1.9.2 final, re-installing Bundler 1.0.0.rc.6 (don't remove 1.0.0) and see if you can reproduce the problem? (about 1 year ago)
-        hurrycane: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
-        hurrycane: Let's try to debug that problem during our session in 1.5 hours. In the mean time, try working on the graphs or internationalization. (about 1 year ago)
+      @cli.direct_messages_sent
+      $stdout.string.should == <<-eos
+           hurrycane: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
+           hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (about 1 year ago)
+           hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (about 1 year ago)
+           hurrycane: Just checking in. How's everything going? (about 1 year ago)
+           hurrycane: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
+           hurrycane: How are the graph enhancements coming? (about 1 year ago)
+           hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
+           hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
+           hurrycane: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
+           hurrycane: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
       eos
     end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.direct_messages_sent
+        $stdout.string.should == <<-eos
+ID             Posted at     Screen name  Text
+1,773,478,249  Oct 17  2010  hurrycane    Sounds good. Meeting Tuesday is fine.
+1,762,960,771  Oct 14  2010  hurrycane    That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you?
+1,711,812,216  Oct  1  2010  hurrycane    I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better.
+1,711,417,617  Oct  1  2010  hurrycane    Just checking in. How's everything going?
+1,653,301,471  Sep 16  2010  hurrycane    Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend?
+1,645,324,992  Sep 14  2010  hurrycane    How are the graph enhancements coming?
+1,632,933,616  Sep 11  2010  hurrycane    How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël.
+1,629,239,903  Sep 10  2010  hurrycane    Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
+1,629,166,212  Sep 10  2010  hurrycane    I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts.
+1,624,782,206  Sep  9  2010  hurrycane    I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running?
+        eos
+      end
+    end
+    context "--number" do
+      before do
+        @cli.options = @cli.options.merge(:number => 1)
+        stub_get("/1/direct_messages/sent.json").
+          with(:query => {:count => "1", :include_entities => "false"}).
+          to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "should limit the number of results" do
+        @cli.direct_messages_sent
+        a_get("/1/direct_messages/sent.json").
+          with(:query => {:count => "1", :include_entities => "false"}).
+          should have_been_made
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.direct_messages_sent
+        $stdout.string.should == <<-eos
+           hurrycane: I'm trying to debug the issue you were having with the Bundler Gemfile.lock shortref. What version of Ruby and RubyGems are you running? (about 1 year ago)
+           hurrycane: I just committed a bunch of cleanup and fixes to RailsAdmin that touched many of files. Make sure you pull to avoid conflicts. (about 1 year ago)
+           hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (about 1 year ago)
+           hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (about 1 year ago)
+           hurrycane: How are the graph enhancements coming? (about 1 year ago)
+           hurrycane: Not sure about the payment. Feel free to ask Leah or Yehuda directly. Think you'll be able to finish up your work on graphs this weekend? (about 1 year ago)
+           hurrycane: Just checking in. How's everything going? (about 1 year ago)
+           hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (about 1 year ago)
+           hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (about 1 year ago)
+           hurrycane: Sounds good. Meeting Tuesday is fine. (about 1 year ago)
+        eos
+      end
+    end
   end
 
   describe "#dm" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc")
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
       stub_post("/1/direct_messages/new.json").
         with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem", :include_entities => "false"}).
         to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.dm("pengwynn", "Creating a fixture for the Twitter gem")
+      @cli.dm("pengwynn", "Creating a fixture for the Twitter gem")
       a_post("/1/direct_messages/new.json").
         with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.dm("pengwynn", "Creating a fixture for the Twitter gem")
+      @cli.dm("pengwynn", "Creating a fixture for the Twitter gem")
       $stdout.string.chomp.should == "Direct Message sent from @testcli to @pengwynn (about 1 year ago)."
     end
   end
 
   describe "#favorite" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc")
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
       stub_post("/1/favorites/create/26755176471724032.json").
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.favorite("26755176471724032")
+      @cli.favorite("26755176471724032")
       a_post("/1/favorites/create/26755176471724032.json").
         should have_been_made
     end
     it "should have the correct output" do
-      @t.favorite("26755176471724032")
+      @cli.favorite("26755176471724032")
       $stdout.string.should =~ /^@testcli favorited @sferik's status: "@noradio working on implementing #NewTwitter API methods in the twitter gem\. Twurl is making it easy\. Thank you!"$/
     end
   end
@@ -207,45 +297,112 @@ describe T::CLI do
         to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.favorites
+      @cli.favorites
       a_get("/1/favorites.json").
         with(:query => {:count => "20", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.favorites
-      $stdout.string.should == <<-eos.gsub(/^/, ' ' * 6)
-        sferik: Ruby is the best programming language for hiding the ugly bits. (about 1 year ago)
-        sferik: There are 1.3 billion people in China; when people say there are 1 billion they are rounding off the entire population of the United States. (about 1 year ago)
-        sferik: The new Windows Phone campaign is the best advertising from Microsoft since "Start Me Up" (1995). Great work by CP+B. http://t.co/tIzxopI (about 1 year ago)
-        sferik: Fear not to sow seeds because of the birds. http://twitpic.com/2wg621 (about 1 year ago)
-        sferik: Speaking of things that are maddening: the interview with the Wall Street guys on the most recent This American Life http://bit.ly/af9pSD (about 1 year ago)
-        sferik: Holy cow! RailsAdmin is up to 200 watchers (from 100 yesterday). http://github.com/sferik/rails_admin (about 1 year ago)
-        sferik: Kind of cool that Facebook acts as a mirror for open-source projects that they use or like http://mirror.facebook.net/ (about 1 year ago)
-        sferik: RailsAdmin already has 100 watchers, 12 forks, and 6 contributors in less than 2 months. Let's keep the momentum going! http://bit.ly/cCMMqD (about 1 year ago)
-        sferik: This week's This American Life is amazing. @JoeLipari is an American hero. http://bit.ly/d9RbnB (about 1 year ago)
-        sferik: RT @polyseme: OH: shofars should be called jewvuzelas. (about 1 year ago)
-        sferik: Spent this morning fixing broken windows in RailsAdmin http://github.com/sferik/rails_admin/compare/ab6c598...0e3770f (about 1 year ago)
-        sferik: I'm a big believer that the broken windows theory applies to software development http://en.wikipedia.org/wiki/Broken_windows_theory (about 1 year ago)
-        sferik: I hope you idiots are happy with your piece of shit Android phones. http://www.apple.com/pr/library/2010/09/09statement.html (about 1 year ago)
-        sferik: Ping: kills MySpace dead. (about 1 year ago)
-        sferik: Crazy that iTunes Ping didn't leak a drop. (about 1 year ago)
-        sferik: The plot thickens http://twitpic.com/2k5lt2 (about 1 year ago)
-        sferik: 140 Proof Provides A Piece Of The Twitter Advertising Puzzle http://t.co/R2cUSDe via @techcrunch (about 1 year ago)
-        sferik: Try as you may http://www.thedoghousediaries.com/?p=1940 (about 1 year ago)
-        sferik: I know @SarahPalinUSA has a right to use Twitter, but should she? (over 1 year ago)
+      @cli.favorites
+      $stdout.string.should == <<-eos
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
       eos
     end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.favorites
+        $stdout.string.should == <<-eos
+ID                       Posted at     Screen name   Text
+194,548,121,416,630,272  Apr 23  2011  natevillegas  RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present.
+194,547,993,607,806,976  Apr 23  2011  TD            @kelseysilver how long will you be in town?
+194,547,987,593,183,233  Apr 23  2011  rusashka      @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+194,547,824,690,597,888  Apr 23  2011  fat           @stevej @xc i'm going to picket when i get back.
+194,547,658,562,605,057  Apr 23  2011  wil           @0x9900 @paulnivin http://t.co/bwVdtAPe
+194,547,528,430,137,344  Apr 23  2011  wangtian      @tianhonghe @xiangxin72 oh, you can even order specific items?
+194,547,402,550,689,793  Apr 23  2011  shinypb       @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+194,547,260,233,760,768  Apr 23  2011  0x9900        @wil @paulnivin if you want to take you seriously don't say daemontools!
+194,547,084,349,804,544  Apr 23  2011  kpk           @shinypb @skilldrick @hoverbird invented it
+194,546,876,782,092,291  Apr 23  2011  skilldrick    @shinypb Well played :) @hoverbird
+194,546,811,480,969,217  Apr 23  2011  sam           Can someone project the date that I'll get a 27" retina display?
+194,546,738,810,458,112  Apr 23  2011  shinypb       @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+194,546,727,670,390,784  Apr 23  2011  bartt         @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come.
+194,546,649,203,347,456  Apr 23  2011  skilldrick    @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all.
+194,546,583,608,639,488  Apr 23  2011  sean          @mep Thanks for coming by. Was great to have you.
+194,546,388,707,717,120  Apr 23  2011  hoverbird     @shinypb @trammell it's all suck a "duck blur" sometimes.
+194,546,264,212,385,793  Apr 23  2011  kelseysilver  San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw
+        eos
+      end
+    end
+    context "--number" do
+      before do
+        @cli.options = @cli.options.merge(:number => 1)
+        stub_get("/1/favorites.json").
+          with(:query => {:count => "1", :include_entities => "false"}).
+          to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "should limit the number of results" do
+        @cli.favorites
+        a_get("/1/favorites.json").
+          with(:query => {:count => "1", :include_entities => "false"}).
+          should have_been_made
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.favorites
+        $stdout.string.should == <<-eos
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
+        eos
+      end
+    end
   end
 
   describe "#follow" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc")
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
     end
     context "no users" do
       it "should exit" do
         lambda do
-          @t.follow
+          @cli.follow
         end.should raise_error
       end
     end
@@ -254,7 +411,7 @@ describe T::CLI do
         stub_post("/1/friendships/create.json").
           with(:body => {:screen_name => "sferik", :include_entities => "false"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        @t.follow("sferik")
+        @cli.follow("sferik")
         a_post("/1/friendships/create.json").
           with(:body => {:screen_name => "sferik", :include_entities => "false"}).
           should have_been_made
@@ -263,7 +420,7 @@ describe T::CLI do
         stub_post("/1/friendships/create.json").
           with(:body => {:screen_name => "sferik", :include_entities => "false"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        @t.follow("sferik")
+        @cli.follow("sferik")
         $stdout.string.should =~ /^@testcli is now following 1 more user\.$/
       end
       context "Twitter is down" do
@@ -272,7 +429,7 @@ describe T::CLI do
             with(:body => {:screen_name => "sferik", :include_entities => "false"}).
             to_return(:status => 502)
           lambda do
-            @t.follow("sferik")
+            @cli.follow("sferik")
           end.should raise_error("Twitter is down or being upgraded.")
           a_post("/1/friendships/create.json").
             with(:body => {:screen_name => "sferik", :include_entities => "false"}).
@@ -292,7 +449,7 @@ describe T::CLI do
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.followings
+      @cli.followings
       a_get("/1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
@@ -301,9 +458,85 @@ describe T::CLI do
         should have_been_made
     end
     it "should have the correct output" do
-      @t.followings
+      @cli.followings
       $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
     end
+    context "--created" do
+      before do
+        @cli.options = @cli.options.merge(:created => true)
+      end
+      it "should sort by the time when Twitter acount was created" do
+        @cli.followings
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--favorites" do
+      before do
+        @cli.options = @cli.options.merge(:favorites => true)
+      end
+      it "should sort by number of favorites" do
+        @cli.followings
+        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      end
+    end
+    context "--followers" do
+      before do
+        @cli.options = @cli.options.merge(:followers => true)
+      end
+      it "should sort by number of followers" do
+        @cli.followings
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--friends" do
+      before do
+        @cli.options = @cli.options.merge(:friends => true)
+      end
+      it "should sort by number of friends" do
+        @cli.followings
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--listed" do
+      before do
+        @cli.options = @cli.options.merge(:listed => true)
+      end
+      it "should sort by number of list memberships" do
+        @cli.followings
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.followings
+        $stdout.string.should == <<-eos
+ID          Since         Tweets  Favorites  Listed  Following  Followers  Screen name  Name
+14,100,886  Mar  8  2008  3,913   32         185     1,871      2,767      pengwynn     Wynn Netherland
+7,505,382   Jul 16  2007  2,962   727        29      88         898        sferik       Erik Michaels-Ober
+        eos
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.followings
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--tweets" do
+      before do
+        @cli.options = @cli.options.merge(:tweets => true)
+      end
+      it "should sort by number of Tweets" do
+        @cli.followings
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
   end
 
   describe "#followers" do
@@ -316,7 +549,7 @@ describe T::CLI do
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.followers
+      @cli.followers
       a_get("/1/followers/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
@@ -325,9 +558,85 @@ describe T::CLI do
         should have_been_made
     end
     it "should have the correct output" do
-      @t.followers
+      @cli.followers
       $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
     end
+    context "--created" do
+      before do
+        @cli.options = @cli.options.merge(:created => true)
+      end
+      it "should sort by the time when Twitter acount was created" do
+        @cli.followers
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--favorites" do
+      before do
+        @cli.options = @cli.options.merge(:favorites => true)
+      end
+      it "should sort by number of favorites" do
+        @cli.followers
+        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      end
+    end
+    context "--followers" do
+      before do
+        @cli.options = @cli.options.merge(:followers => true)
+      end
+      it "should sort by number of followers" do
+        @cli.followers
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--friends" do
+      before do
+        @cli.options = @cli.options.merge(:friends => true)
+      end
+      it "should sort by number of friends" do
+        @cli.followers
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--listed" do
+      before do
+        @cli.options = @cli.options.merge(:listed => true)
+      end
+      it "should sort by number of list memberships" do
+        @cli.followers
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.followers
+        $stdout.string.should == <<-eos
+ID          Since         Tweets  Favorites  Listed  Following  Followers  Screen name  Name
+14,100,886  Mar  8  2008  3,913   32         185     1,871      2,767      pengwynn     Wynn Netherland
+7,505,382   Jul 16  2007  2,962   727        29      88         898        sferik       Erik Michaels-Ober
+        eos
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.followers
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--tweets" do
+      before do
+        @cli.options = @cli.options.merge(:tweets => true)
+      end
+      it "should sort by number of Tweets" do
+        @cli.followers
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
   end
 
   describe "#friends" do
@@ -343,7 +652,7 @@ describe T::CLI do
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.friends
+      @cli.friends
       a_get("/1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
@@ -355,9 +664,85 @@ describe T::CLI do
         should have_been_made
     end
     it "should have the correct output" do
-      @t.friends
+      @cli.friends
       $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
     end
+    context "--created" do
+      before do
+        @cli.options = @cli.options.merge(:created => true)
+      end
+      it "should sort by the time when Twitter acount was created" do
+        @cli.friends
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--favorites" do
+      before do
+        @cli.options = @cli.options.merge(:favorites => true)
+      end
+      it "should sort by number of favorites" do
+        @cli.friends
+        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      end
+    end
+    context "--followers" do
+      before do
+        @cli.options = @cli.options.merge(:followers => true)
+      end
+      it "should sort by number of followers" do
+        @cli.friends
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--friends" do
+      before do
+        @cli.options = @cli.options.merge(:friends => true)
+      end
+      it "should sort by number of friends" do
+        @cli.friends
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--listed" do
+      before do
+        @cli.options = @cli.options.merge(:listed => true)
+      end
+      it "should sort by number of list memberships" do
+        @cli.friends
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.friends
+        $stdout.string.should == <<-eos
+ID          Since         Tweets  Favorites  Listed  Following  Followers  Screen name  Name
+14,100,886  Mar  8  2008  3,913   32         185     1,871      2,767      pengwynn     Wynn Netherland
+7,505,382   Jul 16  2007  2,962   727        29      88         898        sferik       Erik Michaels-Ober
+        eos
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.friends
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--tweets" do
+      before do
+        @cli.options = @cli.options.merge(:tweets => true)
+      end
+      it "should sort by number of Tweets" do
+        @cli.friends
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
   end
 
   describe "#leaders" do
@@ -367,38 +752,102 @@ describe T::CLI do
         to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1/followers/ids.json").
         with(:query => {:cursor => "-1"}).
-        to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1/users/lookup.json").
+        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.leaders
+      @cli.leaders
       a_get("/1/friends/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
       a_get("/1/followers/ids.json").
         with(:query => {:cursor => "-1"}).
         should have_been_made
+      a_get("/1/users/lookup.json").
+        with(:query => {:user_id => "7505382", :include_entities => "false"}).
+        should have_been_made
     end
     it "should have the correct output" do
-      @t.leaders
-      $stdout.string.chomp.rstrip.should == ""
+      @cli.leaders
+      $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
     end
-  end
-
-  describe "#members" do
-    before do
-      stub_get("/1/lists/members.json").
-        with(:query => {:cursor => "-1", :include_entities => "false", :owner_screen_name => "sferik", :skip_status => "true", :slug => "presidents"}).
-        to_return(:body => fixture("empty_cursor.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    context "--created" do
+      before do
+        @cli.options = @cli.options.merge(:created => true)
+      end
+      it "should sort by the time when Twitter acount was created" do
+        @cli.leaders
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
     end
-    it "should request the correct resource" do
-      @t.members("sferik", "presidents")
-      a_get("/1/lists/members.json").
-        with(:query => {:cursor => "-1", :include_entities => "false", :owner_screen_name => "sferik", :skip_status => "true", :slug => "presidents"}).
-        should have_been_made
+    context "--favorites" do
+      before do
+        @cli.options = @cli.options.merge(:favorites => true)
+      end
+      it "should sort by number of favorites" do
+        @cli.leaders
+        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      end
     end
-    it "should have the correct output" do
-      @t.members("sferik", "presidents")
-      $stdout.string.chomp.should == ""
+    context "--followers" do
+      before do
+        @cli.options = @cli.options.merge(:followers => true)
+      end
+      it "should sort by number of followers" do
+        @cli.leaders
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--friends" do
+      before do
+        @cli.options = @cli.options.merge(:friends => true)
+      end
+      it "should sort by number of friends" do
+        @cli.leaders
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--listed" do
+      before do
+        @cli.options = @cli.options.merge(:listed => true)
+      end
+      it "should sort by number of list memberships" do
+        @cli.leaders
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.leaders
+        $stdout.string.should == <<-eos
+ID          Since         Tweets  Favorites  Listed  Following  Followers  Screen name  Name
+14,100,886  Mar  8  2008  3,913   32         185     1,871      2,767      pengwynn     Wynn Netherland
+7,505,382   Jul 16  2007  2,962   727        29      88         898        sferik       Erik Michaels-Ober
+        eos
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.leaders
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--tweets" do
+      before do
+        @cli.options = @cli.options.merge(:tweets => true)
+      end
+      it "should sort by number of Tweets" do
+        @cli.leaders
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
     end
   end
 
@@ -409,51 +858,118 @@ describe T::CLI do
         to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.mentions
+      @cli.mentions
       a_get("/1/statuses/mentions.json").
         with(:query => {:count => "20", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.mentions
-      $stdout.string.should == <<-eos.gsub(/^/, ' ' * 6)
-        sferik: Ruby is the best programming language for hiding the ugly bits. (about 1 year ago)
-        sferik: There are 1.3 billion people in China; when people say there are 1 billion they are rounding off the entire population of the United States. (about 1 year ago)
-        sferik: The new Windows Phone campaign is the best advertising from Microsoft since "Start Me Up" (1995). Great work by CP+B. http://t.co/tIzxopI (about 1 year ago)
-        sferik: Fear not to sow seeds because of the birds. http://twitpic.com/2wg621 (about 1 year ago)
-        sferik: Speaking of things that are maddening: the interview with the Wall Street guys on the most recent This American Life http://bit.ly/af9pSD (about 1 year ago)
-        sferik: Holy cow! RailsAdmin is up to 200 watchers (from 100 yesterday). http://github.com/sferik/rails_admin (about 1 year ago)
-        sferik: Kind of cool that Facebook acts as a mirror for open-source projects that they use or like http://mirror.facebook.net/ (about 1 year ago)
-        sferik: RailsAdmin already has 100 watchers, 12 forks, and 6 contributors in less than 2 months. Let's keep the momentum going! http://bit.ly/cCMMqD (about 1 year ago)
-        sferik: This week's This American Life is amazing. @JoeLipari is an American hero. http://bit.ly/d9RbnB (about 1 year ago)
-        sferik: RT @polyseme: OH: shofars should be called jewvuzelas. (about 1 year ago)
-        sferik: Spent this morning fixing broken windows in RailsAdmin http://github.com/sferik/rails_admin/compare/ab6c598...0e3770f (about 1 year ago)
-        sferik: I'm a big believer that the broken windows theory applies to software development http://en.wikipedia.org/wiki/Broken_windows_theory (about 1 year ago)
-        sferik: I hope you idiots are happy with your piece of shit Android phones. http://www.apple.com/pr/library/2010/09/09statement.html (about 1 year ago)
-        sferik: Ping: kills MySpace dead. (about 1 year ago)
-        sferik: Crazy that iTunes Ping didn't leak a drop. (about 1 year ago)
-        sferik: The plot thickens http://twitpic.com/2k5lt2 (about 1 year ago)
-        sferik: 140 Proof Provides A Piece Of The Twitter Advertising Puzzle http://t.co/R2cUSDe via @techcrunch (about 1 year ago)
-        sferik: Try as you may http://www.thedoghousediaries.com/?p=1940 (about 1 year ago)
-        sferik: I know @SarahPalinUSA has a right to use Twitter, but should she? (over 1 year ago)
+      @cli.mentions
+      $stdout.string.should == <<-eos
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
       eos
     end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.mentions
+        $stdout.string.should == <<-eos
+ID                       Posted at     Screen name   Text
+194,548,121,416,630,272  Apr 23  2011  natevillegas  RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present.
+194,547,993,607,806,976  Apr 23  2011  TD            @kelseysilver how long will you be in town?
+194,547,987,593,183,233  Apr 23  2011  rusashka      @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+194,547,824,690,597,888  Apr 23  2011  fat           @stevej @xc i'm going to picket when i get back.
+194,547,658,562,605,057  Apr 23  2011  wil           @0x9900 @paulnivin http://t.co/bwVdtAPe
+194,547,528,430,137,344  Apr 23  2011  wangtian      @tianhonghe @xiangxin72 oh, you can even order specific items?
+194,547,402,550,689,793  Apr 23  2011  shinypb       @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+194,547,260,233,760,768  Apr 23  2011  0x9900        @wil @paulnivin if you want to take you seriously don't say daemontools!
+194,547,084,349,804,544  Apr 23  2011  kpk           @shinypb @skilldrick @hoverbird invented it
+194,546,876,782,092,291  Apr 23  2011  skilldrick    @shinypb Well played :) @hoverbird
+194,546,811,480,969,217  Apr 23  2011  sam           Can someone project the date that I'll get a 27" retina display?
+194,546,738,810,458,112  Apr 23  2011  shinypb       @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+194,546,727,670,390,784  Apr 23  2011  bartt         @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come.
+194,546,649,203,347,456  Apr 23  2011  skilldrick    @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all.
+194,546,583,608,639,488  Apr 23  2011  sean          @mep Thanks for coming by. Was great to have you.
+194,546,388,707,717,120  Apr 23  2011  hoverbird     @shinypb @trammell it's all suck a "duck blur" sometimes.
+194,546,264,212,385,793  Apr 23  2011  kelseysilver  San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw
+        eos
+      end
+    end
+    context "--number" do
+      before do
+        @cli.options = @cli.options.merge(:number => 1)
+        stub_get("/1/statuses/mentions.json").
+          with(:query => {:count => "1", :include_entities => "false"}).
+          to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "should limit the number of results" do
+        @cli.mentions
+        a_get("/1/statuses/mentions.json").
+          with(:query => {:count => "1", :include_entities => "false"}).
+          should have_been_made
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.mentions
+        $stdout.string.should == <<-eos
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
+        eos
+      end
+    end
   end
 
   describe "#open" do
     before do
-      @t.options = @t.options.merge(:dry_run => true)
+      @cli.options = @cli.options.merge(:dry_run => true)
     end
     it "should not raise error" do
       lambda do
-        @t.open("sferik")
+        @cli.open("sferik")
       end.should_not raise_error
     end
   end
 
   describe "#reply" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc", :location => true)
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc", :location => true)
       stub_get("/1/statuses/show/25938088801.json").
         with(:query => {:include_entities => "false", :include_my_retweet => "false", :trim_user => "true"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -466,7 +982,7 @@ describe T::CLI do
         to_return(:body => fixture("xml.gp"), :headers => {:content_type => "application/xml"})
     end
     it "should request the correct resource" do
-      @t.reply("25938088801", "Testing")
+      @cli.reply("25938088801", "Testing")
       a_get("/1/statuses/show/25938088801.json").
         with(:query => {:include_entities => "false", :include_my_retweet => "false", :trim_user => "true"}).
         should have_been_made
@@ -479,82 +995,149 @@ describe T::CLI do
         should have_been_made
     end
     it "should have the correct output" do
-      @t.reply("25938088801", "Testing")
+      @cli.reply("25938088801", "Testing")
       $stdout.string.should =~ /^Reply created by @testcli to @sferik \(about 1 year ago\)\.$/
     end
   end
 
   describe "#report_spam" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc")
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
       stub_post("/1/report_spam.json").
         with(:body => {:screen_name => "sferik", :include_entities => "false"}).
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.report_spam("sferik")
+      @cli.report_spam("sferik")
       a_post("/1/report_spam.json").
         with(:body => {:screen_name => "sferik", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.report_spam("sferik")
+      @cli.report_spam("sferik")
       $stdout.string.should =~ /^@testcli reported @sferik/
     end
   end
 
   describe "#retweet" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc")
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
       stub_post("/1/statuses/retweet/26755176471724032.json").
         to_return(:body => fixture("retweet.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.retweet("26755176471724032")
+      @cli.retweet("26755176471724032")
       a_post("/1/statuses/retweet/26755176471724032.json").
         should have_been_made
     end
     it "should have the correct output" do
-      @t.retweet("26755176471724032")
+      @cli.retweet("26755176471724032")
       $stdout.string.should =~ /^@testcli retweeted @gruber's status: "As for the Series, I'm for the Giants\. Fuck Texas, fuck Nolan Ryan, fuck George Bush\."$/
     end
   end
 
   describe "#retweets" do
+    before do
+      stub_get("/1/statuses/retweeted_by_me.json").
+        with(:query => {:count => "20", :include_entities => "false"}).
+        to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
     context "without arguments" do
+      it "should request the correct resource" do
+        @cli.retweets
+        a_get("/1/statuses/retweeted_by_me.json").
+          with(:query => {:count => "20", :include_entities => "false"}).
+          should have_been_made
+      end
+      it "should have the correct output" do
+        @cli.retweets
+        $stdout.string.should == <<-eos
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
+        eos
+      end
+    end
+    context "--long" do
       before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.retweets
+        $stdout.string.should == <<-eos
+ID                       Posted at     Screen name   Text
+194,548,121,416,630,272  Apr 23  2011  natevillegas  RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present.
+194,547,993,607,806,976  Apr 23  2011  TD            @kelseysilver how long will you be in town?
+194,547,987,593,183,233  Apr 23  2011  rusashka      @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+194,547,824,690,597,888  Apr 23  2011  fat           @stevej @xc i'm going to picket when i get back.
+194,547,658,562,605,057  Apr 23  2011  wil           @0x9900 @paulnivin http://t.co/bwVdtAPe
+194,547,528,430,137,344  Apr 23  2011  wangtian      @tianhonghe @xiangxin72 oh, you can even order specific items?
+194,547,402,550,689,793  Apr 23  2011  shinypb       @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+194,547,260,233,760,768  Apr 23  2011  0x9900        @wil @paulnivin if you want to take you seriously don't say daemontools!
+194,547,084,349,804,544  Apr 23  2011  kpk           @shinypb @skilldrick @hoverbird invented it
+194,546,876,782,092,291  Apr 23  2011  skilldrick    @shinypb Well played :) @hoverbird
+194,546,811,480,969,217  Apr 23  2011  sam           Can someone project the date that I'll get a 27" retina display?
+194,546,738,810,458,112  Apr 23  2011  shinypb       @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+194,546,727,670,390,784  Apr 23  2011  bartt         @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come.
+194,546,649,203,347,456  Apr 23  2011  skilldrick    @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all.
+194,546,583,608,639,488  Apr 23  2011  sean          @mep Thanks for coming by. Was great to have you.
+194,546,388,707,717,120  Apr 23  2011  hoverbird     @shinypb @trammell it's all suck a "duck blur" sometimes.
+194,546,264,212,385,793  Apr 23  2011  kelseysilver  San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw
+        eos
+      end
+    end
+    context "--number" do
+      before do
+        @cli.options = @cli.options.merge(:number => 1)
         stub_get("/1/statuses/retweeted_by_me.json").
-          with(:query => {:count => "20", :include_entities => "false"}).
+          with(:query => {:count => "1", :include_entities => "false"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
-        @t.retweets
+      it "should limit the number of results" do
+        @cli.retweets
         a_get("/1/statuses/retweeted_by_me.json").
-          with(:query => {:count => "20", :include_entities => "false"}).
+          with(:query => {:count => "1", :include_entities => "false"}).
           should have_been_made
       end
-      it "should have the correct output" do
-        @t.retweets
-        $stdout.string.should == <<-eos.gsub(/^/, ' ' * 4)
-          sferik: Ruby is the best programming language for hiding the ugly bits. (about 1 year ago)
-          sferik: There are 1.3 billion people in China; when people say there are 1 billion they are rounding off the entire population of the United States. (about 1 year ago)
-          sferik: The new Windows Phone campaign is the best advertising from Microsoft since "Start Me Up" (1995). Great work by CP+B. http://t.co/tIzxopI (about 1 year ago)
-          sferik: Fear not to sow seeds because of the birds. http://twitpic.com/2wg621 (about 1 year ago)
-          sferik: Speaking of things that are maddening: the interview with the Wall Street guys on the most recent This American Life http://bit.ly/af9pSD (about 1 year ago)
-          sferik: Holy cow! RailsAdmin is up to 200 watchers (from 100 yesterday). http://github.com/sferik/rails_admin (about 1 year ago)
-          sferik: Kind of cool that Facebook acts as a mirror for open-source projects that they use or like http://mirror.facebook.net/ (about 1 year ago)
-          sferik: RailsAdmin already has 100 watchers, 12 forks, and 6 contributors in less than 2 months. Let's keep the momentum going! http://bit.ly/cCMMqD (about 1 year ago)
-          sferik: This week's This American Life is amazing. @JoeLipari is an American hero. http://bit.ly/d9RbnB (about 1 year ago)
-          sferik: RT @polyseme: OH: shofars should be called jewvuzelas. (about 1 year ago)
-          sferik: Spent this morning fixing broken windows in RailsAdmin http://github.com/sferik/rails_admin/compare/ab6c598...0e3770f (about 1 year ago)
-          sferik: I'm a big believer that the broken windows theory applies to software development http://en.wikipedia.org/wiki/Broken_windows_theory (about 1 year ago)
-          sferik: I hope you idiots are happy with your piece of shit Android phones. http://www.apple.com/pr/library/2010/09/09statement.html (about 1 year ago)
-          sferik: Ping: kills MySpace dead. (about 1 year ago)
-          sferik: Crazy that iTunes Ping didn't leak a drop. (about 1 year ago)
-          sferik: The plot thickens http://twitpic.com/2k5lt2 (about 1 year ago)
-          sferik: 140 Proof Provides A Piece Of The Twitter Advertising Puzzle http://t.co/R2cUSDe via @techcrunch (about 1 year ago)
-          sferik: Try as you may http://www.thedoghousediaries.com/?p=1940 (about 1 year ago)
-          sferik: I know @SarahPalinUSA has a right to use Twitter, but should she? (over 1 year ago)
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.retweets
+        $stdout.string.should == <<-eos
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
         eos
       end
     end
@@ -565,33 +1148,31 @@ describe T::CLI do
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
-        @t.retweets("sferik")
+        @cli.retweets("sferik")
         a_get("/1/statuses/retweeted_by_user.json").
           with(:query => {:count => "20", :include_entities => "false", :screen_name => "sferik"}).
           should have_been_made
       end
       it "should have the correct output" do
-        @t.retweets("sferik")
-        $stdout.string.should == <<-eos.gsub(/^/, ' ' * 4)
-          sferik: Ruby is the best programming language for hiding the ugly bits. (about 1 year ago)
-          sferik: There are 1.3 billion people in China; when people say there are 1 billion they are rounding off the entire population of the United States. (about 1 year ago)
-          sferik: The new Windows Phone campaign is the best advertising from Microsoft since "Start Me Up" (1995). Great work by CP+B. http://t.co/tIzxopI (about 1 year ago)
-          sferik: Fear not to sow seeds because of the birds. http://twitpic.com/2wg621 (about 1 year ago)
-          sferik: Speaking of things that are maddening: the interview with the Wall Street guys on the most recent This American Life http://bit.ly/af9pSD (about 1 year ago)
-          sferik: Holy cow! RailsAdmin is up to 200 watchers (from 100 yesterday). http://github.com/sferik/rails_admin (about 1 year ago)
-          sferik: Kind of cool that Facebook acts as a mirror for open-source projects that they use or like http://mirror.facebook.net/ (about 1 year ago)
-          sferik: RailsAdmin already has 100 watchers, 12 forks, and 6 contributors in less than 2 months. Let's keep the momentum going! http://bit.ly/cCMMqD (about 1 year ago)
-          sferik: This week's This American Life is amazing. @JoeLipari is an American hero. http://bit.ly/d9RbnB (about 1 year ago)
-          sferik: RT @polyseme: OH: shofars should be called jewvuzelas. (about 1 year ago)
-          sferik: Spent this morning fixing broken windows in RailsAdmin http://github.com/sferik/rails_admin/compare/ab6c598...0e3770f (about 1 year ago)
-          sferik: I'm a big believer that the broken windows theory applies to software development http://en.wikipedia.org/wiki/Broken_windows_theory (about 1 year ago)
-          sferik: I hope you idiots are happy with your piece of shit Android phones. http://www.apple.com/pr/library/2010/09/09statement.html (about 1 year ago)
-          sferik: Ping: kills MySpace dead. (about 1 year ago)
-          sferik: Crazy that iTunes Ping didn't leak a drop. (about 1 year ago)
-          sferik: The plot thickens http://twitpic.com/2k5lt2 (about 1 year ago)
-          sferik: 140 Proof Provides A Piece Of The Twitter Advertising Puzzle http://t.co/R2cUSDe via @techcrunch (about 1 year ago)
-          sferik: Try as you may http://www.thedoghousediaries.com/?p=1940 (about 1 year ago)
-          sferik: I know @SarahPalinUSA has a right to use Twitter, but should she? (over 1 year ago)
+        @cli.retweets("sferik")
+        $stdout.string.should == <<-eos
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
         eos
       end
     end
@@ -599,28 +1180,25 @@ describe T::CLI do
 
   describe "#status" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc", :location => true)
-      stub_post("/1/statuses/update.json").
-        with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
+      stub_get("/1/statuses/show/25938088801.json").
+        with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_request(:get, "http://checkip.dyndns.org/").
-        to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
-      stub_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").
-        to_return(:body => fixture("xml.gp"), :headers => {:content_type => "application/xml"})
     end
     it "should request the correct resource" do
-      @t.status("Testing")
-      a_post("/1/statuses/update.json").
-        with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
-        should have_been_made
-      a_request(:get, "http://checkip.dyndns.org/").
-        should have_been_made
-      a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").
+      @cli.status("25938088801")
+      a_get("/1/statuses/show/25938088801.json").
+        with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.status("Testing")
-      $stdout.string.should =~ /^Tweet created by @testcli \(about 1 year ago\)\.$/
+      @cli.status("25938088801")
+      $stdout.string.should == <<-eos
+Text         @noradio working on implementing #NewTwitter API methods in the twitter gem. Twurl is making it easy. Thank you!
+Screen name  @sferik
+Posted at    Sep 29  2010
+Source       web
+URL          https://twitter.com/sferik/status/25938088801
+      eos
     end
   end
 
@@ -631,52 +1209,212 @@ describe T::CLI do
         to_return(:body => fixture("recommendations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.suggest
+      @cli.suggest
       a_get("/1/users/recommendations.json").
         with(:query => {:limit => "20", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.suggest
+      @cli.suggest
       $stdout.string.chomp.rstrip.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
     end
+    context "--created" do
+      before do
+        @cli.options = @cli.options.merge(:created => true)
+      end
+      it "should sort by the time when Twitter acount was created" do
+        @cli.suggest
+        $stdout.string.chomp.rstrip.should == "maccman      mlroach      jtrupiano    stuntmann82  antpires"
+      end
+    end
+    context "--favorites" do
+      before do
+        @cli.options = @cli.options.merge(:favorites => true)
+      end
+      it "should sort by number of favorites" do
+        @cli.suggest
+        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     maccman      mlroach      jtrupiano"
+      end
+    end
+    context "--followers" do
+      before do
+        @cli.options = @cli.options.merge(:followers => true)
+      end
+      it "should sort by number of followers" do
+        @cli.suggest
+        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+      end
+    end
+    context "--friends" do
+      before do
+        @cli.options = @cli.options.merge(:friends => true)
+      end
+      it "should sort by number of friends" do
+        @cli.suggest
+        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+      end
+    end
+    context "--listed" do
+      before do
+        @cli.options = @cli.options.merge(:listed => true)
+      end
+      it "should sort by number of list memberships" do
+        @cli.suggest
+        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.suggest
+        $stdout.string.should == <<-eos
+ID          Since         Tweets  Favorites  Listed  Following  Followers  Screen name  Name
+40,514,587  May 16  2009  183     2          2       198        158        antpires     AntonioPires
+14,736,332  May 11  2008  3,850   117        99      545        802        jtrupiano    John Trupiano
+2,006,261   Mar 23  2007  4,497   9          171     967        2,028      maccman      Alex MacCaw
+14,451,152  Apr 20  2008  6,251   10         20      403        299        mlroach      Matt Laroche
+16,052,754  Aug 30  2008  24      0          1       5          42         stuntmann82  stuntmann82
+        eos
+      end
+    end
+    context "--number" do
+      before do
+        @cli.options = @cli.options.merge(:number => 1)
+        stub_get("/1/users/recommendations.json").
+          with(:query => {:limit => "1", :include_entities => "false"}).
+          to_return(:body => fixture("recommendations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "should limit the number of results" do
+        @cli.suggest
+        a_get("/1/users/recommendations.json").
+          with(:query => {:limit => "1", :include_entities => "false"}).
+          should have_been_made
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.suggest
+        $stdout.string.chomp.rstrip.should == "stuntmann82  mlroach      maccman      jtrupiano    antpires"
+      end
+    end
+    context "--tweets" do
+      before do
+        @cli.options = @cli.options.merge(:tweets => true)
+      end
+      it "should sort by number of Tweets" do
+        @cli.suggest
+        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     jtrupiano    maccman      mlroach"
+      end
+    end
   end
 
   describe "#timeline" do
+    before do
+      stub_get("/1/statuses/home_timeline.json").
+        with(:query => {:count => "20", :include_entities => "false"}).
+        to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
     context "without user" do
+      it "should request the correct resource" do
+        @cli.timeline
+        a_get("/1/statuses/home_timeline.json").
+          with(:query => {:count => "20", :include_entities => "false"}).
+          should have_been_made
+      end
+      it "should have the correct output" do
+        @cli.timeline
+        $stdout.string.should == <<-eos
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
+        eos
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.timeline
+        $stdout.string.should == <<-eos
+ID                       Posted at     Screen name   Text
+194,548,121,416,630,272  Apr 23  2011  natevillegas  RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present.
+194,547,993,607,806,976  Apr 23  2011  TD            @kelseysilver how long will you be in town?
+194,547,987,593,183,233  Apr 23  2011  rusashka      @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+194,547,824,690,597,888  Apr 23  2011  fat           @stevej @xc i'm going to picket when i get back.
+194,547,658,562,605,057  Apr 23  2011  wil           @0x9900 @paulnivin http://t.co/bwVdtAPe
+194,547,528,430,137,344  Apr 23  2011  wangtian      @tianhonghe @xiangxin72 oh, you can even order specific items?
+194,547,402,550,689,793  Apr 23  2011  shinypb       @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+194,547,260,233,760,768  Apr 23  2011  0x9900        @wil @paulnivin if you want to take you seriously don't say daemontools!
+194,547,084,349,804,544  Apr 23  2011  kpk           @shinypb @skilldrick @hoverbird invented it
+194,546,876,782,092,291  Apr 23  2011  skilldrick    @shinypb Well played :) @hoverbird
+194,546,811,480,969,217  Apr 23  2011  sam           Can someone project the date that I'll get a 27" retina display?
+194,546,738,810,458,112  Apr 23  2011  shinypb       @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+194,546,727,670,390,784  Apr 23  2011  bartt         @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come.
+194,546,649,203,347,456  Apr 23  2011  skilldrick    @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all.
+194,546,583,608,639,488  Apr 23  2011  sean          @mep Thanks for coming by. Was great to have you.
+194,546,388,707,717,120  Apr 23  2011  hoverbird     @shinypb @trammell it's all suck a "duck blur" sometimes.
+194,546,264,212,385,793  Apr 23  2011  kelseysilver  San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw
+        eos
+      end
+    end
+    context "--number" do
       before do
+        @cli.options = @cli.options.merge(:number => 1)
         stub_get("/1/statuses/home_timeline.json").
-          with(:query => {:count => "20", :include_entities => "false"}).
+          with(:query => {:count => "1", :include_entities => "false"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
-        @t.timeline
+      it "should limit the number of results" do
+        @cli.timeline
         a_get("/1/statuses/home_timeline.json").
-          with(:query => {:count => "20", :include_entities => "false"}).
+          with(:query => {:count => "1", :include_entities => "false"}).
           should have_been_made
       end
-      it "should have the correct output" do
-        @t.timeline
-        $stdout.string.should == <<-eos.gsub(/^/, ' ' * 4)
-          sferik: Ruby is the best programming language for hiding the ugly bits. (about 1 year ago)
-          sferik: There are 1.3 billion people in China; when people say there are 1 billion they are rounding off the entire population of the United States. (about 1 year ago)
-          sferik: The new Windows Phone campaign is the best advertising from Microsoft since "Start Me Up" (1995). Great work by CP+B. http://t.co/tIzxopI (about 1 year ago)
-          sferik: Fear not to sow seeds because of the birds. http://twitpic.com/2wg621 (about 1 year ago)
-          sferik: Speaking of things that are maddening: the interview with the Wall Street guys on the most recent This American Life http://bit.ly/af9pSD (about 1 year ago)
-          sferik: Holy cow! RailsAdmin is up to 200 watchers (from 100 yesterday). http://github.com/sferik/rails_admin (about 1 year ago)
-          sferik: Kind of cool that Facebook acts as a mirror for open-source projects that they use or like http://mirror.facebook.net/ (about 1 year ago)
-          sferik: RailsAdmin already has 100 watchers, 12 forks, and 6 contributors in less than 2 months. Let's keep the momentum going! http://bit.ly/cCMMqD (about 1 year ago)
-          sferik: This week's This American Life is amazing. @JoeLipari is an American hero. http://bit.ly/d9RbnB (about 1 year ago)
-          sferik: RT @polyseme: OH: shofars should be called jewvuzelas. (about 1 year ago)
-          sferik: Spent this morning fixing broken windows in RailsAdmin http://github.com/sferik/rails_admin/compare/ab6c598...0e3770f (about 1 year ago)
-          sferik: I'm a big believer that the broken windows theory applies to software development http://en.wikipedia.org/wiki/Broken_windows_theory (about 1 year ago)
-          sferik: I hope you idiots are happy with your piece of shit Android phones. http://www.apple.com/pr/library/2010/09/09statement.html (about 1 year ago)
-          sferik: Ping: kills MySpace dead. (about 1 year ago)
-          sferik: Crazy that iTunes Ping didn't leak a drop. (about 1 year ago)
-          sferik: The plot thickens http://twitpic.com/2k5lt2 (about 1 year ago)
-          sferik: 140 Proof Provides A Piece Of The Twitter Advertising Puzzle http://t.co/R2cUSDe via @techcrunch (about 1 year ago)
-          sferik: Try as you may http://www.thedoghousediaries.com/?p=1940 (about 1 year ago)
-          sferik: I know @SarahPalinUSA has a right to use Twitter, but should she? (over 1 year ago)
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.timeline
+        $stdout.string.should == <<-eos
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
         eos
       end
     end
@@ -687,33 +1425,31 @@ describe T::CLI do
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
-        @t.timeline("sferik")
+        @cli.timeline("sferik")
         a_get("/1/statuses/user_timeline.json").
           with(:query => {:count => "20", :include_entities => "false", :screen_name => "sferik"}).
           should have_been_made
       end
       it "should have the correct output" do
-        @t.timeline("sferik")
-        $stdout.string.should == <<-eos.gsub(/^/, ' ' * 4)
-          sferik: Ruby is the best programming language for hiding the ugly bits. (about 1 year ago)
-          sferik: There are 1.3 billion people in China; when people say there are 1 billion they are rounding off the entire population of the United States. (about 1 year ago)
-          sferik: The new Windows Phone campaign is the best advertising from Microsoft since "Start Me Up" (1995). Great work by CP+B. http://t.co/tIzxopI (about 1 year ago)
-          sferik: Fear not to sow seeds because of the birds. http://twitpic.com/2wg621 (about 1 year ago)
-          sferik: Speaking of things that are maddening: the interview with the Wall Street guys on the most recent This American Life http://bit.ly/af9pSD (about 1 year ago)
-          sferik: Holy cow! RailsAdmin is up to 200 watchers (from 100 yesterday). http://github.com/sferik/rails_admin (about 1 year ago)
-          sferik: Kind of cool that Facebook acts as a mirror for open-source projects that they use or like http://mirror.facebook.net/ (about 1 year ago)
-          sferik: RailsAdmin already has 100 watchers, 12 forks, and 6 contributors in less than 2 months. Let's keep the momentum going! http://bit.ly/cCMMqD (about 1 year ago)
-          sferik: This week's This American Life is amazing. @JoeLipari is an American hero. http://bit.ly/d9RbnB (about 1 year ago)
-          sferik: RT @polyseme: OH: shofars should be called jewvuzelas. (about 1 year ago)
-          sferik: Spent this morning fixing broken windows in RailsAdmin http://github.com/sferik/rails_admin/compare/ab6c598...0e3770f (about 1 year ago)
-          sferik: I'm a big believer that the broken windows theory applies to software development http://en.wikipedia.org/wiki/Broken_windows_theory (about 1 year ago)
-          sferik: I hope you idiots are happy with your piece of shit Android phones. http://www.apple.com/pr/library/2010/09/09statement.html (about 1 year ago)
-          sferik: Ping: kills MySpace dead. (about 1 year ago)
-          sferik: Crazy that iTunes Ping didn't leak a drop. (about 1 year ago)
-          sferik: The plot thickens http://twitpic.com/2k5lt2 (about 1 year ago)
-          sferik: 140 Proof Provides A Piece Of The Twitter Advertising Puzzle http://t.co/R2cUSDe via @techcrunch (about 1 year ago)
-          sferik: Try as you may http://www.thedoghousediaries.com/?p=1940 (about 1 year ago)
-          sferik: I know @SarahPalinUSA has a right to use Twitter, but should she? (over 1 year ago)
+        @cli.timeline("sferik")
+        $stdout.string.should == <<-eos
+        natevillegas: RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history. Tomorrow is a mystery. Today is a gift. That's why it's called the present. (7 months ago)
+                  TD: @kelseysilver how long will you be in town? (7 months ago)
+            rusashka: @maciej hahaha :) @gpena together we're going to cover all core 28 languages! (7 months ago)
+                 fat: @stevej @xc i'm going to picket when i get back. (7 months ago)
+                 wil: @0x9900 @paulnivin http://t.co/bwVdtAPe (7 months ago)
+            wangtian: @tianhonghe @xiangxin72 oh, you can even order specific items? (7 months ago)
+             shinypb: @kpk Pfft, I think you're forgetting mechanical television, which depended on a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird (7 months ago)
+              0x9900: @wil @paulnivin if you want to take you seriously don't say daemontools! (7 months ago)
+                 kpk: @shinypb @skilldrick @hoverbird invented it (7 months ago)
+          skilldrick: @shinypb Well played :) @hoverbird (7 months ago)
+                 sam: Can someone project the date that I'll get a 27" retina display? (7 months ago)
+             shinypb: @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain. (7 months ago)
+               bartt: @noahlt @gaarf Yup, now owning @twitter -&gt; FB from FE to daemons. Lot’s of fun. Expect improvements in the weeks to come. (7 months ago)
+          skilldrick: @hoverbird @shinypb You guys must be soooo old, I don't remember the words to the duck tales intro at all. (7 months ago)
+                sean: @mep Thanks for coming by. Was great to have you. (7 months ago)
+           hoverbird: @shinypb @trammell it's all suck a "duck blur" sometimes. (7 months ago)
+        kelseysilver: San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 92 others) http://t.co/eoLANJZw (7 months ago)
         eos
       end
     end
@@ -721,12 +1457,12 @@ describe T::CLI do
 
   describe "#unfollow" do
     before do
-      @t.options = @t.options.merge(:profile => fixture_path + "/.trc")
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
     end
     context "no users" do
       it "should exit" do
         lambda do
-          @t.unfollow
+          @cli.unfollow
         end.should raise_error
       end
     end
@@ -735,7 +1471,7 @@ describe T::CLI do
         stub_delete("/1/friendships/destroy.json").
           with(:query => {:screen_name => "sferik", :include_entities => "false"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        @t.unfollow("sferik")
+        @cli.unfollow("sferik")
         a_delete("/1/friendships/destroy.json").
           with(:query => {:screen_name => "sferik", :include_entities => "false"}).
           should have_been_made
@@ -744,7 +1480,7 @@ describe T::CLI do
         stub_delete("/1/friendships/destroy.json").
           with(:query => {:screen_name => "sferik", :include_entities => "false"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        @t.unfollow("sferik")
+        @cli.unfollow("sferik")
         $stdout.string.should =~ /^@testcli is no longer following 1 user\.$/
       end
       context "Twitter is down" do
@@ -753,7 +1489,7 @@ describe T::CLI do
             with(:query => {:screen_name => "sferik", :include_entities => "false"}).
             to_return(:status => 502)
           lambda do
-            @t.unfollow("sferik")
+            @cli.unfollow("sferik")
           end.should raise_error("Twitter is down or being upgraded.")
           a_delete("/1/friendships/destroy.json").
             with(:query => {:screen_name => "sferik", :include_entities => "false"}).
@@ -763,27 +1499,130 @@ describe T::CLI do
     end
   end
 
+  describe "#update" do
+    before do
+      @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc", :location => true)
+      stub_post("/1/statuses/update.json").
+        with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
+        to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_request(:get, "http://checkip.dyndns.org/").
+        to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
+      stub_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").
+        to_return(:body => fixture("xml.gp"), :headers => {:content_type => "application/xml"})
+    end
+    it "should request the correct resource" do
+      @cli.update("Testing")
+      a_post("/1/statuses/update.json").
+        with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
+        should have_been_made
+      a_request(:get, "http://checkip.dyndns.org/").
+        should have_been_made
+      a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").
+        should have_been_made
+    end
+    it "should have the correct output" do
+      @cli.update("Testing")
+      $stdout.string.should =~ /^Tweet created by @testcli \(about 1 year ago\)\.$/
+    end
+  end
+
   describe "#users" do
     before do
       stub_get("/1/users/lookup.json").
-        with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+        with(:query => {:screen_name => "sferik,pengwynn", :include_entities => "false"}).
         to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.users("sferik")
+      @cli.users("sferik", "pengwynn")
       a_get("/1/users/lookup.json").
-        with(:query => {:screen_name => "sferik", :include_entities => "false"}).
+        with(:query => {:screen_name => "sferik,pengwynn", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.users("sferik")
+      @cli.users("sferik", "pengwynn")
       $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
     end
+    context "--created" do
+      before do
+        @cli.options = @cli.options.merge(:created => true)
+      end
+      it "should sort by the time when Twitter acount was created" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--favorites" do
+      before do
+        @cli.options = @cli.options.merge(:favorites => true)
+      end
+      it "should sort by number of favorites" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      end
+    end
+    context "--followers" do
+      before do
+        @cli.options = @cli.options.merge(:followers => true)
+      end
+      it "should sort by number of followers" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--friends" do
+      before do
+        @cli.options = @cli.options.merge(:friends => true)
+      end
+      it "should sort by number of friends" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--listed" do
+      before do
+        @cli.options = @cli.options.merge(:listed => true)
+      end
+      it "should sort by number of list memberships" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.should == <<-eos
+ID          Since         Tweets  Favorites  Listed  Following  Followers  Screen name  Name
+14,100,886  Mar  8  2008  3,913   32         185     1,871      2,767      pengwynn     Wynn Netherland
+7,505,382   Jul 16  2007  2,962   727        29      88         898        sferik       Erik Michaels-Ober
+        eos
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
+    context "--tweets" do
+      before do
+        @cli.options = @cli.options.merge(:tweets => true)
+      end
+      it "should sort by number of Tweets" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+      end
+    end
   end
 
   describe "#version" do
     it "should have the correct output" do
-      @t.version
+      @cli.version
       $stdout.string.chomp.should == T::Version.to_s
     end
   end
@@ -795,19 +1634,27 @@ describe T::CLI do
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
-      @t.whois("sferik")
+      @cli.whois("sferik")
       a_get("/1/users/show.json").
         with(:query => {:screen_name => "sferik", :include_entities => "false"}).
         should have_been_made
     end
     it "should have the correct output" do
-      @t.whois("sferik")
-      $stdout.string.should == <<-eos.gsub(/^ {8}/, '')
-        id: #7,505,382
-        Erik Michaels-Ober, since Jul 2007.
-        bio: A mind forever voyaging through strange seas of thought, alone.
-        location: San Francisco
-        web: https://github.com/sferik
+      @cli.whois("sferik")
+      $stdout.string.should == <<-eos
+ID           7,505,382
+Name         Erik Michaels-Ober
+Bio          A mind forever voyaging through strange seas of thought, alone.
+Location     San Francisco
+URL          https://github.com/sferik
+Status       Not following
+Last update  RT @tenderlove: [ANN] sqlite3-ruby =&gt; sqlite3 (10 months ago)
+Since        Jul 16  2007
+Tweets       3,479
+Favorites    1,040
+Listed       41
+Following    197
+Followers    1,048
       eos
     end
   end