t 1.7.1 → 1.7.2

data/README.md

@@ -5,12 +5,14 @@
 [![Gem Version](https://badge.fury.io/rb/t.png)][gem]
 [![Build Status](https://secure.travis-ci.org/sferik/t.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/sferik/t.png?travis)][gemnasium]
+[![Coverage Status](https://coveralls.io/repos/sferik/t/badge.png?branch=master)][coveralls]
 [![Pledgie](http://www.pledgie.com/campaigns/17330.png)][pledgie]
 [![Flattr](http://api.flattr.com/button/flattr-badge-large.png)][flattr]
 
 [gem]: https://rubygems.org/gems/t
 [travis]: http://travis-ci.org/sferik/t
 [gemnasium]: https://gemnasium.com/sferik/t
+[coveralls]: https://coveralls.io/r/sferik/t
 [pledgie]: http://www.pledgie.com/campaigns/17330
 [flattr]: http://flattr.com/thing/815001/sferikt-on-GitHub
 
@@ -63,7 +65,7 @@ previously registered a Twitter application, it should be listed at
 to set your application's Access Level to "Read, Write and Access direct
 messages", otherwise you'll receive an error that looks like this:
 
-    Read-only application cannot POST
+    Error processing your OAuth request: Read-only application cannot POST
 
 Now, you're ready to authorize a Twitter account with your application. To
 proceed, type the following command at the prompt and follow the instructions:
@@ -249,15 +251,14 @@ used by `t`:
 ![List](https://github.com/sferik/t/raw/master/screenshots/list.png)
 
 ## Shell completion
-If you're running [Zsh][], you can source the [bundled completion
-file][completion] to get shell completion for `t` commands, subcommands, and
+If you're running Zsh, you can source one of the [bundled completion
+files][completion] to get shell completion for `t` commands, subcommands, and
 flags.
 
 Don't run Zsh? Why not [contribute][] completion support for your favorite
 shell?
 
-[zsh]: http://zsh.org
-[completion]: etc/t-completion.zsh
+[completion]: etc
 [contribute]: CONTRIBUTING.md
 
 ## History

data/Rakefile

@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-import 'tasks/zsh.rake'
+Dir.glob('tasks/*.rake').each { |r| import r }
 
 task :release => 'completion:zsh'
 task :test => :spec

data/bin/t

@@ -10,7 +10,9 @@ require 'twitter'
 
 # Output message to $stderr, prefixed with the program name
 def pute(*args)
-  args.first.insert(0, "#{$0}: ")
+  first = args.shift.dup
+  first.insert(0, "#{$0}: ")
+  args.unshift(first)
   $stderr.puts(*args)
 end
 
@@ -27,8 +29,20 @@ rescue Twitter::Error::TooManyRequests => error
     "The rate limit for this request will reset in #{error.rate_limit.reset_in} seconds.",
     "While you wait, consider making a polite request for Twitter to increase the API rate limit at https://dev.twitter.com/discussions/10644"
   exit 1
-rescue Twitter::Error::Unauthorized => error
-  pute error.message, "Run `t authorize` to authorize."
+rescue Twitter::Error::BadRequest => error
+  pute error.message,
+    "Run `t authorize` to authorize."
+  exit 1
+rescue Twitter::Error::Forbidden, Twitter::Error::Unauthorized => error
+  pute error.message
+  if error.message == "Error processing your OAuth request: Read-only application cannot POST" ||
+    error.message == "This application is not allowed to access or delete your direct messages"
+    $stderr.puts(%q(Make sure to set your Twitter application's Access Level to "Read, Write and Access direct messages".))
+    require 'thor'
+    Thor::Shell::Basic.new.ask "Press [Enter] to open the Twitter Developer site."
+    require 'launchy'
+    Launchy.open("https://dev.twitter.com/apps") { |u,o,e| $stderr.puts "Manually open #{u}" }
+  end
   exit 1
 rescue Twitter::Error => error
   pute error.message

data/lib/t/cli.rb

@@ -29,7 +29,7 @@ module T
     check_unknown_options!
 
     class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
-    class_option "color", :type => :string, :default => "auto", :desc => "Control how color is used in output."
+    class_option "color", :aliases => "-C", :type => :string, :enum => %w(auto never), :default => "auto", :desc => "Control how color is used in output"
     class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
     class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
 
@@ -79,7 +79,7 @@ module T
         say
       end
       require 'launchy'
-      Launchy.open("https://dev.twitter.com/apps", :dry_run => options['display-url'])
+      open_or_print( "https://dev.twitter.com/apps", :dry_run => options['display-url'] )
       key = ask "Enter your consumer key:"
       secret = ask "Enter your consumer secret:"
       consumer = OAuth::Consumer.new(key, secret, :site => base_url)
@@ -94,7 +94,7 @@ module T
       say
       ask "Press [Enter] to open the Twitter app authorization page."
       say
-      Launchy.open(url, :dry_run => options['display-url'])
+      open_or_print(url, :dry_run => options['display-url'])
       pin = ask "Enter the supplied PIN:"
       access_token = request_token.get_access_token(:oauth_verifier => pin.chomp)
       oauth_response = access_token.get('/1.1/account/verify_credentials.json?include_entities=false&skip_status=true')
@@ -510,13 +510,13 @@ module T
       require 'launchy'
       if options['id']
         user = client.user(user.to_i)
-        Launchy.open("https://twitter.com/#{user.screen_name}", :dry_run => options['display-url'])
+        open_or_print("https://twitter.com/#{user.screen_name}", :dry_run => options['display-url'])
       elsif options['status']
         status = client.status(user.to_i, :include_my_retweet => false)
-        Launchy.open("https://twitter.com/#{status.from_user}/status/#{status.id}", :dry_run => options['display-url'])
+        open_or_print("https://twitter.com/#{status.from_user}/status/#{status.id}", :dry_run => options['display-url'])
       else
         require 't/core_ext/string'
-        Launchy.open("https://twitter.com/#{user.strip_ats}", :dry_run => options['display-url'])
+        open_or_print("https://twitter.com/#{user.strip_ats}", :dry_run => options['display-url'])
       end
     end
 
@@ -651,6 +651,7 @@ module T
     method_option "exclude", :aliases => "-e", :type => :string, :enum => %w(replies retweets), :desc => "Exclude certain types of Tweets from the results.", :banner => "TYPE"
     method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    method_option "max_id", :aliases => "-m", :type => :numeric, :desc => "Returns only the results with an ID less than the specified ID."
     method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => "Limit the number of results."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     method_option "since_id", :aliases => "-s", :type => :numeric, :desc => "Returns only the results with an ID greater than the specified ID."
@@ -659,6 +660,7 @@ module T
       opts = {}
       opts[:exclude_replies] = true if options['exclude'] == 'replies'
       opts[:include_rts] = false if options['exclude'] == 'retweets'
+      opts[:max_id] = options['max_id'] if options['max_id']
       opts[:since_id] = options['since_id'] if options['since_id']
       if user
         require 't/core_ext/string'

data/lib/t/delete.rb

@@ -11,11 +11,6 @@ module T
 
     check_unknown_options!
 
-    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
-    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
-    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
-    class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
-
     def initialize(*)
       @rcfile = T::RCFile.instance
       super

data/lib/t/list.rb

@@ -19,11 +19,6 @@ module T
 
     check_unknown_options!
 
-    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
-    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
-    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
-    class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
-
     def initialize(*)
       @rcfile = T::RCFile.instance
       super

data/lib/t/printable.rb

@@ -2,7 +2,7 @@ module T
   module Printable
     LIST_HEADINGS = ["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"]
     TWEET_HEADINGS = ["ID", "Posted at", "Screen name", "Text"]
-    USER_HEADINGS = ["ID", "Since", "Last tweeted at", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name", "Verified", "Bio", "Status", "Location", "URL"]
+    USER_HEADINGS = ["ID", "Since", "Last tweeted at", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name", "Verified", "Protected", "Bio", "Status", "Location", "URL"]
     MONTH_IN_SECONDS = 2592000
 
   private
@@ -16,7 +16,7 @@ module T
     end
 
     def build_long_user(user)
-      [user.id, ls_formatted_time(user), ls_formatted_time(user.status), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, "@#{user.screen_name}", user.name, user.verified? ? "Yes" : "No", user.status ? decode_full_text(user.status, options['decode_urls']).gsub(/\n+/, ' ') : nil, user.location, user.url]
+      [user.id, ls_formatted_time(user), ls_formatted_time(user.status), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, "@#{user.screen_name}", user.name, user.verified? ? "Yes" : "No", user.protected? ? "Yes" : "No", user.description, user.status ? decode_full_text(user.status, options['decode_urls']).gsub(/\n+/, ' ') : nil, user.location, user.url]
     end
 
     def csv_formatted_time(object, key=:created_at)
@@ -51,7 +51,7 @@ module T
     def print_csv_user(user)
       require 'csv'
       require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-      say [user.id, csv_formatted_time(user), csv_formatted_time(user.status), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.screen_name, user.name, user.verified?, user.description, user.status ? user.status.full_text : nil, user.location, user.url].to_csv
+      say [user.id, csv_formatted_time(user), csv_formatted_time(user.status), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.screen_name, user.name, user.verified?, user.protected?, user.description, user.status ? user.status.full_text : nil, user.location, user.url].to_csv
     end
 
     def print_lists(lists)
@@ -113,14 +113,9 @@ module T
     end
 
     def print_message(from_user, message)
-      if options['color'] == 'always'
+      case options['color']
+      when 'auto'
         say("   @#{from_user}", [:bold, :yellow])
-      elsif options['color'] == 'auto'
-        if $stdout.tty?
-          say("   @#{from_user}", [:bold, :yellow])
-        else
-          say("   @#{from_user}")
-        end
       else
         say("   @#{from_user}")
       end

data/lib/t/search.rb

@@ -18,11 +18,6 @@ module T
 
     check_unknown_options!
 
-    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
-    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
-    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
-    class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
-
     def initialize(*)
       @rcfile = T::RCFile.instance
       super
@@ -173,6 +168,7 @@ module T
     method_option "exclude", :aliases => "-e", :type => :string, :enum => %w(replies retweets), :desc => "Exclude certain types of Tweets from the results.", :banner => "TYPE"
     method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    method_option "max_id", :aliases => "-m", :type => :numeric, :desc => "Returns only the results with an ID less than the specified ID."
     method_option "since_id", :aliases => "-s", :type => :numeric, :desc => "Returns only the results with an ID greater than the specified ID."
     def timeline(*args)
       query = args.pop
@@ -181,6 +177,7 @@ module T
       opts[:include_entities] = 1 if options['decode_urls']
       opts[:exclude_replies] = true if options['exclude'] == 'replies'
       opts[:include_rts] = false if options['exclude'] == 'retweets'
+      opts[:max_id] = options['max_id'] if options['max_id']
       opts[:since_id] = options['since_id'] if options['since_id']
       if user
         require 't/core_ext/string'

data/lib/t/set.rb

@@ -8,11 +8,6 @@ module T
 
     check_unknown_options!
 
-    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
-    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
-    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
-    class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
-
     def initialize(*)
       @rcfile = T::RCFile.instance
       super

data/lib/t/stream.rb

@@ -16,11 +16,6 @@ module T
 
     check_unknown_options!
 
-    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
-    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
-    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
-    class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
-
     def initialize(*)
       @rcfile = T::RCFile.instance
       super

data/lib/t/utils.rb

@@ -112,5 +112,10 @@ module T
       full_text
     end
 
+    def open_or_print( url, options )
+      Launchy.open( url, options ) do |e|
+        say "Open: #{url}"
+      end
+    end
   end
 end

data/lib/t/version.rb

@@ -14,7 +14,7 @@ module T
 
       # @return [Integer]
       def patch
-        1
+        2
       end
 
       # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -158,39 +158,39 @@ testcli
     it "has the correct output" do
       @cli.direct_messages
       expect($stdout.string).to eq <<-eos
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    Sounds good. Meeting Tuesday is fine.
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    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
+   @sferik
    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
+   @sferik
    Just checking in. How's everything going?
 
-\e[1m\e[33m   @sferik\e[0m
+   @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?
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    How are the graph enhancements coming?
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    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
+   @sferik
    Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    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
+   @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?
 
@@ -263,40 +263,40 @@ ID          Posted at     Screen name  Text
       it "reverses the order of the sort" do
         @cli.direct_messages
         expect($stdout.string).to eq <<-eos
-\e[1m\e[33m   @sferik\e[0m
+   @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?
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    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
+   @sferik
    Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    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
+   @sferik
    How are the graph enhancements coming?
 
-\e[1m\e[33m   @sferik\e[0m
+   @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?
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    Just checking in. How's everything going?
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    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
+   @sferik
    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
+   @sferik
    Sounds good. Meeting Tuesday is fine.
 
         eos
@@ -316,39 +316,39 @@ ID          Posted at     Screen name  Text
     it "has the correct output" do
       @cli.direct_messages_sent
       expect($stdout.string).to eq <<-eos
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    Sounds good. Meeting Tuesday is fine.
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    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
+   @hurrycane
    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
+   @hurrycane
    Just checking in. How's everything going?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @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?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    How are the graph enhancements coming?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    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
+   @hurrycane
    Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    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
+   @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?
 
@@ -421,40 +421,40 @@ ID          Posted at     Screen name  Text
       it "reverses the order of the sort" do
         @cli.direct_messages_sent
         expect($stdout.string).to eq <<-eos
-\e[1m\e[33m   @hurrycane\e[0m
+   @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?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    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
+   @hurrycane
    Awesome! Any luck duplicating the Gemfile.lock error with Ruby 1.9.2 final?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    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
+   @hurrycane
    How are the graph enhancements coming?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @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?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    Just checking in. How's everything going?
 
-\e[1m\e[33m   @hurrycane\e[0m
+   @hurrycane
    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
+   @hurrycane
    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
+   @hurrycane
    Sounds good. Meeting Tuesday is fine.
 
         eos
@@ -487,9 +487,9 @@ ID          Posted at     Screen name  Text
       it "outputs in CSV format" do
         @cli.groupies
         expect($stdout.string).to eq <<-eos
-ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Bio,Status,Location,URL
-14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
-7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Protected,Bio,Status,Location,URL
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
         eos
       end
     end
@@ -800,78 +800,78 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     it "has the correct output" do
       @cli.favorites
       expect($stdout.string).to eq <<-eos
-\e[1m\e[33m   @mutgoff\e[0m
+   @mutgoff
    Happy Birthday @imdane. Watch out for those @rally pranksters!
 
-\e[1m\e[33m   @ironicsans\e[0m
+   @ironicsans
    If you like good real-life stories, check out @NarrativelyNY's just-launched 
    site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)
 
-\e[1m\e[33m   @pat_shaughnessy\e[0m
+   @pat_shaughnessy
    Something else to vote for: "New Rails workshops to bring more women into the 
    Boston software scene" http://t.co/eNBuckHc /cc @bostonrb
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    Pushing the button to launch the site. http://t.co/qLoEn5jG
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @fivethirtyeight\e[0m
+   @fivethirtyeight
    The Weatherman is Not a Moron: http://t.co/ZwL5Gnq5. An excerpt from my book, 
    THE SIGNAL AND THE NOISE (http://t.co/fNXj8vCE)
 
-\e[1m\e[33m   @codeforamerica\e[0m
+   @codeforamerica
    RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
    Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
    @TheaClay
 
-\e[1m\e[33m   @fbjork\e[0m
+   @fbjork
    RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
    http://t.co/kGEykswZ /cc @JRuby @headius
 
-\e[1m\e[33m   @mbostock\e[0m
+   @mbostock
    If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
 
-\e[1m\e[33m   @FakeDorsey\e[0m
+   @FakeDorsey
    "Write drunk. Edit sober."—Ernest Hemingway
 
-\e[1m\e[33m   @al3x\e[0m
+   @al3x
    RT @wcmaier: Better banking through better ops: build something new with us 
    @Simplify (remote, PDX) http://t.co/8WgzKZH3
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    We just announced Mosaic, what we've been working on since the Yobongo 
    acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic
 
-\e[1m\e[33m   @BarackObama\e[0m
+   @BarackObama
    Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 
    #Obama2012
 
-\e[1m\e[33m   @JEG2\e[0m
+   @JEG2
    RT @tenderlove: If corporations are people, can we use them to drive in the 
    carpool lane?
 
-\e[1m\e[33m   @eveningedition\e[0m
+   @eveningedition
    LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake 
    China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
 
-\e[1m\e[33m   @dhh\e[0m
+   @dhh
    RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
    achievement: why this goulish jingoism is so warped http://t.co/kood278s
 
-\e[1m\e[33m   @jasonfried\e[0m
+   @jasonfried
    The story of Mars Curiosity's gears, made by a factory in Rockford, IL: 
    http://t.co/MwCRsHQg
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    @episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem 
    to be missing "1.1" from the URL.
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
 
-\e[1m\e[33m   @dwiskus\e[0m
+   @dwiskus
    Gentlemen, you can't fight in here! This is the war room! 
    http://t.co/kMxMYyqF
 
@@ -1084,9 +1084,9 @@ ID                   Posted at     Screen name       Text
       it "outputs in CSV format" do
         @cli.followings
         expect($stdout.string).to eq <<-eos
-ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Bio,Status,Location,URL
-14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
-7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Protected,Bio,Status,Location,URL
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
         eos
       end
     end
@@ -1230,9 +1230,9 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       it "outputs in CSV format" do
         @cli.followers
         expect($stdout.string).to eq <<-eos
-ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Bio,Status,Location,URL
-14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
-7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Protected,Bio,Status,Location,URL
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
         eos
       end
     end
@@ -1379,9 +1379,9 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       it "outputs in CSV format" do
         @cli.friends
         expect($stdout.string).to eq <<-eos
-ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Bio,Status,Location,URL
-14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
-7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Protected,Bio,Status,Location,URL
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
         eos
       end
     end
@@ -1531,9 +1531,9 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       it "outputs in CSV format" do
         @cli.leaders
         expect($stdout.string).to eq <<-eos
-ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Bio,Status,Location,URL
-14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
-7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Protected,Bio,Status,Location,URL
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
         eos
       end
     end
@@ -1784,78 +1784,78 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
     it "has the correct output" do
       @cli.mentions
       expect($stdout.string).to eq <<-eos
-\e[1m\e[33m   @mutgoff\e[0m
+   @mutgoff
    Happy Birthday @imdane. Watch out for those @rally pranksters!
 
-\e[1m\e[33m   @ironicsans\e[0m
+   @ironicsans
    If you like good real-life stories, check out @NarrativelyNY's just-launched 
    site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)
 
-\e[1m\e[33m   @pat_shaughnessy\e[0m
+   @pat_shaughnessy
    Something else to vote for: "New Rails workshops to bring more women into the 
    Boston software scene" http://t.co/eNBuckHc /cc @bostonrb
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    Pushing the button to launch the site. http://t.co/qLoEn5jG
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @fivethirtyeight\e[0m
+   @fivethirtyeight
    The Weatherman is Not a Moron: http://t.co/ZwL5Gnq5. An excerpt from my book, 
    THE SIGNAL AND THE NOISE (http://t.co/fNXj8vCE)
 
-\e[1m\e[33m   @codeforamerica\e[0m
+   @codeforamerica
    RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
    Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
    @TheaClay
 
-\e[1m\e[33m   @fbjork\e[0m
+   @fbjork
    RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
    http://t.co/kGEykswZ /cc @JRuby @headius
 
-\e[1m\e[33m   @mbostock\e[0m
+   @mbostock
    If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
 
-\e[1m\e[33m   @FakeDorsey\e[0m
+   @FakeDorsey
    "Write drunk. Edit sober."—Ernest Hemingway
 
-\e[1m\e[33m   @al3x\e[0m
+   @al3x
    RT @wcmaier: Better banking through better ops: build something new with us 
    @Simplify (remote, PDX) http://t.co/8WgzKZH3
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    We just announced Mosaic, what we've been working on since the Yobongo 
    acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic
 
-\e[1m\e[33m   @BarackObama\e[0m
+   @BarackObama
    Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 
    #Obama2012
 
-\e[1m\e[33m   @JEG2\e[0m
+   @JEG2
    RT @tenderlove: If corporations are people, can we use them to drive in the 
    carpool lane?
 
-\e[1m\e[33m   @eveningedition\e[0m
+   @eveningedition
    LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake 
    China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
 
-\e[1m\e[33m   @dhh\e[0m
+   @dhh
    RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
    achievement: why this goulish jingoism is so warped http://t.co/kood278s
 
-\e[1m\e[33m   @jasonfried\e[0m
+   @jasonfried
    The story of Mars Curiosity's gears, made by a factory in Rockford, IL: 
    http://t.co/MwCRsHQg
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    @episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem 
    to be missing "1.1" from the URL.
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
 
-\e[1m\e[33m   @dwiskus\e[0m
+   @dwiskus
    Gentlemen, you can't fight in here! This is the war room! 
    http://t.co/kMxMYyqF
 
@@ -2102,82 +2102,82 @@ ID                   Posted at     Screen name       Text
       it "has the correct output" do
         @cli.retweets
         expect($stdout.string).to eq <<-eos
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @codeforamerica\e[0m
+   @codeforamerica
    RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
    Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
    @TheaClay
 
-\e[1m\e[33m   @fbjork\e[0m
+   @fbjork
    RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
    http://t.co/kGEykswZ /cc @JRuby @headius
 
-\e[1m\e[33m   @al3x\e[0m
+   @al3x
    RT @wcmaier: Better banking through better ops: build something new with us 
    @Simplify (remote, PDX) http://t.co/8WgzKZH3
 
-\e[1m\e[33m   @JEG2\e[0m
+   @JEG2
    RT @tenderlove: If corporations are people, can we use them to drive in the 
    carpool lane?
 
-\e[1m\e[33m   @dhh\e[0m
+   @dhh
    RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
    achievement: why this goulish jingoism is so warped http://t.co/kood278s
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @codeforamerica\e[0m
+   @codeforamerica
    RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
    Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
    @TheaClay
 
-\e[1m\e[33m   @fbjork\e[0m
+   @fbjork
    RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
    http://t.co/kGEykswZ /cc @JRuby @headius
 
-\e[1m\e[33m   @al3x\e[0m
+   @al3x
    RT @wcmaier: Better banking through better ops: build something new with us 
    @Simplify (remote, PDX) http://t.co/8WgzKZH3
 
-\e[1m\e[33m   @JEG2\e[0m
+   @JEG2
    RT @tenderlove: If corporations are people, can we use them to drive in the 
    carpool lane?
 
-\e[1m\e[33m   @dhh\e[0m
+   @dhh
    RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
    achievement: why this goulish jingoism is so warped http://t.co/kood278s
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @codeforamerica\e[0m
+   @codeforamerica
    RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
    Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
    @TheaClay
 
-\e[1m\e[33m   @fbjork\e[0m
+   @fbjork
    RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
    http://t.co/kGEykswZ /cc @JRuby @headius
 
-\e[1m\e[33m   @al3x\e[0m
+   @al3x
    RT @wcmaier: Better banking through better ops: build something new with us 
    @Simplify (remote, PDX) http://t.co/8WgzKZH3
 
-\e[1m\e[33m   @JEG2\e[0m
+   @JEG2
    RT @tenderlove: If corporations are people, can we use them to drive in the 
    carpool lane?
 
-\e[1m\e[33m   @dhh\e[0m
+   @dhh
    RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
    achievement: why this goulish jingoism is so warped http://t.co/kood278s
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @codeforamerica\e[0m
+   @codeforamerica
    RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
    Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
    @TheaClay
@@ -2555,78 +2555,78 @@ ID                 Posted at     Screen name  Text                           ...
       it "has the correct output" do
         @cli.timeline
         expect($stdout.string).to eq <<-eos
-\e[1m\e[33m   @mutgoff\e[0m
+   @mutgoff
    Happy Birthday @imdane. Watch out for those @rally pranksters!
 
-\e[1m\e[33m   @ironicsans\e[0m
+   @ironicsans
    If you like good real-life stories, check out @NarrativelyNY's just-launched 
    site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)
 
-\e[1m\e[33m   @pat_shaughnessy\e[0m
+   @pat_shaughnessy
    Something else to vote for: "New Rails workshops to bring more women into the 
    Boston software scene" http://t.co/eNBuckHc /cc @bostonrb
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    Pushing the button to launch the site. http://t.co/qLoEn5jG
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
 
-\e[1m\e[33m   @fivethirtyeight\e[0m
+   @fivethirtyeight
    The Weatherman is Not a Moron: http://t.co/ZwL5Gnq5. An excerpt from my book, 
    THE SIGNAL AND THE NOISE (http://t.co/fNXj8vCE)
 
-\e[1m\e[33m   @codeforamerica\e[0m
+   @codeforamerica
    RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
    Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
    @TheaClay
 
-\e[1m\e[33m   @fbjork\e[0m
+   @fbjork
    RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
    http://t.co/kGEykswZ /cc @JRuby @headius
 
-\e[1m\e[33m   @mbostock\e[0m
+   @mbostock
    If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
 
-\e[1m\e[33m   @FakeDorsey\e[0m
+   @FakeDorsey
    "Write drunk. Edit sober."—Ernest Hemingway
 
-\e[1m\e[33m   @al3x\e[0m
+   @al3x
    RT @wcmaier: Better banking through better ops: build something new with us 
    @Simplify (remote, PDX) http://t.co/8WgzKZH3
 
-\e[1m\e[33m   @calebelston\e[0m
+   @calebelston
    We just announced Mosaic, what we've been working on since the Yobongo 
    acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic
 
-\e[1m\e[33m   @BarackObama\e[0m
+   @BarackObama
    Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 
    #Obama2012
 
-\e[1m\e[33m   @JEG2\e[0m
+   @JEG2
    RT @tenderlove: If corporations are people, can we use them to drive in the 
    carpool lane?
 
-\e[1m\e[33m   @eveningedition\e[0m
+   @eveningedition
    LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake 
    China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
 
-\e[1m\e[33m   @dhh\e[0m
+   @dhh
    RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
    achievement: why this goulish jingoism is so warped http://t.co/kood278s
 
-\e[1m\e[33m   @jasonfried\e[0m
+   @jasonfried
    The story of Mars Curiosity's gears, made by a factory in Rockford, IL: 
    http://t.co/MwCRsHQg
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    @episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem 
    to be missing "1.1" from the URL.
 
-\e[1m\e[33m   @sferik\e[0m
+   @sferik
    @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
 
-\e[1m\e[33m   @dwiskus\e[0m
+   @dwiskus
    Gentlemen, you can't fight in here! This is the war room! 
    http://t.co/kMxMYyqF
 
@@ -2714,6 +2714,34 @@ ID                   Posted at     Screen name       Text
  244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
         eos
       end
+      context "--max-id" do
+        before do
+          @cli.options = @cli.options.merge("max_id" => 244104558433951744)
+          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :max_id => "244104558433951744"}).to_return(:body => fixture("statuses.json"))
+        end
+        it "requests the correct resource" do
+          @cli.timeline
+          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :max_id => "244104558433951744"})).to have_been_made
+        end
+      end
+      context "--number" do
+        before do
+          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"}).to_return(:body => fixture("statuses.json"))
+          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_statuses.json"))
+          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"))
+        end
+        it "limits the number of results to 1" do
+          @cli.options = @cli.options.merge("number" => 1)
+          @cli.timeline
+          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"})).to have_been_made
+        end
+        it "limits the number of results to 201" do
+          @cli.options = @cli.options.merge("number" => 201)
+          @cli.timeline
+          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"})).to have_been_made
+          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"})).to have_been_made
+        end
+      end
       context "--reverse" do
         before do
           @cli.options = @cli.options.merge("reverse" => true)
@@ -2746,24 +2774,6 @@ ID                   Posted at     Screen name       Text
         end
       end
     end
-    context "--number" do
-      before do
-        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"}).to_return(:body => fixture("statuses.json"))
-        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_statuses.json"))
-        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"))
-      end
-      it "limits the number of results to 1" do
-        @cli.options = @cli.options.merge("number" => 1)
-        @cli.timeline
-        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"})).to have_been_made
-      end
-      it "limits the number of results to 201" do
-        @cli.options = @cli.options.merge("number" => 201)
-        @cli.timeline
-        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"})).to have_been_made
-        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"})).to have_been_made
-      end
-    end
     context "--since-id" do
       before do
         @cli.options = @cli.options.merge("since_id" => 244104558433951744)
@@ -2792,6 +2802,16 @@ ID                   Posted at     Screen name       Text
           expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "20", :user_id => "7505382"})).to have_been_made
         end
       end
+      context "--max-id" do
+        before do
+          @cli.options = @cli.options.merge("max_id" => 244104558433951744)
+          stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "20", :screen_name => "sferik", :max_id => "244104558433951744"}).to_return(:body => fixture("statuses.json"))
+        end
+        it "requests the correct resource" do
+          @cli.timeline("sferik")
+          expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "20", :screen_name => "sferik", :max_id => "244104558433951744"})).to have_been_made
+        end
+      end
       context "--number" do
         before do
           stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "1", :screen_name => "sferik"}).to_return(:body => fixture("statuses.json"))
@@ -3053,9 +3073,9 @@ WOEID     Parent ID  Type       Name           Country
       it "outputs in CSV format" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string).to eq <<-eos
-ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Bio,Status,Location,URL
-14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
-7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Protected,Bio,Status,Location,URL
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
         eos
       end
     end
@@ -3205,8 +3225,8 @@ URL          https://github.com/sferik
       it "has the correct output" do
         @cli.whois("sferik")
         expect($stdout.string).to eq <<-eos
-ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Bio,Status,Location,URL
-7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Protected,Bio,Status,Location,URL
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
         eos
       end
     end