t 0.9.7 → 0.9.8

data/lib/t/delete.rb

@@ -1,11 +1,8 @@
-require 'retryable'
-require 't/core_ext/enumerable'
-require 't/core_ext/string'
-require 't/rcfile'
-require 't/requestable'
 require 'thor'
 
 module T
+  autoload :RCFile, 't/rcfile'
+  autoload :Requestable, 't/requestable'
   class Delete < Thor
     include T::Requestable
 
@@ -21,11 +18,15 @@ module T
     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)
       end
+      require 't/core_ext/enumerable'
+      require 'retryable'
+      require 'twitter'
       users = users.threaded_map do |user|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.unblock(user)
@@ -41,6 +42,7 @@ module T
     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)
       direct_message_ids.each do |direct_message_id|
         unless options['force']
@@ -57,6 +59,7 @@ module T
     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'
       status_ids.map!(&:to_i)
       status_ids.each do |status_id|
         unless options['force']
@@ -73,7 +76,10 @@ module T
     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']
+      if options['id']
+        require 't/core_ext/string'
+        list = list.to_i
+      end
       list = client.list(list)
       unless options['force']
         return unless yes? "Are you sure you want to permanently delete the list \"#{list.name}\"? [y/N]"
@@ -86,6 +92,7 @@ module T
     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)
       status_ids.each do |status_id|
         unless options['force']

data/lib/t/format_helpers.rb

@@ -1,61 +1,61 @@
-require 'date'
-
 module T
   module FormatHelpers
-    private
+  private
 
     # https://github.com/rails/rails/blob/bd8a970/actionpack/lib/action_view/helpers/date_helper.rb
-    def distance_of_time_in_words_to_now(from_time)
-      to_time = Time.now
+    def distance_of_time_in_words(from_time, to_time=Time.now)
       seconds = (to_time - from_time).abs
-      case (minutes = seconds / 60)
-      when 0             then 'less than a minute'
-      when 1             then '1 minute'
-      when 2..44         then '%d minutes' % minutes
-      when 45..89        then 'about 1 hour'
-      when 90..1439      then 'about %d hours' % (minutes.to_f / 60.0).round
-      when 1440..2519    then '1 day'
-      when 2520..43199   then '%d days' % (minutes.to_f / 1440.0).round
-      when 43200..86399  then 'about 1 month'
-      when 86400..525599 then '%d months' % (minutes.to_f / 43200.0).round
-      else
-        fyear = from_time.year
-        fyear += 1 if from_time.month >= 3
-        tyear = to_time.year
-        tyear -= 1 if to_time.month < 3
-        leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
-        minute_offset_for_leap_year = leap_years * 1440
-        minutes_with_offset         = minutes - minute_offset_for_leap_year
-        remainder                   = (minutes_with_offset % 525600)
-        distance_in_years           = (minutes_with_offset / 525600)
-        if remainder < 131400
-          pluralize distance_in_years, 'about %d year'
-        elsif remainder < 394200
-          pluralize distance_in_years, 'over %d year'
-        else
-          pluralize distance_in_years + 1, 'almost %d year'
+      minutes = seconds / 60
+      case minutes
+      when 0...1
+        case seconds
+        when 0...1
+          'a split second'
+        when 1...2
+          'a second'
+        when 2...60
+          '%d seconds' % seconds
         end
-      end
-    end
-    alias time_ago_in_words distance_of_time_in_words_to_now
-
-    def pluralize(count, word)
-      word += 's' if count.to_i > 1
-      if word.include? '%'
-        word % count
+      when 1...2
+        'a minute'
+      when 2...60
+        '%d minutes' % minutes
+      when 60...120
+        'an hour'
+      # 120 minutes up to 23.5 hours
+      when 120...1410
+        '%d hours' % (minutes.to_f / 60.0).round
+      # 23.5 hours up to 48 hours
+      when 1410...2880
+        'a day'
+      # 48 hours up to 29.5 days
+      when 2880...42480
+        '%d days' % (minutes.to_f / 1440.0).round
+      # 29.5 days up to 60 days
+      when 42480...86400
+        'a month'
+      # 60 days up to 11.5 months
+      when 86400...503700
+        '%d months' % (minutes.to_f / 43800.0).round
+      # 11.5 months up to 2 years
+      when 503700...1051200
+        'a year'
       else
-        "%d #{word}" % count
+        '%d years' % (minutes.to_f / 525600.0).round
       end
     end
+    alias :time_ago_in_words :distance_of_time_in_words
+    alias :time_from_now_in_words :distance_of_time_in_words
 
     def strip_tags(html)
       html.gsub(/<.+?>/, '')
     end
 
