t 0.9.1 → 0.9.2

data/README.md

@@ -30,9 +30,9 @@ consumer key and secret, which you can use to authorize your Twitter account.
 
 This command directs you to a URL where you can sign-in to Twitter and then
 enter the returned PIN back into the terminal. If you type the PIN correctly,
-you should now be authorized authorized to use `t` as that user. To authorize
-multiple accounts, simply repeat the last step, signing into Twitter as a
-different user.
+you should now be authorized to use `t` as that user. To authorize multiple
+accounts, simply repeat the last step, signing into Twitter as a different
+user.
 
 You can see a list of all the accounts you've authorized by typing the command:
 
@@ -48,12 +48,13 @@ The output of which will be structured like this:
 
 **Note**: One of your authorized accounts (specifically, the last one
 authorized) will be set as active. To change the active account, use the `set`
-subcommand, passing either just the username, if it's unambiguous, or the
-username and consumer key pair, like this:
+subcommand, passing either just a username, if it's unambiguous, or a username
+and consumer key pair, like this:
 
     t set active sferik UDfNTpOz5ZDG4a6w7dIWj
 
 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
 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`.

data/lib/t/printable.rb

@@ -17,7 +17,7 @@ module T
 
       def build_long_list(list)
         created_at = list.created_at > 6.months.ago ? list.created_at.strftime("%b %e %H:%M") : list.created_at.strftime("%b %e  %Y")
-        [list.id, created_at, list.full_name, number_with_delimiter(list.member_count), number_with_delimiter(list.subscriber_count), list.mode, list.description]
+        [list.id, created_at, "@#{list.user.screen_name}", list.slug, number_with_delimiter(list.member_count), number_with_delimiter(list.subscriber_count), list.mode, list.description]
       end
 
       def build_long_status(status)
@@ -55,6 +55,14 @@ module T
         puts
       end
 
+      def list_headings
+        ["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"]
+      end
+
+      def status_headings
+        ["ID", "Posted at", "Screen name", "Text"]
+      end
+
       def print_lists(lists)
         lists = lists.sort_by{|list| list.slug.downcase} unless options['unsorted']
         if options['posted']
@@ -68,7 +76,7 @@ module T
         end
         lists.reverse! if options['reverse']
         if options['csv']
-          say ["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"].to_csv unless lists.empty?
+          say list_headings.to_csv unless lists.empty?
           lists.each do |list|
             print_csv_list(list)
           end
@@ -77,8 +85,7 @@ module T
             build_long_list(list)
           end
           if STDOUT.tty?
-            headings = ["ID", "Created at", "Slug", "Members", "Subscribers", "Mode", "Description"]
-            array.unshift(headings) unless lists.empty?
+            array.unshift(list_headings) unless lists.empty?
             print_table(array, :truncate => true)
           else
             print_table(array)
@@ -108,7 +115,7 @@ module T
       def print_statuses(statuses)
         statuses.reverse! if options['reverse'] || options['stream']
         if options['csv']
-          say ["ID", "Posted at", "Screen name", "Text"].to_csv unless statuses.empty?
+          say status_headings.to_csv unless statuses.empty?
           statuses.each do |status|
             print_csv_status(status)
           end
@@ -117,8 +124,7 @@ module T
             build_long_status(status)
           end
           if STDOUT.tty?
-            headings = ["ID", "Posted at", "Screen name", "Text"]
-            array.unshift(headings) unless statuses.empty?
+            array.unshift(status_headings) unless statuses.empty?
             print_table(array, :truncate => true)
           else
             print_table(array)
@@ -130,6 +136,10 @@ module T
         end
       end
 
+      def user_headings
+        ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]
+      end
+
       def print_users(users)
         users = users.sort_by{|user| user.screen_name.downcase} unless options['unsorted']
         if options['posted']
@@ -147,7 +157,7 @@ module T
         end
         users.reverse! if options['reverse']
         if options['csv']
-          say ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"].to_csv unless users.empty?
+          say user_headings.to_csv unless users.empty?
           users.each do |user|
             print_csv_user(user)
           end
@@ -156,8 +166,7 @@ module T
             build_long_user(user)
           end
           if STDOUT.tty?
-            headings = ["ID", "Since", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]
-            array.unshift(headings) unless users.empty?
+            array.unshift(user_headings) unless users.empty?
             print_table(array, :truncate => true)
           else
             print_table(array)

data/lib/t/stream.rb

@@ -15,9 +15,17 @@ module T
     end
 
     desc "all", "Stream a random sample of all Tweets (Control-C to stop)"
+    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def all
+      if options['csv']
+        say status_headings.to_csv
+      end
       client.on_timeline_status do |status|
-        print_status(status)
+        if options['csv']
+          print_csv_status(status)
+        else
+          print_status(status)
+        end
       end
       Signal.trap("TERM") do
         client.stop
@@ -39,15 +47,21 @@ module T
     end
 
     desc "search KEYWORD [KEYWORD...]", "Stream Tweets that contain specified keywords, joined with logical ORs (Control-C to stop)"
+    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def search(keyword, *keywords)
       keywords.unshift(keyword)
       client.on_inited do
-        search= T::Search.new
+        search = T::Search.new
+        search.options = search.options.merge(options)
         search.options = search.options.merge(:reverse => true)
         search.all(keywords.join(' OR '))
       end
       client.on_timeline_status do |status|
-        print_status(status)
+        if options['csv']
+          print_csv_status(status)
+        else
+          print_status(status)
+        end
       end
       Signal.trap("TERM") do
         client.stop
@@ -57,14 +71,20 @@ module T
     end
 
     desc "timeline", "Stream your timeline (Control-C to stop)"
+    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def timeline
       client.on_inited do
         cli = T::CLI.new
+        cli.options = cli.options.merge(options)
         cli.options = cli.options.merge(:reverse => true)
         cli.timeline
       end
       client.on_timeline_status do |status|
-        print_status(status)
+        if options['csv']
+          print_csv_status(status)
+        else
+          print_status(status)
+        end
       end
       Signal.trap("TERM") do
         client.stop
@@ -74,10 +94,18 @@ module T
     end
 
     desc "users SCREEN_NAME [SCREEN_NAME...]", "Stream Tweets either from or in reply to specified users (Control-C to stop)"
+    method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def users(screen_name, *screen_names)
+      if options['csv']
+        say status_headings.to_csv
+      end
       screen_names.unshift(screen_name)
       client.on_timeline_status do |status|
-        print_status(status)
+        if options['csv']
+          print_csv_status(status)
+        else
+          print_status(status)
+        end
       end
       Signal.trap("TERM") do
         client.stop

data/lib/t/version.rb

@@ -13,7 +13,7 @@ module T
 
     # @return [Integer]
     def self.patch
-      1
+      2
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -1596,9 +1596,9 @@ ID,Created at,Screen name,Slug,Members,Subscribers,Mode,Description
       it "should output in long format" do
         @cli.lists
         $stdout.string.should == <<-eos
-ID        Created at    Slug                      Members  Subscribers  Mode ...
-21718825  Sep 14  2010  @sferik/code-for-america  26       5            publi...
- 8863586  Mar 15  2010  @sferik/presidents        2        1            publi...
+ID        Created at    Screen name  Slug              Members  Subscribers  ...
+21718825  Sep 14  2010  @sferik      code-for-america  26       5            ...
+ 8863586  Mar 15  2010  @sferik      presidents        2        1            ...
         eos
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors: