t 0.6.4 → 0.7.0

data/lib/t/core_ext/string.rb

@@ -1,5 +1,9 @@
 class String
 
+  def prepend_at
+    "@#{self}"
+  end
+
   def strip_ats
     self.tr('@', '')
   end

data/lib/t/delete.rb

@@ -1,3 +1,4 @@
+require 't/core_ext/enumerable'
 require 't/core_ext/string'
 require 't/rcfile'
 require 't/requestable'
@@ -14,69 +15,83 @@ module T
       @rcfile = RCFile.instance
     end
 
-    desc "block SCREEN_NAME [SCREEN_NAME...]", "Unblock users."
-    def block(screen_name, *screen_names)
-      screen_names.unshift(screen_name)
-      screen_names.map!(&:strip_ats)
-      screen_names.threaded_each do |screen_name|
-        screen_name.strip_ats
+    desc "block USER [USER...]", "Unblock users."
+    method_option :id, :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify input as Twitter user IDs instead of screen names."
+    method_option :force, :aliases => "-f", :type => :boolean, :default => false
+    def block(user, *users)
+      users.unshift(user)
+      if options['id']
+        users.map!(&:to_i)
+      else
+        users.map!(&:strip_ats)
+      end
+      users = users.threaded_map do |user|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.unblock(screen_name, :include_entities => false)
+          client.unblock(user, :include_entities => false)
         end
       end
-      number = screen_names.length
+      number = users.length
       say "@#{@rcfile.default_profile[0]} unblocked #{number} #{number == 1 ? 'user' : 'users'}."
       say
-      say "Run `#{File.basename($0)} block #{screen_names.map{|screen_name| "@#{screen_name}"}.join(' ')}` to block."
+      say "Run `#{File.basename($0)} block #{users.map{|user| "@#{user.screen_name}"}.join(' ')}` to block."
     end
 
     desc "dm [DIRECT_MESSAGE_ID] [DIRECT_MESSAGE_ID...]", "Delete the last Direct Message sent."
+    method_option :force, :aliases => "-f", :type => :boolean, :default => false
     def dm(direct_message_id, *direct_message_ids)
       direct_message_ids.unshift(direct_message_id)
-      direct_message_ids.map!(&:strip_commas).map!(&:to_i)
+      direct_message_ids.map!(&:strip_commas)
       direct_message_ids.each do |direct_message_id|
         unless options['force']
-          direct_message = client.direct_message(direct_message_id, :include_entities => false)
+          direct_message = client.direct_message(direct_message_id.to_i, :include_entities => false)
           return unless yes? "Are you sure you want to permanently delete the direct message to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\"? [y/N]"
         end
-        direct_message = client.direct_message_destroy(direct_message_id, :include_entities => false)
+        direct_message = client.direct_message_destroy(direct_message_id.to_i, :include_entities => false)
         say "@#{@rcfile.default_profile[0]} deleted the direct message sent to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\""
       end
     end
-    map %w(m) => :dm
+    map %w(d m) => :dm
 
     desc "favorite STATUS_ID [STATUS_ID...]", "Delete favorites."
+    method_option :force, :aliases => "-f", :type => :boolean, :default => false
     def favorite(status_id, *status_ids)
       status_ids.unshift(status_id)
+      status_ids.map!(&:strip_commas)
       status_ids.each do |status_id|
         unless options['force']
-          status = client.status(status_id, :include_entities => false, :include_my_retweet => false, :trim_user => true)
+          status = client.status(status_id.to_i, :include_entities => false, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to remove @#{status.user.screen_name}'s status: \"#{status.text}\" from your favorites? [y/N]"
         end
-        status = client.unfavorite(status_id, :include_entities => false)
+        status = client.unfavorite(status_id.to_i, :include_entities => false)
         say "@#{@rcfile.default_profile[0]} unfavorited @#{status.user.screen_name}'s status: \"#{status.text}\""
       end
     end
-    map %w(post tweet update) => :status
+    map %w(fave favourite) => :favorite
 
-    desc "list LIST_NAME", "Delete a list."
-    def list(list_name)
+    desc "list LIST", "Delete a list."
+    method_option :force, :aliases => "-f", :type => :boolean, :default => false
+    method_option :id, :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify list via ID instead of slug."
+    def list(list)
+      list = list.to_i if options['id']
+      list = client.list(list)
       unless options['force']
-        return unless yes? "Are you sure you want to permanently delete the list \"#{list_name}\"? [y/N]"
+        return unless yes? "Are you sure you want to permanently delete the list \"#{list.name}\"? [y/N]"
       end
-      status = client.list_destroy(list_name)
-      say "@#{@rcfile.default_profile[0]} deleted the list \"#{list_name}\"."
+      list = client.list_destroy(list.id)
+      say "@#{@rcfile.default_profile[0]} deleted the list \"#{list.name}\"."
     end
 
     desc "status STATUS_ID [STATUS_ID...]", "Delete Tweets."
+    method_option :force, :aliases => "-f", :type => :boolean, :default => false
     def status(status_id, *status_ids)
       status_ids.unshift(status_id)
+      status_ids.map!(&:strip_commas)
       status_ids.each do |status_id|
         unless options['force']
-          status = client.status(status_id, :include_entities => false, :include_my_retweet => false, :trim_user => true)
+          status = client.status(status_id.to_i, :include_entities => false, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to permanently delete @#{status.user.screen_name}'s status: \"#{status.text}\"? [y/N]"
         end
-        status = client.status_destroy(status_id, :include_entities => false, :trim_user => true)
+        status = client.status_destroy(status_id.to_i, :include_entities => false, :trim_user => true)
         say "@#{@rcfile.default_profile[0]} deleted the status: \"#{status.text}\""
       end
     end

data/lib/t/list.rb

@@ -1,5 +1,8 @@
 require 'action_view'
 require 'active_support/core_ext/array/grouping'
+require 'csv'
+# 'fastercsv' required on Ruby versions < 1.9
+require 'fastercsv' unless Array.new.respond_to?(:to_csv)
 require 'retryable'
 require 't/collectable'
 require 't/core_ext/enumerable'
@@ -28,83 +31,151 @@ module T
       @rcfile = RCFile.instance
     end
 
-    desc "add LIST_NAME SCREEN_NAME [SCREEN_NAME...]", "Add members to a list."
-    def add(list_name, screen_name, *screen_names)
-      screen_names.unshift(screen_name)
-      screen_names.map!(&:strip_ats)
-      screen_names.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_each do |user_id_group|
+    desc "add LIST USER [USER...]", "Add members to a list."
+    method_option :id, :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify input as Twitter user IDs instead of screen names."
+    def add(list, user, *users)
+      users.unshift(user)
+      if options['id']
+        users.map!(&:to_i)
+      else
+        users.map!(&:strip_ats)
+      end
+      users.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_each do |user_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.list_add_members(list_name, user_id_group)
+          client.list_add_members(list, user_id_group)
         end
       end
-      number = screen_names.length
-      say "@#{@rcfile.default_profile[0]} added #{number} #{number == 1 ? 'member' : 'members'} to the list \"#{list_name}\"."
+      number = users.length
+      say "@#{@rcfile.default_profile[0]} added #{number} #{number == 1 ? 'member' : 'members'} to the list \"#{list}\"."
       say
-      say "Run `#{File.basename($0)} list remove #{list_name} #{screen_names.join(' ')}` to undo."
+      if options['id']
+        say "Run `#{File.basename($0)} list remove --id #{list} #{users.join(' ')}` to undo."
+      else
+        say "Run `#{File.basename($0)} list remove #{list} #{users.map{|user| "@#{user}"}.join(' ')}` to undo."
+      end
     end
 
-    desc "create LIST_NAME [DESCRIPTION]", "Create a new list."
+    desc "create LIST [DESCRIPTION]", "Create a new list."
     method_option :private, :aliases => "-p", :type => :boolean
-    def create(list_name, description="")
+    def create(list, description="")
       opts = description.blank? ? {} : {:description => description}
       opts.merge!(:mode => 'private') if options['private']
-      client.list_create(list_name, opts)
-      say "@#{@rcfile.default_profile[0]} created the list \"#{list_name}\"."
+      client.list_create(list, opts)
+      say "@#{@rcfile.default_profile[0]} created the list \"#{list}\"."
     end
 
-    desc "members [SCREEN_NAME] LIST_NAME", "Returns the members of a Twitter list."
-    method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
+    desc "information [USER/]LIST", "Retrieves detailed information about a Twitter list."
+    method_option :csv, :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
+    def information(list)
+      owner, list = list.split('/')
+      if list.nil?
+        list = owner
+        owner = @rcfile.default_profile[0]
+      else
+        owner = if options['id']
+          owner.to_i
+        else
+          owner.strip_ats
+        end
+      end
+      list = client.list(owner, list)
+      if options['csv']
+        say ["ID", "Description", "Slug", "Screen name", "Created at", "Members", "Subscribers", "Following", "Mode", "URL"].to_csv
+        say [list.id, list.description, list.slug, list.user.screen_name, list.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), list.member_count, list.subscriber_count, list.following?, list.mode, "https://twitter.com#{list.uri}"].to_csv
+      else
+        array = []
+        array << ["ID", list.id.to_s]
+        array << ["Description", list.description] unless list.description.nil?
+        array << ["Slug", list.slug]
+        array << ["Screen name", "@#{list.user.screen_name}"]
+        created_at = list.created_at > 6.months.ago ? list.created_at.strftime("%b %e %H:%M") : list.created_at.strftime("%b %e  %Y")
+        array << ["Created at", created_at]
+        array << ["Members", number_with_delimiter(list.member_count)]
+        array << ["Subscribers", number_with_delimiter(list.subscriber_count)]
+        status = list.following ? "Following" : "Not following"
+        array << ["Status", status]
+        array << ["Mode", list.mode]
+        array << ["URL", "https://twitter.com#{list.uri}"]
+        print_table(array)
+      end
+    end
+    map %w(detail) => :information
+
+    desc "members [USER/]LIST", "Returns the members of a Twitter list."
+    method_option :csv, :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
     method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
-    method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
-    method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
+    method_option :friends, :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
+    method_option :id, :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
+    method_option :listed, :aliases => "-s", :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."
+    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 total number of Tweets."
     method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    def members(*args)
-      list = args.pop
-      owner = args.pop || @rcfile.default_profile[0]
-      owner = owner.strip_ats
+    def members(list)
+      owner, list = list.split('/')
+      if list.nil?
+        list = owner
+        owner = @rcfile.default_profile[0]
+      else
+        owner = if options['id']
+          owner.to_i
+        else
+          owner.strip_ats
+        end
+      end
       users = collect_with_cursor do |cursor|
         client.list_members(owner, list, :cursor => cursor, :include_entities => false, :skip_status => true)
       end
-      print_user_list(users)
+      print_users(users)
     end
 
-    desc "remove LIST_NAME SCREEN_NAME [SCREEN_NAME...]", "Remove members from a list."
-    def remove(list_name, screen_name, *screen_names)
-      screen_names.unshift(screen_name)
-      screen_names.map!(&:strip_ats)
-      screen_names.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_each do |user_id_group|
+    desc "remove LIST USER [USER...]", "Remove members from a list."
+    method_option :id, :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify input as Twitter user IDs instead of screen names."
+    def remove(list, user, *users)
+      users.unshift(user)
+      if options['id']
+        users.map!(&:to_i)
+      else
+        users.map!(&:strip_ats)
+      end
+      users.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_each do |user_id_group|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.list_remove_members(list_name, user_id_group)
+          client.list_remove_members(list, user_id_group)
         end
       end
-      number = screen_names.length
-      say "@#{@rcfile.default_profile[0]} removed #{number} #{number == 1 ? 'member' : 'members'} from the list \"#{list_name}\"."
+      number = users.length
+      say "@#{@rcfile.default_profile[0]} removed #{number} #{number == 1 ? 'member' : 'members'} from the list \"#{list}\"."
       say
-      say "Run `#{File.basename($0)} list add #{list_name} #{screen_names.join(' ')}` to undo."
+      if options['id']
+        say "Run `#{File.basename($0)} list add --id #{list} #{users.join(' ')}` to undo."
+      else
+        say "Run `#{File.basename($0)} list add #{list} #{users.map{|user| "@#{user}"}.join(' ')}` to undo."
+      end
     end
 
-    desc "timeline [SCREEN_NAME] LIST_NAME", "Show tweet timeline for members of the specified list."
-    method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
-    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by total number of favorites."
-    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by total number of followers."
-    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by total number of friends."
-    method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
-    method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
+    desc "timeline [USER/]LIST", "Show tweet timeline for members of the specified list."
+    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."
     method_option :number, :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => "Limit the number of results."
     method_option :reverse, :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by total number of Tweets."
-    method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    def timeline(*args)
-      list = args.pop
-      owner = args.pop || @rcfile.default_profile[0]
-      owner = owner.strip_ats
+    def timeline(list)
+      owner, list = list.split('/')
+      if list.nil?
+        list = owner
+        owner = @rcfile.default_profile[0]
+      else
+        owner = if options['id']
+          owner.to_i
+        else
+          owner.strip_ats
+        end
+      end
       per_page = options['number'] || DEFAULT_NUM_RESULTS
       statuses = client.list_timeline(owner, list, :include_entities => false, :per_page => per_page)
-      print_status_list(statuses)
+      print_statuses(statuses)
     end
     map %w(tl) => :timeline
 

data/lib/t/printable.rb

@@ -1,4 +1,7 @@
 require 'action_view'
+require 'csv'
+# 'fastercsv' required on Ruby versions < 1.9
+require 'fastercsv' unless Array.new.respond_to?(:to_csv)
 require 'highline'
 
 module T
@@ -20,9 +23,52 @@ module T
         puts
       end
 
-      def print_status_list(statuses)
+      def print_lists(lists)
+        lists = lists.sort_by{|list| list.slug.downcase} unless options['unsorted']
+        if options['posted']
+          lists = lists.sort_by{|user| user.created_at}
+        elsif options['members']
+          lists = lists.sort_by{|user| user.member_count}
+        elsif options['mode']
+          lists = lists.sort_by{|user| user.mode}
+        elsif options['subscribers']
+          lists = lists.sort_by{|user| user.subscriber_count}
+        end
+        lists.reverse! if options['reverse']
+        if options['csv']
+          say ["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"].to_csv unless lists.empty?
+          lists.each do |list|
+            say [list.id, list.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), list.user.screen_name, list.slug, list.member_count, list.subscriber_count, list.mode, list.description].to_csv
+          end
+        elsif options['long']
+          array = lists.map do |list|
+            created_at = list.created_at > 6.months.ago ? list.created_at.strftime("%b %e %H:%M") : list.created_at.strftime("%b %e  %Y")
+            [list.id.to_s, created_at, list.full_name, number_with_delimiter(list.member_count), number_with_delimiter(list.subscriber_count), list.mode, list.description]
+          end
+          if STDOUT.tty?
+            headings = ["ID", "Created at", "Slug", "Members", "Subscribers", "Mode", "Description"]
+            array.unshift(headings) unless lists.empty?
+          end
+          print_table(array)
+        else
+          if STDOUT.tty?
+            print_in_columns(lists.map(&:full_name))
+          else
+            lists.each do |list|
+              say list.full_name
+            end
+          end
+        end
+      end
+
+      def print_statuses(statuses)
         statuses.reverse! if options['reverse']
