t 0.9.5 → 0.9.6

data/lib/t/search.rb

@@ -3,7 +3,6 @@ require 'csv'
 # 'fastercsv' required on Ruby versions < 1.9
 require 'fastercsv' unless Array.new.respond_to?(:to_csv)
 require 'htmlentities'
-require 'retryable'
 require 't/collectable'
 require 't/printable'
 require 't/rcfile'
@@ -20,6 +19,7 @@ module T
     DEFAULT_NUM_RESULTS = 20
     MAX_NUM_RESULTS = 200
     MAX_SCREEN_NAME_SIZE = 20
+    MAX_USERS_PER_REQUEST = 20
 
     check_unknown_options!
 
@@ -28,7 +28,7 @@ module T
       @rcfile = RCFile.instance
     end
 
-    desc "all QUERY", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets that match a specified query."
+    desc "all QUERY", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
@@ -38,47 +38,32 @@ module T
         client.search(query, opts)
       end
       if options['csv']
-        say ["ID", "Posted at", "Screen name", "Text"].to_csv unless statuses.empty?
+        say STATUS_HEADINGS.to_csv unless statuses.empty?
         statuses.each do |status|
-          say [status.id, status.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), status.from_user, HTMLEntities.new.decode(status.text)].to_csv
+          say [status.id, csv_formatted_time(status), status.from_user, HTMLEntities.new.decode(status.text)].to_csv
         end
       elsif options['long']
         array = statuses.map do |status|
-          created_at = status.created_at > 6.months.ago ? status.created_at.strftime("%b %e %H:%M") : status.created_at.strftime("%b %e  %Y")
-          [status.id, created_at, "@#{status.from_user}", HTMLEntities.new.decode(status.text).gsub(/\n+/, ' ')]
-        end
-        if STDOUT.tty?
-          headings = ["ID", "Posted at", "Screen name", "Text"]
-          array.unshift(headings) unless statuses.empty?
-          print_table(array, :truncate => true)
-        else
-          print_table(array)
+          [status.id, ls_formatted_time(status), "@#{status.from_user}", HTMLEntities.new.decode(status.text).gsub(/\n+/, ' ')]
         end
+        print_table_with_headings(array, STATUS_HEADINGS)
       else
         say unless statuses.empty?
         statuses.each do |status|
-          if STDOUT.tty? && !options['no-color']
-            say("   @#{status.from_user}", [:bold, :yellow])
-          else
-            say("   @#{status.from_user}")
-          end
-          print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
-          say
+          print_status(status)
         end
       end
     end
 
-    desc "favorites QUERY", "Returns Tweets you've favorited that match a specified query."
+    desc "favorites QUERY", "Returns Tweets you've favorited that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def favorites(query)
       opts = {:count => MAX_NUM_RESULTS}
       statuses = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
-        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.favorites(opts)
-        end
-      end.flatten.compact
+        client.favorites(opts)
+      end
       statuses = statuses.select do |status|
         /#{query}/i.match(status.text)
       end
@@ -105,27 +90,23 @@ module T
       opts = {:count => MAX_NUM_RESULTS}
       statuses = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
-        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.list_timeline(owner, list, opts)
-        end
-      end.flatten.compact
+        client.list_timeline(owner, list, opts)
+      end
       statuses = statuses.select do |status|
         /#{query}/i.match(status.text)
       end
       print_statuses(statuses)
     end
 
-    desc "mentions QUERY", "Returns Tweets mentioning you that match a specified query."
+    desc "mentions QUERY", "Returns Tweets mentioning you that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def mentions(query)
       opts = {:count => MAX_NUM_RESULTS}
       statuses = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
-        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.mentions(opts)
-        end
-      end.flatten.compact
+        client.mentions(opts)
+      end
       statuses = statuses.select do |status|
         /#{query}/i.match(status.text)
       end
@@ -133,17 +114,15 @@ module T
     end
     map %w(replies) => :mentions
 
-    desc "retweets QUERY", "Returns Tweets you've retweeted that match a specified query."
+    desc "retweets QUERY", "Returns Tweets you've retweeted that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def retweets(query)
       opts = {:count => MAX_NUM_RESULTS}
       statuses = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
-        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.retweeted_by(opts)
-        end
-      end.flatten.compact
+        client.retweeted_by(opts)
+      end
       statuses = statuses.select do |status|
         /#{query}/i.match(status.text)
       end
