t 2.0.1 → 2.0.2

data/lib/t/collectable.rb

@@ -3,10 +3,9 @@ require 'retryable'
 
 module T
   module Collectable
-
     MAX_NUM_RESULTS = 200
 
-    def collect_with_max_id(collection=[], max_id=nil, &block)
+    def collect_with_max_id(collection = [], max_id = nil, &block)
       tweets = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         yield(max_id)
       end
@@ -29,7 +28,7 @@ module T
       end.flatten.compact
     end
 
-    def collect_with_page(collection=[], page=1, &block)
+    def collect_with_page(collection = [], page = 1, &block)
       tweets = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
         yield page
       end
@@ -37,6 +36,5 @@ module T
       collection += tweets
       tweets.empty? ? collection.flatten.uniq : collect_with_page(collection, page + 1, &block)
     end
-
   end
 end

data/lib/t/core_ext/kernel.rb

@@ -1,15 +1,13 @@
 module Kernel
-
-  def Bignum(arg, base=0)
+  def Bignum(arg, base = 0) # rubocop:disable MethodName
     Integer(arg, base)
   end
 
-  def Fixnum(arg, base=0)
+  def Fixnum(arg, base = 0) # rubocop:disable MethodName
     Integer(arg, base)
   end
 
-  def NilClass(arg)
+  def NilClass(arg) # rubocop:disable MethodName
     nil
   end
-
 end

data/lib/t/core_ext/string.rb

@@ -1,17 +1,15 @@
 class String
-
   def prepend_at
     "@#{self}"
   end
 
   def strip_ats
-    self.tr('@', '')
+    tr('@', '')
   end
 
-  alias old_to_i to_i
+  alias_method :old_to_i, :to_i
 
-  def to_i(base=10)
-    self.tr(',', '').old_to_i(base)
+  def to_i(base = 10)
+    tr(',', '').old_to_i(base)
   end
-
 end

data/lib/t/delete.rb

@@ -16,43 +16,42 @@ module T
       super
     end
 
-    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
+    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, number = fetch_users(users.unshift(user), options) do |users|
-        client.unblock(users)
+      unblocked_users, number = fetch_users(users.unshift(user), options) do |users_to_unblock|
+        client.unblock(users_to_unblock)
       end
       say "@#{@rcfile.active_profile[0]} unblocked #{pluralize(number, 'user')}."
       say
-      say "Run `#{File.basename($0)} block #{users.map{|user| "@#{user.screen_name}"}.join(' ')}` to block."
+      say "Run `#{File.basename($PROGRAM_NAME)} block #{unblocked_users.map { |unblocked_user| "@#{unblocked_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
+    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)
       require 't/core_ext/string'
       direct_message_ids.map!(&:to_i)
       if options['force']
-        direct_messages = client.direct_message_destroy(direct_message_ids)
+        direct_messages = client.destroy_direct_message(direct_message_ids)
         direct_messages.each do |direct_message|
           say "@#{@rcfile.active_profile[0]} deleted the direct message sent to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\""
         end
       else
-        direct_message_ids.each do |direct_message_id|
-          direct_message = client.direct_message(direct_message_id)
+        direct_message_ids.each do |direct_message_id_to_delete|
+          direct_message = client.direct_message(direct_message_id_to_delete)
           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]"
-          client.direct_message_destroy(direct_message_id)
+          client.destroy_direct_message(direct_message_id_to_delete)
           say "@#{@rcfile.active_profile[0]} deleted the direct message sent to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\""
         end
       end
-
     end
     map %w(d m) => :dm
 
-    desc "favorite TWEET_ID [TWEET_ID...]", "Delete favorites."
-    method_option "force", :aliases => "-f", :type => :boolean, :default => false
+    desc 'favorite TWEET_ID [TWEET_ID...]', 'Delete favorites.'
+    method_option 'force', :aliases => '-f', :type => :boolean, :default => false
     def favorite(status_id, *status_ids)
       status_ids.unshift(status_id)
       require 't/core_ext/string'
@@ -63,19 +62,19 @@ module T
           say "@#{@rcfile.active_profile[0]} unfavorited @#{status.user.screen_name}'s status: \"#{status.full_text}\""
         end
       else
