t 0.9.6 → 0.9.7

data/README.md

@@ -1,4 +1,9 @@
+# [![Application icon](https://github.com/sferik/t/raw/master/icon/t.png)][icon]
+
+[icon]: https://github.com/sferik/t/raw/master/icon/t.png
+
 # Twitter CLI [![Build Status](https://secure.travis-ci.org/sferik/t.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/sferik/t.png?travis)][gemnasium] [![Click here to make a donation to T](http://www.pledgie.com/campaigns/17330.png)][pledgie]
+
 ### A command-line power tool for Twitter.
 
 The CLI takes syntactic cues from the [Twitter SMS commands][sms], however it
@@ -7,12 +12,10 @@ offers vastly more commands and capabilities than are available via SMS.
 [travis]: http://travis-ci.org/sferik/t
 [gemnasium]: https://gemnasium.com/sferik/t
 [pledgie]: http://www.pledgie.com/campaigns/17330
-[gem]: https://rubygems.org/gems/twitter
 [sms]: https://support.twitter.com/articles/14020-twitter-sms-command
 
 ## Installation
-    # Requires Ruby :)
-    gem install t
+    gem install t # Requires Ruby :)
 
 ## Configuration
 
@@ -56,7 +59,7 @@ and consumer key pair, like this:
 
 Account information is stored in a YAML-formatted file located at `~/.trc`.
 
-**Note**: Anyone with access to this file can masquerade as you on Twitter, so
+**Note**: Anyone with access to this file can impersonate you on Twitter, so
 it's important to keep it secure, just as you would treat your SSH private key.
 For this reason, the file is hidden and has the permission bits set to `0600`.
 
@@ -114,7 +117,7 @@ example, send a user a direct message only if he already follows you:
     t leaders | xargs t unfollow
 
 ### Twitter roulette: randomly follow someone who follows you (who you don't already follow)
-    t disciples | shuf | head -1 | xargs t follow
+    t groupies | shuf | head -1 | xargs t follow
 
 ### Favorite the last 10 tweets that mention you
     t mentions -n 10 -l | awk '{print $1}' | xargs t favorite
@@ -163,6 +166,23 @@ example, send a user a direct message only if he already follows you:
 
 [search]: https://dev.twitter.com/docs/using-search
 
+# Using T for Backup
+
+[@jphpsf][jphpsf] wrote a [blog post][blog] explaining how to use `t` to backup
+your Twitter account.
+
+[jphpsf]: https://github.com/jphpsf
+[blog]: http://blog.jphpsf.com/2012/05/07/backing-up-your-twitter-account-with-t/
+
+`t` was also mentioned on [an episode of the Ruby 5 podcast][ruby5].
+
+[ruby5]: http://ruby5.envylabs.com/episodes/273-episode-269-may-4th-2012/stories/2400-t-command-line-power-tool-for-twitter
+
+If you discuss `t` in a blog post or podcast, [let me know][email] and I'll
+link it here.
+
+[email]: mailto:sferik@gmail.com
+
 ## Relationship Terminology
 
 There is some ambiguity in the terminology used to describe relationships on
@@ -176,7 +196,7 @@ used by `t`:
                               |     YOU FOLLOW THEM     |  YOU DON'T FOLLOW THEM  |
      _________________________|_________________________|_________________________|_________________________
     |                         |                         |                         |                         |
-    |     THEY FOLLOW YOU     |         friends         |        disciples        |        followers        |
+    |     THEY FOLLOW YOU     |         friends         |        groupies         |        followers        |
     |_________________________|_________________________|_________________________|_________________________|
     |                         |                         |
     |  THEY DON'T FOLLOW YOU  |         leaders         |
@@ -195,6 +215,7 @@ version 0.5.0, when it was [removed][]. This project is offered as a sucessor
 to that effort, however it is a clean room implementation that contains none of
 the original code.
 
