twat 0.6.1 → 0.6.2

data/lib/twat.rb

@@ -6,8 +6,6 @@ require 'yaml'
 require 'optparse'
 require 'oauth'
 
-require 'readline-ng'
-
 %w[config exceptions argparse actions migration options endpoint].each do |filename|
   require "twat/#{filename}"
 end
@@ -51,7 +49,7 @@ end
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 6
-  VERSION_PATCH = 1
+  VERSION_PATCH = 2
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat
@@ -61,12 +59,14 @@ module Twat
     def cli_run
       # FIXME Handing in the opts like this feels dirty
       with_handled_exceptions(ArgParse.new) do |opts|
-        actor = Actions.new
-
         if opts[:account] && opts[:action] != :add
           config.account = opts[:account]
         end
 
+        require 'readline-ng'
+        actor = Actions.new
+
+
         actor.config = config
         actor.opts = opts
         actor.send(opts.options[:action])

data/lib/twat/actions.rb

@@ -17,6 +17,10 @@ module Twat
       "%02d" % n
     end
 
+    def reader
+      @reader ||= ReadlineNG::Reader.new
+    end
+
     # Format a tweet all pretty like
     def format(twt, idx = nil)
       idx = pad(idx) if idx

data/lib/twat/actions/add.rb

@@ -15,8 +15,8 @@ module Twat
 
       oauth = OAuth::Consumer.new( v[0], v[1], oauth_options )
       token_request = oauth.get_request_token()
-      puts "Please authenticate the application at #{token_request.authorize_url}, then enter pin"
-      pin = STDIN.gets.chomp
+      reader.puts_above "Please authenticate the application at #{token_request.authorize_url} , then enter pin"
+      pin = reader.get_line
       begin
         access_token = token_request.get_access_token(oauth_verifier: pin)
         account_settings = {
@@ -24,10 +24,11 @@ module Twat
           oauth_token_secret: access_token.secret,
           endpoint: opts[:endpoint]
         }
+        config.create_unless_exists!
         config.accounts[opts[:account]] = account_settings
         config.save!
       rescue OAuth::Unauthorized
-        puts "Couldn't authenticate you, did you enter the pin correctly?"
+        reader.puts_above "Couldn't authenticate you, did you enter the pin correctly?"
       end
     end
 

data/lib/twat/actions/follow.rb

@@ -44,9 +44,9 @@ module Twat
   class Actions
 
     def initialize
-      @reader = ReadlineNG::Reader.new
+      @failcount = 0
 
-      def @reader.filter
+      def reader.filter
         case @buf.length
         when 140
           _print ""
@@ -56,6 +56,15 @@ module Twat
       end
     end
 
+    def fail_or_bail
+      if @failcount > 2
+        puts "3 consecutive failures, giving up"
+      else
+        @failcount += 1
+        return true
+      end
+    end
+
     def follow
       twitter_auth
       failcount = 0
@@ -68,8 +77,8 @@ module Twat
           last_id = process_followed(tweets) if tweets.any?
           (config.polling_interval * POLLING_RESOLUTION).times do
             begin
-              @reader.tick
-              @reader.each_line { |inp| handle_input(inp) }
+              reader.tick
+              reader.each_line { |inp| handle_input(inp) }
             rescue TweetTooLong
               puts "Too long".red
             end
@@ -79,23 +88,13 @@ module Twat
           failcount = 0
         rescue Interrupt
           break
-        # rescue Twitter::ServiceUnavailable
-        #   if failcount > 2
-        #     puts "3 consecutive failures, giving up"
-        #   else
-        #     sleeptime = 60 * (failcount + 1)
-        #     print "(__-){".red
-        #     puts ": the fail whale has been rolled out, sleeping for #{sleeptime} seconds"
-        #     sleep sleeptime
-        #     failcount += 1
-        #   end
-        rescue Errno::ECONNRESET
-        rescue Errno::ETIMEDOUT
-          if failcount > 2
-            puts "3 consecutive failures, giving up"
-          else
-            failcount += 1
-          end
+        rescue Twitter::Error::ServiceUnavailable
+          break unless fail_or_bail
+          sleeptime = 60 * (@failcount + 1)
+          reader.puts_above "#{"(__-){".red}: the fail whale has been rolled out, sleeping for #{sleeptime} seconds"
+          sleep sleeptime
+        rescue Errno::ECONNRESET, Errno::ETIMEDOUT, SocketError
+          break unless fail_or_bail
         end
       end
     end
@@ -112,7 +111,7 @@ module Twat
       tweets.reverse.each do |tweet|
         id = @tweetstack << tweet
         beep if config.beep? && tweet.text.mentions?(config.account_name)
-        @reader.puts_above format(tweet, @tweetstack.last)
+        reader.puts_above format(tweet, @tweetstack.last)
         last_id = tweet.id
       end
 
@@ -130,7 +129,7 @@ module Twat
       when /follow (.*)/
         follow_user($1)
       when /test/
-        @reader.puts_above "Testline!"
+        reader.puts_above "Testline!"
       else
         # Assume they want to tweet something
         raise TweetTooLong if inp.length > 140

data/lib/twat/config.rb

@@ -18,6 +18,14 @@ module Twat
       @config_path ||= ENV['TWAT_CONFIG'] || "#{ENV['HOME']}/.twatrc"
     end
 
+    def create_unless_exists!
+      begin
+        config
+      rescue NoConfigFile
+        @config = { accounts: {} }
+      end
+    end
+
     def config
       begin
         @config ||= YAML.load_file(config_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000 Z
+date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &12531360 !ruby/object:Gem::Requirement
+  requirement: &18009540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12531360
+  version_requirements: *18009540
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &13194720 !ruby/object:Gem::Requirement
+  requirement: &18008460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13194720
+  version_requirements: *18008460
 - !ruby/object:Gem::Dependency
   name: readline-ng
-  requirement: &13194200 !ruby/object:Gem::Requirement
+  requirement: &18332540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13194200
+  version_requirements: *18332540
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net