@@ -151,17 +130,30 @@ module T
     end
     map %w(rts) => :retweets
 
-    desc "timeline QUERY", "Returns Tweets in your timeline that match a specified query."
+    desc "timeline QUERY", "Returns Tweets in your timeline that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
+    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    def timeline(query)
+    def timeline(*args)
       opts = {:count => MAX_NUM_RESULTS}
-      statuses = collect_with_max_id do |max_id|
-        opts[:max_id] = max_id unless max_id.nil?
-        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+      query = args.pop
+      user = args.pop
+      if user
+        user = if options['id']
+          user.to_i
+        else
+          user.strip_ats
+        end
+        statuses = collect_with_max_id do |max_id|
+          opts[:max_id] = max_id unless max_id.nil?
+          client.user_timeline(user, opts)
+        end
+      else
+        statuses = collect_with_max_id do |max_id|
+          opts[:max_id] = max_id unless max_id.nil?
           client.home_timeline(opts)
         end
-      end.flatten.compact
+      end
       statuses = statuses.select do |status|
         /#{query}/i.match(status.text)
       end
@@ -169,27 +161,24 @@ module T
     end
     map %w(tl) => :timeline
 
-    desc "user USER QUERY", "Returns Tweets in a user's timeline that match a specified query."
+    desc "users QUERY", "Returns users that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
+    method_option "favorites", :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
+    method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
+    method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
+    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    def user(user, query)
-      user = if options['id']
-        user.to_i
-      else
-        user.strip_ats
-      end
-      opts = {:count => MAX_NUM_RESULTS}
-      statuses = collect_with_max_id do |max_id|
-        opts[:max_id] = max_id unless max_id.nil?
+    method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
+    method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
+    method_option "tweets", :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
+    method_option "unsorted", :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
+    def users(query)
+      users = 1.upto(50).threaded_map do |page|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.user_timeline(user, opts)
+          client.user_search(query, :page => page, :per_page => MAX_USERS_PER_REQUEST)
         end
-      end.flatten.compact
-      statuses = statuses.select do |status|
-        /#{query}/i.match(status.text)
-      end
-      print_statuses(statuses)
+      end.flatten
+      print_users(users)
     end
 
   end

data/lib/t/stream.rb

@@ -1,3 +1,4 @@
+require 't/cli'
 require 't/printable'
 require 't/rcfile'
 require 't/search'
@@ -17,7 +18,7 @@ module T
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def all
       if options['csv']
-        say status_headings.to_csv
+        say STATUS_HEADINGS.to_csv
       end
       client.on_timeline_status do |status|
         if options['csv']
@@ -26,10 +27,7 @@ module T
           print_status(status)
         end
       end
-      Signal.trap("TERM") do
-        client.stop
-        shutdown
-      end
+      until_term
       client.sample
     end
 
@@ -38,10 +36,7 @@ module T
       client.on_timeline_status do |status|
         say(status.text.gsub("\n", ''), [:bold, :green, :on_black])
       end
-      Signal.trap("TERM") do
-        client.stop
-        shutdown
-      end
+      until_term
       client.sample
     end
 
@@ -62,10 +57,7 @@ module T
           print_status(status)
         end
       end
-      Signal.trap("TERM") do
-        client.stop
-        shutdown
-      end
+      until_term
       client.track(keywords)
     end
 
@@ -85,10 +77,7 @@ module T
           print_status(status)
         end
       end
-      Signal.trap("TERM") do
-        client.stop
-        shutdown
-      end
+      until_term
       client.userstream
     end
 
@@ -96,7 +85,7 @@ module T
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def users(screen_name, *screen_names)
       if options['csv']
-        say status_headings.to_csv
+        say STATUS_HEADINGS.to_csv
       end
       screen_names.unshift(screen_name)
       client.on_timeline_status do |status|
@@ -106,10 +95,7 @@ module T
           print_status(status)
         end
       end
-      Signal.trap("TERM") do
-        client.stop
-        shutdown
-      end
+      until_term
       client.follow(screen_names)
     end
 
@@ -126,5 +112,12 @@ module T
       )
     end
 
+    def until_term
+      Signal.trap("TERM") do
+        client.stop
+        shutdown
+      end
+    end
+
   end
 end

data/lib/t/version.rb