+[gem]: https://rubygems.org/gems/twitter
 [removed]: https://github.com/jnunemaker/twitter/commit/dd2445e3e2c97f38b28a3f32ea902536b3897adf
 ![History](https://github.com/sferik/t/raw/master/screenshots/history.png)
 
@@ -253,9 +274,6 @@ implementations:
 * Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
-* [Rubinius][]
-
-[rubinius]: http://rubini.us/
 
 If something doesn't work on one of these Ruby versions, it's a bug.
 
@@ -272,5 +290,6 @@ of a major release, support for that Ruby version may be dropped.
 
 ## Copyright
 Copyright (c) 2011 Erik Michaels-Ober. See [LICENSE][] for details.
-
+Application icon by [@nvk][nvk].
 [license]: https://github.com/sferik/t/blob/master/LICENSE.md
+[nvk]: http://rodolfonovak.com

data/bin/t

@@ -12,34 +12,13 @@ begin
 rescue Interrupt
   pute "Quitting..."
   exit 1
-rescue Twitter::Error::BadRequest => error
-  pute error.message
-  exit 400
 rescue OAuth::Unauthorized
   pute "Authorization failed"
-  exit 401
+  exit 1
 rescue Twitter::Error::Unauthorized => error
   pute "#{error.message} Run `#{$0} authorize --consumer-key=CONSUMER_KEY --consumer-secret=CONSUMER_SECRET` to authorize."
-  exit 401
-rescue Twitter::Error::Forbidden => error
-  pute error.message
-  exit 403
-rescue Twitter::Error::NotFound => error
-  pute error.message
-  exit 404
-rescue Twitter::Error::NotAcceptable => error
-  pute error.message
-  exit 406
-rescue Twitter::Error::EnhanceYourCalm => error
-  pute error.message
-  exit 420
-rescue Twitter::Error::InternalServerError => error
-  pute error.message
-  exit 500
-rescue Twitter::Error::BadGateway => error
-  pute error.message
-  exit 502
-rescue Twitter::Error::ServiceUnavailable => error
+  exit 1
+rescue Twitter::Error => error
   pute error.message
-  exit 503
+  exit 1
 end

data/lib/t/cli.rb

@@ -1,8 +1,8 @@
-require 'action_view'
 require 'active_support/core_ext/array/grouping'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/integer/time'
 require 'active_support/core_ext/numeric/time'
+require 't/format_helpers'
 require 'csv'
 # 'fastercsv' required on Ruby versions < 1.9
 require 'fastercsv' unless Array.new.respond_to?(:to_csv)
@@ -27,17 +27,17 @@ require 'yaml'
 
 module T
   class CLI < Thor
-    include ActionView::Helpers::DateHelper
-    include ActionView::Helpers::NumberHelper
-    include ActionView::Helpers::TextHelper
     include T::Authorizable
     include T::Collectable
     include T::Printable
     include T::Requestable
+    include T::FormatHelpers
 
     DEFAULT_NUM_RESULTS = 20
     MAX_SCREEN_NAME_SIZE = 20
     MAX_USERS_PER_REQUEST = 100
+    DIRECT_MESSAGE_HEADINGS = ["ID", "Posted at", "Screen name", "Text"]
+    TREND_HEADINGS = ["WOEID", "Parent ID", "Type", "Name", "Country"]
 
     check_unknown_options!
 
@@ -141,7 +141,8 @@ module T
         array = direct_messages.map do |direct_message|
           [direct_message.id, ls_formatted_time(direct_message), "@#{direct_message.sender.screen_name}", HTMLEntities.new.decode(direct_message.text).gsub(/\n+/, ' ')]
         end
-        print_table_with_headings(array, DIRECT_MESSAGE_HEADINGS)
+        format = options['format'] || DIRECT_MESSAGE_HEADINGS.size.times.map{"%s"}
+        print_table_with_headings(array, DIRECT_MESSAGE_HEADINGS, format)
       else
         direct_messages.each do |direct_message|
           say "#{direct_message.sender.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{direct_message.text.gsub(/\n+/, ' ')} (#{time_ago_in_words(direct_message.created_at)} ago)"
@@ -170,7 +171,8 @@ module T
         array = direct_messages.map do |direct_message|
           [direct_message.id, ls_formatted_time(direct_message), "@#{direct_message.recipient.screen_name}", HTMLEntities.new.decode(direct_message.text).gsub(/\n+/, ' ')]
         end
-        print_table_with_headings(array, DIRECT_MESSAGE_HEADINGS)
+        format = options['format'] || DIRECT_MESSAGE_HEADINGS.size.times.map{"%s"}
+        print_table_with_headings(array, DIRECT_MESSAGE_HEADINGS, format)
       else
         direct_messages.each do |direct_message|
           say "#{direct_message.recipient.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{direct_message.text.gsub(/\n+/, ' ')} (#{time_ago_in_words(direct_message.created_at)} ago)"
@@ -179,7 +181,7 @@ module T
     end
     map %w(directmessagessent sent_messages sentmessages sms) => :direct_messages_sent
 
-    desc "disciples [USER]", "Returns the list of people who follow you but you don't follow back."
+    desc "groupies [USER]", "Returns the list of people who follow you but you don't follow back."
     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 number of favorites."
     method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
@@ -191,7 +193,7 @@ module T
     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 number of Tweets."
     method_option "unsorted", :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
-    def disciples(user=nil)
+    def groupies(user=nil)
       if user
         user = if options['id']
           user.to_i
@@ -213,6 +215,7 @@ module T
       end.flatten
       print_users(users)
     end
+    map %w(disciples) => :groupies
 
     desc "dm USER MESSAGE", "Sends that person a Direct Message."
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
@@ -288,10 +291,10 @@ module T
     desc "favorite STATUS_ID [STATUS_ID...]", "Marks Tweets as favorites."
     def favorite(status_id, *status_ids)
       status_ids.unshift(status_id)
-      status_ids.map!(&:strip_commas)
+      status_ids.map!(&:to_i)
       favorites = status_ids.threaded_map do |status_id|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.favorite(status_id.to_i)
+          client.favorite(status_id)
         end
       end
       number = favorites.length
@@ -546,7 +549,7 @@ module T
         array = []
         array << ["Hourly limit", number_with_delimiter(rate_limit_status.hourly_limit)]
         array << ["Remaining hits", number_with_delimiter(rate_limit_status.remaining_hits)]
-        array << ["Reset time", ls_formatted_time(rate_limit_status, :reset_time)]
+        array << ["Reset time", "#{ls_formatted_time(rate_limit_status, :reset_time)} (#{distance_of_time_in_words_to_now(rate_limit_status.reset_time)} from now)"]
         print_table(array)
       end
     end
@@ -556,7 +559,6 @@ module T
     method_option "all", :aliases => "-a", :type => "boolean", :default => false, :desc => "Reply to all users mentioned in the Tweet."
     method_option "location", :aliases => "-l", :type => :boolean, :default => false
     def reply(status_id, message)
-      status_id = status_id.strip_commas
       status = client.status(status_id.to_i, :include_my_retweet => false)
       users = Array(status.from_user)
       if options['all']
@@ -564,7 +566,7 @@ module T
         major, minor, patch = RUBY_VERSION.split('.')
         $KCODE='u' if major.to_i == 1 && minor.to_i < 9
         require 'twitter-text'
-        users += Twitter::Extractor.extract_mentioned_screen_names(status.text)
+        users += Twitter::Extractor.extract_mentioned_screen_names(status.full_text)
         users.uniq!
       end
       users.map!(&:prepend_at)
@@ -598,16 +600,16 @@ module T
     desc "retweet STATUS_ID [STATUS_ID...]", "Sends Tweets to your followers."
     def retweet(status_id, *status_ids)
       status_ids.unshift(status_id)
-      status_ids.map!(&:strip_commas)
+      status_ids.map!(&:to_i)
       retweets = status_ids.threaded_map do |status_id|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.retweet(status_id.to_i, :trim_user => true)
+          client.retweet(status_id, :trim_user => true)
         end
       end
       number = retweets.length
       say "@#{@rcfile.active_profile[0]} retweeted #{number} #{number == 1 ? 'tweet' : 'tweets'}."
       say
-      say "Run `#{File.basename($0)} delete status #{status_ids.join(' ')}` to undo."
+      say "Run `#{File.basename($0)} delete status #{retweets.map(&:id).join(' ')}` to undo."
     end
     map %w(rt) => :retweet
 
@@ -641,7 +643,6 @@ module T
     desc "status STATUS_ID", "Retrieves detailed information about a Tweet."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def status(status_id)
-      status_id = status_id.strip_commas
       status = client.status(status_id.to_i, :include_my_retweet => false)
       location = if status.place
         if status.place.name && status.place.attributes && status.place.attributes['street_address'] && status.place.attributes['locality'] && status.place.attributes['region'] && status.place.country
@@ -662,14 +663,13 @@ module T
       end
       if options['csv']
         say ["ID", "Text", "Screen name", "Posted at", "Location", "Retweets", "Source", "URL"].to_csv
-        say [status.id, HTMLEntities.new.decode(status.text), status.from_user, csv_formatted_time(status), location, status.retweet_count, strip_tags(status.source), "https://twitter.com/#{status.from_user}/status/#{status.id}"].to_csv
+        say [status.id, HTMLEntities.new.decode(status.full_text), status.from_user, csv_formatted_time(status), location, status.retweet_count, strip_tags(status.source), "https://twitter.com/#{status.from_user}/status/#{status.id}"].to_csv
       else
         array = []
         array << ["ID", status.id.to_s]
-        array << ["Text", HTMLEntities.new.decode(status.text).gsub(/\n+/, ' ')]
+        array << ["Text", HTMLEntities.new.decode(status.full_text).gsub(/\n+/, ' ')]
         array << ["Screen name", "@#{status.from_user}"]
-        posted_at = status.created_at > 6.months.ago ? status.created_at.strftime("%b %e %H:%M") : status.created_at.strftime("%b %e  %Y")
-        array << ["Posted at", posted_at]
+        array << ["Posted at", "#{ls_formatted_time(status)} (#{time_ago_in_words(status.created_at)} ago)"]
         array << ["Location", location] unless location.nil?
         array << ["Retweets", number_with_delimiter(status.retweet_count)]
         array << ["Source", strip_tags(status.source)]
@@ -757,7 +757,8 @@ module T
         array = places.map do |place|
           [place.woeid, place.parent_id, place.place_type, place.name, place.country]
         end
-        print_table_with_headings(array, TREND_HEADINGS)
+        format = options['format'] || TREND_HEADINGS.size.times.map{"%s"}
+        print_table_with_headings(array, TREND_HEADINGS, format)
       else
         print_attribute(places, :name)
       end
@@ -847,7 +848,7 @@ module T
         array << ["Location", user.location] unless user.location.nil?
         array << ["Status", user.following ? "Following" : "Not following"]
         array << ["Last update", "#{HTMLEntities.new.decode(user.status.text).gsub(/\n+/, ' ')} (#{time_ago_in_words(user.status.created_at)} ago)"] unless user.status.nil?
-        array << ["Since", ls_formatted_time(user)]
+        array << ["Since", "#{ls_formatted_time(user)} (#{time_ago_in_words(user.created_at)} ago)"]
         array << ["Tweets", number_with_delimiter(user.statuses_count)]
         array << ["Favorites", number_with_delimiter(user.favourites_count)]
         array << ["Listed", number_with_delimiter(user.listed_count)]

data/lib/t/core_ext/kernel.rb

@@ -0,0 +1,15 @@
+module Kernel
+
+  def Bignum(arg)
+    Integer(arg)
+  end
+
+  def Fixnum(arg)
+    Integer(arg)
+  end
+
+  def NilClass(arg)
+    nil
+  end
+
+end

data/lib/t/core_ext/string.rb

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

data/lib/t/delete.rb

@@ -41,13 +41,13 @@ 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)
-      direct_message_ids.map!(&:strip_commas)
+      direct_message_ids.map!(&:to_i)
       direct_message_ids.each do |direct_message_id|
         unless options['force']