-    def number_with_delimiter(num)
-      digits = num.to_s.split(//)
-      groups = digits.reverse.in_groups_of(3).map {|g| g.join('') }
-      groups.join(',').reverse
+    def number_with_delimiter(number, delimiter=",")
+      digits = number.to_s.split(//)
+      require 'active_support/core_ext/array/grouping'
+      groups = digits.reverse.in_groups_of(3).map{|g| g.join('')}
+      groups.join(delimiter).reverse
     end
 
   end

data/lib/t/list.rb

@@ -1,18 +1,11 @@
-require 'active_support/core_ext/array/grouping'
-require 't/format_helpers'
-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'
-require 't/core_ext/string'
-require 't/printable'
-require 't/rcfile'
-require 't/requestable'
 require 'thor'
 
 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
@@ -35,11 +28,16 @@ module T
     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'
+      require 'twitter'
       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)
@@ -57,8 +55,8 @@ module T
 
     desc "create LIST [DESCRIPTION]", "Create a new list."
     method_option "private", :aliases => "-p", :type => :boolean
-    def create(list, description="")
-      opts = description.blank? ? {} : {:description => description}
+    def create(list, description=nil)
+      opts = description ? {:description => description} : {}
       opts.merge!(:mode => 'private') if options['private']
       client.list_create(list, opts)
       say "@#{@rcfile.active_profile[0]} created the list \"#{list}\"."
@@ -72,6 +70,7 @@ module T
         list = owner
         owner = @rcfile.active_profile[0]
       else
+        require 't/core_ext/string'
         owner = if options['id']
           owner.to_i
         else
@@ -80,6 +79,8 @@ module T
       end
       list = client.list(owner, list)
       if options['csv']
+        require 'csv'
+        require 'fastercsv' unless Array.new.respond_to?(: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, "https://twitter.com#{list.uri}"].to_csv
       else
@@ -117,6 +118,7 @@ module T
         list = owner
         owner = @rcfile.active_profile[0]
       else
+        require 't/core_ext/string'
         owner = if options['id']
           owner.to_i
         else
@@ -133,11 +135,16 @@ module T
     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)
       end
+      require 'active_support/core_ext/array/grouping'
+      require 't/core_ext/enumerable'
+      require 'retryable'
+      require 'twitter'
       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)
@@ -165,6 +172,7 @@ module T
         list = owner
         owner = @rcfile.active_profile[0]
       else
+        require 't/core_ext/string'
         owner = if options['id']
           owner.to_i
         else

data/lib/t/printable.rb

@@ -1,11 +1,3 @@
-require 'csv'
-# 'fastercsv' required on Ruby versions < 1.9
-require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-require 'htmlentities'
-require 't/core_ext/kernel'
-require 'thor/shell/color'
-require 'time'
-
 module T
   module Printable
     MAX_SCREEN_NAME_SIZE = 20
@@ -13,160 +5,179 @@ module T
     STATUS_HEADINGS = ["ID", "Posted at", "Screen name", "Text"]
     USER_HEADINGS = ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]
 
-    private
-
-      def build_long_list(list)
-        [list.id, ls_formatted_time(list), "@#{list.user.screen_name}", list.slug, list.member_count, list.subscriber_count, list.mode, list.description]
+  private
+
+    def build_long_list(list)
+      [list.id, ls_formatted_time(list), "@#{list.user.screen_name}", list.slug, list.member_count, list.subscriber_count, list.mode, list.description]
+    end
+
+    def build_long_status(status)
+      require 'htmlentities'
+      [status.id, ls_formatted_time(status), "@#{status.from_user}", HTMLEntities.new.decode(status.full_text).gsub(/\n+/, ' ')]
+    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]
+    end
+
+    def csv_formatted_time(object, key=:created_at)
+      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)
+      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
+        time.strftime("%b %e %H:%M")
+      else
+        time.strftime("%b %e  %Y")
       end
-
-      def build_long_status(status)
-        [status.id, ls_formatted_time(status), "@#{status.from_user}", HTMLEntities.new.decode(status.full_text).gsub(/\n+/, ' ')]
-      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]
+    end
+
+    def print_csv_list(list)
+      require 'csv'
+      require 'fastercsv' unless Array.new.respond_to?(:to_csv)
+      say [list.id, csv_formatted_time(list), list.user.screen_name, list.slug, list.member_count, list.subscriber_count, list.mode, list.description].to_csv
+    end
+
+    def print_csv_status(status)
+      require 'csv'
+      require 'fastercsv' unless Array.new.respond_to?(:to_csv)
+      require 'htmlentities'
+      say [status.id, csv_formatted_time(status), status.from_user, HTMLEntities.new.decode(status.full_text)].to_csv
+    end
+
+    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
+    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
-
-      def csv_formatted_time(object, key=:created_at)
-        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)
-        time = T.local_time object.send(key.to_sym)
-        if time > 6.months.ago
-          time.strftime("%b %e %H:%M")
-        else
-          time.strftime("%b %e  %Y")
+      lists.reverse! if options['reverse']
+      if options['csv']
+        require 'csv'
+        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
+        say LIST_HEADINGS.to_csv unless lists.empty?
+        lists.each do |list|
+          print_csv_list(list)
         end
