twat 0.3.1 → 0.3.3

data/TODO

@@ -3,3 +3,16 @@ 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)

data/bin/twat

@@ -3,4 +3,4 @@
 require 'twat'
 
 inst = Twat::Twat.new
-inst.run
+inst.cli_run

data/lib/twat/actions.rb

@@ -3,15 +3,16 @@ module Twat
   CONSUMER_TOKENS = [ :consumer_key, :consumer_secret ]
   class Actions
 
-    def tweet(opts)
-      # This is all broken, we should know what options we have before this happend
-      twitter_auth(opts)
+    attr_accessor :config, :opts
+
+    def tweet
+      twitter_auth
 
       Twitter.update(opts.msg)
       #puts opts.msg
     end
 
-    def add(opts)
+    def add
       v = Config.consumer_info.map do |key, value|
         value
       end
@@ -24,48 +25,43 @@ module Twat
       pin = gets.chomp
       begin
         access_token = token_request.get_access_token(oauth_verifier: pin)
-        cf[opts[:account]] = {
+        config[opts[:account]] = {
           oauth_token: access_token.token,
           oauth_token_secret: access_token.secret
         }
-        cf.save! 
+        config.save!
       rescue OAuth::Unauthorized
         puts "Couldn't authenticate you, did you enter the pin correctly?"
       end
     end
 
-    def delete(opts)
-      if cf.delete(opts[:account])
-        cf.save!
+    def delete
+      if config.delete(opts[:account])
+        config.save!
         puts "Successfully deleted"
       else
         puts "No such account"
       end
     end
 
-    def show(opts)
-      twitter_auth(opts)
+    def show
+      twitter_auth
       Twitter.home_timeline.each_with_index do |tweet, idx|
-        puts "#{tweet.user.screen_name}: #{tweet.text}"
+        puts "#{tweet.user.screen_name.bold.cyan}: #{tweet.text}"
 
         break if idx == opts[:count]
       end
     end
 
-    def version(opts)
+    def version
       puts "twat: #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
     end
 
     private
 
-    def cf
-      @cf ||= Config.new
-    end
-
-    def twitter_auth(opts)
-      conf = cf[opts[:account]]
+    def twitter_auth
       Twitter.configure do |twit|
-        conf.each do |key, value|
+        account.each do |key, value|
           twit.send("#{key}=", value)
         end
         Config.consumer_info.each do |key, value|
@@ -74,5 +70,9 @@ module Twat
       end
     end
 
+    def account
+      @account ||= config[opts[:account]]
+    end
+
   end
 end

data/lib/twat/config.rb

@@ -1,7 +1,18 @@
-require 'ostruct'
-
 module Twat
-  class Config #< OpenStruct
+  class Twat
+    def configure(&block)
+      yield config
+
+      # If I understand correctly, I can check over what's
+      # happened here?
+    end
+
+    def config
+      @config ||= Config.new
+    end
+  end
+
+  class Config
 
     def config_path
       @config_path ||= ENV['TWAT_CONFIG'] || "#{ENV['HOME']}/.twatrc"
@@ -22,6 +33,10 @@ module Twat
       end
     end
 
+    def method_missing(meth)
+      self[meth]
+    end
+
     def [](key)
       raise NoSuchAccount unless config.include?(key)
       config[key]

data/lib/twat.rb

@@ -10,18 +10,34 @@ require 'oauth'
   require "twat/#{filename}"
 end
 
+class String
+  def red
+    "#{self}"
+  end
+
+  def cyan
+    "#{self}"
+  end
+
+  def bold
+    "#{self}"
+  end
+end
+
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 3
-  VERSION_PATCH = 1
+  VERSION_PATCH = 3
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat
-    def run
+    def cli_run
       begin
-        action = Actions.new
         opts = ArgParse.new
-        action.send(opts.options[:action], opts)
+        actor = Actions.new
+        actor.config = config
+        actor.opts = opts
+        actor.send(opts.options[:action])
       rescue Usage
         opts.usage
       rescue NoSuchAccount

metadata

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