-          direct_message = client.direct_message(direct_message_id.to_i)
+          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]"
         end
-        direct_message = client.direct_message_destroy(direct_message_id.to_i)
+        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
@@ -57,14 +57,14 @@ module T
     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.map!(&:to_i)
       status_ids.each do |status_id|
         unless options['force']
-          status = client.status(status_id.to_i, :include_my_retweet => false, :trim_user => true)
-          return unless yes? "Are you sure you want to remove @#{status.from_user}'s status: \"#{status.text}\" from your favorites? [y/N]"
+          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]"
         end
-        status = client.unfavorite(status_id.to_i)
-        say "@#{@rcfile.active_profile[0]} unfavorited @#{status.from_user}'s status: \"#{status.text}\""
+        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
@@ -86,14 +86,14 @@ module T
     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.map!(&:to_i)
       status_ids.each do |status_id|
         unless options['force']
-          status = client.status(status_id.to_i, :include_my_retweet => false, :trim_user => true)
-          return unless yes? "Are you sure you want to permanently delete @#{status.from_user}'s status: \"#{status.text}\"? [y/N]"
+          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]"
         end
-        status = client.status_destroy(status_id.to_i, :trim_user => true)
-        say "@#{@rcfile.active_profile[0]} deleted the status: \"#{status.text}\""
+        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/format_helpers.rb

