twat 0.4.1 → 0.4.2

data/TODO

@@ -18,3 +18,16 @@ COLORS!
 twat -l should dump colors to terminal (This should be configurable tho)
 
 Refactor tweet printing code, unify throughout
+
+MIGRATIONS
+==========
+
+Shouldn't run if config is up to date
+
+TODO
+====
+
+Finish the config stuff (change --set-default <acct> to --set
+DEFAULT=<acct>)
+implement twat -f that just ticks by (have some option to ring a bell or
+some shit)

data/doc/twat.1

@@ -2,7 +2,8 @@
 .SH NAME
 twat \- a cli/ruby interface to twitter.
 .SH SYNOPSIS
-.B twat [-n account] <-a|-d|tweet>
+.B twat [-n account] <-a|-d|-l|-u [user]>
+.B twat [-n account] tweet goes here
 .SH DESCRIPTION
 .B twat
 gives a simple interface to twitter from the command line.
@@ -19,6 +20,23 @@ Tell twat to execute the routines for authenticating itself with OAuth for your
 account.
 .IP -d
 Delete speficied account.
+.IP -h
+Display a short summary of twat's options.
+.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.
+.SH CONFIGURATION
+Options are configured with --set OPTION=VALUE.
+Options include
+.IP default=account
+Sets account as the default
+.IP colors=<true|false>
+Turns colors on or off in the output from twat.
+.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
+consent, twat instead allows a user to use --update-config to migrate their
+config to the latest version.
 .SH FILES
 .IP ~/.twatrc
 yaml file containing a mapping of account nicknames to oauth credentials.

data/lib/twat.rb

@@ -6,7 +6,7 @@ require 'yaml'
 require 'optparse'
 require 'oauth'
 
-%w[config exceptions argparse actions migration].each do |filename|
+%w[config exceptions argparse actions migration options].each do |filename|
   require "twat/#{filename}"
 end
 
@@ -39,7 +39,7 @@ end
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 4
-  VERSION_PATCH = 1
+  VERSION_PATCH = 2
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat
@@ -63,11 +63,18 @@ module Twat
       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("|")}"
       end
     end
   end

data/lib/twat/actions.rb

@@ -44,14 +44,13 @@ module Twat
       end
     end
 
-    def setdefault
-      unless config.accounts.include?(opts[:account])
-        raise NoSuchAccount
-      end
+    def setoption
+      k, v = opts[:optval].split("=")
+      raise RequiresOptVal unless v
+      options = Options.new
+      options.send(:"#{k}=", v)
 
-      config[:default] = opts[:account]
-      config.save!
-      puts "Successfully set #{opts[:account]} as default"
+      puts "Successfully set #{k} as #{v}"
     end
 
     def updateconfig
@@ -83,7 +82,7 @@ module Twat
       puts "twat: #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
     end
 
-    def method_missing
+    def method_missing(sym, *args, &block)
       raise NoSuchCommand
     end
 
@@ -91,11 +90,14 @@ module Twat
 
     # Format a tweet all pretty like
     def format(twt)
-      # if config.color
-      if twt.user.screen_name == account_name.to_s
-        puts "#{twt.user.screen_name.bold.blue}: #{twt.text}"
+      if config.colors?
+        if twt.user.screen_name == account_name.to_s
+          puts "#{twt.user.screen_name.bold.blue}: #{twt.text}"
+        else
+          puts "#{twt.user.screen_name.bold.cyan}: #{twt.text}"
+        end
       else
-        puts "#{twt.user.screen_name.bold.cyan}: #{twt.text}"
+        puts "#{twt.user.screen_name}: #{twt.text}"
       end
     end
 
@@ -110,6 +112,15 @@ module Twat
       end
     end
 
+    def account_name
+      @account_name ||=
+        if opts.include?(:account)
+          opts[:account]
+        else
+          config[:default]
+        end
+    end
+
     def account
       @account = config.accounts[account_name]
     end

data/lib/twat/argparse.rb

@@ -4,6 +4,8 @@ module Twat
 
   class ArgParse
 