-        status_ids.each do |status_id|
-          status = client.status(status_id, :include_my_retweet => false)
+        status_ids.each do |status_id_to_unfavorite|
+          status = client.status(status_id_to_unfavorite, :include_my_retweet => false)
           return unless yes? "Are you sure you want to remove @#{status.user.screen_name}'s status: \"#{status.full_text}\" from your favorites? [y/N]"
-          client.unfavorite(status_id)
+          client.unfavorite(status_id_to_unfavorite)
           say "@#{@rcfile.active_profile[0]} unfavorited @#{status.user.screen_name}'s status: \"#{status.full_text}\""
         end
       end
     end
     map %w(fave favourite) => :favorite
 
-    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."
+    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)
       if options['id']
         require 't/core_ext/string'
@@ -85,31 +84,30 @@ module T
       unless options['force']
         return unless yes? "Are you sure you want to permanently delete the list \"#{list.name}\"? [y/N]"
       end
-      client.list_destroy(list)
+      client.destroy_list(list)
       say "@#{@rcfile.active_profile[0]} deleted the list \"#{list.name}\"."
     end
 
-    desc "status TWEET_ID [TWEET_ID...]", "Delete Tweets."
-    method_option "force", :aliases => "-f", :type => :boolean, :default => false
+    desc 'status TWEET_ID [TWEET_ID...]', 'Delete Tweets.'
+    method_option 'force', :aliases => '-f', :type => :boolean, :default => false
     def status(status_id, *status_ids)
       status_ids.unshift(status_id)
       require 't/core_ext/string'
       status_ids.map!(&:to_i)
       if options['force']
-        tweets = client.status_destroy(status_ids, :trim_user => true)
+        tweets = client.destroy_status(status_ids, :trim_user => true)
         tweets.each do |status|
           say "@#{@rcfile.active_profile[0]} deleted the Tweet: \"#{status.full_text}\""
         end
       else
-        status_ids.each do |status_id|
-          status = client.status(status_id, :include_my_retweet => false)
+        status_ids.each do |status_id_to_delete|
+          status = client.status(status_id_to_delete, :include_my_retweet => false)
           return unless yes? "Are you sure you want to permanently delete @#{status.user.screen_name}'s status: \"#{status.full_text}\"? [y/N]"
-          client.status_destroy(status_id, :trim_user => true)
+          client.destroy_status(status_id_to_delete, :trim_user => true)
           say "@#{@rcfile.active_profile[0]} deleted the Tweet: \"#{status.full_text}\""
         end
       end
     end
     map %w(post tweet update) => :status
-
   end
 end

data/lib/t/editor.rb

@@ -4,7 +4,6 @@ require 'shellwords'
 module T
   class Editor
     class << self
-
       def gets
         file = tempfile
         edit(file.path)
@@ -15,7 +14,7 @@ module T
       end
 
       def tempfile
-        Tempfile.new("TWEET_EDITMSG")
+        Tempfile.new('TWEET_EDITMSG')
       end
 
       def edit(path)
@@ -29,7 +28,6 @@ module T
       def system_editor
         RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'notepad' : 'vi'
       end
-
     end
   end
 end

data/lib/t/list.rb

@@ -24,92 +24,92 @@ module T
       super
     end
 
-    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."
+    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, number = fetch_users(users.unshift(user), options) do |users|
-        client.list_add_members(list, users)
-        users
+      added_users, number = fetch_users(users.unshift(user), options) do |users_to_add|
+        client.add_list_members(list, users_to_add)
+        users_to_add
       end
       say "@#{@rcfile.active_profile[0]} added #{pluralize(number, 'member')} to the list \"#{list}\"."
       say
       if options['id']
-        say "Run `#{File.basename($0)} list remove --id #{list} #{users.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list remove --id #{list} #{added_users.join(' ')}` to undo."
       else
-        say "Run `#{File.basename($0)} list remove #{list} #{users.map{|user| "@#{user}"}.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list remove #{list} #{added_users.map { |added_user| "@#{added_user}" }.join(' ')}` to undo."
       end
     end
 
-    desc "create LIST [DESCRIPTION]", "Create a new list."
-    method_option "private", :aliases => "-p", :type => :boolean
-    def create(list, description=nil)
+    desc 'create LIST [DESCRIPTION]', 'Create a new list.'
+    method_option 'private', :aliases => '-p', :type => :boolean
+    def create(list, description = nil)
       opts = description ? {:description => description} : {}
       opts.merge!(:mode => 'private') if options['private']