@@ -0,0 +1,62 @@
+require 'date'
+
+module T
+  module FormatHelpers
+    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
+      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'
+        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
+      else
+        "%d #{word}" % count
+      end
+    end
+
+    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
+    end
+
+  end
+end

data/lib/t/list.rb

@@ -1,5 +1,5 @@
-require 'action_view'
 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)
@@ -14,10 +14,10 @@ require 'thor'
 
 module T
   class List < Thor
-    include ActionView::Helpers::DateHelper
     include T::Collectable
     include T::Printable
     include T::Requestable
+    include T::FormatHelpers
 
     DEFAULT_NUM_RESULTS = 20
     MAX_SCREEN_NAME_SIZE = 20
@@ -88,7 +88,7 @@ module T
         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)]
+        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"]
@@ -97,7 +97,7 @@ module T
         print_table(array)
       end
     end
-    map %w(detail) => :information
+    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."

data/lib/t/printable.rb

@@ -1,47 +1,43 @@
-require 'action_view'
 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
-    DIRECT_MESSAGE_HEADINGS = ["ID", "Posted at", "Screen name", "Text"]
-    LIST_HEADINGS =["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"]
+    LIST_HEADINGS = ["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"]
     STATUS_HEADINGS = ["ID", "Posted at", "Screen name", "Text"]