@@ -13,7 +13,7 @@ module T
 
     # @return [Integer]
     def self.patch
-      5
+      6
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -368,7 +368,7 @@ ID          Posted at     Screen name  Text
     end
     it "should have the correct output" do
       @cli.disciples
-      $stdout.string.rstrip.should == "@pengwynn  @sferik"
+      $stdout.string.rstrip.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -389,7 +389,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of favorites" do
         @cli.disciples
-        $stdout.string.rstrip.should == "@pengwynn  @sferik"
+        $stdout.string.rstrip.should == "pengwynn  sferik"
       end
     end
     context "--followers" do
@@ -398,7 +398,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of followers" do
         @cli.disciples
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--friends" do
@@ -407,7 +407,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of friends" do
         @cli.disciples
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--listed" do
@@ -416,7 +416,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of list memberships" do
         @cli.disciples
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--long" do
@@ -438,7 +438,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.disciples
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--reverse" do
@@ -447,7 +447,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should reverse the order of the sort" do
         @cli.disciples
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--tweets" do
@@ -456,7 +456,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by number of Tweets" do
         @cli.disciples
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--unsorted" do
@@ -465,7 +465,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should not be sorted" do
         @cli.disciples
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "with a user passed" do
@@ -969,7 +969,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.rstrip.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -990,7 +990,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of favorites" do
         @cli.followings
-        $stdout.string.rstrip.should == "@pengwynn  @sferik"
+        $stdout.string.rstrip.should == "pengwynn  sferik"
       end
     end
     context "--followers" do
@@ -999,7 +999,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of followers" do
         @cli.followings
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--friends" do
@@ -1008,7 +1008,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of friends" do
         @cli.followings
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--listed" do
@@ -1017,7 +1017,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of list memberships" do
         @cli.followings
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--long" do
@@ -1039,7 +1039,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.followings
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--reverse" do
@@ -1048,7 +1048,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should reverse the order of the sort" do
         @cli.followings
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--tweets" do
@@ -1057,7 +1057,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by number of Tweets" do
         @cli.followings
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--unsorted" do
@@ -1066,7 +1066,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.rstrip.should == "sferik    pengwynn"
       end
     end
     context "with a user passed" do
@@ -1124,7 +1124,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.rstrip.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -1145,7 +1145,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of favorites" do
         @cli.followers
-        $stdout.string.rstrip.should == "@pengwynn  @sferik"
+        $stdout.string.rstrip.should == "pengwynn  sferik"
       end
     end
     context "--followers" do
@@ -1154,7 +1154,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of followers" do
         @cli.followers
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--friends" do
@@ -1163,7 +1163,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of friends" do
         @cli.followers
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--listed" do
@@ -1172,7 +1172,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of list memberships" do
         @cli.followers
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--long" do
@@ -1194,7 +1194,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.followers
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--reverse" do
@@ -1203,7 +1203,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should reverse the order of the sort" do
         @cli.followers
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--tweets" do
@@ -1212,7 +1212,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by number of Tweets" do
         @cli.followers
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--unsorted" do
@@ -1221,7 +1221,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.rstrip.should == "sferik    pengwynn"
       end
     end
     context "with a user passed" do
@@ -1288,7 +1288,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.rstrip.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -1309,7 +1309,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of favorites" do
         @cli.friends
-        $stdout.string.rstrip.should == "@pengwynn  @sferik"
+        $stdout.string.rstrip.should == "pengwynn  sferik"
       end
     end
     context "--followers" do
@@ -1318,7 +1318,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of followers" do
         @cli.friends
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--friends" do
@@ -1327,7 +1327,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of friends" do
         @cli.friends
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--listed" do
@@ -1336,7 +1336,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of list memberships" do
         @cli.friends
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--long" do
@@ -1358,7 +1358,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.friends
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--reverse" do
@@ -1367,7 +1367,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should reverse the order of the sort" do
         @cli.friends
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--tweets" do
@@ -1376,7 +1376,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by number of Tweets" do
         @cli.friends
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--unsorted" do
@@ -1385,7 +1385,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.rstrip.should == "sferik    pengwynn"
       end
     end
     context "with a user passed" do
@@ -1461,7 +1461,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.rstrip.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -1482,7 +1482,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of favorites" do
         @cli.leaders
-        $stdout.string.rstrip.should == "@pengwynn  @sferik"
+        $stdout.string.rstrip.should == "pengwynn  sferik"
       end
     end
     context "--followers" do
