t 0.3.0 → 0.3.1

data/.travis.yml

@@ -1,3 +1,4 @@
+before_install: "gem update --system"
 rvm:
   - 1.8.7
   - 1.9.2

data/bin/t

@@ -2,41 +2,44 @@
 
 require 't'
 
+# Output message to $stderr, prefixed with the program name
+def pute(message="")
+  $stderr.puts "#{$0}: #{message}"
+end
+
 begin
   T::CLI.start(ARGV)
 rescue Interrupt
-  $stderr.puts "Quitting..."
+  pute "Quitting..."
   exit 1
 rescue Twitter::Error::BadRequest => error
-  $stderr.puts error.message
+  pute error.message
   exit 400
 rescue OAuth::Unauthorized
-  $stderr.puts "Authorization failed"
+  pute "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."
+  pute "#{error.message} Run `#{$0} authorize --consumer-key=CONSUMER_KEY --consumer-secret=CONSUMER_SECRET` to authorize."
   exit 401
 rescue Twitter::Error::Forbidden => error
-  $stderr.puts error.message
+  pute error.message
   exit 403
 rescue Twitter::Error::NotFound => error
-  $stderr.puts error.message
+  pute error.message
   exit 404
 rescue Twitter::Error::NotAcceptable => error
-  $stderr.puts error.message
+  pute error.message
   exit 406
 rescue Twitter::Error::EnhanceYourCalm => error
-  $stderr.puts error.message
+  pute error.message
   exit 420
 rescue Twitter::Error::InternalServerError => error
-  $stderr.puts error.message
+  pute error.message
   exit 500
 rescue Twitter::Error::BadGateway => error
-  $stderr.puts error.message
+  pute error.message
   exit 502
 rescue Twitter::Error::ServiceUnavailable => error
-  $stderr.puts error.message
+  pute error.message
   exit 503
 end

data/lib/t.rb

@@ -1 +1,14 @@
+require 'active_support/string_inquirer'
 require 't/cli'
+
+module T
+  class << self
+    def env
+      @env ||= ActiveSupport::StringInquirer.new("development")
+    end
+
+    def env=(environment)
+      @env = ActiveSupport::StringInquirer.new(environment)
+    end
+  end
+end

data/lib/t/cli.rb

@@ -1,6 +1,7 @@
 require 'action_view'
 require 'launchy'
 require 'oauth'
+require 'pager'
 require 't/core_ext/string'
 require 't/rcfile'
 require 'thor'
@@ -12,6 +13,7 @@ module T
   class CLI < Thor
     include ActionView::Helpers::DateHelper
     include ActionView::Helpers::NumberHelper
+    include Pager
 
     DEFAULT_HOST = 'api.twitter.com'
     DEFAULT_PROTOCOL = 'https'
@@ -92,7 +94,7 @@ module T
     def direct_messages
       defaults = {:include_entities => false}
       defaults.merge!(:count => options['number']) if options['number']
-      run_pager
+      page unless T.env.test?
       client.direct_messages(defaults).each do |direct_message|
         say "#{direct_message.sender.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{direct_message.text} (#{time_ago_in_words(direct_message.created_at)} ago)"
       end
@@ -136,7 +138,7 @@ module T
       defaults.merge!(:count => options['number']) if options['number']
       timeline = client.favorites(defaults)
       timeline.reverse! if options['reverse']
-      run_pager
+      page unless T.env.test?
       timeline.each do |status|
         say "#{status.user.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
       end
@@ -151,7 +153,7 @@ module T
       defaults.merge!(:count => options['number']) if options['number']
       timeline = client.mentions(defaults)
       timeline.reverse! if options['reverse']
-      run_pager
+      page unless T.env.test?
       timeline.each do |status|
         say "#{status.user.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
       end
@@ -166,7 +168,7 @@ module T
     end
 
     desc "reply SCREEN_NAME MESSAGE", "Post your Tweet as a reply directed at another person."
-    method_option :location, :aliases => "-l", :type => :boolean, :default => true
+    method_option :location, :aliases => "-l", :type => :boolean, :default => false
     def reply(screen_name, message)
       screen_name = screen_name.strip_at
       defaults = {:include_entities => false, :trim_user => true}
