t 0.0.2 → 0.1.0

data/.rspec

@@ -1 +1,2 @@
+--format=documentation
 --color

data/.travis.yml

@@ -2,6 +2,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - jruby
   - rbx
   - ree
-  - jruby

data/README.md

@@ -19,15 +19,15 @@ John Nunemaker's original code.
 ## <a name="installation"></a>Installation
     gem install t
 
-## <a name="ci"></a>Continuous Integration
-[![Build Status](https://secure.travis-ci.org/sferik/t.png)][ci]
+## <a name="build"></a>Build Status
+[![Build Status](https://secure.travis-ci.org/sferik/t.png?branch=master)][travis]
 
-[ci]: http://travis-ci.org/sferik/t
+[travis]: http://travis-ci.org/sferik/t
 
 ## <a name="dependencies"></a>Dependency Status
-[![Dependency Status](https://gemnasium.com/codeforamerica/adopt-a-hydrant.png)][gemnasium]
+[![Dependency Status](https://gemnasium.com/sferik/t.png?travis)][gemnasium]
 
-[gemnasium]: https://gemnasium.com/codeforamerica/adopt-a-hydrant
+[gemnasium]: https://gemnasium.com/sferik/t
 
 ## <a name="examples"></a>Usage Examples
 Typing `t help` will give you a list of all the available commands. You can
@@ -41,26 +41,36 @@ create your application make sure to set the "Application Type" to "Read, Write
 and Access direct messages", otherwise you won't be able to post status updates
 or send direct messages via the CLI.
 
-Once you have registered your application, you'll be assigned a consumer key
-and secret, which you can use to authorize your Twitter account.
+Once you have registered your application, you'll be given a consumer key and
+secret, which you can use to authorize your Twitter account.
 
     t authorize --consumer-key YOUR_CONSUMER_KEY --consumer-secret YOUR_CONSUMER_SECRET
 
-This will open a new browser window where you can authenticate to Twitter.
+This will open a new browser window where you can authenticate to Twitter and
+then enter the returned PIN back into the terminal.  Assuming all that works
+well, you will be authorized to make requests with the API.
 
 You can see a list of all the accounts you've authorized.
 
     t accounts
 
-You can easily switch between accounts.
+    sferik
+      UDfNTpOz5ZDG4a6w7dIWj
+      uuP7Xbl2mEfGMiDu1uIyFN
+    gem
+      thG9EfWoADtIr6NjbL9ON (default)
 
-    t set default sferik
+Notice that one account is marked as the default. To change the default use the
+`set` subcommand, passing either just the username, if it's unambiguous, or the
+username and consumer key pair:
 
-Incidentally, account information is stored in YAML format in `~/.trc`.
+    t set default sferik thG9EfWoADtIr6NjbL9ON
+
+Account information is stored in the YAML-formatted file `~/.trc`.
 
 ### <a name="update"></a>Update your status
 
-    t update "I'm tweeting from the command line, powered by @gem."
+    t update "I'm tweeting from the command line. Isn't that special?"
 
 ### <a name="dm"></a>Send a user a private message
 
@@ -104,7 +114,7 @@ Incidentally, account information is stored in YAML format in `~/.trc`.
 
 ### <a name="reply"></a>Reply to a Tweet
 
-    t reply sferik Thanks
+    t reply sferik "Thanks Erik"
 
 ### <a name="retweet"></a>Send another user's latest Tweet to your followers
 
@@ -162,7 +172,7 @@ bug report should include a pull request with failing specs.
    reason, please do so in a separate commit.)
 
 ## <a name="versions"></a>Supported Ruby Versions
-This library aims to support and is [tested against][ci] the following Ruby
+This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
 * Ruby 1.8.7

data/bin/t

@@ -5,5 +5,38 @@ require 't'
 begin
   T::CLI.start(ARGV)
 rescue Interrupt
-  puts "Quitting..."
+  $stderr.puts "Quitting..."
+  exit 1
+rescue Twitter::Error::BadRequest => error
+  $stderr.puts error.message
+  exit 400
+rescue OAuth::Unauthorized
+  $stderr.puts "Authorization failed"
+  exit 401
+rescue Twitter::Error::Unauthorized => error
+  $stderr.puts error.message
+  $stderr.puts
+  $stderr.puts "Run `#{$0} authorize --consumer-key=CONSUMER_KEY --consumer-secret=CONSUMER_SECRET` to authorize."
+  exit 401
+rescue Twitter::Error::Forbidden => error
+  $stderr.puts error.message
+  exit 403
+rescue Twitter::Error::NotFound => error
+  $stderr.puts error.message
+  exit 404
+rescue Twitter::Error::NotAcceptable => error
+  $stderr.puts error.message
+  exit 406
+rescue Twitter::Error::EnhanceYourCalm => error
+  $stderr.puts error.message
+  exit 420
+rescue Twitter::Error::InternalServerError => error
+  $stderr.puts error.message
+  exit 500
+rescue Twitter::Error::BadGateway => error
+  $stderr.puts error.message
+  exit 502
+rescue Twitter::Error::ServiceUnavailable => error
+  $stderr.puts error.message
+  exit 503
 end

data/lib/t/cli.rb

@@ -1,6 +1,8 @@
 require 'action_view'
 require 'launchy'
 require 'oauth'
+require 't/core_ext/string'
+require 't/delete'
 require 't/rcfile'
 require 't/set'
 require 'thor'
@@ -10,262 +12,305 @@ require 'yaml'
 
 module T
   class CLI < Thor
+    include ActionView::Helpers::DateHelper
+    include ActionView::Helpers::NumberHelper
+
     DEFAULT_HOST = 'api.twitter.com'
     DEFAULT_PROTOCOL = 'https'
 
-    class_option "host", :aliases => "-H", :default => DEFAULT_HOST
-    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false
+    class_option :host, :aliases => "-H", :type => :string, :default => DEFAULT_HOST, :desc => "Twitter API server"
+    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("~"), RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
 
-    include ActionView::Helpers::DateHelper
-    include ActionView::Helpers::NumberHelper
+    check_unknown_options!
+
+    def initialize(*)
+      super
+      @rcfile = RCFile.instance
+    end
 
     desc "accounts", "List accounts"
     def accounts
-      rcfile = RCFile.instance
-      rcfile.profiles.each do |profile|
+      @rcfile.path = options['profile'] if options['profile']
+      @rcfile.profiles.each do |profile|
         say profile[0]
         profile[1].keys.each do |key|
-          say "  #{key}#{rcfile.default_profile[0] == profile[0] && rcfile.default_profile[1] == key ? " (default)" : nil}"
+          say "  #{key}#{@rcfile.default_profile[0] == profile[0] && @rcfile.default_profile[1] == key ? " (default)" : nil}"
         end
       end
     end
     map %w(list ls) => :accounts
 
     desc "authorize", "Allows an application to request user authorization"
-    option "consumer-key", :aliases => "-c", :required => true
-    option "consumer-secret", :aliases => "-s", :required => true
-    option "access-token", :aliases => "-a"
-    option "token-secret", :aliases => "-S"
+    method_option :consumer_key, :aliases => "-c", :required => true
+    method_option :consumer_secret, :aliases => "-s", :required => true
+    method_option :prompt, :aliases => "-p", :type => :boolean, :default => true
+    method_option :dry_run, :type => :boolean
     def authorize
       request_token = consumer.get_request_token
       url = generate_authorize_url(request_token)
-      say "Authorize this app and copy the supplied PIN to complete the authorization process."
-      print "Your default web browser will open in "
-      9.downto(1) do |i|
-        sleep 0.2
-        print i
-        4.times do
-          sleep 0.2
-          print '.'
-        end
+      if options['prompt']
+        say "In a moment, your web browser will open to the Twitter app authorization page."
+        say "Perform the following steps to complete the authorization process:"
+        say "  1. Sign in to Twitter"
+        say "  2. Press \"Authorize app\""
+        say "  3. Copy or memorize the supplied PIN"
+        say "  4. Return to the terminal to enter the PIN"
+        say
+        ask "Press [Enter] to open the Twitter app authorization page."
+        say
       end
-      Launchy.open(url)
-      pin = ask "\nPaste in the supplied PIN:"
+      Launchy.open(url, :dry_run => options.fetch('dry_run', false))
+      pin = ask "Paste in the supplied PIN:"
       access_token = request_token.get_access_token(:oauth_verifier => pin.chomp)
       oauth_response = access_token.get('/1/account/verify_credentials.json')
       username = oauth_response.body.match(/"screen_name"\s*:\s*"(.*?)"/).captures.first
-      rcfile = RCFile.instance
-      rcfile[username] = {
-        options['consumer-key'] => {
+      @rcfile.path = options['profile'] if options['profile']
+      @rcfile[username] = {
+        options['consumer_key'] => {
           'username' => username,
-          'consumer_key' => options['consumer-key'],
-          'consumer_secret' => options['consumer-secret'],
+          'consumer_key' => options['consumer_key'],
+          'consumer_secret' => options['consumer_secret'],
           'token' => access_token.token,
           'secret' => access_token.secret,
         }
       }
-      rcfile.default_profile = {'username' => username, 'consumer_key' => options['consumer-key']}
+      @rcfile.default_profile = {'username' => username, 'consumer_key' => options['consumer_key']}
       say "Authorization successful"
-    rescue OAuth::Unauthorized
-      raise Exception, "Authorization failed. Check that your consumer key and secret are correct, as well as your username and password."
     end
 
     desc "block USERNAME", "Block a user."
     def block(username)
-      client.block(username)
-      say "Blocked @#{username}"
+      username = username.strip_at
+      user = client.block(username)
+      say "@#{@rcfile.default_profile[0]} blocked @#{user.screen_name}"
       say
-      say "Run `#{$0} unblock #{username}` to unblock."
+      say "Run `#{$0} delete block #{user.screen_name}` to unblock."
     end
 
     desc "direct_messages", "Returns the 20 most recent Direct Messages sent to you."
     def direct_messages
-      client.direct_messages.each do |direct_message|
+      run_pager
+      client.direct_messages.map do |direct_message|
         say "#{direct_message.sender.screen_name.rjust(20)}: #{direct_message.text} (#{time_ago_in_words(direct_message.created_at)} ago)"
       end
     end
+    map %w(dms) => :direct_messages
 
     desc "sent_messages", "Returns the 20 most recent Direct Messages sent to you."
     def sent_messages
-      client.direct_messages_sent.each do |direct_message|
+      run_pager
+      client.direct_messages_sent.map do |direct_message|
         say "#{direct_message.recipient.screen_name.rjust(20)}: #{direct_message.text} (#{time_ago_in_words(direct_message.created_at)} ago)"
       end
     end
+    map %w(sms) => :sent_messages
 
     desc "dm USERNAME MESSAGE", "Sends that person a Direct Message."
     def dm(username, message)
+      username = username.strip_at
       direct_message = client.direct_message_create(username, message)
-      say "Direct Message sent to @#{username} (#{time_ago_in_words(status.created_at)} ago)"
+      say "Direct Message sent from @#{@rcfile.default_profile[0]} to @#{direct_message.recipient.screen_name} (#{time_ago_in_words(direct_message.created_at)} ago)"
     end
-    map :m => :dm
+    map %w(m) => :dm
 
     desc "favorite USERNAME", "Marks that user's last Tweet as one of your favorites."
     def favorite(username)
-      status = client.user_timeline(username).first
-      client.favorite(status.id)
-      say "You have favorited @#{username}'s latest tweet: #{status.text}"
+      username = username.strip_at
+      user = client.user(username)
+      if user.status
+        client.favorite(user.status.id)
+        say "@#{@rcfile.default_profile[0]} favorited @#{user.screen_name}'s latest status: #{user.status.text}"
+        say
+        say "Run `#{$0} delete favorite` to unfavorite."
+      else
+        raise Thor::Error, "Tweet not found"
+      end
     rescue Twitter::Error::Forbidden => error
-      say error.message
+      if error.message =~ /You have already favorited this status\./
+        say "@#{@rcfile.default_profile[0]} favorited @#{user.screen_name}'s latest status: #{user.status.text}"
+      else
+        raise
+      end
     end
-    map :fave => :favorite
+    map %w(fave) => :favorite
 
     desc "follow USERNAME", "Allows you to start following a specific user."
     def follow(username)
+      username = username.strip_at
       user = client.follow(username)
-      say "You're now following @#{username}. Run `#{$0} unfollow #{username}` to stop."
-      recommendations = client.recommendations(:user_id => user.id, :limit => 2)
+      say "@#{@rcfile.default_profile[0]} is now following @#{user.screen_name}."
       say
-      say "Try following @#{recommendations[0].screen_name} or @#{recommendations[1].screen_name}."
-      status = client.user_timeline(username).first
-      say "#{username}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
+      say "Run `#{$0} unfollow #{user.screen_name}` to stop."
     end
-    map :befriend => :follow
+    map %w(befriend) => :follow
 
     desc "get USERNAME", "Retrieves the latest update posted by the user."
     def get(username)
-      status = client.user_timeline(username).first
-      say "#{status.text} (#{time_ago_in_words(status.created_at)} ago)"
+      username = username.strip_at
+      user = client.user(username)
+      if user.status
+        say "#{user.status.text} (#{time_ago_in_words(user.status.created_at)} ago)"
+      else
+        raise Thor::Error, "Tweet not found"
+      end
     end
 
     desc "mentions", "Returns the 20 most recent Tweets mentioning you."
-    option "reverse", :aliases => "-r", :type => :boolean, :default => false
+    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
     def mentions
       timeline = client.mentions
       timeline.reverse! if options['reverse']
-      timeline.each do |status|
+      run_pager
+      timeline.map do |status|
         say "#{status.user.screen_name.rjust(20)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
       end
     end
-    map :replies => :mentions
+    map %w(replies) => :mentions
 
     desc "open USERNAME", "Opens that user's profile in a web browser."
+    method_option :dry_run, :type => :boolean
     def open(username)
-      Launchy.open("https://twitter.com/#{username}")
+      username = username.strip_at
+      Launchy.open("https://twitter.com/#{username}", :dry_run => options.fetch('dry_run', false))
     end
 
     desc "reply USERNAME MESSAGE", "Post your Tweet as a reply directed at another person."
+    method_option :location, :aliases => "-l", :type => :boolean, :default => true
     def reply(username, message)
-      in_reply_to_status = client.user_timeline(username).first
-      status = client.update("@#{username} #{message}", :in_reply_to_status_id => in_reply_to_status.id)
-      say "Reply created (#{time_ago_in_words(status.created_at)} ago)"
-    rescue Twitter::Error::Forbidden => error
-      say error.message
+      username = username.strip_at
+      hash = {}
+      hash.merge!(:lat => location.lat, :long => location.lng) if options['location']
+      user = client.user(username)
+      hash.merge!(:in_reply_to_status_id => user.status.id) if user.status
+      status = client.update("@#{user.screen_name} #{message}", hash)
+      say "Reply created by @#{@rcfile.default_profile[0]} to @#{user.screen_name} (#{time_ago_in_words(status.created_at)} ago)"
+      say
+      say "Run `#{$0} delete status` to delete."
     end
 
     desc "retweet USERNAME", "Sends that user's latest Tweet to your followers."
     def retweet(username)
-      status = client.user_timeline(username).first
-      client.retweet(status.id)
-      say "You have retweeted @#{username}'s latest tweet: #{status.text}"
+      username = username.strip_at
+      user = client.user(username)
+      if user.status
+        client.retweet(user.status.id)
+        say "@#{@rcfile.default_profile[0]} retweeted @#{user.screen_name}'s latest status: #{user.status.text}"
+        say
+        say "Run `#{$0} delete status` to undo."
+      else
+        raise Thor::Error, "Tweet not found"
+      end
+    rescue Twitter::Error::Forbidden => error
+      if error.message =~ /sharing is not permissable for this status \(Share validations failed\)/
+        say "@#{@rcfile.default_profile[0]} retweeted @#{user.screen_name}'s latest status: #{user.status.text}"
+      else
+        raise
+      end
     end
-    map :rt => :retweet
+    map %w(rt) => :retweet
 
     desc "stats USERNAME", "Retrieves the given user's number of followers and how many people they're following."
     def stats(username)
+      username = username.strip_at
       user = client.user(username)
       say "Followers: #{number_with_delimiter(user.followers_count)}"
       say "Following: #{number_with_delimiter(user.friends_count)}"
       say
-      say "Run `#{$0} whois #{username}` to view profile."
+      say "Run `#{$0} whois #{user.screen_name}` to view profile."
     end
 
+    desc "status MESSAGE", "Post a Tweet."
+    method_option :location, :aliases => "-l", :type => :boolean, :default => true
+    def status(message)
+      hash = {}
+      hash.merge!(:lat => location.lat, :long => location.lng) if options['location']
+      status = client.update(message, hash)
+      say "Tweet created by @#{@rcfile.default_profile[0]} (#{time_ago_in_words(status.created_at)} ago)"
+      say
+      say "Run `#{$0} delete status` to delete."
+    end
+    map %w(post tweet update) => :status
+
     desc "suggest", "This command returns a listing of Twitter users' accounts we think you might enjoy following."
     def suggest
-      recommendations = client.recommendations(:limit => 2)
-      say "Try following @#{recommendations[0].screen_name} or @#{recommendations[1].screen_name}."
-      say
-      say "Run `#{$0} follow USERNAME` to follow."
-      say "Run `#{$0} whois USERNAME` for profile."
-      say "Run `#{$0} suggest` for more."
+      recommendation = client.recommendations(:limit => 1).first
+      if recommendation
+        say "Try following @#{recommendation.screen_name}."
+        say
+        say "Run `#{$0} follow #{recommendation.screen_name}` to follow."
+        say "Run `#{$0} whois #{recommendation.screen_name}` for profile."
+        say "Run `#{$0} suggest` for another recommendation."
+      end
     end
 
     desc "timeline", "Returns the 20 most recent Tweets posted by you and the users you follow."
-    option "reverse", :aliases => "-r", :type => :boolean, :default => false
+    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
     def timeline
       timeline = client.home_timeline
       timeline.reverse! if options['reverse']
-      timeline.each do |status|
+      run_pager
+      timeline.map do |status|
         say "#{status.user.screen_name.rjust(20)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
       end
     end
-    map :tl => :timeline
-
-    desc "unblock USERNAME", "Unblock a user."
-    def unblock(username)
-      client.unblock(username)
-      say "Unblocked @#{username}"
-      say
-      say "Run `#{$0} block #{username}` to block."
-    end
-
-    desc "unfavorite USERNAME", "Marks that user's last Tweet as one of your favorites."
-    def unfavorite(username)
-      status = client.user_timeline(username).first
-      client.unfavorite(status.id)
-      say "You have unfavorited @#{username}'s latest tweet: #{status.text}"
-    end
+    map %w(tl) => :timeline
 
     desc "unfollow USERNAME", "Allows you to stop following a specific user."
     def unfollow(username)
+      username = username.strip_at
       user = client.unfollow(username)
-      say "You are no longer following @#{username}. Run `#{$0} follow #{username}` to follow again."
+      say "@#{@rcfile.default_profile[0]} is no longer following @#{user.screen_name}."
+      say
+      say "Run `#{$0} follow #{user.screen_name}` to follow again."
     end
-    map :defriend => :unfollow
+    map %w(defriend) => :unfollow
 
-    desc "update MESSAGE", "Post a Tweet."
-    def update(message)
-      status = client.update(message)
-      say "Tweet created (#{time_ago_in_words(status.created_at)} ago)"
-    rescue Twitter::Error::Forbidden => error
-      say error.message
+    desc "version", "Show version"
+    def version
+      say T::Version
     end
-    map :post => :update
+    map %w(-v --version) => :version
 
     desc "whois USERNAME", "Retrieves profile information for the user."
     def whois(username)
+      username = username.strip_at
       user = client.user(username)
-      output = []
-      output << "#{user.name}, since #{user.created_at.strftime("%b %Y")}."
-      output << "bio: #{user.description}"
-      output << "location: #{user.location}"
-      output << "web: #{user.url}"
-      say output.join("\n")
+      say "#{user.name}, since #{user.created_at.strftime("%b %Y")}."
+      say "bio: #{user.description}"
+      say "location: #{user.location}"
+      say "web: #{user.url}"
     end
 
-    desc "version", "Show version"
-    def version
-      say T::Version
-    end
-    map %w(-v --version) => :version
+    desc "delete SUBCOMMAND ...ARGS", "Delete Tweets, Direct Messages, etc."
+    method_option :force, :aliases => "-f", :type => :boolean
+    subcommand 'delete', Delete
 
     desc "set SUBCOMMAND ...ARGS", "Change various account settings."
     subcommand 'set', Set
 
     no_tasks do
 
-      def access_token
-        OAuth::AccessToken.new(consumer, token, secret)
-      end
-
       def base_url
         "#{protocol}://#{host}"
       end
 
       def client
-        rcfile = RCFile.instance
-        Twitter::Client.new(
+        return @client if @client
+        @rcfile.path = options['profile'] if options['profile']
+        @client = Twitter::Client.new(
           :endpoint => base_url,
-          :consumer_key => rcfile.default_consumer_key,
-          :consumer_secret => rcfile.default_consumer_secret,
-          :oauth_token => rcfile.default_token,
-          :oauth_token_secret  => rcfile.default_secret
+          :consumer_key => @rcfile.default_consumer_key,
+          :consumer_secret => @rcfile.default_consumer_secret,
+          :oauth_token => @rcfile.default_token,
+          :oauth_token_secret  => @rcfile.default_secret
         )
       end
 
       def consumer
         OAuth::Consumer.new(
-          options['consumer-key'],
-          options['consumer-secret'],
+          options['consumer_key'],
+          options['consumer_secret'],
           :site => base_url
         )
       end
@@ -284,12 +329,49 @@ module T
         options['host'] || DEFAULT_HOST
       end
 
+      def location
+        return @location if @location
+        require 'geokit'
+        require 'open-uri'
+        ip_address = Kernel::open("http://checkip.dyndns.org/") do |body|
+          /(?:\d{1,3}\.){3}\d{1,3}/.match(body.read)[0]
+        end
+        @location = Geokit::Geocoders::MultiGeocoder.geocode(ip_address)
+      end
+
       def pin_auth_parameters
         {:oauth_callback => 'oob'}
       end
 
       def protocol
-        options['no-ssl'] ? 'http' : DEFAULT_PROTOCOL
+        options['no_ssl'] ? 'http' : DEFAULT_PROTOCOL
+      end
+
+      def run_pager
+        return if RUBY_PLATFORM =~ /win32/
+        return if ENV["T_ENV"] == "test"
+        return unless STDOUT.tty?
+
+        read, write = IO.pipe
+
+        unless Kernel.fork # Child process
+          STDOUT.reopen(write)
+          STDERR.reopen(write) if STDERR.tty?
+          read.close
+          write.close
+          return
+        end
+
+        # Parent process, become pager
+        STDIN.reopen(read)
+        read.close
+        write.close
+
+        ENV['LESS'] = 'FSRX' # Don't page if the input is short enough
+
+        Kernel.select [STDIN] # Wait until we have input before we start the pager
+        pager = ENV['PAGER'] || 'less'
+        exec pager rescue exec "/bin/sh", "-c", pager
       end
 
     end