-        if options['long']
+        if options['csv']
+          say ["ID", "Posted at", "Screen name", "Text"].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.user.screen_name, 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.to_s, created_at, "@#{status.user.screen_name}", status.text.gsub(/\n+/, ' ')]
@@ -39,9 +85,9 @@ module T
         end
       end
 
-      def print_user_list(users)
+      def print_users(users)
         users = users.sort_by{|user| user.screen_name.downcase} unless options['unsorted']
-        if options['created']
+        if options['posted']
           users = users.sort_by{|user| user.created_at}
         elsif options['favorites']
           users = users.sort_by{|user| user.favourites_count}
@@ -55,7 +101,12 @@ module T
           users = users.sort_by{|user| user.statuses_count}
         end
         users.reverse! if options['reverse']
-        if options['long']
+        if options['csv']
+          say ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"].to_csv unless users.empty?
+          users.each do |user|
+            say [user.id, user.created_at.utc.strftime("%Y-%m-%d %H:%M:%S %z"), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.screen_name, user.name].to_csv
+          end
+        elsif options['long']
           array = users.map do |user|
             created_at = user.created_at > 6.months.ago ? user.created_at.strftime("%b %e %H:%M") : user.created_at.strftime("%b %e  %Y")
             [user.id.to_s, created_at, number_with_delimiter(user.statuses_count), number_with_delimiter(user.favourites_count), number_with_delimiter(user.listed_count), number_with_delimiter(user.friends_count), number_with_delimiter(user.followers_count), "@#{user.screen_name}", user.name]