@@ -205,7 +207,7 @@ module T
     def sent_messages
       defaults = {:include_entities => false}
       defaults.merge!(:count => options['number']) if options['number']
-      run_pager
+      page unless T.env.test?
       client.direct_messages_sent(defaults).each do |direct_message|
         say "#{direct_message.recipient.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{direct_message.text} (#{time_ago_in_words(direct_message.created_at)} ago)"
       end
@@ -226,7 +228,7 @@ module T
     end
 
     desc "status MESSAGE", "Post a Tweet."
-    method_option :location, :aliases => "-l", :type => :boolean, :default => true
+    method_option :location, :aliases => "-l", :type => :boolean, :default => false
     def status(message)
       defaults = {:include_entities => false, :trim_user => true}
       defaults.merge!(:lat => location.lat, :long => location.lng) if options['location']
@@ -262,7 +264,7 @@ module T
         timeline = client.home_timeline(defaults)
       end
       timeline.reverse! if options['reverse']
-      run_pager
+      page unless T.env.test?
       timeline.each do |status|
         say "#{status.user.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
       end
@@ -279,6 +281,7 @@ module T
     def whois(screen_name)
       screen_name = screen_name.strip_at
       user = client.user(screen_name, :include_entities => false)
+      say "id: ##{number_with_delimiter(user.id)}"
       say "#{user.name}, since #{user.created_at.strftime("%b %Y")}."
       say "bio: #{user.description}"
       say "location: #{user.location}"
@@ -368,32 +371,5 @@ module T
       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
 end

data/lib/t/cli/list.rb

@@ -1,4 +1,5 @@
 require 'action_view'
+require 'pager'
 require 't/rcfile'
 require 'thor'
 require 'twitter'
@@ -7,6 +8,7 @@ module T
   class CLI
     class List < Thor
       include ActionView::Helpers::DateHelper
+      include Pager
 
       DEFAULT_HOST = 'api.twitter.com'
       DEFAULT_PROTOCOL = 'https'
@@ -37,7 +39,7 @@ module T
         defaults.merge!(:per_page => options['number']) if options['number']
         timeline = client.list_timeline(list_name, defaults)
         timeline.reverse! if options['reverse']
-        run_pager
+        page unless T.env.test?
         timeline.each do |status|
           say "#{status.user.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
         end
@@ -78,33 +80,6 @@ module T
         parent_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
   end
 end

data/lib/t/cli/search.rb

@@ -1,4 +1,5 @@
 require 'action_view'
+require 'pager'
 require 'retryable'
 require 't/core_ext/enumerable'
 require 't/rcfile'
@@ -9,6 +10,7 @@ module T
   class CLI
     class Search < Thor
       include ActionView::Helpers::DateHelper
+      include Pager
 
       DEFAULT_HOST = 'api.twitter.com'
       DEFAULT_PROTOCOL = 'https'
@@ -32,7 +34,7 @@ module T
         defaults.merge!(:rpp => options['number']) if options['number']
         timeline = client.search(query, defaults)
         timeline.reverse! if options['reverse']
-        run_pager
+        page unless T.env.test?
         timeline.each do |status|
           say "#{status.from_user.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
         end
@@ -47,7 +49,7 @@ module T
             end
           end
         end
-        run_pager
+        page unless T.env.test?
         timeline.flatten.compact.each do |status|
           say "#{status.user.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
         end
@@ -64,7 +66,7 @@ module T
             end
           end
         end
-        run_pager
+        page unless T.env.test?
         timeline.flatten.compact.each do |status|
           say "#{status.user.screen_name.rjust(MAX_SCREEN_NAME_SIZE)}: #{status.text} (#{time_ago_in_words(status.created_at)} ago)"
         end
@@ -96,33 +98,6 @@ module T
         parent_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
   end
 end

data/lib/t/collectable.rb

@@ -2,10 +2,9 @@ module T
   module Collectable
 
     def collect_with_cursor(collection=[], cursor=-1, &block)
-      return collection if cursor == 0
       object = yield cursor
       collection += object.collection