-    TREND_HEADINGS = ["WOEID", "Parent ID", "Type", "Name", "Country"]
     USER_HEADINGS = ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]
 
-    include ActionView::Helpers::NumberHelper
-
-    def self.included(base)
-
     private
 
       def build_long_list(list)
-        [list.id, ls_formatted_time(list), "@#{list.user.screen_name}", list.slug, number_with_delimiter(list.member_count), number_with_delimiter(list.subscriber_count), list.mode, list.description]
+        [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)
-        [status.id, ls_formatted_time(status), "@#{status.from_user}", HTMLEntities.new.decode(status.text).gsub(/\n+/, ' ')]
+        [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), 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]
+        [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.parse(object.send(key.to_sym).to_s).utc.strftime("%Y-%m-%d %H:%M:%S %z")
+        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)
-        if object.send(key.to_sym) > 6.months.ago
-          Time.parse(object.send(key.to_sym).to_s).strftime("%b %e %H:%M")
+        time = T.local_time object.send(key.to_sym)
+        if time > 6.months.ago
+          time.strftime("%b %e %H:%M")
         else
-          Time.parse(object.send(key.to_sym).to_s).strftime("%b %e  %Y")
+          time.strftime("%b %e  %Y")
         end
       end
 
@@ -50,7 +46,7 @@ module T
       end
 
       def print_csv_status(status)
-        say [status.id, csv_formatted_time(status), status.from_user, HTMLEntities.new.decode(status.text)].to_csv
+        say [status.id, csv_formatted_time(status), status.from_user, HTMLEntities.new.decode(status.full_text)].to_csv
       end
 
       def print_csv_user(user)
@@ -78,7 +74,8 @@ module T
           array = lists.map do |list|
             build_long_list(list)
           end
-          print_table_with_headings(array, LIST_HEADINGS)
+          format = options['format'] || LIST_HEADINGS.size.times.map{"%s"}
+          print_table_with_headings(array, LIST_HEADINGS, format)
         else
           print_attribute(lists, :full_name)
         end
@@ -94,9 +91,15 @@ module T
         end
       end
 
-      def print_table_with_headings(array, headings)
+      def print_table_with_headings(array, headings, format)
+        return if array.flatten.empty?
         if STDOUT.tty?
-          array.unshift(headings) unless array.flatten.empty?
+          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
           print_table(array, :truncate => true)
         else
           print_table(array)
@@ -109,7 +112,7 @@ module T
         else
           say("   @#{status.from_user}")
         end
-        print_wrapped(HTMLEntities.new.decode(status.text), :indent => 3)
+        print_wrapped(HTMLEntities.new.decode(status.full_text), :indent => 3)
         say
       end
 
@@ -124,7 +127,8 @@ module T
           array = statuses.map do |status|
             build_long_status(status)
           end
-          print_table_with_headings(array, STATUS_HEADINGS)
+          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)
@@ -157,13 +161,12 @@ module T
           array = users.map do |user|
             build_long_user(user)
           end
-          print_table_with_headings(array, USER_HEADINGS)
+          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
 end

data/lib/t/rcfile.rb

@@ -86,7 +86,7 @@ private
   end
 
   def write
-    File.open(@path, File::RDWR|File::CREAT, 0600) do |rcfile|
+    File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |rcfile|
       rcfile.write @data.to_yaml
     end
   end

data/lib/t/requestable.rb

@@ -5,8 +5,6 @@ module T
     DEFAULT_HOST = 'api.twitter.com'
     DEFAULT_PROTOCOL = 'https'
 
-    def self.included(base)
-
     private
 
       def base_url
@@ -33,7 +31,5 @@ module T
         options['no-ssl'] ? 'http' : DEFAULT_PROTOCOL
       end
 
-    end
-
   end
 end