twat 0.4.2 → 0.4.3

data/TODO

@@ -1,33 +1,17 @@
-twat -l -> <newsfeed>
-twat -l [count] -> <count entries from newsfeed>
-# Include who tweeted...
-
 catch invalid options and return opts
 
-
-CONFIG FILE
-===========
-
-This really does need to change, but I'm not sure where on the "Can piss off a userbase" scale I am, (ie, do I have one)
-
-For now I'm going to leave it, and if it gets to 1.0 I'll fix it then.
-
 COLORS!
 =======
 
-twat -l should dump colors to terminal (This should be configurable tho)
-
 Refactor tweet printing code, unify throughout
 
-MIGRATIONS
-==========
-
-Shouldn't run if config is up to date
 
 TODO
 ====
 
-Finish the config stuff (change --set-default <acct> to --set
-DEFAULT=<acct>)
-implement twat -f that just ticks by (have some option to ring a bell or
-some shit)
+Configurable polling interval
+(which carries with it warnings if it's too short.. which means a warn
+method.. which means abstracting it's output..)
+
+On the upside, it'll make unit testing similar.  
+(Add unit tests)

data/doc/twat.1

@@ -22,6 +22,9 @@ account.
 Delete speficied account.
 .IP -h
 Display a short summary of twat's options.
+.IP -f
+Watch your newsfeed in a similar manner to tail -f, updating as your feed does
+(polling interval 60 seconds)
 .IP -u USER
 Retrieve a list of USER's recent tweets. Note this will retrieve all of their
 tweets as opposed to just what would have appeared in your feed.

data/lib/twat.rb

@@ -39,7 +39,7 @@ end
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 4
-  VERSION_PATCH = 2
+  VERSION_PATCH = 3
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat

data/lib/twat/actions.rb

@@ -66,12 +66,51 @@ module Twat
       end
     end
 
+    private
+
+    # @return last_id
+    def process_followed(tweets)
+      last_id = nil
+      tweets.reverse.each do |tweet|
+        format(tweet)
+        last_id = tweet.id
+      end
+
+      return last_id
+    end
+
+    public
+
+    def follow
+      # I can't see any way to poll the server for updates, so in the meantime
+      # we will have to retrieve a few tweets from the timeline, and then poll
+      # occasionally :/
+      twitter_auth
+
+      # Get 5 tweets
+      tweets = Twitter.home_timeline(:count => 5)
+      begin
+        while true do
+          last_id = process_followed(tweets) if tweets.any?
+          # Sleep 15 seconds between requests
+          # If left running at all times, that's 240 requests per hour, well
+          # under the limit
+          # sleep 15
+          # Disregard that, once per 60 seconds is plenty
+          sleep 60
+          tweets = Twitter.home_timeline(:since_id => last_id)
+        end
+      rescue Interrupt
+      end
+    end
+
     def user_feed
       twitter_auth
 
       begin
-        Twitter.user_timeline(opts[:user]).first.tap do |tweet|
+        Twitter.user_timeline(opts[:user]).each_with_index do |tweet, idx|
           puts "#{tweet.user.screen_name.bold.cyan}: #{tweet.text}"
+          break if idx == opts[:count]
         end
       rescue Twitter::NotFound
         puts "#{opts[:user].bold.red} doesn't appear to be a valid user"

data/lib/twat/argparse.rb

@@ -14,8 +14,9 @@ module Twat
 
     def getopts
       options = Hash.new
+      options[:action] = :tweet
+      options[:count] = 1
       @optparser = OptionParser.new do |opts|
-        options[:action] = :tweet
         opts.banner = "Usage: twat <tweet>"
 
         opts.on('-n', '--account ACCOUNT', 'Use ACCOUNT (or default)') do |acct| #{{{ --account ACCOUNT
@@ -37,6 +38,9 @@ module Twat
           options[:count] = count || 10
           options[:action] = :show
         end #}}}
+        opts.on('-f', '--follow', 'Display tweets from your newsfeed indefinitely') do #{{{ --follow
+          options[:action] = :follow
+        end #}}}
         opts.on('-v', '--version', 'Display version info') do #{{{ --version
           options[:action] = :version
         end #}}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &20971900 !ruby/object:Gem::Requirement
+  requirement: &14528640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20971900
+  version_requirements: *14528640
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &20971320 !ruby/object:Gem::Requirement
+  requirement: &14528080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20971320
+  version_requirements: *14528080
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net