twat 0.3.5 → 0.4.0

data/lib/twat.rb

@@ -6,7 +6,7 @@ require 'yaml'
 require 'optparse'
 require 'oauth'
 
-%w[config exceptions argparse actions].each do |filename|
+%w[config exceptions argparse actions migration].each do |filename|
   require "twat/#{filename}"
 end
 
@@ -15,6 +15,18 @@ class String
     "#{self}"
   end
 
+  def green
+    "#{self}"
+  end
+
+  def yellow
+    "#{self}"
+  end
+
+  def blue
+    "#{self}"
+  end
+
   def cyan
     "#{self}"
   end
@@ -26,8 +38,8 @@ end
 
 module Twat
   VERSION_MAJOR = 0
-  VERSION_MINOR = 3
-  VERSION_PATCH = 5
+  VERSION_MINOR = 4
+  VERSION_PATCH = 0
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat
@@ -43,6 +55,8 @@ module Twat
       rescue NoSuchAccount
         puts "No such account"
         opts.usage
+      rescue NoDefaultAccount
+        puts "No default account configured."
       rescue NoSuchCommand
         puts "No such command"
         opts.usage
@@ -52,6 +66,8 @@ module Twat
       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"
       end
     end
   end

data/lib/twat/actions.rb

@@ -25,7 +25,7 @@ module Twat
       pin = gets.chomp
       begin
         access_token = token_request.get_access_token(oauth_verifier: pin)
-        config[opts[:account]] = {
+        config.accounts[opts[:account]] = {
           oauth_token: access_token.token,
           oauth_token_secret: access_token.secret
         }
@@ -36,7 +36,7 @@ module Twat
     end
 
     def delete
-      if config.delete(opts[:account])
+      if config.accounts.delete(opts[:account])
         config.save!
         puts "Successfully deleted"
       else
@@ -44,10 +44,24 @@ module Twat
       end
     end
 
+    def setdefault
+      unless config.accounts.include?(opts[:account])
+        raise NoSuchAccount
+      end
+
+      config[:default] = opts[:account]
+      config.save!
+      puts "Successfully set #{opts[:account]} as default"
+    end
+
+    def updateconfig
+      config.update!
+    end
+
     def show
       twitter_auth
       Twitter.home_timeline.each_with_index do |tweet, idx|
-        puts "#{tweet.user.screen_name.bold.cyan}: #{tweet.text}"
+        format(tweet)
 
         break if idx == opts[:count]
       end
@@ -75,6 +89,16 @@ module Twat
 
     private
 
+    # 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}"
+      else
+        puts "#{twt.user.screen_name.bold.cyan}: #{twt.text}"
+      end
+    end
+
     def twitter_auth
       Twitter.configure do |twit|
         account.each do |key, value|
@@ -87,7 +111,16 @@ module Twat
     end
 
     def account
-      @account ||= config[opts[:account]]
+      @account = config.accounts[account_name]
+    end
+
+    def account_name
+      @account_name ||=
+        if opts.include?(:account)
+          opts[:account]
+        else
+          config.default_account
+        end
     end
 
   end

data/lib/twat/argparse.rb

@@ -1,5 +1,5 @@
 module Twat
-  REQUIRED = [:account]
+  REQUIRED = []
   MSG_REQUIRED = [:tweet]
 
   class ArgParse
@@ -14,7 +14,6 @@ module Twat
       options = Hash.new
       @optparser = OptionParser.new do |opts|
         options[:action] = :tweet
-        options[:account] = :default
         opts.banner = "Usage: twat <tweet>"
 
         opts.on('-n', '--account ACCOUNT', 'Use ACCOUNT (or default)') do |acct| #{{{ --account ACCOUNT
@@ -43,6 +42,13 @@ 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
+        end #}}}
+        opts.on("--update-config", "Update config to latest version") do #{{{ --update-config
+          options[:action] = :updateconfig
+        end #}}}
       end
 
       @optparser.parse!
@@ -64,6 +70,10 @@ module Twat
       options[key]
     end
 
+    def include?(key)
+      options.include?(key)
+    end
+
     def options
       begin
         @configthingfucken ||= getopts

data/lib/twat/config.rb

@@ -21,11 +21,18 @@ module Twat
     def config
       begin
         @config ||= YAML.load_file(config_path)
+        validate!(@config)
       rescue Errno::ENOENT
         raise NoConfigFile
       end
     end
 
+    def validate!(conf)
+      # TODO Proper checks, instead of a series of hackish checks
+      raise ConfigVersionIncorrect unless conf.include?(:accounts)
+      conf
+    end
+
     def save!
       File.open(config_path, 'w') do |conf|
         conf.chmod(0600)
@@ -37,17 +44,13 @@ module Twat
       self[meth]
     end
 
-    def [](key)
-      raise NoSuchAccount unless config.include?(key)
-      config[key]
-    end
-
-    def []=(key, value)
-      config[key] = value
+    def accounts
+      return config[:accounts]
     end
 
-    def delete(key)
-      config.delete(key)
+    def default_account
+      raise NoDefaultAccount unless config.include?(:default)
+      return config[:default].to_sym
     end
 
     def self.consumer_info
@@ -57,5 +60,17 @@ module Twat
       }
     end
 
+    def []=(k, v)
+      config[k] = v
+    end
+
+    # update! migrates an old config file to the current API
+    # it does this by calling a sequence of migration functions in order
+    # which rebuild the config in stages, saving and leaving it in a
+    # consistent step at each point
+    def update!
+      Migrate.new.migrate!(config_path)
+    end
+
   end
 end

data/lib/twat/exceptions.rb

@@ -1,7 +1,9 @@
 module Twat
   class NoSuchAccount < Exception; end
+  class NoDefaultAccount < Exception; end
   class NoSuchCommand < Exception; end
   class NoConfigFile < Exception; end
   class Usage < Exception; end
   class InvalidCredentials < Exception; end
+  class ConfigVersionIncorrect < Exception; end
 end

data/lib/twat/migration.rb

@@ -0,0 +1,39 @@
+module Twat
+  class Migrate
+    def migrate!(filename)
+      @file = filename
+      migration_1
+    end
+
+    def migration_1
+      new = { accounts: {} }
+      default = nil
+      current = YAML.load_file(@file)
+      current.each do |k, v|
+        k = k.to_sym
+        if k == :default
+          default = v[:oauth_token]
+        else
+          new[:accounts][k] = v
+        end
+      end
+
+      new[:accounts].each do |k, v|
+        if v[:oauth_token] == default
+          new[:default] = k
+          break
+        end
+      end
+
+      save(new)
+    end
+
+    def save(cf)
+      File.open(@file, 'w') do |conf|
+        conf.chmod(0600)
+        conf.puts(cf.to_yaml)
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &82825950 !ruby/object:Gem::Requirement
+  requirement: &26665120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82825950
+  version_requirements: *26665120
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &82825650 !ruby/object:Gem::Requirement
+  requirement: &26664500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82825650
+  version_requirements: *26664500
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net
@@ -53,6 +53,7 @@ files:
 - lib/twat/argparse.rb
 - lib/twat/config.rb
 - lib/twat/exceptions.rb
+- lib/twat/migration.rb
 - twat.gemspec
 homepage: http://github.com/richoH/twat
 licenses: []