data/lib/t/search.rb

@@ -1,4 +1,7 @@
 require 'action_view'
+require 'csv'
+# 'fastercsv' required on Ruby versions < 1.9
+require 'fastercsv' unless Array.new.respond_to?(:to_csv)
 require 'retryable'
 require 't/core_ext/enumerable'
 require 't/printable'
@@ -25,11 +28,18 @@ module T
     end
 
     desc "all QUERY", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets that match a 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
     def all(query)
       rpp = options['number'] || DEFAULT_NUM_RESULTS
       statuses = client.search(query, :include_entities => false, :rpp => rpp)
-      if options['long']
+      if options['csv']
+        say ["ID", "Posted at", "Screen name", "Text"].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, 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.to_s, created_at, "@#{status.from_user}", status.text.gsub(/\n+/, ' ')]
@@ -47,6 +57,8 @@ module T
     end
 
     desc "favorites QUERY", "Returns Tweets you've favorited that mach a 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)
       statuses = 1.upto(MAX_PAGES).threaded_map do |page|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
@@ -55,11 +67,13 @@ module T
           end
         end
       end.flatten.compact
-      print_status_list(statuses)
+      print_statuses(statuses)
     end
     map %w(faves) => :favorites
 
     desc "mentions QUERY", "Returns Tweets mentioning you that mach a 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)
       statuses = 1.upto(MAX_PAGES).threaded_map do |page|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
