twat 0.4.8 → 0.4.9

data/TODO

@@ -9,9 +9,10 @@ Refactor tweet printing code, unify throughout
 TODO
 ====
 
-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)
+
+Split config and options out into submodules

data/lib/twat.rb

@@ -45,7 +45,7 @@ end
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 4
-  VERSION_PATCH = 8
+  VERSION_PATCH = 9
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat
@@ -81,6 +81,8 @@ module Twat
         puts "Your config file is out of date. Run with --update-config to rememdy"
       rescue InvalidBool
         puts "Invalid value, valid values are #{Options::BOOL_VALID.join("|")}"
+      rescue InvalidInt
+        puts "Invalid value, must be an integer"
       end
     end
   end

data/lib/twat/actions.rb

@@ -91,12 +91,7 @@ module Twat
       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
+          sleep config.polling_interval
           tweets = Twitter.home_timeline(:since_id => last_id)
         end
       rescue Interrupt

data/lib/twat/config.rb

@@ -58,6 +58,10 @@ module Twat
       Options.bool_true?(beep)
     end
 
+    def polling_interval
+      config[:polling_interval] || 60
+    end
+
     def default_account
       raise NoDefaultAccount unless config.include?(:default)
       return config[:default].to_sym

data/lib/twat/exceptions.rb

@@ -9,4 +9,5 @@ module Twat
   class ConfigVersionIncorrect < Exception; end
   class InvalidSetOpt < Exception; end
   class InvalidBool < Exception; end
+  class InvalidInt < Exception; end
 end

data/lib/twat/options.rb

@@ -19,6 +19,10 @@ module Twat
       BOOL_VALS.include?(val.to_s.downcase)
     end
 
+    def self.int_valid?(val)
+      !!/^[0-9]+$/.match(val)
+    end
+
     # A set of wrappers around the global config object to set given attributes
     # Catching failures is convenient because of the method_missing? hook
     def method_missing(sym, *args, &block)
@@ -57,5 +61,17 @@ module Twat
       config.save!
     end
 
+    def polling_interval=(value)
+      raise InvalidInt unless Options.int_valid?(value)
+      val = value.to_i
+      if val < 15 then
+        puts "Polling intervals of < 15secs will exceed your daily API requests"
+        exit
+      else
+        config[:polling_interval] = val
+        config.save!
+      end
+    end
+
   end
 end

data/man/twat.1

@@ -24,7 +24,7 @@ Delete speficied account.
 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)
+(polling interval defaults to 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.
@@ -37,6 +37,9 @@ Sets account as the default
 Turns colors on or off in the output from twat. [defaults on]
 .IP beep=<true|false>
 Beep when a new tweet mentioning you is recieved (Handy in tmux). [defaults off]
+.IP polling_interval=[>14 seconds]
+Specify the interval between polls to twitter's API. Values of <15 seconds are
+not allowed as they would exceed a user's daily API requests to twitter.
 .IP --update-config
 Twat is a rolling release and as such, sometimes it is necessary to change the
 format of it's internal config file. Rather than making changes without user

metadata

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