twat 0.2.7 → 0.3.0

data/TODO

@@ -1,2 +1,5 @@
 twat -l -> <newsfeed>
 twat -l [count] -> <count entries from newsfeed>
+# Include who tweeted...
+
+catch invalid options and return opts

data/lib/twat/actions.rb

@@ -5,16 +5,7 @@ module Twat
 
     def tweet(opts)
       # This is all broken, we should know what options we have before this happend
-      conf = cf[opts[:account]]
-
-      Twitter.configure do |twit|
-        conf.each do |key, value|
-          twit.send("#{key}=", value)
-        end
-        Config.consumer_info.each do |key, value|
-          twit.send("#{key}=", value)
-        end
-      end
+      twitter_auth(opts)
 
       Twitter.update(opts.msg)
       #puts opts.msg
@@ -53,7 +44,12 @@ module Twat
     end
 
     def show(opts)
-      puts "#{opts[:count]} Tweets XD"
+      twitter_auth(opts)
+      Twitter.home_timeline.each_with_index do |tweet, idx|
+        puts "#{tweet.user.screen_name}: #{tweet.text}"
+
+        break if idx == opts[:count]
+      end
     end
 
     def version(opts)
@@ -66,5 +62,17 @@ module Twat
       @cf ||= Config.new
     end
 
+    def twitter_auth(opts)
+      conf = cf[opts[:account]]
+      Twitter.configure do |twit|
+        conf.each do |key, value|
+          twit.send("#{key}=", value)
+        end
+        Config.consumer_info.each do |key, value|
+          twit.send("#{key}=", value)
+        end
+      end
+    end
+
   end
 end

data/lib/twat/argparse.rb

@@ -16,31 +16,31 @@ module Twat
         options[:action] = :tweet
         options[:account] = :default
         opts.banner = "Usage: twat <tweet>"
-        opts.on('-n', '--account ACCOUNT', 'Tweet from ACCOUNT (or default)') do |acct|
+
+        opts.on('-n', '--account ACCOUNT', 'Use ACCOUNT (or default)') do |acct| #{{{ --account ACCOUNT
           options[:account] = acct.to_sym
-        end
-        opts.on('-a', '--add ACCOUNT', 'Configure and authorise ACCOUNT') do |acct|
+        end # }}}
+        opts.on('-a', '--add ACCOUNT', 'Configure and authorise ACCOUNT') do |acct| #{{{ --add ACCOUNT
           options[:account] = acct.to_sym
           options[:action] = :add
-        end
-        opts.on('-d', '--delete ACCOUNT', 'Delete ACCOUNT') do |acct|
+        end #}}}
+        opts.on('-d', '--delete ACCOUNT', 'Delete ACCOUNT') do |acct| #{{{ --delete ACCOUNT
           options[:account] = acct.to_sym
           options[:action] = :delete
-        end
-        #opts.on( '-a' '--add ACCOUNT' ) do |acct|
-        #end
-        opts.on('-h', '--help', 'Display this screen') do
+        end #}}}
+        opts.on('-h', '--help', 'Display this screen') do #{{{ --help
           puts opts
           exit
-        end
-        opts.on('-l', '--list [COUNT]', 'Display [count] tweets from your newsfeed') do |count|
+        end #}}}
+        opts.on('-l', '--list [COUNT]', 'Display [count] tweets from your newsfeed') do |count| #{{{ --list ACCOUNT
           options[:count] = count || 10
           options[:action] = :show
-        end
-        opts.on('-v', '--version', 'Display version info') do
+        end #}}}
+        opts.on('-v', '--version', 'Display version info') do #{{{ --version
           options[:action] = :version
-        end
+        end #}}}
       end
+
       @optparser.parse!
       REQUIRED.each do |req|
         usage unless options[req]
@@ -61,7 +61,11 @@ module Twat
     end
 
     def options
-      @configthingfucken ||= getopts
+      begin
+        @configthingfucken ||= getopts
+      rescue OptionParser::InvalidOption
+        usage "Unknown option"
+      end
     end
 
   end

data/lib/twat/exceptions.rb

@@ -2,4 +2,5 @@ module Twat
   class NoSuchAccount < Exception; end
   class NoConfigFile < Exception; end
   class Usage < Exception; end
+  class InvalidCredentials < Exception; end
 end

data/lib/twat.rb

@@ -12,8 +12,8 @@ end
 
 module Twat
   VERSION_MAJOR = 0
-  VERSION_MINOR = 2
-  VERSION_PATCH = 7
+  VERSION_MINOR = 3
+  VERSION_PATCH = 0
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat
@@ -33,6 +33,9 @@ module Twat
       rescue NoConfigFile
         puts "No config file, create one with twat -a [user|nick]"
         opts.usage
+      rescue InvalidCredentials
+        puts "Invalid credentials, try reauthenticating with"
+        puts "twat -a #{opts[:account]}"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &11627540 !ruby/object:Gem::Requirement
+  requirement: &74735110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11627540
+  version_requirements: *74735110
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &11626400 !ruby/object:Gem::Requirement
+  requirement: &74734800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11626400
+  version_requirements: *74734800
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net