t 0.9.9 → 1.0.0

data/lib/t/collectable.rb

@@ -1,4 +1,5 @@
 require 'twitter'
+require 'retryable'
 
 module T
   module Collectable
@@ -10,7 +11,6 @@ module T
     end
 
     def collect_with_cursor(collection=[], cursor=-1, &block)
-      require 'retryable'
       object = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
         yield cursor
       end
@@ -19,7 +19,6 @@ module T
     end
 
     def collect_with_max_id(collection=[], max_id=nil, &block)
-      require 'retryable'
       array = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
         yield max_id
       end
@@ -31,7 +30,7 @@ module T
     def collect_with_number(number, key, &block)
       opts = {}
       opts[key] = MAX_NUM_RESULTS
-      statuses = collect_with_max_id do |max_id|
+      collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
         opts[key] = number unless number >= MAX_NUM_RESULTS
         if number > 0
@@ -50,5 +49,14 @@ module T
       collect_with_number(rpp, :rpp, &block)
     end
 
+    def collect_with_page(collection=[], page=1, &block)
+      array = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+        yield page
+      end
+      return collection if array.nil?
+      collection += array
+      array.empty? ? collection.flatten.uniq : collect_with_page(collection, page + 1, &block)
+    end
+
   end
 end

data/lib/t/core_ext/string.rb

@@ -8,7 +8,7 @@ class String
     self.tr('@', '')
   end
 
-  alias_method :old_to_i, :to_i
+  alias old_to_i to_i
 
   def to_i(base=10)
     self.tr(',', '').old_to_i(base)

data/lib/t/delete.rb

@@ -1,39 +1,29 @@
 require 'thor'
 require 'twitter'
+require 't/rcfile'
+require 't/requestable'
+require 't/utils'
 
 module T
-  autoload :RCFile, 't/rcfile'
-  autoload :Requestable, 't/requestable'
   class Delete < Thor
     include T::Requestable
+    include T::Utils
 
     check_unknown_options!
 
     def initialize(*)
+      @rcfile = T::RCFile.instance
       super
-      @rcfile = RCFile.instance
     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
     def block(user, *users)
-      users.unshift(user)
-      require 't/core_ext/string'
-      if options['id']
-        users.map!(&:to_i)
-      else
-        users.map!(&:strip_ats)
+      users, number = fetch_users(users.unshift(user), options) do |users|
+        client.unblock(users)
       end
-      require 't/core_ext/enumerable'
-      require 'retryable'
-      users = users.threaded_map do |user|
-        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.unblock(user)
-        end
-      end
-      number = users.length
-      say "@#{@rcfile.active_profile[0]} unblocked #{number} #{number == 1 ? 'user' : 'users'}."
+      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."
     end
@@ -44,14 +34,20 @@ module T
       direct_message_ids.unshift(direct_message_id)
       require 't/core_ext/string'
       direct_message_ids.map!(&:to_i)
-      direct_message_ids.each do |direct_message_id|
-        unless options['force']
+      if options['force']
+        direct_messages = client.direct_message_destroy(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)
           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)
+          say "@#{@rcfile.active_profile[0]} deleted the direct message sent to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\""
         end
-        direct_message = client.direct_message_destroy(direct_message_id)
-        say "@#{@rcfile.active_profile[0]} deleted the direct message sent to @#{direct_message.recipient.screen_name}: \"#{direct_message.text}\""
       end
+
     end
     map %w(d m) => :dm
 
@@ -61,13 +57,18 @@ module T
       status_ids.unshift(status_id)
       require 't/core_ext/string'
       status_ids.map!(&:to_i)