+    # TODO delegate specifically instead of shimming everything?
+
     def usage(additional=nil)
       puts additional if additional
       puts @optparser
@@ -42,9 +44,9 @@ module Twat
           options[:user] = (user || :default)
           options[:action] = :user_feed
         end #}}}
-        opts.on("--set-default ACCOUNT", 'Set ACCOUNT as default') do |acct| #{{{ --set-default ACCOUNT
-          options[:action] = :setdefault
-          options[:account] = acct.to_sym
+        opts.on("--set OPTION=VALUE", 'Set OPTION to VALUE') do |optval| #{{{ --set OPTION=VALUE
+          options[:action] = :setoption
+          options[:optval] = optval
         end #}}}
         opts.on("--update-config", "Update config to latest version") do #{{{ --update-config
           options[:action] = :updateconfig

data/lib/twat/config.rb

@@ -48,6 +48,11 @@ module Twat
       return config[:accounts]
     end
 
+    def colors?
+      colors = config[:colors] || "true"
+      Options.bool_true?(colors)
+    end
+
     def default_account
       raise NoDefaultAccount unless config.include?(:default)
       return config[:default].to_sym

data/lib/twat/exceptions.rb

@@ -3,7 +3,10 @@ module Twat
   class NoDefaultAccount < Exception; end
   class NoSuchCommand < Exception; end
   class NoConfigFile < Exception; end
+  class RequiresOptVal < Exception; end
   class Usage < Exception; end
   class InvalidCredentials < Exception; end
   class ConfigVersionIncorrect < Exception; end
+  class InvalidSetOpt < Exception; end
+  class InvalidBool < Exception; end
 end

data/lib/twat/migration.rb

@@ -2,7 +2,18 @@ module Twat
   class Migrate
     def migrate!(filename)
       @file = filename
-      migration_1
+      @ran = []
+      migration_1 if migration_1?
+      if @ran.any?
+        puts "Successfully ran migrations: #{@ran.join(", ")}"
+      else
+        puts "Already up to date"
+      end
+    end
+
+    def migration_1?
+      current = YAML.load_file(@file)
+      return !current.include?(:accounts)
     end
 
     def migration_1
@@ -26,6 +37,7 @@ module Twat
       end
 
       save(new)
+      @ran << "1"
     end
 
     def save(cf)

data/lib/twat/options.rb

@@ -0,0 +1,50 @@
+module Twat
+  class Options
+    BOOL_TRUE=["yes", "true", "1", "on"]
+    BOOL_FALSE=["no", "false", "0", "off"]
+    BOOL_VALS = BOOL_TRUE + BOOL_FALSE
+    def self.bool_true?(val)
+      BOOL_TRUE.include?(val.to_s.downcase)
+    end
+
+    def self.bool_false?(val)
+      BOOL_FALSE.include?(val.to_s.downcase)
+    end
+
+    def self.bool_valid?(val)
+      BOOL_VALS.include?(val.to_s.downcase)
+    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)
+      puts sym
+      raise InvalidSetOpt
+    end
+
+    def config
+      @config ||= Config.new
+    end
+
+    # This is deliberately not abstracted (it could be easily accessed from
+    # withing the method_missing method, but that will just lead to nastiness
+    # later when I implement colors, for example.
+    def default=(value)
+      val = value.to_sym
+      unless config.accounts.include?(val)
+        raise NoSuchAccount
+      end
+
+      config[:default] = val
+      config.save!
+    end
+
+    def colors=(value)
+      val = value.to_sym
+      raise InvalidBool unless Options.bool_valid?(val)
+      config[:colors] = val
+      config.save!
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &18606080 !ruby/object:Gem::Requirement
+  requirement: &20971900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18606080
+  version_requirements: *20971900
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &18605460 !ruby/object:Gem::Requirement
+  requirement: &20971320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18605460
+  version_requirements: *20971320
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net
@@ -54,6 +54,7 @@ files:
 - lib/twat/config.rb
 - lib/twat/exceptions.rb
 - lib/twat/migration.rb
+- lib/twat/options.rb
 - twat.gemspec
 homepage: http://github.com/richoH/twat
 licenses: []