twat 0.6.3 → 0.9.2

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3
+rvm use 1.9.3

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+gemfile: Gemfile.travis
+rvm:
+  # - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,5 +1,2 @@
 source :rubygems
-
-gem "twitter"
-gem "oauth"
-gem "rack", '1.3.3'
+gemspec

data/Gemfile.lock

@@ -1,31 +1,51 @@
+PATH
+  remote: .
+  specs:
+    twat (0.9.1)
+      oauth
+      readline-ng (>= 0.0.8)
+      twitter
+
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
-    faraday (0.7.4)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    faraday_middleware (0.7.0)
-      faraday (~> 0.7.3)
-    hashie (1.1.0)
-    multi_json (1.0.3)
-    multi_xml (0.2.2)
-    multipart-post (1.1.3)
-    oauth (0.4.5)
-    rack (1.3.2)
-    simple_oauth (0.1.5)
-    twitter (1.6.2)
-      faraday (~> 0.7.4)
-      faraday_middleware (~> 0.7.0)
-      hashie (~> 1.1.0)
-      multi_json (~> 1.0.0)
-      multi_xml (~> 0.2.0)
-      simple_oauth (~> 0.1.5)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    faraday (0.8.0)
+      multipart-post (~> 1.1)
+    i18n (0.6.0)
+    metaclass (0.0.1)
+    mktemp (0.0.1)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.2)
+    multipart-post (1.1.5)
+    oauth (0.4.6)
+    rake (0.9.2.2)
+    readline-ng (0.0.8)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    simple_oauth (0.1.7)
+    twitter (2.2.4)
+      activesupport (>= 2.3.9, < 4)
+      faraday (~> 0.8)
+      multi_json (~> 1.3)
+      simple_oauth (~> 0.1.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  oauth
-  twitter
+  mktemp
+  mocha
+  rake
+  rspec
+  twat!

data/Gemfile.travis

@@ -0,0 +1,12 @@
+source :rubygems
+
+gem "twitter"
+gem "oauth"
+gem "readline-ng", ">= 0.0.4"
+group :test do
+  gem "rake"
+  gem "mocha"
+  gem "rspec"
+  gem "mktemp"
+end
+

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "spec/**/*_spec.rb"
+end
+
+desc 'Default: run specs'
+task :default => :spec

data/TODO

@@ -5,7 +5,6 @@ COLORS!
 
 Refactor tweet printing code, unify throughout
 
-
 TODO
 ====
 
@@ -45,6 +44,10 @@ Allow -f #hashtag to follow that hashtag instead of your newsfeed
 
 Seriously consider moving to subcommands
 
+Still needs argv parsing for account etc
+
+twat config to create the first account from scratch
+
 MOAR BACKENDS
 =============
 

data/lib/twat.rb

@@ -5,18 +5,20 @@ require 'twitter'
 require 'yaml'
 require 'optparse'
 require 'oauth'
+require 'readline-ng'
 
-%w[config exceptions argparse actions migration options endpoint].each do |filename|
+%w[follow_mixin endpoint exceptions config argparse migration options
+  subcommand version tweetstack].each do |filename|
   require "twat/#{filename}"
 end
 
-%w[follow tweet add delete follow_user updateconfig setoption show user_feed version].each do |filename|
-  require "twat/actions/#{filename}"
-end
-
 class String
   # TODO - It'd be nice to implement the colors support here, maybe even only
   # mix this in if it's enabled?
+  def black
+    "#{self}"
+  end
+
   def red
     "#{self}"
   end
@@ -44,33 +46,35 @@ class String
   def mentions?(name)
     return self.downcase.include?(name.to_s.downcase)
   end
-end
 
-module Twat
-  VERSION_MAJOR = 0
-  VERSION_MINOR = 6
-  VERSION_PATCH = 3
-
-  VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
-  class Twat
+  def colorise!
+    colorise_handles!
+    colorise_hashtags!
+    colorise_urls!
+  end
 
-    include HandledExceptions
+  def colorise_handles!
+    self.gsub!(/@[a-z0-9_+-]+/i) { |s| s.cyan }
+    return self
+  end
 
-    def cli_run
-      # FIXME Handing in the opts like this feels dirty
-      with_handled_exceptions(ArgParse.new) do |opts|
-        if opts[:account] && opts[:action] != :add
-          config.account = opts[:account]
-        end
+  def colorise_hashtags!
+    self.gsub!(/#[a-z0-9_+-]+/i) { |s| s.cyan }
+    return self
+  end
 
-        require 'readline-ng'
-        actor = Actions.new
+  def colorise_urls!
+    self.gsub!(%r{https?://[a-z0-9./_+-]+}i) { |s| s.black }
+    return self
+  end
+end
 
+module Twat
+  class Twat
 
-        actor.config = config
-        actor.opts = opts
-        actor.send(opts.options[:action])
-      end
+    def cli_run
+      # FIXME exception handling is gone for now
+      Subcommand.run
     end
   end
 end

data/lib/twat/argparse.rb

@@ -1,10 +1,36 @@
 module Twat
-  REQUIRED = []
-  MSG_REQUIRED = [:tweet]
+  class ArgWrapper
+    def initialize(data)
+      @data = data
+    end
 
-  class ArgParse
+    def method_missing(sym)
+      @data[sym]
+    end
+  end
 
+  class Args
     # TODO delegate specifically instead of shimming everything?
+    # TODO Twat::Subcommands.COMMANDS needs to be parsed and dumped
+
+    def initialize
+      # XXX What the shit...
+      getopts
+    end
+
+    def method_missing(sym)
+      @options[sym]
+    end
+
+    def [](key)
+      @options[key]
+    end
+
+    def include?(key)
+      @options.include?(key)
+    end
+
+    private
 
     def usage(additional=nil)
       puts additional if additional
@@ -14,100 +40,31 @@ module Twat
 
     def getopts
       options = Hash.new
-      options[:count] = 1
       @optparser = OptionParser.new do |opts|
         opts.banner = "Usage: twat <tweet>"
 
         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| #{{{ --add ACCOUNT
-          options[:account] = acct.to_sym
-          options[:action] = :add
-        end #}}}
-        opts.on('--follow-user USER', 'Follow USER on twitter') do |user| #{{{ --follow-user USER
-          options[:action] = :follow_user
-          options[:user] = user
-        end #}}}
-        opts.on('--endpoint ENDPOINT', 'Specify a different endpoint for use with --add') do |endpoint| #{{{ --add ACCOUNT
+        opts.on('--endpoint ENDPOINT', 'Specify a different endpoint for use with add or config') do |endpoint| #{{{ --add ACCOUNT
           options[:endpoint] = endpoint.to_sym
         end #}}}
-        opts.on('-d', '--delete ACCOUNT', 'Delete ACCOUNT') do |acct| #{{{ --delete ACCOUNT
-          options[:account] = acct.to_sym
-          options[:action] = :delete
-        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| #{{{ --list ACCOUNT
-          options[:count] = count || 10
-          options[:action] ||= :show
-        end #}}}
-        opts.on('-f', '--follow', 'Display tweets from your newsfeed indefinitely') do #{{{ --follow
-          options[:action] = :follow
-        end #}}}
         opts.on('-v', '--version', 'Display version info') do #{{{ --version
-          options[:action] = :version
-        end #}}}
-        opts.on('-u', '--user [USER]', 'Display current status for USER (Defaults to your default account)') do |user| #{{{ --user USER
-          options[:user] = (user || :default)
-          options[:action] = :user_feed
-        end #}}}
-        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
+          # FIXME, this is /bad/
+          puts "twat #{::Twat::VERSION}"
+          exit
         end #}}}
       end
       @optparser.parse!
-      # {{{ Validation ---
-      # Default action is to send a tweet
-      options[:action] ||= :tweet
-
-      # Only specify an endpoint when adding accounts
-      if options[:endpoint]
-        usage unless options[:action] == :add
-      end
-      # Similarly, default endpoint to twitter when we do add
-      if options[:action] == :add
-        options[:endpoint] ||= :twitter
-      end
-
-      REQUIRED.each do |req|
-        usage unless options[req]
-      end
-      if MSG_REQUIRED.include?(options[:action])
-        options[:msg] = msg
-      end
-      # }}} Validation End ---
-      options
-    end
-
-    def msg
-      usage unless ARGV.length > 0
-      ARGV.join(" ")
-    end
-
-    def [](key)
-      options[key]
-    end
 
-    def include?(key)
-      options.include?(key)
-    end
+      # Only makes sense for add, but doesn't hurt anything else
+      options[:endpoint] ||= :twitter
 
-    def options
-      begin
-        @configthingfucken ||= getopts
-      # FIXME, actually do something smart, not yell and barf
-      rescue OptionParser::InvalidOption
-        usage "Unknown option"
-      rescue OptionParser::MissingArgument
-        usage "Missing argument"
-      end
+      @options = options
     end
 
   end

data/lib/twat/config.rb

@@ -1,21 +1,19 @@
 module Twat
-  class Twat
-    def configure(&block)
-      yield config
+  class Config
 
-      # If I understand correctly, I can check over what's
-      # happened here?
-    end
+    include ::Twat::Exceptions
 
-    def config
-      @config ||= Config.new
+    def config_path
+      @config_path ||= ENV['TWAT_CONFIG'] || "#{ENV['HOME']}/.twatrc"
     end
-  end
 
-  class Config
+    def exists?
+      File.exist?(config_path)
+    end
 
-    def config_path
-      @config_path ||= ENV['TWAT_CONFIG'] || "#{ENV['HOME']}/.twatrc"
+    def create!
+      @config = { accounts: {} }
+      save!
     end
 
     def create_unless_exists!
@@ -57,13 +55,15 @@ module Twat
     end
 
     def colors?
-      colors = config[:colors] || "true"
-      Options.bool_true?(colors)
+      config[:colors].nil? ? false : config[:colors]
     end
 
     def beep?
-      beep = config[:beep] || "false"
-      Options.bool_true?(beep)
+      config[:beep].nil? ? false : config[:beep]
+    end
+
+    def show_mentions?
+      config[:show_mentions].nil? ? false : config[:show_mentions]
     end
 
     def polling_interval
@@ -78,34 +78,22 @@ module Twat
     # 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!
+    def update_config
+      raise NoConfigFile unless exists?
       Migrate.new.migrate!(config_path)
     end
 
-    # I don't know how rubyists feel about method returning something vastly
-    # different to what method= accepts, but I think the api makes sense
-    def account=(acct)
-      if accounts.include?(acct)
-        @account = acct
-      else
-        raise NoSuchAccount
-      end
-    end
-
-    def account_set?
-      !!@account
-    end
-
     def account_name
-      if account_set?
-        @account
+      if $args[:account]
+        return $args[:account].to_sym
       else
-        raise NoDefaultAccount unless config.include?(:default)
+        raise ::Twat::Exceptions::NoDefaultAccount unless config.include?(:default)
         return config[:default].to_sym
       end
     end
 
     def account
+      raise NoSuchAccount unless accounts.include?(account_name)
       accounts[account_name]
     end