@@ -1491,7 +1491,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of followers" do
         @cli.leaders
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--friends" do
@@ -1500,7 +1500,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of friends" do
         @cli.leaders
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--listed" do
@@ -1509,7 +1509,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of list memberships" do
         @cli.leaders
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--long" do
@@ -1531,7 +1531,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.leaders
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--reverse" do
@@ -1540,7 +1540,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should reverse the order of the sort" do
         @cli.leaders
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--tweets" do
@@ -1549,7 +1549,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by number of Tweets" do
         @cli.leaders
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--unsorted" do
@@ -1558,7 +1558,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.rstrip.should == "sferik    pengwynn"
       end
     end
     context "with a user passed" do
@@ -1911,6 +1911,38 @@ ID                  Posted at     Screen name    Text
     end
   end
 
+  describe "#rate_limit" do
+    before do
+      stub_get("/1/account/rate_limit_status.json").
+        to_return(:body => fixture("rate_limit_status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "should request the correct resource" do
+      @cli.rate_limit
+      a_get("/1/account/rate_limit_status.json").
+        should have_been_made
+    end
+    it "should have the correct output" do
+      @cli.rate_limit
+      $stdout.string.should == <<-eos
+Hourly limit    20,000
+Remaining hits  19,993
+Reset time      Oct 25  2010
+      eos
+    end
+    context "--csv" do
+      before do
+        @cli.options = @cli.options.merge("csv" => true)
+      end
+      it "should have the correct output" do
+        @cli.rate_limit
+        $stdout.string.should == <<-eos
+Hourly limit,Remaining hits,Reset time
+20000,19993,2010-10-26 02:43:08 +0000
+        eos
+      end
+    end
+  end
+
   describe "#reply" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc", "location" => true)
@@ -2206,6 +2238,7 @@ ID           55709764298092545
 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
+Location     Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States
 Retweets     320
 Source       Twitter for iPhone
 URL          https://twitter.com/sferik/status/55709764298092545
@@ -2219,7 +2252,107 @@ URL          https://twitter.com/sferik/status/55709764298092545
         @cli.status("55709764298092545")
         $stdout.string.should == <<-eos
 ID,Text,Screen name,Posted at,Location,Retweets,Source,URL
-55709764298092545,The problem with your code is that it's doing exactly what you told it to do.,sferik,2011-04-06 19:13:37 +0000,,320,Twitter for iPhone,https://twitter.com/sferik/status/55709764298092545
+55709764298092545,The problem with your code is that it's doing exactly what you told it to do.,sferik,2011-04-06 19:13:37 +0000,"Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States",320,Twitter for iPhone,https://twitter.com/sferik/status/55709764298092545
+        eos
+      end
+    end
+    context "with no street address" do
+      before do
+        stub_get("/1/statuses/show/55709764298092545.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")
+        $stdout.string.should == <<-eos
+ID           55709764298092545
+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
+Location     Blowfish Sushi To Die For, San Francisco, California, United States
+Retweets     320
+Source       Twitter for iPhone
+URL          https://twitter.com/sferik/status/55709764298092545
+        eos
+      end
+    end
+    context "with no locality" do
+      before do
+        stub_get("/1/statuses/show/55709764298092545.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")
+        $stdout.string.should == <<-eos
+ID           55709764298092545
+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
+Location     Blowfish Sushi To Die For, San Francisco, California, United States
+Retweets     320
+Source       Twitter for iPhone
+URL          https://twitter.com/sferik/status/55709764298092545
+        eos
+      end
+    end
+    context "with no attributes" do
+      before do
+        stub_get("/1/statuses/show/55709764298092545.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")
+        $stdout.string.should == <<-eos
+ID           55709764298092545
+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
+Location     Blowfish Sushi To Die For, San Francisco, United States
+Retweets     320
+Source       Twitter for iPhone
+URL          https://twitter.com/sferik/status/55709764298092545
+        eos
+      end
+    end
+    context "with no country" do
+      before do
+        stub_get("/1/statuses/show/55709764298092545.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")
+        $stdout.string.should == <<-eos
+ID           55709764298092545
+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
+Location     Blowfish Sushi To Die For, San Francisco
+Retweets     320
+Source       Twitter for iPhone
+URL          https://twitter.com/sferik/status/55709764298092545
+        eos
+      end
+    end
+    context "with no full name" do
+      before do
+        stub_get("/1/statuses/show/55709764298092545.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")
+        $stdout.string.should == <<-eos
+ID           55709764298092545
+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
+Location     Blowfish Sushi To Die For
+Retweets     320
+Source       Twitter for iPhone
+URL          https://twitter.com/sferik/status/55709764298092545
         eos
       end
     end
@@ -2243,7 +2376,7 @@ ID,Text,Screen name,Posted at,Location,Retweets,Source,URL
     end
     it "should have the correct output" do
       @cli.suggest
-      $stdout.string.rstrip.should == "@antpires     @jtrupiano    @maccman      @mlroach      @stuntmann82"
+      $stdout.string.rstrip.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
     end
     context "--csv" do
       before do
@@ -2267,7 +2400,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of favorites" do
         @cli.suggest
-        $stdout.string.rstrip.should == "@stuntmann82  @antpires     @maccman      @mlroach      @jtrupiano"
+        $stdout.string.rstrip.should == "stuntmann82  antpires     maccman      mlroach      jtrupiano"
       end
     end
     context "--followers" do
@@ -2276,7 +2409,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of followers" do
         @cli.suggest
-        $stdout.string.rstrip.should == "@stuntmann82  @antpires     @mlroach      @jtrupiano    @maccman"
+        $stdout.string.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
       end
     end
     context "--friends" do
@@ -2285,7 +2418,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of friends" do
         @cli.suggest
-        $stdout.string.rstrip.should == "@stuntmann82  @antpires     @mlroach      @jtrupiano    @maccman"
+        $stdout.string.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
       end
     end
     context "--listed" do
@@ -2294,7 +2427,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of list memberships" do
         @cli.suggest
-        $stdout.string.rstrip.should == "@stuntmann82  @antpires     @mlroach      @jtrupiano    @maccman"
+        $stdout.string.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
       end
     end
     context "--long" do
@@ -2333,7 +2466,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.suggest
-        $stdout.string.rstrip.should == "@maccman      @mlroach      @jtrupiano    @stuntmann82  @antpires"
+        $stdout.string.rstrip.should == "maccman      mlroach      jtrupiano    stuntmann82  antpires"
       end
     end
     context "--reverse" do
@@ -2342,7 +2475,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should reverse the order of the sort" do
         @cli.suggest
-        $stdout.string.rstrip.should == "@stuntmann82  @mlroach      @maccman      @jtrupiano    @antpires"
+        $stdout.string.rstrip.should == "stuntmann82  mlroach      maccman      jtrupiano    antpires"
       end
     end
     context "--tweets" do
@@ -2351,7 +2484,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by number of Tweets" do
         @cli.suggest
-        $stdout.string.rstrip.should == "@stuntmann82  @antpires     @jtrupiano    @maccman      @mlroach"
+        $stdout.string.rstrip.should == "stuntmann82  antpires     jtrupiano    maccman      mlroach"
       end
     end
     context "--unsorted" do
@@ -2360,7 +2493,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.rstrip.should == "jtrupiano    mlroach      antpires     maccman      stuntmann82"
       end
     end
     context "with a user passed" do
@@ -2372,7 +2505,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.rstrip.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
       end
       context "--id" do
         before do
@@ -2791,7 +2924,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.rstrip.should == "pengwynn  sferik"
     end
     context "--csv" do
       before do
@@ -2812,7 +2945,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of favorites" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "@pengwynn  @sferik"
+        $stdout.string.rstrip.should == "pengwynn  sferik"
       end
     end
     context "--followers" do
@@ -2821,7 +2954,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of followers" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--friends" do
@@ -2830,7 +2963,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of friends" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--id" do
@@ -2853,7 +2986,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
       end
       it "should sort by number of list memberships" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--long" do
@@ -2875,7 +3008,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       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.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--reverse" do
@@ -2884,7 +3017,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should reverse the order of the sort" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--tweets" do
@@ -2893,7 +3026,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Scre...
       end
       it "should sort by number of Tweets" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.rstrip.should == "@sferik    @pengwynn"
+        $stdout.string.rstrip.should == "sferik    pengwynn"
       end
     end
     context "--unsorted" do
@@ -2902,7 +3035,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.rstrip.should == "sferik    pengwynn"
       end
     end
   end