-      client.list_create(list, opts)
+      client.create_list(list, opts)
       say "@#{@rcfile.active_profile[0]} created the list \"#{list}\"."
     end
 
-    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."
+    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 = extract_owner(list, options)
       list = client.list(owner, list)
       if options['csv']
         require 'csv'
-        say ["ID", "Description", "Slug", "Screen name", "Created at", "Members", "Subscribers", "Following", "Mode", "URL"].to_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, csv_formatted_time(list), list.member_count, list.subscriber_count, list.following?, list.mode, 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}"]
-        array << ["Created at", "#{ls_formatted_time(list)} (#{time_ago_in_words(list.created_at)} ago)"]
-        array << ["Members", number_with_delimiter(list.member_count)]
-        array << ["Subscribers", number_with_delimiter(list.subscriber_count)]
-        array << ["Status", list.following ? "Following" : "Not following"]
-        array << ["Mode", list.mode]
-        array << ["URL", list.uri]
+        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}"]
+        array << ['Created at', "#{ls_formatted_time(list)} (#{time_ago_in_words(list.created_at)} ago)"]
+        array << ['Members', number_with_delimiter(list.member_count)]
+        array << ['Subscribers', number_with_delimiter(list.subscriber_count)]
+        array << ['Status', list.following ? 'Following' : 'Not following']
+        array << ['Mode', list.mode]
+        array << ['URL', list.uri]
         print_table(array)
       end
     end
     map %w(details) => :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 "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 "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option "sort", :aliases => "-s", :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => "screen_name", :desc => "Specify the order of the results.", :banner => "ORDER"
-    method_option "unsorted", :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
+    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 '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 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def members(list)
       owner, list = extract_owner(list, options)
       users = client.list_members(owner, list).to_a
       print_users(users)
     end
 
-    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."
+    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, number = fetch_users(users.unshift(user), options) do |users|
-        client.list_remove_members(list, users)
-        users
+      removed_users, number = fetch_users(users.unshift(user), options) do |users_to_remove|
+        client.remove_list_members(list, users_to_remove)
+        users_to_remove
       end
       say "@#{@rcfile.active_profile[0]} removed #{pluralize(number, 'member')} from the list \"#{list}\"."
       say
       if options['id']
-        say "Run `#{File.basename($0)} list add --id #{list} #{users.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list add --id #{list} #{removed_users.join(' ')}` to undo."
       else
-        say "Run `#{File.basename($0)} list add #{list} #{users.map{|user| "@#{user}"}.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list add #{list} #{removed_users.map { |removed_user| "@#{removed_user}" }.join(' ')}` to undo."
       end
     end
 
-    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."
+    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.'
     def timeline(list)
       owner, list = extract_owner(list, options)
       count = options['number'] || DEFAULT_NUM_RESULTS
@@ -119,6 +119,5 @@ module T
       print_tweets(tweets)
     end
     map %w(tl) => :timeline
-
   end
 end

data/lib/t/printable.rb

@@ -1,9 +1,9 @@
 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", "Protected", "Bio", "Status", "Location", "URL"]
-    MONTH_IN_SECONDS = 2592000
+    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', 'Protected', 'Bio', 'Status', 'Location', 'URL']
+    MONTH_IN_SECONDS = 2_592_000
 
   private
 
@@ -16,22 +16,22 @@ module T
     end
 
     def build_long_user(user)
-      [user.id, ls_formatted_time(user), ls_formatted_time(user.status), user.statuses_count, user.favorites_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.gsub(/\n+/, ' '), user.status ? decode_full_text(user.status, options['decode_uris']).gsub(/\n+/, ' ') : nil, user.location, user.website.to_s]
+      [user.id, ls_formatted_time(user), ls_formatted_time(user.status), user.statuses_count, user.favorites_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.gsub(/\n+/, ' '), user.status ? decode_full_text(user.status, options['decode_uris']).gsub(/\n+/, ' ') : nil, user.location, user.website.to_s]
     end
 
-    def csv_formatted_time(object, key=:created_at)
+    def csv_formatted_time(object, key = :created_at)
       return nil if object.nil?
       time = object.send(key.to_sym).dup
-      time.utc.strftime("%Y-%m-%d %H:%M:%S %z")
+      time.utc.strftime('%Y-%m-%d %H:%M:%S %z')
     end
 