@@ -68,11 +82,13 @@ module T
           end
         end
       end.flatten.compact
-      print_status_list(statuses)
+      print_statuses(statuses)
     end
     map %w(replies) => :mentions
 
     desc "retweets QUERY", "Returns Tweets you've retweeted that mach a 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)
       statuses = 1.upto(MAX_PAGES).threaded_map do |page|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
@@ -81,11 +97,13 @@ module T
           end
         end
       end.flatten.compact
-      print_status_list(statuses)
+      print_statuses(statuses)
     end
     map %w(rts) => :retweets
 
     desc "timeline QUERY", "Returns Tweets in your timeline that match a 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 timeline(query)
       statuses = 1.upto(MAX_PAGES).threaded_map do |page|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
@@ -94,21 +112,28 @@ module T
           end
         end
       end.flatten.compact
-      print_status_list(statuses)
+      print_statuses(statuses)
     end
     map %w(tl) => :timeline
 
-    desc "user SCREEN_NAME QUERY", "Returns Tweets in a user's timeline that match a specified query."
-    def user(screen_name, query)
-      screen_name = screen_name.strip_ats
+    desc "user USER QUERY", "Returns Tweets in a user's timeline that match a 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 user(user, query)
+      user = if options['id']
+        user.to_i
+      else
+        user.strip_ats
+      end
       statuses = 1.upto(MAX_PAGES).threaded_map do |page|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.user_timeline(screen_name, :page => page, :count => MAX_NUM_RESULTS).select do |status|
+          client.user_timeline(user, :page => page, :count => MAX_NUM_RESULTS).select do |status|
             /#{query}/i.match(status.text)
           end
         end
       end.flatten.compact
-      print_status_list(statuses)
+      print_statuses(statuses)
     end
 
   end