t 0.9.9 → 1.0.0

data/lib/t/version.rb

@@ -3,17 +3,17 @@ module T
 
     # @return [Integer]
     def self.major
-      0
+      1
     end
 
     # @return [Integer]
     def self.minor
-      9
+      0
     end
 
     # @return [Integer]
     def self.patch
-      9
+      0
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -13,9 +13,8 @@ describe T::CLI do
     Timecop.return
   end
 
-  before do
-    rcfile = RCFile.instance
-    rcfile.path = fixture_path + "/.trc"
+  before :each do
+    T::RCFile.instance.path = fixture_path + "/.trc"
     @cli = T::CLI.new
     @old_stderr = $stderr
     $stderr = StringIO.new
@@ -23,7 +22,8 @@ describe T::CLI do
     $stdout = StringIO.new
   end
 
-  after do
+  after :each do
+    T::RCFile.instance.reset
     $stderr = @old_stderr
     $stdout = @old_stdout
   end
@@ -43,7 +43,7 @@ testcli
 
   describe "#authorize" do
     before do
-      @cli.options = @cli.options.merge("profile" => project_path + "/tmp/trc", "consumer-key" => "abc123", "consumer-secret" => "asdfasd223sd2", "prompt" => true, "display-url" => true)
+      @cli.options = @cli.options.merge("profile" => project_path + "/tmp/authorize", "display-url" => true)
       stub_post("/oauth/request_token").
         to_return(:body => fixture("request_token"))
       stub_post("/oauth/access_token").
@@ -52,9 +52,15 @@ testcli
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
+      $stdout.should_receive(:print)
+      $stdin.should_receive(:gets).and_return("\n")
+      $stdout.should_receive(:print).with("Enter your consumer key: ")
+      $stdin.should_receive(:gets).and_return("abc123")
+      $stdout.should_receive(:print).with("Enter your consumer secret: ")
+      $stdin.should_receive(:gets).and_return("asdfasd223sd2")
       $stdout.should_receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
       $stdin.should_receive(:gets).and_return("\n")
-      $stdout.should_receive(:print).with("Paste in the supplied PIN: ")
+      $stdout.should_receive(:print).with("Enter the supplied PIN: ")
       $stdin.should_receive(:gets).and_return("1234567890")
       @cli.authorize
       a_post("/oauth/request_token").
@@ -66,9 +72,15 @@ testcli
     end
     it "should not raise error" do
       lambda do
+        $stdout.should_receive(:print)
+        $stdin.should_receive(:gets).and_return("\n")
+        $stdout.should_receive(:print).with("Enter your consumer key: ")
+        $stdin.should_receive(:gets).and_return("abc123")
+        $stdout.should_receive(:print).with("Enter your consumer secret: ")
+        $stdin.should_receive(:gets).and_return("asdfasd223sd2")
         $stdout.should_receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
         $stdin.should_receive(:gets).and_return("\n")
-        $stdout.should_receive(:print).with("Paste in the supplied PIN: ")
+        $stdout.should_receive(:print).with("Enter the supplied PIN: ")
         $stdin.should_receive(:gets).and_return("1234567890")
         @cli.authorize
       end.should_not raise_error
@@ -126,16 +138,42 @@ testcli
     it "should have the correct output" do
       @cli.direct_messages
       $stdout.string.should == <<-eos