-      end
-
-      def print_csv_list(list)
-        say [list.id, csv_formatted_time(list), list.user.screen_name, list.slug, list.member_count, list.subscriber_count, list.mode, list.description].to_csv
-      end
-
-      def print_csv_status(status)
-        say [status.id, csv_formatted_time(status), status.from_user, HTMLEntities.new.decode(status.full_text)].to_csv
-      end
-
-      def print_csv_user(user)
-        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
-      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.reverse! if options['reverse']
-        if options['csv']
-          say LIST_HEADINGS.to_csv unless lists.empty?
-          lists.each do |list|
-            print_csv_list(list)
-          end
-        elsif options['long']
-          array = lists.map do |list|
-            build_long_list(list)
-          end
-          format = options['format'] || LIST_HEADINGS.size.times.map{"%s"}
-          print_table_with_headings(array, LIST_HEADINGS, format)
-        else
-          print_attribute(lists, :full_name)
+      elsif options['long']
+        array = lists.map do |list|
+          build_long_list(list)
         end
+        format = options['format'] || LIST_HEADINGS.size.times.map{"%s"}
+        print_table_with_headings(array, LIST_HEADINGS, format)
+      else
+        print_attribute(lists, :full_name)
       end
-
-      def print_attribute(array, attribute)
-        if STDOUT.tty?
-          print_in_columns(array.map(&attribute.to_sym))
-        else
-          array.each do |element|
-            say element.send(attribute.to_sym)
-          end
+    end
+
+    def print_attribute(array, attribute)
+      if STDOUT.tty?
+        print_in_columns(array.map(&attribute.to_sym))
+      else
+        array.each do |element|
+          say element.send(attribute.to_sym)
         end
       end
-
-      def print_table_with_headings(array, headings, format)
-        return if array.flatten.empty?
-        if STDOUT.tty?
-          array.unshift(headings)
-          array.map! do |row|
-            row.each_with_index.map do |element, index|
-              Kernel.send(element.class.name.to_sym, format[index] % element)
-            end
+    end
+
+    def print_table_with_headings(array, headings, format)
+      return if array.flatten.empty?
+      if STDOUT.tty?
+        array.unshift(headings)
+        require 't/core_ext/kernel'
+        array.map! do |row|
+          row.each_with_index.map do |element, index|
+            Kernel.send(element.class.name.to_sym, format[index] % element)
           end
-          print_table(array, :truncate => true)
-        else
-          print_table(array)
         end
+        print_table(array, :truncate => true)
+      else
+        print_table(array)
       end
+    end
 
-      def print_status(status)
-        if STDOUT.tty? && !options['no-color']
-          say("   @#{status.from_user}", [:bold, :yellow])
-        else
-          say("   @#{status.from_user}")
-        end
-        print_wrapped(HTMLEntities.new.decode(status.full_text), :indent => 3)
-        say
+    def print_status(status)
+      if STDOUT.tty? && !options['no-color']
+        say("   @#{status.from_user}", [:bold, :yellow])
+      else
+        say("   @#{status.from_user}")
       end
-
-      def print_statuses(statuses)
-        statuses.reverse! if options['reverse'] || options['stream']
-        if options['csv']
-          say STATUS_HEADINGS.to_csv unless statuses.empty?
-          statuses.each do |status|
-            print_csv_status(status)
-          end
-        elsif options['long']
-          array = statuses.map do |status|
-            build_long_status(status)
-          end
-          format = options['format'] || STATUS_HEADINGS.size.times.map{"%s"}
-          print_table_with_headings(array, STATUS_HEADINGS, format)
-        else
-          statuses.each do |status|
-            print_status(status)
-          end
+      require 'htmlentities'
+      print_wrapped(HTMLEntities.new.decode(status.full_text), :indent => 3)
+      say
+    end
+
+    def print_statuses(statuses)
+      statuses.reverse! if options['reverse'] || options['stream']
+      if options['csv']
+        require 'csv'
+        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
+        say STATUS_HEADINGS.to_csv unless statuses.empty?
+        statuses.each do |status|
+          print_csv_status(status)
+        end
+      elsif options['long']
+        array = statuses.map do |status|
+          build_long_status(status)
+        end
+        format = options['format'] || STATUS_HEADINGS.size.times.map{"%s"}
+        print_table_with_headings(array, STATUS_HEADINGS, format)
+      else
+        statuses.each do |status|
+          print_status(status)
         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
+
+    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.reverse! if options['reverse']
+      if options['csv']
+        require 'csv'
+        require 'fastercsv' unless Array.new.respond_to?(:to_csv)
+        say USER_HEADINGS.to_csv unless users.empty?
+        users.each do |user|
+          print_csv_user(user)
         end
-        users.reverse! if options['reverse']
-        if options['csv']
-          say USER_HEADINGS.to_csv unless users.empty?
-          users.each do |user|
-            print_csv_user(user)
-          end
-        elsif options['long']
-          array = users.map do |user|
-            build_long_user(user)
-          end
-          format = options['format'] || USER_HEADINGS.size.times.map{"%s"}
-          print_table_with_headings(array, USER_HEADINGS, format)
-        else
-          print_attribute(users, :screen_name)
+      elsif options['long']
+        array = users.map do |user|
+          build_long_user(user)
         end
+        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