t 1.6.0 → 1.7.0

data/CONTRIBUTING.md

@@ -0,0 +1,48 @@
+## Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help
+improve this project.
+
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
+
+Here are some ways *you* can contribute:
+
+* by using alpha, beta, and prerelease versions
+* by reporting bugs
+* by suggesting new features
+* by writing or editing documentation
+* by writing specifications
+* by writing code (**no patch is too small**: fix typos, add comments, clean up
+  inconsistent whitespace)
+* by refactoring code
+* by fixing [issues][]
+* by reviewing patches
+* [financially][pledgie]
+
+[issues]: https://github.com/sferik/t/issues
+[pledgie]: http://www.pledgie.com/campaigns/17330
+
+## Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. When submitting a bug report, please include a [Gist][]
+that includes a stack trace and any details that may be necessary to reproduce
+the bug, including your gem version, Ruby version, and operating system.
+Ideally, a bug report should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
+7. Run `open coverage/index.html`. If your changes are not completely covered
+   by your tests, return to step 3.
+8. Add, commit, and push your changes.
+9. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/

data/README.md

@@ -3,6 +3,7 @@
 [icon]: https://github.com/sferik/t/raw/master/icon/t.png
 
 # Twitter CLI
+[![Gem Version](https://badge.fury.io/rb/t.png)][gem]
 [![Build Status](https://secure.travis-ci.org/sferik/t.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/sferik/t.png?travis)][gemnasium]
 [![Pledgie](http://www.pledgie.com/campaigns/17330.png)][pledgie]
@@ -13,6 +14,7 @@
 The CLI takes syntactic cues from the [Twitter SMS commands][sms], however it
 offers vastly more commands and capabilities than are available via SMS.
 
+[gem]: https://rubygems.org/gems/t
 [travis]: http://travis-ci.org/sferik/t
 [gemnasium]: https://gemnasium.com/sferik/t
 [pledgie]: http://www.pledgie.com/campaigns/17330
@@ -242,6 +244,13 @@ used by `t`:
 ![Timeline](https://github.com/sferik/t/raw/master/screenshots/timeline.png)
 ![List](https://github.com/sferik/t/raw/master/screenshots/list.png)
 
+## Shell completion
+If you're running [Zsh][zsh], you can source the [bundled completion file][completion]
+to get shell completion for `t` commands, subcommands, and flags.
+
+Don't run Zsh? Why not [contribute][] completion support for your favorite
+shell?
+
 ## History
 The [twitter gem][gem] previously contained a command-line interface, up until
 version 0.5.0, when it was [removed][]. This project is offered as a sucessor
@@ -273,8 +282,16 @@ implementation, you will be responsible for providing patches in a timely
 fashion. If critical issues for a particular implementation exist at the time
 of a major release, support for that Ruby version may be dropped.
 
+## Troubleshooting
+If you are running t on a remote computer you can use the flag --display-url during authorize process to display the url instead of opening the web browser.
+
+    t authorize --display-url
+
 ## 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
+[zsh]: http://zsh.org
+[completion]: https://github.com/sferik/t/tree/etc/t-completion.zsh
+[contribute]: https://github.com/sferik/t/blob/master/CONTRIBUTING.md

data/Rakefile

@@ -4,5 +4,8 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
+import 'tasks/zsh.rake'
+
+task :release => 'completion:zsh'
 task :test => :spec
 task :default => :spec

data/bin/t

@@ -1,12 +1,17 @@
 #!/usr/bin/env ruby
 
+# Trap interrupts to quit cleanly. See
+# https://twitter.com/mitchellh/status/283014103189053442
+Signal.trap("INT") { exit 1 }
+
 require 'oauth'
 require 't'
 require 'twitter'
 
 # Output message to $stderr, prefixed with the program name
-def pute(message="")
-  $stderr.puts "#{$0}: #{message}"
+def pute(*args)
+  args.first.insert(0, "#{$0}: ")
+  $stderr.puts(*args)
 end
 
 begin
@@ -17,9 +22,13 @@ rescue Interrupt
 rescue OAuth::Unauthorized
   pute "Authorization failed"
   exit 1
+rescue Twitter::Error::TooManyRequests => error
+  pute error.message,
+    "The rate limit for this request will reset in #{error.rate_limit.reset_in} seconds.",
+    "While you wait, consider making a polite request for Twitter to increase the API rate limit at https://dev.twitter.com/discussions/10644"
+  exit 1
 rescue Twitter::Error::Unauthorized => error
-  pute error.message
-  pute "Run `#{$0} authorize` to authorize."
+  pute error.message, "Run `t authorize` to authorize."
   exit 1
 rescue Twitter::Error => error
   pute error.message

data/lib/t/cli.rb

@@ -29,7 +29,7 @@ module T
     check_unknown_options!
 
     class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
-    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
+    class_option "color", :type => :string, :default => "auto", :desc => "Control how color is used in output."
     class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
     class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
 
@@ -130,8 +130,8 @@ module T
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     def direct_messages
       count = options['number'] || DEFAULT_NUM_RESULTS
-      direct_messages = collect_with_count(count) do |opts|
-        client.direct_messages(opts)
+      direct_messages = collect_with_count(count) do |count_opts|
+        client.direct_messages(count_opts)
       end
       direct_messages.reverse! if options['reverse']
       require 'htmlentities'
@@ -163,8 +163,8 @@ module T
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     def direct_messages_sent
       count = options['number'] || DEFAULT_NUM_RESULTS
-      direct_messages = collect_with_count(count) do |opts|
-        client.direct_messages_sent(opts)
+      direct_messages = collect_with_count(count) do |count_opts|
+        client.direct_messages_sent(count_opts)
       end
       direct_messages.reverse! if options['reverse']
       require 'htmlentities'
@@ -197,13 +197,15 @@ module T
     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 groupies(user=nil)
-      if user
+      user = if user
         require 't/core_ext/string'
-        user = if options['id']
+        if options['id']
           user.to_i
         else
           user.strip_ats
         end
+      else
+        client.verify_credentials.screen_name
       end
       follower_ids = Thread.new do
         collect_with_cursor do |cursor|
@@ -319,8 +321,8 @@ module T
         end
       end
       count = options['number'] || DEFAULT_NUM_RESULTS
-      tweets = collect_with_count(count) do |opts|
-        client.favorites(user, opts)
+      tweets = collect_with_count(count) do |count_opts|
+        client.favorites(user, count_opts)
       end
       print_tweets(tweets)
     end
@@ -397,13 +399,15 @@ module T
     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 friends(user=nil)
-      if user
+      user = if user
         require 't/core_ext/string'
-        user = if options['id']
+        if options['id']
           user.to_i
         else
           user.strip_ats
         end
+      else
+        client.verify_credentials.screen_name
       end
       following_ids = Thread.new do
         collect_with_cursor do |cursor|
@@ -431,13 +435,15 @@ module T
     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 leaders(user=nil)
-      if user
+      user = if user
         require 't/core_ext/string'
-        user = if options['id']
+        if options['id']
           user.to_i
         else
           user.strip_ats
         end
+      else
+        client.verify_credentials.screen_name
       end
       following_ids = Thread.new do
         collect_with_cursor do |cursor|
@@ -489,8 +495,8 @@ module T
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
     def mentions
       count = options['number'] || DEFAULT_NUM_RESULTS
-      tweets = collect_with_count(count) do |opts|
-        client.mentions(opts)
+      tweets = collect_with_count(count) do |count_opts|
+        client.mentions(count_opts)
       end
       print_tweets(tweets)
     end
@@ -574,12 +580,12 @@ module T
         else
           user.strip_ats
         end
-        collect_with_count(count) do |opts|
-          client.retweeted_by_user(user, opts)
+        collect_with_count(count) do |count_opts|
+          client.retweeted_by_user(user, count_opts)
         end
       else
-        collect_with_count(count) do |opts|
-          client.retweeted_by_me(opts)
+        collect_with_count(count) do |count_opts|
+          client.retweeted_by_me(count_opts)
         end
       end
       print_tweets(tweets)
@@ -647,16 +653,13 @@ module T
     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."
+    method_option "since_id", :aliases => "-s", :type => :numeric, :desc => "Returns only the results with an ID greater than the specified ID."
     def timeline(user=nil)
       count = options['number'] || DEFAULT_NUM_RESULTS
-      exclude_opts = case options['exclude']
-      when 'replies'
-        {:exclude_replies => true}
-      when 'retweets'
-        {:include_rts => false}
-      else
-        {}
-      end
+      opts = {}
+      opts[:exclude_replies] = true if options['exclude'] == 'replies'
+      opts[:include_rts] = false if options['exclude'] == 'retweets'
+      opts[:since_id] = options['since_id'] if options['since_id']
       if user
         require 't/core_ext/string'
         user = if options['id']
@@ -664,12 +667,12 @@ module T
         else
           user.strip_ats
         end
-        tweets = collect_with_count(count) do |opts|
-          client.user_timeline(user, opts.merge(exclude_opts))
+        tweets = collect_with_count(count) do |count_opts|
+          client.user_timeline(user, count_opts.merge(opts))
         end
       else
-        tweets = collect_with_count(count) do |opts|
-          client.home_timeline(opts.merge(exclude_opts))
+        tweets = collect_with_count(count) do |count_opts|
+          client.home_timeline(count_opts.merge(opts))
         end
       end
       print_tweets(tweets)

data/lib/t/delete.rb

@@ -69,7 +69,7 @@ module T
         end
       else
         status_ids.each do |status_id|
-          status = client.status(status_id, :include_my_retweet => false, :trim_user => true)
+          status = client.status(status_id, :include_my_retweet => false)
           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}\""
@@ -107,7 +107,7 @@ module T
         end
       else
         status_ids.each do |status_id|
-          status = client.status(status_id, :include_my_retweet => false, :trim_user => true)
+          status = client.status(status_id, :include_my_retweet => false)
           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 Tweet: \"#{status.full_text}\""

data/lib/t/list.rb

@@ -91,7 +91,7 @@ module T
     def members(list)
       owner, list = extract_owner(list, options)
       users = collect_with_cursor do |cursor|
-        client.list_members(owner, list, :cursor => cursor, :skip_status => true)
+        client.list_members(owner, list, :cursor => cursor)
       end
       print_users(users)
     end
@@ -121,8 +121,8 @@ module T
     def timeline(list)
       owner, list = extract_owner(list, options)
       count = options['number'] || DEFAULT_NUM_RESULTS
-      tweets = collect_with_count(count) do |opts|
-        client.list_timeline(owner, list, opts)
+      tweets = collect_with_count(count) do |count_opts|
+        client.list_timeline(owner, list, count_opts)
       end
       print_tweets(tweets)
     end

data/lib/t/printable.rb

@@ -16,7 +16,7 @@ module T
     end
 
     def build_long_user(user)
-      [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, user.verified? ? "Yes" : "No", decode_full_text(user.status, options['decode_urls']).gsub(/\n+/, ' '), user.location, user.url]
+      [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, user.verified? ? "Yes" : "No", user.status ? decode_full_text(user.status, options['decode_urls']).gsub(/\n+/, ' ') : nil, user.location, user.url]
     end
 
     def csv_formatted_time(object, key=:created_at)
@@ -51,7 +51,7 @@ 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), 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, user.verified?, user.description, user.status.text, user.location, user.url].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, user.verified?, user.description, user.status ? user.status.full_text : nil, user.location, user.url].to_csv
     end
 
     def print_lists(lists)
@@ -113,8 +113,14 @@ module T
     end
 
     def print_message(from_user, message)
-      if STDOUT.tty? && !options['no-color']
+      if options['color'] == 'always'
         say("   @#{from_user}", [:bold, :yellow])
+      elsif options['color'] == 'auto'
+        if $stdout.tty?
+          say("   @#{from_user}", [:bold, :yellow])
+        else
+          say("   @#{from_user}")
+        end
       else
         say("   @#{from_user}")
       end

data/lib/t/requestable.rb

@@ -19,7 +19,7 @@ module T
         :consumer_key => @rcfile.active_consumer_key,
         :consumer_secret => @rcfile.active_consumer_secret,
         :oauth_token => @rcfile.active_token,
-        :oauth_token_secret  => @rcfile.active_secret
+        :oauth_token_secret  => @rcfile.active_secret,
       )
     end
 

data/lib/t/search.rb

@@ -35,9 +35,9 @@ module T
     method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
     def all(query)
       count = options['number'] || DEFAULT_NUM_RESULTS
-      tweets = collect_with_count(count) do |opts|
-        opts[:include_entities] = 1 if options['decode_urls']
-        client.search(query, opts).results
+      tweets = collect_with_count(count) do |count_opts|
+        count_opts[:include_entities] = 1 if options['decode_urls']
+        client.search(query, count_opts).results
       end
       tweets.reverse! if options['reverse']
       require 'htmlentities'
@@ -169,23 +169,19 @@ module T
 
     desc "timeline [USER] QUERY", "Returns Tweets in your timeline that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
+    method_option "decode_urls", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
     method_option "exclude", :aliases => "-e", :type => :string, :enum => %w(replies retweets), :desc => "Exclude certain types of Tweets from the results.", :banner => "TYPE"
     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 "decode_urls", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
+    method_option "since_id", :aliases => "-s", :type => :numeric, :desc => "Returns only the results with an ID greater than the specified ID."
     def timeline(*args)
-      opts = {:count => MAX_NUM_RESULTS}
       query = args.pop
       user = args.pop
+      opts = {:count => MAX_NUM_RESULTS}
       opts[:include_entities] = 1 if options['decode_urls']
-      exclude_opts = case options['exclude']
-      when 'replies'
-        {:exclude_replies => true}
-      when 'retweets'
-        {:include_rts => false}
-      else
-        {}
-      end
+      opts[:exclude_replies] = true if options['exclude'] == 'replies'
+      opts[:include_rts] = false if options['exclude'] == 'retweets'
+      opts[:since_id] = options['since_id'] if options['since_id']
       if user
         require 't/core_ext/string'
         user = if options['id']
@@ -195,12 +191,12 @@ module T
         end
         tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
-          client.user_timeline(user, opts.merge(exclude_opts))
+          client.user_timeline(user, opts)
         end
       else
         tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
-          client.home_timeline(opts.merge(exclude_opts))
+          client.home_timeline(opts)
         end
       end
       tweets = tweets.select do |tweet|

data/lib/t/version.rb

@@ -9,7 +9,7 @@ module T
 
       # @return [Integer]
       def minor
-        6
+        7
       end
 
       # @return [Integer]