-      status_ids.each do |status_id|
-        unless options['force']
+      if options['force']
+        statuses = client.unfavorite(status_ids)
+        statuses.each do |status|
+          say "@#{@rcfile.active_profile[0]} unfavorited @#{status.from_user}'s status: \"#{status.full_text}\""
+        end
+      else
+        status_ids.each do |status_id|
           status = client.status(status_id, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to remove @#{status.from_user}'s status: \"#{status.full_text}\" from your favorites? [y/N]"
+          client.unfavorite(status_id)
+          say "@#{@rcfile.active_profile[0]} unfavorited @#{status.from_user}'s status: \"#{status.full_text}\""
         end
-        status = client.unfavorite(status_id)
-        say "@#{@rcfile.active_profile[0]} unfavorited @#{status.from_user}'s status: \"#{status.full_text}\""
       end
     end
     map %w(fave favourite) => :favorite
@@ -94,13 +95,18 @@ module T
       status_ids.unshift(status_id)
       require 't/core_ext/string'
       status_ids.map!(&:to_i)
-      status_ids.each do |status_id|
-        unless options['force']
+      if options['force']
+        statuses = client.status_destroy(status_ids, :trim_user => true)
+        statuses.each do |status|
+          say "@#{@rcfile.active_profile[0]} deleted the status: \"#{status.full_text}\""
+        end
+      else
+        status_ids.each do |status_id|
           status = client.status(status_id, :include_my_retweet => false, :trim_user => true)
           return unless yes? "Are you sure you want to permanently delete @#{status.from_user}'s status: \"#{status.full_text}\"? [y/N]"
+          client.status_destroy(status_id, :trim_user => true)
+          say "@#{@rcfile.active_profile[0]} deleted the status: \"#{status.full_text}\""
         end
-        status = client.status_destroy(status_id, :trim_user => true)
-        say "@#{@rcfile.active_profile[0]} deleted the status: \"#{status.full_text}\""
       end
     end
     map %w(post tweet update) => :status

data/lib/t/list.rb

@@ -1,50 +1,37 @@
 require 'thor'
 require 'twitter'
+require 't/collectable'
+require 't/printable'
+require 't/rcfile'
+require 't/requestable'
+require 't/utils'
 
 module T
-  autoload :Collectable, 't/collectable'
-  autoload :FormatHelpers, 't/format_helpers'
-  autoload :Printable, 't/printable'
-  autoload :RCFile, 't/rcfile'
-  autoload :Requestable, 't/requestable'
   class List < Thor
     include T::Collectable
     include T::Printable
     include T::Requestable
-    include T::FormatHelpers
+    include T::Utils
 
     DEFAULT_NUM_RESULTS = 20
-    MAX_SCREEN_NAME_SIZE = 20
     MAX_USERS_PER_LIST = 500
     MAX_USERS_PER_REQUEST = 100
 
     check_unknown_options!
 
     def initialize(*)
+      @rcfile = T::RCFile.instance
       super
-      @rcfile = RCFile.instance
     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."
     def add(list, user, *users)
-      users.unshift(user)
-      require 't/core_ext/string'
-      if options['id']
-        users.map!(&:to_i)
-      else
-        users.map!(&:strip_ats)
-      end
-      require 'active_support/core_ext/array/grouping'
-      require 't/core_ext/enumerable'
-      require 'retryable'
-      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, user_id_group)
-        end
+      users, number = fetch_users(users.unshift(user), options) do |users|
+        client.list_add_members(list, users)
+        users
       end
-      number = users.length
-      say "@#{@rcfile.active_profile[0]} added #{number} #{number == 1 ? 'member' : 'members'} to the list \"#{list}\"."
+      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."
@@ -65,18 +52,7 @@ module T
     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.active_profile[0]
-      else
-        require 't/core_ext/string'
-        owner = if options['id']
-          owner.to_i
-        else
-          owner.strip_ats
-        end
-      end
+      owner, list = extract_owner(list, options)
       list = client.list(owner, list)
       if options['csv']
         require 'csv'
@@ -102,29 +78,13 @@ module T
 
     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 "followers", :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 => "-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 => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    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 "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 = list.split('/')
-      if list.nil?
-        list = owner
-        owner = @rcfile.active_profile[0]
-      else
-        require 't/core_ext/string'
-        owner = if options['id']
-          owner.to_i
-        else
-          owner.strip_ats
-        end
-      end
+      owner, list = extract_owner(list, options)
       users = collect_with_cursor do |cursor|
         client.list_members(owner, list, :cursor => cursor, :skip_status => true)
       end
@@ -134,23 +94,11 @@ module T
     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)
-      require 't/core_ext/string'
-      if options['id']
-        users.map!(&:to_i)
-      else
-        users.map!(&:strip_ats)
+      users, number = fetch_users(users.unshift(user), options) do |users|
+        client.list_remove_members(list, users)
+        users
       end
-      require 'active_support/core_ext/array/grouping'
-      require 't/core_ext/enumerable'
-      require 'retryable'
-      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, user_id_group)
-        end
-      end
-      number = users.length
-      say "@#{@rcfile.active_profile[0]} removed #{number} #{number == 1 ? 'member' : 'members'} from the list \"#{list}\"."
+      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."
@@ -166,18 +114,7 @@ module T
     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 = list.split('/')
-      if list.nil?
-        list = owner
-        owner = @rcfile.active_profile[0]
-      else
-        require 't/core_ext/string'
-        owner = if options['id']
-          owner.to_i
-        else
-          owner.strip_ats
-        end
-      end
+      owner, list = extract_owner(list, options)
       per_page = options['number'] || DEFAULT_NUM_RESULTS
       statuses = collect_with_per_page(per_page) do |opts|
         client.list_timeline(owner, list, opts)

data/lib/t/printable.rb

@@ -1,9 +1,9 @@
 module T
   module Printable
-    MAX_SCREEN_NAME_SIZE = 20
     LIST_HEADINGS = ["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"]
     STATUS_HEADINGS = ["ID", "Posted at", "Screen name", "Text"]
-    USER_HEADINGS = ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]
+    USER_HEADINGS = ["ID", "Since", "Last tweeted at", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]
+    MONTH_IN_SECONDS = 2592000
 
   private
 
@@ -17,20 +17,19 @@ module T
     end
 
     def build_long_user(user)
-      [user.id, ls_formatted_time(user), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, "@#{user.screen_name}", user.name]
+      [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]
     end
 
     def csv_formatted_time(object, key=:created_at)
+      return nil if object.nil?
       time = object.send(key.to_sym)
       time.utc.strftime("%Y-%m-%d %H:%M:%S %z")
     end
 
     def ls_formatted_time(object, key=:created_at)
+      return "" if object.nil?
       time = T.local_time(object.send(key.to_sym))
-      require 'active_support/core_ext/date/calculations'
-      require 'active_support/core_ext/integer/time'
-      require 'active_support/core_ext/numeric/time'
-      if time > 6.months.ago
+      if time > Time.now - MONTH_IN_SECONDS * 6
         time.strftime("%b %e %H:%M")
       else
         time.strftime("%b %e  %Y")
@@ -53,20 +52,22 @@ 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), user.statuses_count, user.favourites_count, user.listed_count, user.friends_count, user.followers_count, user.screen_name, user.name].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].to_csv
     end
 
     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 = 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']
       lists.reverse! if options['reverse']
       if options['csv']
         require 'csv'
@@ -112,19 +113,19 @@ module T
       end
     end
 
-    def print_status(status)
+    def print_message(from_user, message)
       if STDOUT.tty? && !options['no-color']
-        say("   @#{status.from_user}", [:bold, :yellow])
+        say("   @#{from_user}", [:bold, :yellow])
       else
-        say("   @#{status.from_user}")
+        say("   @#{from_user}")
       end
       require 'htmlentities'
-      print_wrapped(HTMLEntities.new.decode(status.full_text), :indent => 3)
+      print_wrapped(HTMLEntities.new.decode(message), :indent => 3)
       say
     end
 
     def print_statuses(statuses)
-      statuses.reverse! if options['reverse'] || options['stream']
+      statuses.reverse! if options['reverse']
       if options['csv']
         require 'csv'
         require 'fastercsv' unless Array.new.respond_to?(:to_csv)
@@ -140,26 +141,30 @@ module T
         print_table_with_headings(array, STATUS_HEADINGS, format)
       else
         statuses.each do |status|
-          print_status(status)
+          print_message(status.user.screen_name, status.full_text)
         end
       end
     end
 
     def print_users(users)
-      users = users.sort_by{|user| user.screen_name.downcase} unless options['unsorted']
-      if options['posted']
-        users = users.sort_by{|user| user.created_at}
-      elsif options['favorites']
-        users = users.sort_by{|user| user.favourites_count}
-      elsif options['followers']
-        users = users.sort_by{|user| user.followers_count}
-      elsif options['friends']
-        users = users.sort_by{|user| user.friends_count}
-      elsif options['listed']
-        users = users.sort_by{|user| user.listed_count}
-      elsif options['tweets']
-        users = users.sort_by{|user| user.statuses_count}
-      end
+      users = case options['sort']
+      when 'favorites'
+        users.sort_by{|user| user.favourites_count}
+      when 'followers'
+        users.sort_by{|user| user.followers_count}
+      when 'friends'
+        users.sort_by{|user| user.friends_count}
+      when 'listed'
+        users.sort_by{|user| user.listed_count}
+      when 'since'
+        users.sort_by{|user| user.created_at}
+      when 'tweets'
+        users.sort_by{|user| user.statuses_count}
+      when 'tweeted'
+        users.sort_by{|user| user.status.created_at rescue 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'