twat 0.4.14 → 0.4.15

data/TODO

@@ -20,14 +20,6 @@ On the upside, it'll make unit testing similar.
 
 Split config and options out into submodules
 
-Wrap all of the exception handling into a submodule, ie
-with_handled_exceptions do
-    <perform actions assuming everything went well>
-end
-
-(With handled exceptions contains the logic for yelling at the user for
-being stupid, etc)
-
 Allow upload of media files with the tweet via some kind of --attach
 (Has implications for other endpoints because we need that data from the user or to infer it somehow)
 

data/lib/twat.rb

@@ -45,48 +45,20 @@ end
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 4
-  VERSION_PATCH = 14
+  VERSION_PATCH = 15
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat
+
+    include HandledExceptions
+
     def cli_run
-      begin
-        opts = ArgParse.new
+      # FIXME Handing in the opts like this feels dirty
+      with_handled_exceptions(ArgParse.new) do |opts|
         actor = Actions.new
         actor.config = config
         actor.opts = opts
         actor.send(opts.options[:action])
-      rescue Usage
-        opts.usage
-      rescue NoSuchAccount
-        puts "No such account"
-        opts.usage
-      rescue NoDefaultAccount
-        puts "No default account configured."
-      rescue NoSuchCommand
-        puts "No such command"
-        opts.usage
-      rescue NoConfigFile
-        puts "No config file, create one with twat -a [user|nick]"
-        opts.usage
-      rescue InvalidSetOpt
-        puts "There is no such configurable option"
-        opts.usage
-      rescue RequiresOptVal
-        puts "--set must take an option=value pair as arguments"
-      rescue InvalidCredentials
-        puts "Invalid credentials, try reauthenticating with"
-        puts "twat -a #{opts[:account]}"
-      rescue ConfigVersionIncorrect
-        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"
-      rescue Errno::ECONNRESET
-        puts "Connection was reset by third party."
-      rescue TweetTooLong
-        puts "Twitter enforces a maximum status length of 140 characters"
       end
     end
   end

data/lib/twat/actions.rb

@@ -176,7 +176,12 @@ module Twat
     end
 
     def account
-      @account = config.accounts[account_name]
+      @account ||= config.accounts[account_name]
+      unless @account
+        raise NoSuchAccount
+      else
+        return @account
+      end
     end
 
     def account_name

data/lib/twat/exceptions.rb

@@ -11,4 +11,44 @@ module Twat
   class InvalidBool < Exception; end
   class InvalidInt < Exception; end
   class TweetTooLong < Exception; end
+
+  module HandledExceptions
+    def with_handled_exceptions(opts)
+      begin
+        # FIXME
+        yield opts
+      rescue Usage
+        opts.usage
+      rescue NoSuchAccount
+        puts "No such account"
+        opts.usage
+      rescue NoDefaultAccount
+        puts "No default account configured."
+      rescue NoSuchCommand
+        puts "No such command"
+        opts.usage
+      rescue NoConfigFile
+        puts "No config file, create one with twat -a [user|nick]"
+        opts.usage
+      rescue InvalidSetOpt
+        puts "There is no such configurable option"
+        opts.usage
+      rescue RequiresOptVal
+        puts "--set must take an option=value pair as arguments"
+      rescue InvalidCredentials
+        puts "Invalid credentials, try reauthenticating with"
+        puts "twat -a #{opts[:account]}"
+      rescue ConfigVersionIncorrect
+        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"
+      rescue Errno::ECONNRESET
+        puts "Connection was reset by third party."
+      rescue TweetTooLong
+        puts "Twitter enforces a maximum status length of 140 characters"
+      end
+    end
+  end
 end

data/man/twat.1

@@ -49,3 +49,8 @@ config to the latest version.
 .IP ~/.twatrc
 yaml file containing a mapping of account nicknames to oauth credentials.
 Should always be readable only to you.
+.SH AUTHOR
+twat was written by Rich Healey <richo@psych0tik.net>
+.SH CREDIT
+twat was inspired by (and began life as a 6 line script invoking) the Twitter
+gem by John Nunemaker.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &20659360 !ruby/object:Gem::Requirement
+  requirement: &17618920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20659360
+  version_requirements: *17618920
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &20658720 !ruby/object:Gem::Requirement
+  requirement: &17618180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20658720
+  version_requirements: *17618180
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Command line tool for tweeting and whatnot