t 0.1.0 → 0.2.0

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'

data/README.md

@@ -1,39 +1,18 @@
-# Twitter CLI
+# 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]
 A command-line interface for Twitter, powered by the [twitter gem][gem]. The
 CLI attempts to mimic the [Twitter SMS commands][sms] wherever possible,
 however it offers more commands than are available via SMS.
 
+[travis]: http://travis-ci.org/sferik/t
+[gemnasium]: https://gemnasium.com/sferik/t
 [gem]: https://rubygems.org/gems/twitter
 [sms]: https://support.twitter.com/articles/14020-twitter-sms-command
 
-## <a name="history"></a>History
-![History](http://twitter.rubyforge.org/images/terminal_output.png "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
-to that effort, however it is a clean room implementation that contains none of
-John Nunemaker's original code.
-
-[removed]: https://github.com/jnunemaker/twitter/commit/dd2445e3e2c97f38b28a3f32ea902536b3897adf
-
 ## <a name="installation"></a>Installation
     gem install t
 
-## <a name="build"></a>Build Status
-[![Build Status](https://secure.travis-ci.org/sferik/t.png?branch=master)][travis]
-
-[travis]: http://travis-ci.org/sferik/t
-
-## <a name="dependencies"></a>Dependency Status
-[![Dependency Status](https://gemnasium.com/sferik/t.png?travis)][gemnasium]
 
-[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
-type `t help TASK` to get help for a specific command.
-
-    t help
+## <a name="configuration"></a>Configuration
 
 Because Twitter requires OAuth for most of its functionality, you'll need to
 register a new application at <http://dev.twitter.com/apps/new>. Once you
@@ -47,8 +26,8 @@ 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 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.
+then enter the returned PIN back into the terminal.  Assuming that works,
+you'll be authorized to use the CLI.
 
 You can see a list of all the accounts you've authorized.
 
@@ -62,25 +41,32 @@ You can see a list of all the accounts you've authorized.
 
 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:
+username and consumer key pair, like so:
 
     t set default sferik thG9EfWoADtIr6NjbL9ON
 
 Account information is stored in the YAML-formatted file `~/.trc`.
 
+## <a name="examples"></a>Usage Examples
+
+Typing `t help` will give you a list of all the available commands. You can
+type `t help TASK` to get help for a specific command.
+
+    t help
+
 ### <a name="update"></a>Update your status
 
     t update "I'm tweeting from the command line. Isn't that special?"
 
-### <a name="dm"></a>Send a user a private message
+### <a name="dm"></a>Send a direct message
 
-    t dm sferik "Want to get dinner together tonight?"
+    t dm sferik "Want to get dinner tonight?"
 
 ### <a name="location"></a>Update the location field in your profile
 
-    t set location San Francisco
+    t set location "San Francisco"
 
-### <a name="get"></a>Retrieve the latest Tweet posted by a user
+### <a name="get"></a>Get the latest Tweet posted by a user
 
     t get sferik
 
@@ -88,30 +74,70 @@ Account information is stored in the YAML-formatted file `~/.trc`.
 
     t whois sferik
 
-### <a name="stats"></a>Get stats about a user
+### <a name="stats"></a>Retrieve stats about a user
 
     t stats sferik
 
-### <a name="suggest"></a>Return a listing of users you might enjoy following
+### <a name="suggest"></a>Return a user you might enjoy following
 
     t suggest
 
-### <a name="follow"></a>Start following a user
+### <a name="follow-users"></a>Start following users
+
+    t follow users sferik gem
 
-    t follow sferik
+### <a name="follow-all-followers"></a>Follow all followers (i.e. follow back)
 
-### <a name="leave"></a>Stop following a user
+    t follow all followers
 
-    t unfollow sferik
+### <a name="unfollow-users"></a>Stop following users
 
-### <a name="timeline"></a>Retrieve the timeline of status updates from users you are following
+    t unfollow users sferik gem
 
-    t timeline
+### <a name="unfollow-all-nonfollowers"></a>Unfollow all non-followers
+
+    t unfollow all nonfollowers
+
+### <a name="list-create"></a>Create a list
+
+    t list create presidents
+
+### <a name="list-add-followers"></a>Add users to a list
+
+    t list add users presidents BarackObama Jasonfinn
+
+### <a name="list-add-friends"></a>Add all friends to a list
+
+    t list add all friends presidents
+
+### <a name="list-add-followers"></a>Add all followers to a list
+
+    t list add all followers presidents
+
+### <a name="list-add-followers"></a>Add all members of one list to another
+
+    t list add all listed democrats presidents
+
+### <a name="follow-all-listed"></a>Follow all members of a list
+
+    t follow all listed presidents
+
+### <a name="unfollow-all-listed"></a>Unfollow all members of a list
+
+    t unfollow all listed presidents
+
+### <a name="list-timeline"></a>Retrieve the timeline of status updates from a list
+
+    t list timeline presidents
 
 ### <a name="mentions"></a>Retrieve the timeline of status updates that mention you
 
     t mentions
 
+### <a name="favorites"></a>Retrieve the timeline of status updates that you favorited
+
+    t favorites
+
 ### <a name="reply"></a>Reply to a Tweet
 
     t reply sferik "Thanks Erik"
@@ -124,6 +150,16 @@ Account information is stored in the YAML-formatted file `~/.trc`.
 
     t favorite sferik
 
+## <a name="history"></a>History
+![History](http://twitter.rubyforge.org/images/terminal_output.png "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
+to that effort, however it is a clean room implementation that contains none of
+John Nunemaker's original code.
+
+[removed]: https://github.com/jnunemaker/twitter/commit/dd2445e3e2c97f38b28a3f32ea902536b3897adf
+
 ## <a name="contributing"></a>Contributing
 In the spirit of [free software][fsf], **everyone** is encouraged to help
 improve this project.
@@ -160,14 +196,11 @@ bug report should include a pull request with failing specs.
 1. Fork the project.
 2. Create a topic branch.
 3. Implement your feature or bug fix.
-4. Add documentation for your feature or bug fix.
-5. Run `bundle exec rake doc:yard`. If your changes are not 100%
-   documented, go back to step 4.
-6. Add specs for your feature or bug fix.
-7. Run `bundle exec rake spec`. If your changes are not 100% covered, go
-   back to step 6.
-8. Commit and push your changes.
-9. Submit a pull request. Please do not include changes to the gemspec,
+4. Add specs for your feature or bug fix.
+5. Run `bundle exec rake spec`. If your changes are not 100% covered, go back
+   to step 4.
+6. Commit and push your changes.
+7. Submit a pull request. Please do not include changes to the gemspec,
    version, or history file. (If you want to create your own version for some
    reason, please do so in a separate commit.)
 

data/lib/t/cli.rb

@@ -2,9 +2,7 @@ require 'action_view'
 require 'launchy'
 require 'oauth'
 require 't/core_ext/string'
-require 't/delete'
 require 't/rcfile'
-require 't/set'
 require 'thor'
 require 'time'
 require 'twitter'
@@ -39,7 +37,6 @@ module T
         end
       end
     end
-    map %w(list ls) => :accounts
 
     desc "authorize", "Allows an application to request user authorization"
     method_option :consumer_key, :aliases => "-c", :required => true
@@ -64,25 +61,25 @@ module T
       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
+      screen_name = oauth_response.body.match(/"screen_name"\s*:\s*"(.*?)"/).captures.first
       @rcfile.path = options['profile'] if options['profile']
-      @rcfile[username] = {
+      @rcfile[screen_name] = {
         options['consumer_key'] => {
-          'username' => username,
+          'username' => screen_name,
           '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' => screen_name, 'consumer_key' => options['consumer_key']}
       say "Authorization successful"
     end
 
-    desc "block USERNAME", "Block a user."
-    def block(username)
-      username = username.strip_at
-      user = client.block(username)
+    desc "block SCREEN_NAME", "Block a user."
+    def block(screen_name)
+      screen_name = screen_name.strip_at
+      user = client.block(screen_name, :include_entities => false)
       say "@#{@rcfile.default_profile[0]} blocked @#{user.screen_name}"
       say
       say "Run `#{$0} delete block #{user.screen_name}` to unblock."
@@ -91,36 +88,27 @@ module T
     desc "direct_messages", "Returns the 20 most recent Direct Messages sent to you."
     def direct_messages
       run_pager
-      client.direct_messages.map do |direct_message|
+      client.direct_messages(:include_entities => false).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
-      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)
+    desc "dm SCREEN_NAME MESSAGE", "Sends that person a Direct Message."
+    def dm(screen_name, message)
+      screen_name = screen_name.strip_at
+      direct_message = client.direct_message_create(screen_name, message, :include_entities => false)
       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 %w(m) => :dm
 
-    desc "favorite USERNAME", "Marks that user's last Tweet as one of your favorites."
-    def favorite(username)
-      username = username.strip_at
-      user = client.user(username)
+    desc "favorite SCREEN_NAME", "Marks that user's last Tweet as one of your favorites."
+    def favorite(screen_name)
+      screen_name = screen_name.strip_at
+      user = client.user(screen_name, :include_entities => false)
       if user.status
-        client.favorite(user.status.id)
-        say "@#{@rcfile.default_profile[0]} favorited @#{user.screen_name}'s latest status: #{user.status.text}"
+        client.favorite(user.status.id, :include_entities => false)
+        say "@#{@rcfile.default_profile[0]} favorited @#{user.screen_name}'s latest status: \"#{user.status.text}\""
         say
         say "Run `#{$0} delete favorite` to unfavorite."
       else
@@ -128,27 +116,32 @@ module T
       end
     rescue Twitter::Error::Forbidden => error
       if error.message =~ /You have already favorited this status\./
-        say "@#{@rcfile.default_profile[0]} favorited @#{user.screen_name}'s latest status: #{user.status.text}"
+        say "@#{@rcfile.default_profile[0]} favorited @#{user.screen_name}'s latest status: \"#{user.status.text}\""
       else
         raise
       end
     end
     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 "@#{@rcfile.default_profile[0]} is now following @#{user.screen_name}."
-      say
-      say "Run `#{$0} unfollow #{user.screen_name}` to stop."
+    desc "favorites", "Returns the 20 most recent Tweets you favorited."
+    method_option :number, :aliases => "-n", :type => :numeric, :default => 20
+    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
+    def favorites
+      hash = {:include_entities => false}
+      hash.merge!(:count => options['number']) if options['number']
+      timeline = client.favorites(hash)
+      timeline.reverse! if options['reverse']
+      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 %w(befriend) => :follow
+    map %w(faves) => :favorites
 
-    desc "get USERNAME", "Retrieves the latest update posted by the user."
-    def get(username)
-      username = username.strip_at
-      user = client.user(username)
+    desc "get SCREEN_NAME", "Retrieves the latest update posted by the user."
+    def get(screen_name)
+      screen_name = screen_name.strip_at
+      user = client.user(screen_name, :include_entities => false)
       if user.status
         say "#{user.status.text} (#{time_ago_in_words(user.status.created_at)} ago)"
       else
@@ -157,9 +150,12 @@ module T
     end
 
     desc "mentions", "Returns the 20 most recent Tweets mentioning you."
+    method_option :number, :aliases => "-n", :type => :numeric, :default => 20
     method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
     def mentions
-      timeline = client.mentions
+      hash = {:include_entities => false}
+      hash.merge!(:count => options['number']) if options['number']
+      timeline = client.mentions(hash)
       timeline.reverse! if options['reverse']
       run_pager
       timeline.map do |status|
@@ -168,20 +164,20 @@ module T
     end
     map %w(replies) => :mentions
 
-    desc "open USERNAME", "Opens that user's profile in a web browser."
+    desc "open SCREEN_NAME", "Opens that user's profile in a web browser."
     method_option :dry_run, :type => :boolean
-    def open(username)
-      username = username.strip_at
-      Launchy.open("https://twitter.com/#{username}", :dry_run => options.fetch('dry_run', false))
+    def open(screen_name)
+      screen_name = screen_name.strip_at
+      Launchy.open("https://twitter.com/#{screen_name}", :dry_run => options.fetch('dry_run', false))
     end
 
-    desc "reply USERNAME MESSAGE", "Post your Tweet as a reply directed at another person."
+    desc "reply SCREEN_NAME MESSAGE", "Post your Tweet as a reply directed at another person."
     method_option :location, :aliases => "-l", :type => :boolean, :default => true
-    def reply(username, message)
-      username = username.strip_at
-      hash = {}
+    def reply(screen_name, message)
+      screen_name = screen_name.strip_at
+      hash = {:include_entities => false, :trim_user => true}
       hash.merge!(:lat => location.lat, :long => location.lng) if options['location']
-      user = client.user(username)
+      user = client.user(screen_name, :include_entities => false)
       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)"
@@ -189,13 +185,13 @@ module T
       say "Run `#{$0} delete status` to delete."
     end
 
-    desc "retweet USERNAME", "Sends that user's latest Tweet to your followers."
-    def retweet(username)
-      username = username.strip_at
-      user = client.user(username)
+    desc "retweet SCREEN_NAME", "Sends that user's latest Tweet to your followers."
+    def retweet(screen_name)
+      screen_name = screen_name.strip_at
+      user = client.user(screen_name, :include_entities => false)
       if user.status
-        client.retweet(user.status.id)
-        say "@#{@rcfile.default_profile[0]} retweeted @#{user.screen_name}'s latest status: #{user.status.text}"
+        client.retweet(user.status.id, :include_entities => false, :trim_user => true)
+        say "@#{@rcfile.default_profile[0]} retweeted @#{user.screen_name}'s latest status: \"#{user.status.text}\""
         say
         say "Run `#{$0} delete status` to undo."
       else
@@ -203,19 +199,45 @@ module T
       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}"
+        say "@#{@rcfile.default_profile[0]} retweeted @#{user.screen_name}'s latest status: \"#{user.status.text}\""
       else
         raise
       end
     end
     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)}"
+    desc "search QUERY", "Returns the 20 most recent Tweets that match a specified query."
+    method_option :number, :aliases => "-n", :type => :numeric, :default => 20
+    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
+    def search(query)
+      hash = {:include_entities => false}
+      hash.merge!(:rpp => options['number']) if options['number']
+      timeline = client.search(query, hash)
+      timeline.reverse! if options['reverse']
+      run_pager
+      timeline.map do |status|
+        say "#{status.from_user.rjust(20)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
+      end
+    end
+
+    desc "sent_messages", "Returns the 20 most recent Direct Messages sent to you."
+    def sent_messages
+      run_pager
+      client.direct_messages_sent(:include_entities => false).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 "stats SCREEN_NAME", "Retrieves the given user's number of followers and how many people they're following."
+    def stats(screen_name)
+      screen_name = screen_name.strip_at
+      user = client.user(screen_name, :include_entities => false)
+      say "Tweets: #{number_with_delimiter(user.statuses_count)}"
       say "Following: #{number_with_delimiter(user.friends_count)}"
+      say "Followers: #{number_with_delimiter(user.followers_count)}"
+      say "Favorites: #{number_with_delimiter(user.favorites_count)}"
+      say "Listed: #{number_with_delimiter(user.listed_count)}"
       say
       say "Run `#{$0} whois #{user.screen_name}` to view profile."
     end
@@ -223,7 +245,7 @@ module T
     desc "status MESSAGE", "Post a Tweet."
     method_option :location, :aliases => "-l", :type => :boolean, :default => true
     def status(message)
-      hash = {}
+      hash = {:include_entities => false, :trim_user => true}
       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)"
@@ -234,7 +256,7 @@ module T
 
     desc "suggest", "This command returns a listing of Twitter users' accounts we think you might enjoy following."
     def suggest
-      recommendation = client.recommendations(:limit => 1).first
+      recommendation = client.recommendations(:limit => 1, :include_entities => false).first
       if recommendation
         say "Try following @#{recommendation.screen_name}."
         say
@@ -245,9 +267,12 @@ module T
     end
 
     desc "timeline", "Returns the 20 most recent Tweets posted by you and the users you follow."
+    method_option :number, :aliases => "-n", :type => :numeric, :default => 20
     method_option :reverse, :aliases => "-r", :type => :boolean, :default => false
     def timeline
-      timeline = client.home_timeline
+      hash = {:include_entities => false}
+      hash.merge!(:count => options['number']) if options['number']
+      timeline = client.home_timeline(hash)
       timeline.reverse! if options['reverse']
       run_pager
       timeline.map do |status|
@@ -256,26 +281,16 @@ module T
     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 "@#{@rcfile.default_profile[0]} is no longer following @#{user.screen_name}."
-      say
-      say "Run `#{$0} follow #{user.screen_name}` to follow again."
-    end
-    map %w(defriend) => :unfollow
-
-    desc "version", "Show version"
+    desc "version", "Show version."
     def version
       say T::Version
     end
     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)
+    desc "whois SCREEN_NAME", "Retrieves profile information for the user."
+    def whois(screen_name)
+      screen_name = screen_name.strip_at
+      user = client.user(screen_name, :include_entities => false)
       say "#{user.name}, since #{user.created_at.strftime("%b %Y")}."
       say "bio: #{user.description}"
       say "location: #{user.location}"
@@ -284,96 +299,109 @@ module T
 
     desc "delete SUBCOMMAND ...ARGS", "Delete Tweets, Direct Messages, etc."
     method_option :force, :aliases => "-f", :type => :boolean
-    subcommand 'delete', Delete
+    require 't/cli/delete'
+    subcommand 'delete', CLI::Delete
+
+    desc "follow SUBCOMMAND ...ARGS", "Follow users."
+    require 't/cli/follow'
+    subcommand 'follow', CLI::Follow
+
+    desc "list SUBCOMMAND ...ARGS", "Do various things with lists."
+    require 't/cli/list'
+    subcommand 'list', CLI::List
 
     desc "set SUBCOMMAND ...ARGS", "Change various account settings."
-    subcommand 'set', Set
+    require 't/cli/set'
+    subcommand 'set', CLI::Set
 
-    no_tasks do
+    desc "unfollow SUBCOMMAND ...ARGS", "Unfollow users."
+    require 't/cli/unfollow'
+    subcommand 'unfollow', CLI::Unfollow
 
-      def base_url
-        "#{protocol}://#{host}"
-      end
+  private
 
-      def client
-        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
-        )
-      end
+    def base_url
+      "#{protocol}://#{host}"
+    end
 
-      def consumer
-        OAuth::Consumer.new(
-          options['consumer_key'],
-          options['consumer_secret'],
-          :site => base_url
-        )
-      end
+    def client
+      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
+      )
+    end
 