-      collect_with_cursor(collection, object.next_cursor)
+      object.next_cursor.zero? ? collection : collect_with_cursor(collection, object.next_cursor)
     end
 
   end

data/lib/t/version.rb

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

data/spec/cli_spec.rb

@@ -594,6 +594,7 @@ describe T::CLI do
     it "should have the correct output" do
       @t.whois("sferik")
       $stdout.string.should == <<-eos.gsub(/^ {8}/, '')
+        id: #7,505,382
         Erik Michaels-Ober, since Jul 2007.
         bio: A mind forever voyaging through strange seas of thought, alone.
         location: San Francisco

data/spec/helper.rb

@@ -1,7 +1,7 @@
-ENV["T_ENV"] = "test"
 require 'simplecov'
 SimpleCov.start
 require 't'
+T.env = 'test'
 require 'rspec'
 require 'timecop'
 require 'webmock/rspec'

data/t.gemspec

@@ -7,9 +7,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'launchy', '~> 2.0'
   gem.add_dependency 'geokit', '~> 1.6'
   gem.add_dependency 'oauth', '~> 0.4'
+  gem.add_dependency 'pager', '~> 1.0'
   gem.add_dependency 'retryable', '~> 1.2'
   gem.add_dependency 'thor', '~> 0.15.0.rc2'
-  gem.add_dependency 'twitter', ['>= 2.0.2', '< 3']
+  gem.add_dependency 'twitter', '~> 2.1'
   gem.add_dependency 'yajl-ruby', '~> 1.1'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70328292738520 !ruby/object:Gem::Requirement
+  requirement: &70134698842180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *70328292738520
+  version_requirements: *70134698842180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70328292736540 !ruby/object:Gem::Requirement
+  requirement: &70134698841380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *70328292736540
+  version_requirements: *70134698841380
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70328292735260 !ruby/object:Gem::Requirement
+  requirement: &70134698840660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328292735260
+  version_requirements: *70134698840660
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &70328292734440 !ruby/object:Gem::Requirement
+  requirement: &70134698840200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70328292734440
+  version_requirements: *70134698840200
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70328292733780 !ruby/object:Gem::Requirement
+  requirement: &70134698858160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,21 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70328292733780
+  version_requirements: *70134698858160
+- !ruby/object:Gem::Dependency
+  name: pager
+  requirement: &70134698857700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70134698857700
 - !ruby/object:Gem::Dependency
   name: retryable
-  requirement: &70328292732920 !ruby/object:Gem::Requirement
+  requirement: &70134698857240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +93,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70328292732920
+  version_requirements: *70134698857240
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70328292732400 !ruby/object:Gem::Requirement
+  requirement: &70134698856780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,24 +104,21 @@ dependencies:
         version: 0.15.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70328292732400
+  version_requirements: *70134698856780
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &70328292731300 !ruby/object:Gem::Requirement
+  requirement: &70134698856320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70328292731300
+  version_requirements: *70134698856320
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70328292729420 !ruby/object:Gem::Requirement
+  requirement: &70134698855860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -118,10 +126,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70328292729420
+  version_requirements: *70134698855860
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70328292728420 !ruby/object:Gem::Requirement
+  requirement: &70134698855480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -129,10 +137,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328292728420
+  version_requirements: *70134698855480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70328292714620 !ruby/object:Gem::Requirement
+  requirement: &70134698855020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -140,10 +148,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328292714620
+  version_requirements: *70134698855020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328292713460 !ruby/object:Gem::Requirement
+  requirement: &70134698854600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -151,10 +159,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328292713460
+  version_requirements: *70134698854600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70328292712180 !ruby/object:Gem::Requirement
+  requirement: &70134698854180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -162,10 +170,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328292712180
+  version_requirements: *70134698854180
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70328292710680 !ruby/object:Gem::Requirement
+  requirement: &70134698853760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -173,10 +181,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328292710680
+  version_requirements: *70134698853760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70328292708760 !ruby/object:Gem::Requirement
+  requirement: &70134698853340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -184,7 +192,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328292708760
+  version_requirements: *70134698853340
 description: A command-line interface for Twitter.
 email: sferik@gmail.com
 executables:
@@ -270,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: CLI for Twitter