-              sferik: Sounds good. Meeting Tuesday is fine. (a year ago)
-              sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (a year ago)
-              sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (a year ago)
-              sferik: Just checking in. How's everything going? (a 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? (a year ago)
-              sferik: How are the graph enhancements coming? (a year ago)
-              sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (a year ago)
-              sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (a 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. (a 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? (a year ago)
+\e[1m\e[33m   @sferik\e[0m
+   Sounds good. Meeting Tuesday is fine.
+
+\e[1m\e[33m   @sferik\e[0m
+   That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does 
+   that work for you?
+
+\e[1m\e[33m   @sferik\e[0m
+   I asked Yehuda about the stipend. I believe it has already been sent. Glad 
+   you're feeling better.
+
+\e[1m\e[33m   @sferik\e[0m
+   Just checking in. How's everything going?
+
+\e[1m\e[33m   @sferik\e[0m
+   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?
+
+\e[1m\e[33m   @sferik\e[0m
+   How are the graph enhancements coming?
+
+\e[1m\e[33m   @sferik\e[0m
+   How are the graphs coming? I'm really looking forward to seeing what you do 
+   with Raphaël.
+
+\e[1m\e[33m   @sferik\e[0m
+   Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
+
+\e[1m\e[33m   @sferik\e[0m
+   I just committed a bunch of cleanup and fixes to RailsAdmin that touched many 
+   of files. Make sure you pull to avoid conflicts.
+
+\e[1m\e[33m   @sferik\e[0m
+   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
     context "--csv" do
@@ -227,16 +265,42 @@ ID          Posted at     Screen name  Text
       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? (a 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. (a year ago)
-              sferik: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (a year ago)
-              sferik: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (a year ago)
-              sferik: How are the graph enhancements coming? (a 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? (a year ago)
-              sferik: Just checking in. How's everything going? (a year ago)
-              sferik: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (a year ago)
-              sferik: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (a year ago)
-              sferik: Sounds good. Meeting Tuesday is fine. (a year ago)
+\e[1m\e[33m   @sferik\e[0m
+   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?
+
+\e[1m\e[33m   @sferik\e[0m
+   I just committed a bunch of cleanup and fixes to RailsAdmin that touched many 
+   of files. Make sure you pull to avoid conflicts.
+
+\e[1m\e[33m   @sferik\e[0m
+   Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
+
+\e[1m\e[33m   @sferik\e[0m
+   How are the graphs coming? I'm really looking forward to seeing what you do 
+   with Raphaël.
+
+\e[1m\e[33m   @sferik\e[0m
+   How are the graph enhancements coming?
+
+\e[1m\e[33m   @sferik\e[0m
+   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?
+
+\e[1m\e[33m   @sferik\e[0m
+   Just checking in. How's everything going?
+
+\e[1m\e[33m   @sferik\e[0m
+   I asked Yehuda about the stipend. I believe it has already been sent. Glad 
+   you're feeling better.
+
+\e[1m\e[33m   @sferik\e[0m
+   That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does 
+   that work for you?
+
+\e[1m\e[33m   @sferik\e[0m
+   Sounds good. Meeting Tuesday is fine.
+
         eos
       end
     end
@@ -260,16 +324,42 @@ ID          Posted at     Screen name  Text
     it "should have the correct output" do
       @cli.direct_messages_sent
       $stdout.string.should == <<-eos
-           hurrycane: Sounds good. Meeting Tuesday is fine. (a year ago)
-           hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (a year ago)
-           hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (a year ago)
-           hurrycane: Just checking in. How's everything going? (a 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? (a year ago)
-           hurrycane: How are the graph enhancements coming? (a year ago)
-           hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (a year ago)
-           hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (a 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. (a 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? (a year ago)
+\e[1m\e[33m   @hurrycane\e[0m
+   Sounds good. Meeting Tuesday is fine.
+
+\e[1m\e[33m   @hurrycane\e[0m
+   That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does 
+   that work for you?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   I asked Yehuda about the stipend. I believe it has already been sent. Glad 
+   you're feeling better.
+
+\e[1m\e[33m   @hurrycane\e[0m
+   Just checking in. How's everything going?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   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?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   How are the graph enhancements coming?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   How are the graphs coming? I'm really looking forward to seeing what you do 
+   with Raphaël.
+
+\e[1m\e[33m   @hurrycane\e[0m
+   Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   I just committed a bunch of cleanup and fixes to RailsAdmin that touched many 
+   of files. Make sure you pull to avoid conflicts.
+
+\e[1m\e[33m   @hurrycane\e[0m
+   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
     context "--csv" do
@@ -361,16 +451,42 @@ ID          Posted at     Screen name  Text
       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? (a 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. (a year ago)
-           hurrycane: Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final? (a year ago)
-           hurrycane: How are the graphs coming? I'm really looking forward to seeing what you do with Raphaël. (a year ago)
-           hurrycane: How are the graph enhancements coming? (a 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? (a year ago)
-           hurrycane: Just checking in. How's everything going? (a year ago)
-           hurrycane: I asked Yehuda about the stipend. I believe it has already been sent. Glad you're feeling better. (a year ago)
-           hurrycane: That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does that work for you? (a year ago)
-           hurrycane: Sounds good. Meeting Tuesday is fine. (a year ago)
+\e[1m\e[33m   @hurrycane\e[0m
+   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?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   I just committed a bunch of cleanup and fixes to RailsAdmin that touched many 
+   of files. Make sure you pull to avoid conflicts.
+
+\e[1m\e[33m   @hurrycane\e[0m
+   Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   How are the graphs coming? I'm really looking forward to seeing what you do 
+   with Raphaël.
+
+\e[1m\e[33m   @hurrycane\e[0m
+   How are the graph enhancements coming?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   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?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   Just checking in. How's everything going?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   I asked Yehuda about the stipend. I believe it has already been sent. Glad 
+   you're feeling better.
+
+\e[1m\e[33m   @hurrycane\e[0m
+   That's great news! Let's plan to chat around 8 AM tomorrow Pacific time. Does 
+   that work for you?
+
+\e[1m\e[33m   @hurrycane\e[0m
+   Sounds good. Meeting Tuesday is fine.
+
         eos
       end
     end
@@ -402,7 +518,7 @@ ID          Posted at     Screen name  Text
     end
     it "should have the correct output" do
       @cli.groupies
-      $stdout.string.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -411,86 +527,95 @@ ID          Posted at     Screen name  Text
       it "should output in CSV format" do
         @cli.groupies
         $stdout.string.should == <<-eos
-ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
-14100886,2008-03-08 16:34:22 +0000,3913,32,185,1871,2767,pengwynn,Wynn Netherland
-7505382,2007-07-16 12:59:01 +0000,2962,727,29,88,898,sferik,Erik Michaels-Ober
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland ⚡
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober
         eos
       end
     end
-    context "--favorites" do
+    context "--long" do
       before do
-        @cli.options = @cli.options.merge("favorites" => true)
+        @cli.options = @cli.options.merge("long" => true)
       end
-      it "should sort by number of favorites" do
+      it "should output in long format" do
         @cli.groupies
-        $stdout.string.rstrip.should == "pengwynn  sferik"
+        $stdout.string.should == <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
+        eos
       end
     end
-    context "--followers" do
+    context "--reverse" do
       before do
-        @cli.options = @cli.options.merge("followers" => true)
+        @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should sort by number of followers" do
+      it "should reverse the order of the sort" do
         @cli.groupies
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--friends" do
+    context "--sort=favorites" do
       before do
-        @cli.options = @cli.options.merge("friends" => true)
+        @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of friends" do
+      it "should sort by number of favorites" do
         @cli.groupies
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
-    context "--listed" do
+    context "--sort=followers" do
       before do
-        @cli.options = @cli.options.merge("listed" => true)
+        @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of list memberships" do
+      it "should sort by number of followers" do
         @cli.groupies
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--long" do
+    context "--sort=friends" do
       before do
-        @cli.options = @cli.options.merge("long" => true)
+        @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should output in long format" do
+      it "should sort by number of friends" do
         @cli.groupies
-        $stdout.string.should == <<-eos
-ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
-14100886  Mar  8  2008    3913         32     185       1871       2767  @pen...
- 7505382  Jul 16  2007    2962        727      29         88        898  @sfe...
-        eos
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--posted" do
+    context "--sort=listed" do
       before do
-        @cli.options = @cli.options.merge("posted" => true)
+        @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "should sort by number of list memberships" do
         @cli.groupies
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--reverse" do
+    context "--sort=since" do
       before do
-        @cli.options = @cli.options.merge("reverse" => true)
+        @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should reverse the order of the sort" do
+      it "should sort by the time when Twitter acount was created" do
         @cli.groupies
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--tweets" do
+    context "--sort=tweets" do
       before do
-        @cli.options = @cli.options.merge("tweets" => true)
+        @cli.options = @cli.options.merge("sort" => "tweets")
       end
       it "should sort by number of Tweets" do
         @cli.groupies
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
+      end
+    end
+    context "--sort=tweeted" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "tweeted")
+      end
+      it "should sort by the time of the last Tweet" do
+        @cli.groupies
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "--unsorted" do
@@ -499,7 +624,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should not be sorted" do
         @cli.groupies
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "with a user passed" do
@@ -564,7 +689,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     end
     it "should have the correct output" do
       @cli.dm("pengwynn", "Creating a fixture for the Twitter gem")
-      $stdout.string.chomp.should == "Direct Message sent from @testcli to @pengwynn (a year ago)."
+      $stdout.string.chomp.should == "Direct Message sent from @testcli to @pengwynn."
     end
     context "--id" do
       before do
@@ -597,7 +722,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     end
     it "should have the correct output" do
       @cli.does_contain("presidents")
-      $stdout.string.chomp.should == "Yes, @testcli/presidents contains @testcli."
+      $stdout.string.chomp.should == "Yes, presidents contains @testcli."
     end
     context "--id" do
       before do
@@ -622,7 +747,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     context "with an owner passed" do
       it "should have the correct output" do
         @cli.does_contain("testcli/presidents", "testcli")
-        $stdout.string.chomp.should == "Yes, @testcli/presidents contains @testcli."
+        $stdout.string.chomp.should == "Yes, presidents contains @testcli."
       end
       context "--id" do
         before do
@@ -631,16 +756,16 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
             with(:query => {:user_id => "7505382"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1/lists/members/show.json").
-            with(:query => {:owner_screen_name => "sferik", :screen_name => "sferik", :slug => "presidents"}).
+            with(:query => {:owner_id => "7505382", :screen_name => "sferik", :slug => "presidents"}).
             to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
           @cli.does_contain("7505382/presidents", "7505382")
           a_get("/1/users/show.json").
             with(:query => {:user_id => "7505382"}).
-            should have_been_made.times(2)
+            should have_been_made
           a_get("/1/lists/members/show.json").
-            with(:query => {:owner_screen_name => "sferik", :screen_name => "sferik", :slug => "presidents"}).
+            with(:query => {:owner_id => "7505382", :screen_name => "sferik", :slug => "presidents"}).
             should have_been_made
         end
       end
@@ -648,7 +773,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     context "with a user passed" do
       it "should have the correct output" do
         @cli.does_contain("presidents", "testcli")
-        $stdout.string.chomp.should == "Yes, @testcli/presidents contains @testcli."
+        $stdout.string.chomp.should == "Yes, presidents contains @testcli."
       end
     end
     context "false" do
@@ -785,9 +910,76 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     end
     it "should have the correct output" do
       @cli.favorites
-      $stdout.string.should =~ /@natevillegas/
-      $stdout.string.should =~ /RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history\. Tomorrow is a /
-      $stdout.string.should =~ /mystery\. Today is a gift\. That's why it's called the present\./
+      $stdout.string.should == <<-eos
+\e[1m\e[33m   @ryanbigg\e[0m
+   Things that have made my life better, in order of greatness: GitHub, Travis 
+   CI, the element Oxygen.
+
+\e[1m\e[33m   @sfbike\e[0m
+   Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers 
+   counted in 1 hour--that's 17 per minute. Way to roll, SF!
+
+\e[1m\e[33m   @levie\e[0m
+   I know you're as rare as leprechauns, but if you're an amazing designer then 
+   Box wants to hire you. Email recruiting@box.com
+
+\e[1m\e[33m   @natevillegas\e[0m
+   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.
+
+\e[1m\e[33m   @TD\e[0m
+   @kelseysilver how long will you be in town?
+
+\e[1m\e[33m   @rusashka\e[0m
+   @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+
+\e[1m\e[33m   @fat\e[0m
+   @stevej @xc i'm going to picket when i get back.
+
+\e[1m\e[33m   @wil\e[0m
+   @0x9900 @paulnivin http://t.co/bwVdtAPe
+
+\e[1m\e[33m   @wangtian\e[0m
+   @tianhonghe @xiangxin72 oh, you can even order specific items?
+
+\e[1m\e[33m   @shinypb\e[0m
+   @kpk Pfft, I think you're forgetting mechanical television, which depended on 
+   a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+
+\e[1m\e[33m   @0x9900\e[0m
+   @wil @paulnivin if you want to take you seriously don't say daemontools!
+
+\e[1m\e[33m   @kpk\e[0m
+   @shinypb @skilldrick @hoverbird invented it
+
+\e[1m\e[33m   @skilldrick\e[0m
+   @shinypb Well played :) @hoverbird
+
+\e[1m\e[33m   @sam\e[0m
+   Can someone project the date that I'll get a 27\" retina display?
+
+\e[1m\e[33m   @shinypb\e[0m
+   @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+
+\e[1m\e[33m   @bartt\e[0m
+   @noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of 
+   fun. Expect improvements in the weeks to come.
+
+\e[1m\e[33m   @skilldrick\e[0m
+   @hoverbird @shinypb You guys must be soooo old, I don't remember the words to 
+   the duck tales intro at all.
+
+\e[1m\e[33m   @sean\e[0m
+   @mep Thanks for coming by. Was great to have you.
+
+\e[1m\e[33m   @hoverbird\e[0m
+   @shinypb @trammell it's all suck a \"duck blur\" sometimes.
+
+\e[1m\e[33m   @kelseysilver\e[0m
+   San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 
+   92 others) http://t.co/eoLANJZw
+
+      eos
     end
     context "--csv" do
       before do
@@ -956,46 +1148,81 @@ ID                  Posted at     Screen name    Text
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
     end
     context "one user" do
-      it "should request the correct resource" do
+      before do
+        stub_get("/1/friends/ids.json").
+          with(:query => {:cursor => "-1"}).
+          to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1/users/lookup.json").
+          with(:query => {:screen_name => "sferik,pengwynn"}).
+          to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1/friendships/create.json").
-          with(:body => {:screen_name => "sferik"}).
+          with(:body => {:user_id => "14100886"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        @cli.follow("sferik")
+      end
+      it "should request the correct resource" do
+        @cli.follow("sferik", "pengwynn")
+        a_get("/1/friends/ids.json").
+          with(:query => {:cursor => "-1"}).
+          should have_been_made
+        a_get("/1/users/lookup.json").
+          with(:query => {:screen_name => "sferik,pengwynn"}).
+          should have_been_made
         a_post("/1/friendships/create.json").
-          with(:body => {:screen_name => "sferik"}).
+          with(:body => {:user_id => "14100886"}).
           should have_been_made
       end
       it "should have the correct output" do
-        stub_post("/1/friendships/create.json").
-          with(:body => {:screen_name => "sferik"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        @cli.follow("sferik")
+        @cli.follow("sferik", "pengwynn")
         $stdout.string.should =~ /^@testcli is now following 1 more user\.$/
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
+          stub_get("/1/friends/ids.json").
+            with(:query => {:cursor => "-1"}).
+            to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1/users/lookup.json").
+            with(:query => {:user_id => "7505382,14100886"}).
+            to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_post("/1/friendships/create.json").
-            with(:body => {:user_id => "7505382"}).
+            with(:body => {:user_id => "14100886"}).
             to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "should request the correct resource" do
-          @cli.follow("7505382")
+          @cli.follow("7505382", "14100886")
+          a_get("/1/friends/ids.json").
+            with(:query => {:cursor => "-1"}).
+            should have_been_made
+          a_get("/1/users/lookup.json").
+            with(:query => {:user_id => "7505382,14100886"}).
+            should have_been_made
           a_post("/1/friendships/create.json").
-            with(:body => {:user_id => "7505382"}).
+            with(:body => {:user_id => "14100886"}).
             should have_been_made
         end
       end
       context "Twitter is down" do
         it "should retry 3 times and then raise an error" do
+          stub_get("/1/friends/ids.json").
+            with(:query => {:cursor => "-1"}).
+            to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1/users/lookup.json").
+            with(:query => {:screen_name => "sferik,pengwynn"}).
+            to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_post("/1/friendships/create.json").
-            with(:body => {:screen_name => "sferik"}).
+            with(:body => {:user_id => "14100886"}).
             to_return(:status => 502)
           lambda do
-            @cli.follow("sferik")
+            @cli.follow("sferik", "pengwynn")
           end.should raise_error("Twitter is down or being upgraded.")
+          a_get("/1/friends/ids.json").
+            with(:query => {:cursor => "-1"}).
+            should have_been_made.times(3)
+          a_get("/1/users/lookup.json").
+            with(:query => {:screen_name => "sferik,pengwynn"}).
+            should have_been_made.times(3)
           a_post("/1/friendships/create.json").
-            with(:body => {:screen_name => "sferik"}).
+            with(:body => {:user_id => "14100886"}).
             should have_been_made.times(3)
         end
       end
@@ -1022,7 +1249,7 @@ ID                  Posted at     Screen name    Text
     end
     it "should have the correct output" do
       @cli.followings
-      $stdout.string.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -1031,86 +1258,95 @@ ID                  Posted at     Screen name    Text
       it "should output in CSV format" do
         @cli.followings
         $stdout.string.should == <<-eos
-ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
-14100886,2008-03-08 16:34:22 +0000,3913,32,185,1871,2767,pengwynn,Wynn Netherland
-7505382,2007-07-16 12:59:01 +0000,2962,727,29,88,898,sferik,Erik Michaels-Ober
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland ⚡
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober
         eos
       end
     end
-    context "--favorites" do
+    context "--long" do
       before do
-        @cli.options = @cli.options.merge("favorites" => true)
+        @cli.options = @cli.options.merge("long" => true)
       end
-      it "should sort by number of favorites" do
+      it "should output in long format" do
         @cli.followings
-        $stdout.string.rstrip.should == "pengwynn  sferik"
+        $stdout.string.should == <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
+        eos
       end
     end
-    context "--followers" do
+    context "--reverse" do
       before do
-        @cli.options = @cli.options.merge("followers" => true)
+        @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should sort by number of followers" do
+      it "should reverse the order of the sort" do
         @cli.followings
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--friends" do
+    context "--sort=favorites" do
       before do
-        @cli.options = @cli.options.merge("friends" => true)
+        @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of friends" do
+      it "should sort by number of favorites" do
         @cli.followings
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
-    context "--listed" do
+    context "--sort=followers" do
       before do
-        @cli.options = @cli.options.merge("listed" => true)
+        @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of list memberships" do
+      it "should sort by number of followers" do
         @cli.followings
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--long" do
+    context "--sort=friends" do
       before do
-        @cli.options = @cli.options.merge("long" => true)
+        @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should output in long format" do
+      it "should sort by number of friends" do
         @cli.followings
-        $stdout.string.should == <<-eos
-ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
-14100886  Mar  8  2008    3913         32     185       1871       2767  @pen...
- 7505382  Jul 16  2007    2962        727      29         88        898  @sfe...
-        eos
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--posted" do
+    context "--sort=listed" do
       before do
-        @cli.options = @cli.options.merge("posted" => true)
+        @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "should sort by number of list memberships" do
         @cli.followings
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--reverse" do
+    context "--sort=since" do
       before do
-        @cli.options = @cli.options.merge("reverse" => true)
+        @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should reverse the order of the sort" do
+      it "should sort by the time when Twitter acount was created" do
         @cli.followings
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--tweets" do
+    context "--sort=tweets" do
       before do
-        @cli.options = @cli.options.merge("tweets" => true)
+        @cli.options = @cli.options.merge("sort" => "tweets")
       end
       it "should sort by number of Tweets" do
         @cli.followings
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
+      end
+    end
+    context "--sort=tweeted" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "tweeted")
+      end
+      it "should sort by the time of the last Tweet" do
+        @cli.followings
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "--unsorted" do
@@ -1119,7 +1355,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should not be sorted" do
         @cli.followings
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "with a user passed" do
@@ -1177,7 +1413,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     end
     it "should have the correct output" do
       @cli.followers
-      $stdout.string.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -1186,86 +1422,95 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       it "should output in CSV format" do
         @cli.followers
         $stdout.string.should == <<-eos
-ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
-14100886,2008-03-08 16:34:22 +0000,3913,32,185,1871,2767,pengwynn,Wynn Netherland
-7505382,2007-07-16 12:59:01 +0000,2962,727,29,88,898,sferik,Erik Michaels-Ober
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland ⚡
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober
         eos
       end
     end
-    context "--favorites" do
+    context "--long" do
       before do
-        @cli.options = @cli.options.merge("favorites" => true)
+        @cli.options = @cli.options.merge("long" => true)
       end
-      it "should sort by number of favorites" do
+      it "should output in long format" do
         @cli.followers
-        $stdout.string.rstrip.should == "pengwynn  sferik"
+        $stdout.string.should == <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
+        eos
       end
     end
-    context "--followers" do
+    context "--reverse" do
       before do
-        @cli.options = @cli.options.merge("followers" => true)
+        @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should sort by number of followers" do
+      it "should reverse the order of the sort" do
         @cli.followers
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--friends" do
+    context "--sort=favorites" do
       before do
-        @cli.options = @cli.options.merge("friends" => true)
+        @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of friends" do
+      it "should sort by number of favorites" do
         @cli.followers
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
-    context "--listed" do
+    context "--sort=followers" do
       before do
-        @cli.options = @cli.options.merge("listed" => true)
+        @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of list memberships" do
+      it "should sort by number of followers" do
         @cli.followers
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--long" do
+    context "--sort=friends" do
       before do
-        @cli.options = @cli.options.merge("long" => true)
+        @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should output in long format" do
+      it "should sort by number of friends" do
         @cli.followers
-        $stdout.string.should == <<-eos
-ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
-14100886  Mar  8  2008    3913         32     185       1871       2767  @pen...
- 7505382  Jul 16  2007    2962        727      29         88        898  @sfe...
-        eos
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--posted" do
+    context "--sort=listed" do
       before do
-        @cli.options = @cli.options.merge("posted" => true)
+        @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "should sort by number of list memberships" do
         @cli.followers
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--reverse" do
+    context "--sort=since" do
       before do
-        @cli.options = @cli.options.merge("reverse" => true)
+        @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should reverse the order of the sort" do
+      it "should sort by the time when Twitter acount was created" do
         @cli.followers
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--tweets" do
+    context "--sort=tweets" do
       before do
-        @cli.options = @cli.options.merge("tweets" => true)
+        @cli.options = @cli.options.merge("sort" => "tweets")
       end
       it "should sort by number of Tweets" do
         @cli.followers
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
+      end
+    end
+    context "--sort=tweeted" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "tweeted")
+      end
+      it "should sort by the time of the last Tweet" do
+        @cli.followers
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "--unsorted" do
@@ -1274,7 +1519,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should not be sorted" do
         @cli.followers
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "with a user passed" do
@@ -1341,7 +1586,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     end
     it "should have the correct output" do
       @cli.friends
-      $stdout.string.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -1350,86 +1595,95 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       it "should output in CSV format" do
         @cli.friends
         $stdout.string.should == <<-eos
-ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
-14100886,2008-03-08 16:34:22 +0000,3913,32,185,1871,2767,pengwynn,Wynn Netherland
-7505382,2007-07-16 12:59:01 +0000,2962,727,29,88,898,sferik,Erik Michaels-Ober
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland ⚡
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober
         eos
       end
     end
-    context "--favorites" do
+    context "--long" do
       before do
-        @cli.options = @cli.options.merge("favorites" => true)
+        @cli.options = @cli.options.merge("long" => true)
       end
-      it "should sort by number of favorites" do
+      it "should output in long format" do
         @cli.friends
-        $stdout.string.rstrip.should == "pengwynn  sferik"
+        $stdout.string.should == <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
+        eos
       end
     end
-    context "--followers" do
+    context "--reverse" do
       before do
-        @cli.options = @cli.options.merge("followers" => true)
+        @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should sort by number of followers" do
+      it "should reverse the order of the sort" do
         @cli.friends
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--friends" do
+    context "--sort=favorites" do
       before do
-        @cli.options = @cli.options.merge("friends" => true)
+        @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of friends" do
+      it "should sort by number of favorites" do
         @cli.friends
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
-    context "--listed" do
+    context "--sort=followers" do
       before do
-        @cli.options = @cli.options.merge("listed" => true)
+        @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of list memberships" do
+      it "should sort by number of followers" do
         @cli.friends
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--long" do
+    context "--sort=friends" do
       before do
-        @cli.options = @cli.options.merge("long" => true)
+        @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should output in long format" do
+      it "should sort by number of friends" do
         @cli.friends
-        $stdout.string.should == <<-eos
-ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
-14100886  Mar  8  2008    3913         32     185       1871       2767  @pen...
- 7505382  Jul 16  2007    2962        727      29         88        898  @sfe...
-        eos
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--posted" do
+    context "--sort=listed" do
       before do
-        @cli.options = @cli.options.merge("posted" => true)
+        @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "should sort by number of list memberships" do
         @cli.friends
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--reverse" do
+    context "--sort=since" do
       before do
-        @cli.options = @cli.options.merge("reverse" => true)
+        @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should reverse the order of the sort" do
+      it "should sort by the time when Twitter acount was created" do
         @cli.friends
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--tweets" do
+    context "--sort=tweets" do
       before do
-        @cli.options = @cli.options.merge("tweets" => true)
+        @cli.options = @cli.options.merge("sort" => "tweets")
       end
       it "should sort by number of Tweets" do
         @cli.friends
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
+      end
+    end
+    context "--sort=tweeted" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "tweeted")
+      end
+      it "should sort by the time of the last Tweet" do
+        @cli.friends
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "--unsorted" do
@@ -1438,7 +1692,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should not be sorted" do
         @cli.friends
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "with a user passed" do
@@ -1514,7 +1768,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     end
     it "should have the correct output" do
       @cli.leaders
-      $stdout.string.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -1523,86 +1777,95 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       it "should output in CSV format" do
         @cli.leaders
         $stdout.string.should == <<-eos
-ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
-14100886,2008-03-08 16:34:22 +0000,3913,32,185,1871,2767,pengwynn,Wynn Netherland
-7505382,2007-07-16 12:59:01 +0000,2962,727,29,88,898,sferik,Erik Michaels-Ober
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland ⚡
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober
         eos
       end
     end
-    context "--favorites" do
+    context "--long" do
       before do
-        @cli.options = @cli.options.merge("favorites" => true)
+        @cli.options = @cli.options.merge("long" => true)
       end
-      it "should sort by number of favorites" do
+      it "should output in long format" do
         @cli.leaders
-        $stdout.string.rstrip.should == "pengwynn  sferik"
+        $stdout.string.should == <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
+         eos
       end
     end
-    context "--followers" do
+    context "--reverse" do
       before do
-        @cli.options = @cli.options.merge("followers" => true)
+        @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should sort by number of followers" do
+      it "should reverse the order of the sort" do
         @cli.leaders
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--friends" do
+    context "--sort=favorites" do
       before do
-        @cli.options = @cli.options.merge("friends" => true)
+        @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of friends" do
+      it "should sort by number of favorites" do
         @cli.leaders
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
-    context "--listed" do
+    context "--sort=followers" do
       before do
-        @cli.options = @cli.options.merge("listed" => true)
+        @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of list memberships" do
+      it "should sort by number of followers" do
         @cli.leaders
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--long" do
+    context "--sort=friends" do
       before do
-        @cli.options = @cli.options.merge("long" => true)
+        @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should output in long format" do
+      it "should sort by number of friends" do
         @cli.leaders
-        $stdout.string.should == <<-eos
-ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
-14100886  Mar  8  2008    3913         32     185       1871       2767  @pen...
- 7505382  Jul 16  2007    2962        727      29         88        898  @sfe...
-        eos
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--posted" do
+    context "--sort=listed" do
       before do
-        @cli.options = @cli.options.merge("posted" => true)
+        @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "should sort by number of list memberships" do
         @cli.leaders
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--reverse" do
+    context "--sort=since" do
       before do
-        @cli.options = @cli.options.merge("reverse" => true)
+        @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should reverse the order of the sort" do
+      it "should sort by the time when Twitter acount was created" do
         @cli.leaders
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--tweets" do
+    context "--sort=tweets" do
       before do
-        @cli.options = @cli.options.merge("tweets" => true)
+        @cli.options = @cli.options.merge("sort" => "tweets")
       end
       it "should sort by number of Tweets" do
         @cli.leaders
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
+      end
+    end
+    context "--sort=tweeted" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "tweeted")
+      end
+      it "should sort by the time of the last Tweet" do
+        @cli.leaders
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "--unsorted" do
@@ -1611,7 +1874,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should not be sorted" do
         @cli.leaders
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "with a user passed" do
@@ -1675,7 +1938,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
     end
     it "should have the correct output" do
       @cli.lists
-      $stdout.string.rstrip.should == "@sferik/code-for-america  @sferik/presidents"
+      $stdout.string.chomp.should == "@sferik/code-for-america  @sferik/presidents"
     end
     context "--csv" do
       before do
@@ -1703,49 +1966,49 @@ ID        Created at    Screen name  Slug              Members  Subscribers  ...
         eos
       end
     end
-    context "--members" do
+    context "--reverse" do
       before do
-        @cli.options = @cli.options.merge("members" => true)
+        @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "should reverse the order of the sort" do
         @cli.lists
-        $stdout.string.rstrip.should == "@sferik/presidents        @sferik/code-for-america"
+        $stdout.string.chomp.should == "@sferik/presidents        @sferik/code-for-america"
       end
     end
-    context "--mode" do
+    context "--sort=members" do
       before do
-        @cli.options = @cli.options.merge("mode" => true)
+        @cli.options = @cli.options.merge("sort" => "members")
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.lists
-        $stdout.string.rstrip.should == "@sferik/code-for-america  @sferik/presidents"
+        $stdout.string.chomp.should == "@sferik/presidents        @sferik/code-for-america"
       end
     end
-    context "--posted" do
+    context "--sort=mode" do
       before do
-        @cli.options = @cli.options.merge("posted" => true)
+        @cli.options = @cli.options.merge("sort" => "mode")
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.lists
-        $stdout.string.rstrip.should == "@sferik/presidents        @sferik/code-for-america"
+        $stdout.string.chomp.should == "@sferik/code-for-america  @sferik/presidents"
       end
     end
-    context "--reverse" do
+    context "--sort=posted" do
       before do
-        @cli.options = @cli.options.merge("reverse" => true)
+        @cli.options = @cli.options.merge("sort" => "posted")
       end
-      it "should reverse the order of the sort" do
+      it "should sort by the time when Twitter acount was created" do
         @cli.lists
-        $stdout.string.rstrip.should == "@sferik/presidents        @sferik/code-for-america"
+        $stdout.string.chomp.should == "@sferik/presidents        @sferik/code-for-america"
       end
     end
-    context "--subscribers" do
+    context "--sort=subscribers" do
       before do
-        @cli.options = @cli.options.merge("subscribers" => true)
+        @cli.options = @cli.options.merge("sort" => "subscribers")
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.lists
-        $stdout.string.rstrip.should == "@sferik/presidents        @sferik/code-for-america"
+        $stdout.string.chomp.should == "@sferik/presidents        @sferik/code-for-america"
       end
     end
     context "--unsorted" do
@@ -1754,7 +2017,7 @@ ID        Created at    Screen name  Slug              Members  Subscribers  ...
       end
       it "should not be sorted" do
         @cli.lists
-        $stdout.string.rstrip.should == "@sferik/code-for-america  @sferik/presidents"
+        $stdout.string.chomp.should == "@sferik/code-for-america  @sferik/presidents"
       end
     end
     context "with a user passed" do
@@ -1800,9 +2063,76 @@ ID        Created at    Screen name  Slug              Members  Subscribers  ...
     end
     it "should have the correct output" do
       @cli.mentions
-      $stdout.string.should =~ /@natevillegas/
-      $stdout.string.should =~ /RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history\. Tomorrow is a /
-      $stdout.string.should =~ /mystery\. Today is a gift\. That's why it's called the present\./
+      $stdout.string.should == <<-eos
+\e[1m\e[33m   @ryanbigg\e[0m
+   Things that have made my life better, in order of greatness: GitHub, Travis 
+   CI, the element Oxygen.
+
+\e[1m\e[33m   @sfbike\e[0m
+   Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers 
+   counted in 1 hour--that's 17 per minute. Way to roll, SF!
+
+\e[1m\e[33m   @levie\e[0m
+   I know you're as rare as leprechauns, but if you're an amazing designer then 
+   Box wants to hire you. Email recruiting@box.com
+
+\e[1m\e[33m   @natevillegas\e[0m
+   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.
+
+\e[1m\e[33m   @TD\e[0m
+   @kelseysilver how long will you be in town?
+
+\e[1m\e[33m   @rusashka\e[0m
+   @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+
+\e[1m\e[33m   @fat\e[0m
+   @stevej @xc i'm going to picket when i get back.
+
+\e[1m\e[33m   @wil\e[0m
+   @0x9900 @paulnivin http://t.co/bwVdtAPe
+
+\e[1m\e[33m   @wangtian\e[0m
+   @tianhonghe @xiangxin72 oh, you can even order specific items?
+
+\e[1m\e[33m   @shinypb\e[0m
+   @kpk Pfft, I think you're forgetting mechanical television, which depended on 
+   a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+
+\e[1m\e[33m   @0x9900\e[0m
+   @wil @paulnivin if you want to take you seriously don't say daemontools!
+
+\e[1m\e[33m   @kpk\e[0m
+   @shinypb @skilldrick @hoverbird invented it
+
+\e[1m\e[33m   @skilldrick\e[0m
+   @shinypb Well played :) @hoverbird
+
+\e[1m\e[33m   @sam\e[0m
+   Can someone project the date that I'll get a 27\" retina display?
+
+\e[1m\e[33m   @shinypb\e[0m
+   @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+
+\e[1m\e[33m   @bartt\e[0m
+   @noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of 
+   fun. Expect improvements in the weeks to come.
+
+\e[1m\e[33m   @skilldrick\e[0m
+   @hoverbird @shinypb You guys must be soooo old, I don't remember the words to 
+   the duck tales intro at all.
+
+\e[1m\e[33m   @sean\e[0m
+   @mep Thanks for coming by. Was great to have you.
+
+\e[1m\e[33m   @hoverbird\e[0m
+   @shinypb @trammell it's all suck a \"duck blur\" sometimes.
+
+\e[1m\e[33m   @kelseysilver\e[0m
+   San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 
+   92 others) http://t.co/eoLANJZw
+
+      eos
     end
     context "--csv" do
       before do
@@ -2044,7 +2374,7 @@ Hourly limit,Remaining hits,Reset time
     end
     it "should have the correct output" do
       @cli.reply("55709764298092545", "Testing")
-      $stdout.string.should =~ /^Reply created by @testcli to @sferik \(8 months ago\)\.$/
+      $stdout.string.split("\n").first.should == "Reply posted by @testcli to @sferik."
     end
     context "--all" do
       before do
@@ -2065,7 +2395,7 @@ Hourly limit,Remaining hits,Reset time
       end
       it "should have the correct output" do
         @cli.reply("55709764298092545", "Testing")
-        $stdout.string.should =~ /^Reply created by @testcli to @sferik \(8 months ago\)\.$/
+        $stdout.string.split("\n").first.should == "Reply posted by @testcli to @sferik."
       end
     end
   end
@@ -2135,9 +2465,76 @@ Hourly limit,Remaining hits,Reset time
       end
       it "should have the correct output" do
         @cli.retweets
-        $stdout.string.should =~ /@natevillegas/
-        $stdout.string.should =~ /RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history\. Tomorrow is a /
-        $stdout.string.should =~ /mystery\. Today is a gift\. That's why it's called the present\./
+        $stdout.string.should == <<-eos
+\e[1m\e[33m   @ryanbigg\e[0m
+   Things that have made my life better, in order of greatness: GitHub, Travis 
+   CI, the element Oxygen.
+
+\e[1m\e[33m   @sfbike\e[0m
+   Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers 
+   counted in 1 hour--that's 17 per minute. Way to roll, SF!
+
+\e[1m\e[33m   @levie\e[0m
+   I know you're as rare as leprechauns, but if you're an amazing designer then 
+   Box wants to hire you. Email recruiting@box.com
+
+\e[1m\e[33m   @natevillegas\e[0m
+   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.
+
+\e[1m\e[33m   @TD\e[0m
+   @kelseysilver how long will you be in town?
+
+\e[1m\e[33m   @rusashka\e[0m
+   @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+
+\e[1m\e[33m   @fat\e[0m
+   @stevej @xc i'm going to picket when i get back.
+
+\e[1m\e[33m   @wil\e[0m
+   @0x9900 @paulnivin http://t.co/bwVdtAPe
+
+\e[1m\e[33m   @wangtian\e[0m
+   @tianhonghe @xiangxin72 oh, you can even order specific items?
+
+\e[1m\e[33m   @shinypb\e[0m
+   @kpk Pfft, I think you're forgetting mechanical television, which depended on 
+   a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+
+\e[1m\e[33m   @0x9900\e[0m
+   @wil @paulnivin if you want to take you seriously don't say daemontools!
+
+\e[1m\e[33m   @kpk\e[0m
+   @shinypb @skilldrick @hoverbird invented it
+
+\e[1m\e[33m   @skilldrick\e[0m
+   @shinypb Well played :) @hoverbird
+
+\e[1m\e[33m   @sam\e[0m
+   Can someone project the date that I'll get a 27\" retina display?
+
+\e[1m\e[33m   @shinypb\e[0m
+   @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+
+\e[1m\e[33m   @bartt\e[0m
+   @noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of 
+   fun. Expect improvements in the weeks to come.
+
+\e[1m\e[33m   @skilldrick\e[0m
+   @hoverbird @shinypb You guys must be soooo old, I don't remember the words to 
+   the duck tales intro at all.
+
+\e[1m\e[33m   @sean\e[0m
+   @mep Thanks for coming by. Was great to have you.
+
+\e[1m\e[33m   @hoverbird\e[0m
+   @shinypb @trammell it's all suck a \"duck blur\" sometimes.
+
+\e[1m\e[33m   @kelseysilver\e[0m
+   San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 
+   92 others) http://t.co/eoLANJZw
+
+        eos
       end
     end
     context "--csv" do
@@ -2349,101 +2746,101 @@ ID,Text,Screen name,Posted at,Location,Retweets,Source,URL
     end
     context "with no street address" do
       before do
-        stub_get("/1/statuses/show/55709764298092545.json").
+        stub_get("/1/statuses/show/55709764298092550.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_street_address.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092545")
+        @cli.status("55709764298092550")
         $stdout.string.should == <<-eos
-ID           55709764298092545
+ID           55709764298092550
 Text         The problem with your code is that it's doing exactly what you told it to do.
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, San Francisco, California, United States
 Retweets     320
 Source       Twitter for iPhone
-URL          https://twitter.com/sferik/status/55709764298092545
+URL          https://twitter.com/sferik/status/55709764298092550
         eos
       end
     end
     context "with no locality" do
       before do
-        stub_get("/1/statuses/show/55709764298092545.json").
+        stub_get("/1/statuses/show/55709764298092549.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_locality.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092545")
+        @cli.status("55709764298092549")
         $stdout.string.should == <<-eos
-ID           55709764298092545
+ID           55709764298092549
 Text         The problem with your code is that it's doing exactly what you told it to do.
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, San Francisco, California, United States
 Retweets     320
 Source       Twitter for iPhone
-URL          https://twitter.com/sferik/status/55709764298092545
+URL          https://twitter.com/sferik/status/55709764298092549
         eos
       end
     end
     context "with no attributes" do
       before do
-        stub_get("/1/statuses/show/55709764298092545.json").
+        stub_get("/1/statuses/show/55709764298092546.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_attributes.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092545")
+        @cli.status("55709764298092546")
         $stdout.string.should == <<-eos
-ID           55709764298092545
+ID           55709764298092546
 Text         The problem with your code is that it's doing exactly what you told it to do.
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, San Francisco, United States
 Retweets     320
 Source       Twitter for iPhone
-URL          https://twitter.com/sferik/status/55709764298092545
+URL          https://twitter.com/sferik/status/55709764298092546
         eos
       end
     end
     context "with no country" do
       before do
-        stub_get("/1/statuses/show/55709764298092545.json").
+        stub_get("/1/statuses/show/55709764298092547.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_country.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092545")
+        @cli.status("55709764298092547")
         $stdout.string.should == <<-eos
-ID           55709764298092545
+ID           55709764298092547
 Text         The problem with your code is that it's doing exactly what you told it to do.
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, San Francisco
 Retweets     320
 Source       Twitter for iPhone
-URL          https://twitter.com/sferik/status/55709764298092545
+URL          https://twitter.com/sferik/status/55709764298092547
         eos
       end
     end
     context "with no full name" do
       before do
-        stub_get("/1/statuses/show/55709764298092545.json").
+        stub_get("/1/statuses/show/55709764298092548.json").
           with(:query => {:include_my_retweet => "false"}).
           to_return(:body => fixture("status_no_full_name.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092545")
+        @cli.status("55709764298092548")
         $stdout.string.should == <<-eos
-ID           55709764298092545
+ID           55709764298092548
 Text         The problem with your code is that it's doing exactly what you told it to do.
 Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For
 Retweets     320
 Source       Twitter for iPhone
-URL          https://twitter.com/sferik/status/55709764298092545
+URL          https://twitter.com/sferik/status/55709764298092548
         eos
       end
     end
@@ -2467,7 +2864,7 @@ URL          https://twitter.com/sferik/status/55709764298092545
     end
     it "should have the correct output" do
       @cli.suggest
-      $stdout.string.rstrip.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
+      $stdout.string.chomp.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
     end
     context "--csv" do
       before do
@@ -2476,106 +2873,115 @@ URL          https://twitter.com/sferik/status/55709764298092545
       it "should output in CSV format" do
         @cli.suggest
         $stdout.string.should == <<-eos
-ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
-40514587,2009-05-16 18:24:33 +0000,183,2,2,198,158,antpires,AntonioPires
-14736332,2008-05-11 19:46:06 +0000,3850,117,99,545,802,jtrupiano,John Trupiano
-2006261,2007-03-23 12:36:14 +0000,4497,9,171,967,2028,maccman,Alex MacCaw
-14451152,2008-04-20 12:05:38 +0000,6251,10,20,403,299,mlroach,Matt Laroche
-16052754,2008-08-30 08:22:57 +0000,24,0,1,5,42,stuntmann82,stuntmann82
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
+40514587,2009-05-16 18:24:33 +0000,2011-06-13 16:27:31 +0000,183,2,2,198,158,antpires,AntonioPires
+14736332,2008-05-11 19:46:06 +0000,2011-08-20 03:27:22 +0000,3850,117,99,545,802,jtrupiano,John Trupiano
+2006261,2007-03-23 12:36:14 +0000,2011-08-21 23:54:01 +0000,4497,9,171,967,2028,maccman,Alex MacCaw
+14451152,2008-04-20 12:05:38 +0000,2011-08-21 20:59:41 +0000,6251,10,20,403,299,mlroach,Matt Laroche
+16052754,2008-08-30 08:22:57 +0000,2009-11-25 06:20:05 +0000,24,0,1,5,42,stuntmann82,stuntmann82
         eos
       end
     end
-    context "--favorites" do
+    context "--long" do
       before do
-        @cli.options = @cli.options.merge("favorites" => true)
+        @cli.options = @cli.options.merge("long" => true)
       end
-      it "should sort by number of favorites" do
+      it "should output in long format" do
         @cli.suggest
-        $stdout.string.rstrip.should == "stuntmann82  antpires     maccman      mlroach      jtrupiano"
+        $stdout.string.should == <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+40514587  May 16  2009  Jun 13 08:27        183          2       2        198...
+14736332  May 11  2008  Aug 19 19:27       3850        117      99        545...
+ 2006261  Mar 23  2007  Aug 21 15:54       4497          9     171        967...
+14451152  Apr 20  2008  Aug 21 12:59       6251         10      20        403...
+16052754  Aug 30  2008  Nov 24  2009         24          0       1          5...
+        eos
       end
     end
-    context "--followers" do
+    context "--number" do
       before do
-        @cli.options = @cli.options.merge("followers" => true)
+        @cli.options = @cli.options.merge("number" => 1)
+        stub_get("/1/users/recommendations.json").
+          with(:query => {:limit => "1", :screen_name => "sferik"}).
+          to_return(:body => fixture("recommendations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should sort by number of followers" do
+      it "should limit the number of results" do
         @cli.suggest
-        $stdout.string.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+        a_get("/1/users/recommendations.json").
+          with(:query => {:limit => "1", :screen_name => "sferik"}).
+          should have_been_made
       end
     end
-    context "--friends" do
+    context "--reverse" do
       before do
-        @cli.options = @cli.options.merge("friends" => true)
+        @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should sort by number of friends" do
+      it "should reverse the order of the sort" do
         @cli.suggest
-        $stdout.string.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+        $stdout.string.chomp.should == "stuntmann82  mlroach      maccman      jtrupiano    antpires"
       end
     end
-    context "--listed" do
+    context "--sort=favorites" do
       before do
-        @cli.options = @cli.options.merge("listed" => true)
+        @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of list memberships" do
+      it "should sort by number of favorites" do
         @cli.suggest
-        $stdout.string.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+        $stdout.string.chomp.should == "stuntmann82  antpires     maccman      mlroach      jtrupiano"
       end
     end
-    context "--long" do
+    context "--sort=followers" do
       before do
-        @cli.options = @cli.options.merge("long" => true)
+        @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should output in long format" do
+      it "should sort by number of followers" do
         @cli.suggest
-        $stdout.string.should == <<-eos
-ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
-40514587  May 16  2009     183          2       2        198        158  @ant...
-14736332  May 11  2008    3850        117      99        545        802  @jtr...
- 2006261  Mar 23  2007    4497          9     171        967       2028  @mac...
-14451152  Apr 20  2008    6251         10      20        403        299  @mlr...
-16052754  Aug 30  2008      24          0       1          5         42  @stu...
-        eos
+        $stdout.string.chomp.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
       end
     end
-    context "--number" do
+    context "--sort=friends" do
       before do
-        @cli.options = @cli.options.merge("number" => 1)
-        stub_get("/1/users/recommendations.json").
-          with(:query => {:limit => "1", :screen_name => "sferik"}).
-          to_return(:body => fixture("recommendations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should limit the number of results" do
+      it "should sort by number of friends" do
         @cli.suggest
-        a_get("/1/users/recommendations.json").
-          with(:query => {:limit => "1", :screen_name => "sferik"}).
-          should have_been_made
+        $stdout.string.chomp.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
       end
     end
-    context "--posted" do
+    context "--sort=listed" do
       before do
-        @cli.options = @cli.options.merge("posted" => true)
+        @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "should sort by number of list memberships" do
         @cli.suggest
-        $stdout.string.rstrip.should == "maccman      mlroach      jtrupiano    stuntmann82  antpires"
+        $stdout.string.chomp.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
       end
     end
-    context "--reverse" do
+    context "--sort=since" do
       before do
-        @cli.options = @cli.options.merge("reverse" => true)
+        @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should reverse the order of the sort" do
+      it "should sort by the time when Twitter acount was created" do
         @cli.suggest
-        $stdout.string.rstrip.should == "stuntmann82  mlroach      maccman      jtrupiano    antpires"
+        $stdout.string.chomp.should == "maccman      mlroach      jtrupiano    stuntmann82  antpires"
       end
     end
-    context "--tweets" do
+    context "--sort=tweets" do
       before do
-        @cli.options = @cli.options.merge("tweets" => true)
+        @cli.options = @cli.options.merge("sort" => "tweets")
       end
       it "should sort by number of Tweets" do
         @cli.suggest
-        $stdout.string.rstrip.should == "stuntmann82  antpires     jtrupiano    maccman      mlroach"
+        $stdout.string.chomp.should == "stuntmann82  antpires     jtrupiano    maccman      mlroach"
+      end
+    end
+    context "--sort=tweeted" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "tweeted")
+      end
+      it "should sort by the time of the last Tweet" do
+        @cli.suggest
+        $stdout.string.chomp.should == "stuntmann82  antpires     jtrupiano    mlroach      maccman"
       end
     end
     context "--unsorted" do
@@ -2584,7 +2990,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should not be sorted" do
         @cli.suggest
-        $stdout.string.rstrip.should == "jtrupiano    mlroach      antpires     maccman      stuntmann82"
+        $stdout.string.chomp.should == "jtrupiano    mlroach      antpires     maccman      stuntmann82"
       end
     end
     context "with a user passed" do
@@ -2596,7 +3002,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should have the correct output" do
         @cli.suggest("sferik")
-        $stdout.string.rstrip.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
+        $stdout.string.chomp.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
       end
       context "--id" do
         before do
@@ -2630,9 +3036,76 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should have the correct output" do
         @cli.timeline
-        $stdout.string.should =~ /@natevillegas/
-        $stdout.string.should =~ /RT @gelobautista #riordan RT @WilI_Smith: Yesterday is history\. Tomorrow is a /
-        $stdout.string.should =~ /mystery\. Today is a gift\. That's why it's called the present\./
+        $stdout.string.should == <<-eos
+\e[1m\e[33m   @ryanbigg\e[0m
+   Things that have made my life better, in order of greatness: GitHub, Travis 
+   CI, the element Oxygen.
+
+\e[1m\e[33m   @sfbike\e[0m
+   Bike to Work Counts in: 73% of morning Market traffic was bikes! 1,031 bikers 
+   counted in 1 hour--that's 17 per minute. Way to roll, SF!
+
+\e[1m\e[33m   @levie\e[0m
+   I know you're as rare as leprechauns, but if you're an amazing designer then 
+   Box wants to hire you. Email recruiting@box.com
+
+\e[1m\e[33m   @natevillegas\e[0m
+   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.
+
+\e[1m\e[33m   @TD\e[0m
+   @kelseysilver how long will you be in town?
+
+\e[1m\e[33m   @rusashka\e[0m
+   @maciej hahaha :) @gpena together we're going to cover all core 28 languages!
+
+\e[1m\e[33m   @fat\e[0m
+   @stevej @xc i'm going to picket when i get back.
+
+\e[1m\e[33m   @wil\e[0m
+   @0x9900 @paulnivin http://t.co/bwVdtAPe
+
+\e[1m\e[33m   @wangtian\e[0m
+   @tianhonghe @xiangxin72 oh, you can even order specific items?
+
+\e[1m\e[33m   @shinypb\e[0m
+   @kpk Pfft, I think you're forgetting mechanical television, which depended on 
+   a clever German. http://t.co/JvLNQCDm @skilldrick @hoverbird
+
+\e[1m\e[33m   @0x9900\e[0m
+   @wil @paulnivin if you want to take you seriously don't say daemontools!
+
+\e[1m\e[33m   @kpk\e[0m
+   @shinypb @skilldrick @hoverbird invented it
+
+\e[1m\e[33m   @skilldrick\e[0m
+   @shinypb Well played :) @hoverbird
+
+\e[1m\e[33m   @sam\e[0m
+   Can someone project the date that I'll get a 27\" retina display?
+
+\e[1m\e[33m   @shinypb\e[0m
+   @skilldrick @hoverbird Wow, I didn't even know they *had* TV in Britain.
+
+\e[1m\e[33m   @bartt\e[0m
+   @noahlt @gaarf Yup, now owning @twitter -> FB from FE to daemons. Lot’s of 
+   fun. Expect improvements in the weeks to come.
+
+\e[1m\e[33m   @skilldrick\e[0m
+   @hoverbird @shinypb You guys must be soooo old, I don't remember the words to 
+   the duck tales intro at all.
+
+\e[1m\e[33m   @sean\e[0m
+   @mep Thanks for coming by. Was great to have you.
+
+\e[1m\e[33m   @hoverbird\e[0m
+   @shinypb @trammell it's all suck a \"duck blur\" sometimes.
+
+\e[1m\e[33m   @kelseysilver\e[0m
+   San Francisco here I come! (@ Newark Liberty International Airport (EWR) w/ 
+   92 others) http://t.co/eoLANJZw
+
+        eos
       end
     end
     context "--csv" do
@@ -2849,7 +3322,7 @@ ID                  Posted at     Screen name    Text
     end
     it "should have the correct output" do
       @cli.trends
-      $stdout.string.rstrip.should == "#sevenwordsaftersex  Walkman              Allen Iverson"
+      $stdout.string.chomp.should == "#sevenwordsaftersex  Walkman              Allen Iverson"
     end
     context "--exclude-hashtags" do
       before do
@@ -2866,7 +3339,7 @@ ID                  Posted at     Screen name    Text
       end
       it "should have the correct output" do
         @cli.trends
-        $stdout.string.rstrip.should == "#sevenwordsaftersex  Walkman              Allen Iverson"
+        $stdout.string.chomp.should == "#sevenwordsaftersex  Walkman              Allen Iverson"
       end
     end
     context "with a WOEID passed" do
@@ -2881,7 +3354,7 @@ ID                  Posted at     Screen name    Text
       end
       it "should have the correct output" do
         @cli.trends("2487956")
-        $stdout.string.rstrip.should == "#sevenwordsaftersex  Walkman              Allen Iverson"
+        $stdout.string.chomp.should == "#sevenwordsaftersex  Walkman              Allen Iverson"
       end
     end
   end
@@ -2898,7 +3371,7 @@ ID                  Posted at     Screen name    Text
     end
     it "should have the correct output" do
       @cli.trend_locations
-      $stdout.string.rstrip.should == "Boston         New York       San Francisco  United States  Worldwide"
+      $stdout.string.chomp.should == "Boston         New York       San Francisco  United States  Worldwide"
     end
     context "--csv" do
       before do
@@ -2906,7 +3379,7 @@ ID                  Posted at     Screen name    Text
       end
       it "should output in CSV format" do
         @cli.trend_locations
-        $stdout.string.rstrip.should == <<-eos.rstrip
+        $stdout.string.chomp.should == <<-eos.chomp
 WOEID,Parent ID,Type,Name,Country
 2367105,,Town,Boston,United States
 2459115,,Town,New York,United States
@@ -2922,13 +3395,13 @@ WOEID,Parent ID,Type,Name,Country
       end
       it "should output in long format" do
         @cli.trend_locations
-        $stdout.string.rstrip.should == <<-eos.rstrip
+        $stdout.string.chomp.should == <<-eos.chomp
 WOEID     Parent ID  Type       Name           Country
  2367105             Town       Boston         United States
  2459115             Town       New York       United States
  2487956             Town       San Francisco  United States
 23424977             Country    United States  United States
-       1             Supername  Worldwide
+       1             Supername  Worldwide      
         eos
       end
     end
@@ -2938,7 +3411,7 @@ WOEID     Parent ID  Type       Name           Country
       end
       it "should reverse the order of the sort" do
         @cli.trend_locations
-        $stdout.string.rstrip.should == "Worldwide      United States  San Francisco  New York       Boston"
+        $stdout.string.chomp.should == "Worldwide      United States  San Francisco  New York       Boston"
       end
     end
     context "--unsorted" do
@@ -2947,7 +3420,7 @@ WOEID     Parent ID  Type       Name           Country
       end
       it "should not be sorted" do
         @cli.trend_locations
-        $stdout.string.rstrip.should == "Boston         Worldwide      New York       United States  San Francisco"
+        $stdout.string.chomp.should == "Boston         Worldwide      New York       United States  San Francisco"
       end
     end
   end
@@ -3026,7 +3499,7 @@ WOEID     Parent ID  Type       Name           Country
     end
     it "should have the correct output" do
       @cli.update("Testing")
-      $stdout.string.should =~ /^Tweet created by @testcli \(8 months ago\)\.$/
+      $stdout.string.split("\n").first.should == "Tweet posted by @testcli."
     end
   end
 
@@ -3044,7 +3517,7 @@ WOEID     Parent ID  Type       Name           Country
     end
     it "should have the correct output" do
       @cli.users("sferik", "pengwynn")
-      $stdout.string.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -3053,37 +3526,59 @@ WOEID     Parent ID  Type       Name           Country
       it "should output in CSV format" do
         @cli.users("sferik", "pengwynn")
         $stdout.string.should == <<-eos
-ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
-14100886,2008-03-08 16:34:22 +0000,3913,32,185,1871,2767,pengwynn,Wynn Netherland
-7505382,2007-07-16 12:59:01 +0000,2962,727,29,88,898,sferik,Erik Michaels-Ober
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland ⚡
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober
+        eos
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge("long" => true)
+      end
+      it "should output in long format" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.should == <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
         eos
       end
     end
-    context "--favorites" do
+    context "--reverse" do
       before do
-        @cli.options = @cli.options.merge("favorites" => true)
+        @cli.options = @cli.options.merge("reverse" => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.users("sferik", "pengwynn")
+        $stdout.string.chomp.should == "sferik    pengwynn"
+      end
+    end
+    context "--sort=favorites" do
+      before do
+        @cli.options = @cli.options.merge("sort" => "favorites")
       end
       it "should sort by number of favorites" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "pengwynn  sferik"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
-    context "--followers" do
+    context "--sort=followers" do
       before do
-        @cli.options = @cli.options.merge("followers" => true)
+        @cli.options = @cli.options.merge("sort" => "followers")
       end
       it "should sort by number of followers" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--friends" do
+    context "--sort=friends" do
       before do
-        @cli.options = @cli.options.merge("friends" => true)
+        @cli.options = @cli.options.merge("sort" => "friends")
       end
       it "should sort by number of friends" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
     context "--id" do
@@ -3100,53 +3595,40 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
           should have_been_made
       end
     end
-    context "--listed" do
+    context "--sort=listed" do
       before do
-        @cli.options = @cli.options.merge("listed" => true)
+        @cli.options = @cli.options.merge("sort" => "listed")
       end
       it "should sort by number of list memberships" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "sferik    pengwynn"
-      end
-    end
-    context "--long" do
-      before do
-        @cli.options = @cli.options.merge("long" => true)
-      end
-      it "should output in long format" do
-        @cli.users("sferik", "pengwynn")
-        $stdout.string.should == <<-eos
-ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
-14100886  Mar  8  2008    3913         32     185       1871       2767  @pen...
- 7505382  Jul 16  2007    2962        727      29         88        898  @sfe...
-        eos
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--posted" do
+    context "--sort=since" do
       before do
-        @cli.options = @cli.options.merge("posted" => true)
+        @cli.options = @cli.options.merge("sort" => "since")
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "sferik    pengwynn"
       end
     end
-    context "--reverse" do
+    context "--sort=tweets" do
       before do
-        @cli.options = @cli.options.merge("reverse" => true)
+        @cli.options = @cli.options.merge("sort" => "tweets")
       end
-      it "should reverse the order of the sort" do
+      it "should sort by number of Tweets" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
-    context "--tweets" do
+    context "--sort=tweeted" do
       before do
-        @cli.options = @cli.options.merge("tweets" => true)
+        @cli.options = @cli.options.merge("sort" => "tweeted")
       end
-      it "should sort by number of Tweets" do
+      it "should sort by the time of the last Tweet" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
     context "--unsorted" do
@@ -3155,7 +3637,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should not be sorted" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.should == "pengwynn  sferik"
       end
     end
   end
@@ -3184,16 +3666,16 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       $stdout.string.should == <<-eos
 ID           7505382
 Name         Erik Michaels-Ober
-Bio          A mind forever voyaging through strange seas of thought, alone.
+Bio          Vagabond.
 Location     San Francisco
 Status       Not following
-Last update  RT @tenderlove: [ANN] sqlite3-ruby => sqlite3 (10 months ago)
+Last update  @goldman You're near my home town! Say hi to Woodstock for me. (7 months ago)
 Since        Jul 16  2007 (4 years ago)
-Tweets       3,479
-Favorites    1,040
-Listed       41
-Following    197
-Followers    1,048
+Tweets       7,890
+Favorites    3,755
+Listed       118
+Following    212
+Followers    2,262
 URL          https://github.com/sferik
       eos
     end
@@ -3205,7 +3687,7 @@ URL          https://github.com/sferik
         @cli.whois("sferik")
         $stdout.string.should == <<-eos
 ID,Verified,Name,Screen name,Bio,Location,Following,Last update,Lasted updated at,Since,Tweets,Favorites,Listed,Following,Followers,URL
-7505382,false,Erik Michaels-Ober,sferik,"A mind forever voyaging through strange seas of thought, alone.",San Francisco,false,RT @tenderlove: [ANN] sqlite3-ruby => sqlite3,2011-01-16 21:38:25 +0000,2007-07-16 12:59:01 +0000,3479,1040,41,197,1048,https://github.com/sferik
+7505382,false,Erik Michaels-Ober,sferik,Vagabond.,San Francisco,false,@goldman You're near my home town! Say hi to Woodstock for me.,2012-07-08 18:29:20 +0000,2007-07-16 12:59:01 +0000,7890,3755,118,212,2262,https://github.com/sferik
         eos
       end
     end