-      def generate_authorize_url(request_token)
-        request = consumer.create_signed_request(:get, consumer.authorize_path, request_token, pin_auth_parameters)
-        params = request['Authorization'].sub(/^OAuth\s+/, '').split(/,\s+/).map do |param|
-          key, value = param.split('=')
-          value =~ /"(.*?)"/
-          "#{key}=#{CGI::escape($1)}"
-        end.join('&')
-        "#{base_url}#{request.path}?#{params}"
-      end
+    def consumer
+      OAuth::Consumer.new(
+        options['consumer_key'],
+        options['consumer_secret'],
+        :site => base_url
+      )
+    end
 
-      def host
-        options['host'] || DEFAULT_HOST
-      end
+    def generate_authorize_url(request_token)
+      request = consumer.create_signed_request(:get, consumer.authorize_path, request_token, pin_auth_parameters)
+      params = request['Authorization'].sub(/^OAuth\s+/, '').split(/,\s+/).map do |param|
+        key, value = param.split('=')
+        value =~ /"(.*?)"/
+        "#{key}=#{CGI::escape($1)}"
+      end.join('&')
+      "#{base_url}#{request.path}?#{params}"
+    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 host
+      options['host'] || DEFAULT_HOST
+    end
 
-      def pin_auth_parameters
-        {:oauth_callback => 'oob'}
+    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 protocol
-        options['no_ssl'] ? 'http' : DEFAULT_PROTOCOL
-      end
+    def pin_auth_parameters
+      {:oauth_callback => 'oob'}
+    end
 
-      def run_pager
-        return if RUBY_PLATFORM =~ /win32/
-        return if ENV["T_ENV"] == "test"
-        return unless STDOUT.tty?
+    def protocol
+      options['no_ssl'] ? 'http' : DEFAULT_PROTOCOL
+    end
 
-        read, write = IO.pipe
+    def run_pager
+      return if RUBY_PLATFORM =~ /win32/
+      return if ENV["T_ENV"] == "test"
+      return unless STDOUT.tty?
 
-        unless Kernel.fork # Child process
-          STDOUT.reopen(write)
-          STDERR.reopen(write) if STDERR.tty?
-          read.close
-          write.close
-          return
-        end
+      read, write = IO.pipe
 
-        # Parent process, become pager
-        STDIN.reopen(read)
+      unless Kernel.fork # Child process
+        STDOUT.reopen(write)
+        STDERR.reopen(write) if STDERR.tty?
         read.close
         write.close
+        return
+      end
 
-        ENV['LESS'] = 'FSRX' # Don't page if the input is short enough
+      # Parent process, become pager
+      STDIN.reopen(read)
+      read.close
+      write.close
 
-        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
+      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
 end