-    def ls_formatted_time(object, key=:created_at)
-      return "" if object.nil?
+    def ls_formatted_time(object, key = :created_at)
+      return '' if object.nil?
       time = T.local_time(object.send(key.to_sym))
       if time > Time.now - MONTH_IN_SECONDS * 6
-        time.strftime("%b %e %H:%M")
+        time.strftime('%b %e %H:%M')
       else
-        time.strftime("%b %e  %Y")
+        time.strftime('%b %e  %Y')
       end
     end
 
@@ -53,17 +53,17 @@ module T
 
     def print_lists(lists)
       lists = case options['sort']
-      when 'members'
-        lists.sort_by{|user| user.member_count}
-      when 'mode'
-        lists.sort_by{|user| user.mode}
-      when 'posted'
-        lists.sort_by{|user| user.created_at}
-      when 'subscribers'
-        lists.sort_by{|user| user.subscriber_count}
-      else
-        lists.sort_by{|list| list.slug.downcase}
-      end unless options['unsorted']
+              when 'members'
+                lists.sort_by { |user| user.member_count }
+              when 'mode'
+                lists.sort_by { |user| user.mode }
+              when 'since'
+                lists.sort_by { |user| user.created_at }
+              when 'subscribers'
+                lists.sort_by { |user| user.subscriber_count }
+              else
+                lists.sort_by { |list| list.slug.downcase }
+              end unless options['unsorted']
       lists.reverse! if options['reverse']
       if options['csv']
         require 'csv'
@@ -75,7 +75,7 @@ module T
         array = lists.map do |list|
           build_long_list(list)
         end
-        format = options['format'] || LIST_HEADINGS.size.times.map{"%s"}
+        format = options['format'] || LIST_HEADINGS.size.times.map { '%s' }
         print_table_with_headings(array, LIST_HEADINGS, format)
       else
         print_attribute(lists, :full_name)
@@ -132,7 +132,7 @@ module T
         array = tweets.map do |tweet|
           build_long_tweet(tweet)
         end
-        format = options['format'] || TWEET_HEADINGS.size.times.map{"%s"}
+        format = options['format'] || TWEET_HEADINGS.size.times.map { '%s' }
         print_table_with_headings(array, TWEET_HEADINGS, format)
       else
         tweets.each do |tweet|
@@ -141,25 +141,25 @@ module T
       end
     end
 
-    def print_users(users)
+    def print_users(users) # rubocop:disable CyclomaticComplexity
       users = case options['sort']
-      when 'favorites'
-        users.sort_by{|user| user.favorites_count.to_i}
-      when 'followers'
-        users.sort_by{|user| user.followers_count.to_i}
-      when 'friends'
-        users.sort_by{|user| user.friends_count.to_i}
-      when 'listed'
-        users.sort_by{|user| user.listed_count.to_i}
-      when 'since'
-        users.sort_by{|user| user.created_at}
-      when 'tweets'
-        users.sort_by{|user| user.statuses_count.to_i}
-      when 'tweeted'
-        users.sort_by{|user| user.status? ? user.status.created_at : Time.at(0)}
-      else
-        users.sort_by{|user| user.screen_name.downcase}
-      end unless options['unsorted']
+              when 'favorites'
+                users.sort_by { |user| user.favorites_count.to_i }
+              when 'followers'
+                users.sort_by { |user| user.followers_count.to_i }
+              when 'friends'
+                users.sort_by { |user| user.friends_count.to_i }
+              when 'listed'
+                users.sort_by { |user| user.listed_count.to_i }
+              when 'since'
+                users.sort_by { |user| user.created_at }
+              when 'tweets'
+                users.sort_by { |user| user.statuses_count.to_i }
+              when 'tweeted'
+                users.sort_by { |user| user.status? ? user.status.created_at : Time.at(0) }
+              else
+                users.sort_by { |user| user.screen_name.downcase }
+              end unless options['unsorted']
       users.reverse! if options['reverse']
       if options['csv']
         require 'csv'
@@ -171,12 +171,11 @@ module T
         array = users.map do |user|
           build_long_user(user)
         end
-        format = options['format'] || USER_HEADINGS.size.times.map{"%s"}
+        format = options['format'] || USER_HEADINGS.size.times.map { '%s' }
         print_table_with_headings(array, USER_HEADINGS, format)
       else
         print_attribute(users, :screen_name)
       end
     end
-
   end
 end