twat 0.5.3 → 0.5.4

data/.rvmrc

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

data/TODO

@@ -53,3 +53,11 @@ etc etc)
 
 into a wrapper for each service so that twat can natively support
 facebook, g+ etc etc as I get around to writing the new modules.
+
+READLINE SHIT
+=============
+
+Would be pretty sweet to be able to change color after too many chars
+entered, be able to puts a tweet while user is entering text, etc.
+
+Look into it (and create another feature branch that's destined to rot)

data/lib/twat.rb

@@ -10,6 +10,10 @@ require 'oauth'
   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?
@@ -45,7 +49,7 @@ end
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 5
-  VERSION_PATCH = 3
+  VERSION_PATCH = 4
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat

data/lib/twat/actions.rb

@@ -2,218 +2,11 @@ module Twat
   OAUTH_TOKENS = [ :oauth_token, :oauth_token_secret ]
   CONSUMER_TOKENS = [ :consumer_key, :consumer_secret ]
 
-  class NoSuchTweet < Exception; end
-
-  class TweetStack
-    # A circularly linked list representing all of the tweets printed thus far,
-    # for the purposes of retrieving them after being printed
-    def initialize
-      @stack = {}
-      @_next = 0
-    end
-
-    def [] k
-      @stack[k]
-    end
-
-    def << v
-      @stack[nxt] = v
-    end
-
-    def include? k
-      @stack.keys.include?(k)
-    end
-
-    def last
-      # I see the irony
-      @_next
-    end
-
-    private
-
-    def nxt
-      if @_next == 99
-        @_next = 0
-      else
-        @_next += 1
-      end
-    end
-
-  end
 
   class Actions
 
     attr_accessor :config, :opts, :failcount
 
-    def tweet
-      twitter_auth
-
-      raise TweetTooLong if opts.msg.length > 140
-
-      Twitter.update(opts.msg)
-      #puts opts.msg
-    end
-
-    # Add is somewhat of a special case, everything else hangs off config for
-    # it's magic, However we're forced to do it manually here- config doesn't
-    # know anything about it yet
-    def add
-      endpoint = Endpoint.new(opts[:endpoint])
-      v = endpoint.consumer_info.map do |key, value|
-        value
-      end
-
-      oauth_options = { :site => endpoint.url }
-      oauth_options.merge!(endpoint.oauth_options)
-
-      oauth = OAuth::Consumer.new( v[0], v[1], oauth_options )
-      token_request = oauth.get_request_token()
-      puts "Please authenticate the application at #{token_request.authorize_url}, then enter pin"
-      pin = STDIN.gets.chomp
-      begin
-        access_token = token_request.get_access_token(oauth_verifier: pin)
-        account_settings = {
-          oauth_token: access_token.token,
-          oauth_token_secret: access_token.secret,
-          endpoint: opts[:endpoint]
-        }
-        config.accounts[opts[:account]] = account_settings
-        config.save!
-      rescue OAuth::Unauthorized
-        puts "Couldn't authenticate you, did you enter the pin correctly?"
-      end
-    end
-
-    def delete
-      if config.accounts.delete(opts[:account])
-        config.save!
-        puts "Successfully deleted"
-      else
-        puts "No such account"
-      end
-    end
-
-    def follow_user
-      twitter_auth
-
-      Twitter.follow(opts[:user])
-    end
-
-    def setoption
-      k, v = opts[:optval].split("=")
-      raise RequiresOptVal unless v
-      options = Options.new
-      options.send(:"#{k}=", v)
-
-      puts "Successfully set #{k} as #{v}"
-    end
-
-    def updateconfig
-      config.update!
-    end
-
-    def show
-      twitter_auth
-      Twitter.home_timeline(:count => opts[:count]).reverse.each do |tweet|
-        format(tweet)
-      end
-    end
-
-    private
-
-    # The handling of the shared variable in the follow code makes a shitton
-    # more sense in the context of a class (ala the subcommands branch).  For
-    # now the kludginess must be tolerated
-
-    # @return last_id
-    def process_followed(tweets)
-      last_id = nil
-      tweets.reverse.each do |tweet|
-        id = @tweetstack << tweet
-        beep if config.beep? && tweet.text.mentions?(config.account_name)
-        format(tweet, @tweetstack.last)
-        last_id = tweet.id
-      end
-
-      return last_id
-    end
-
-    def handle_input(inp)
-      case inp
-      when /[rR][tT] ([0-9]{1,2})/
-        begin
-          retweet($1.to_i)
-        rescue NoSuchTweet
-          puts "No such tweet".red
-        end
-      end
-    end
-
-    def retweet(idx)
-      raise NoSuchTweet unless @tweetstack.include?(idx)
-      Twitter.retweet(@tweetstack[idx].id)
-    end
-
-    public
-
-    def follow
-      # I can't see any way to poll the server for updates, so in the meantime
-      # we will have to retrieve a few tweets from the timeline, and then poll
-      # occasionally :/
-      twitter_auth
-      failcount = 0
-      @tweetstack = TweetStack.new
-
-      # Get 5 tweets
-      tweets = Twitter.home_timeline(:count => 5)
-      while true do
-        begin
-          last_id = process_followed(tweets) if tweets.any?
-          config.polling_interval.times do
-            handle_input(STDIN.read_nonblock(128).chop) rescue nil
-            sleep 1
-          end
-          tweets = Twitter.home_timeline(:since_id => last_id)
-          failcount = 0
-        rescue Interrupt
-          break
-        rescue Twitter::ServiceUnavailable
-          if failcount > 2
-            puts "3 consecutive failures, giving up"
-          else
-            sleeptime = 60 * (failcount + 1)
-            print "(__-){".red
-            puts ": the fail whale has been rolled out, sleeping for #{sleeptime} seconds"
-            sleep sleeptime
-            failcount += 1
-          end
-        rescue Errno::ECONNRESET
-        rescue Errno::ETIMEDOUT
-          if failcount > 2
-            puts "3 consecutive failures, giving up"
-          else
-            failcount += 1
-          end
-        end
-      end
-    end
-
-    def user_feed
-      twitter_auth
-
-      begin
-        Twitter.user_timeline(opts[:user], :count => opts[:count]).each do |tweet|
-          format(tweet)
-        end
-      rescue Twitter::NotFound
-        puts "#{opts[:user].bold.red} doesn't appear to be a valid user"
-      end
-    end
-
-    def version
-      puts "twat: #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
-    end
-
     def method_missing(sym, *args, &block)
       raise NoSuchCommand
     end

data/lib/twat/actions/add.rb

@@ -0,0 +1,35 @@
+module Twat
+  class Actions
+
+    # Add is somewhat of a special case, everything else hangs off config for
+    # it's magic, However we're forced to do it manually here- config doesn't
+    # know anything about it yet
+    def add
+      endpoint = Endpoint.new(opts[:endpoint])
+      v = endpoint.consumer_info.map do |key, value|
+        value
+      end
+
+      oauth_options = { :site => endpoint.url }
+      oauth_options.merge!(endpoint.oauth_options)
+
+      oauth = OAuth::Consumer.new( v[0], v[1], oauth_options )
+      token_request = oauth.get_request_token()
+      puts "Please authenticate the application at #{token_request.authorize_url}, then enter pin"
+      pin = STDIN.gets.chomp
+      begin
+        access_token = token_request.get_access_token(oauth_verifier: pin)
+        account_settings = {
+          oauth_token: access_token.token,
+          oauth_token_secret: access_token.secret,
+          endpoint: opts[:endpoint]
+        }
+        config.accounts[opts[:account]] = account_settings
+        config.save!
+      rescue OAuth::Unauthorized
+        puts "Couldn't authenticate you, did you enter the pin correctly?"
+      end
+    end
+
+  end
+end

data/lib/twat/actions/delete.rb

@@ -0,0 +1,14 @@
+module Twat
+  class Actions
+
+    def delete
+      if config.accounts.delete(opts[:account])
+        config.save!
+        puts "Successfully deleted"
+      else
+        puts "No such account"
+      end
+    end
+
+  end
+end

data/lib/twat/actions/follow.rb

@@ -0,0 +1,135 @@
+module Twat
+
+  class NoSuchTweet < Exception; end
+
+  class TweetStack
+    # A circularly linked list representing all of the tweets printed thus far,
+    # for the purposes of retrieving them after being printed
+    def initialize
+      @stack = {}
+      @_next = 0
+    end
+
+    def [] k
+      @stack[k]
+    end
+
+    def << v
+      @stack[nxt] = v
+    end
+
+    def include? k
+      @stack.keys.include?(k)
+    end
+
+    def last
+      # I see the irony
+      @_next
+    end
+
+    private
+
+    def nxt
+      if @_next == 99
+        @_next = 1
+      else
+        @_next += 1
+      end
+    end
+
+  end
+
+
+  class Actions
+
+    def follow
+      # I can't see any way to poll the server for updates, so in the meantime
+      # we will have to retrieve a few tweets from the timeline, and then poll
+      # occasionally :/
+      twitter_auth
+      failcount = 0
+      @tweetstack = TweetStack.new
+
+      # Get 5 tweets
+      tweets = Twitter.home_timeline(:count => 5)
+      while true do
+        begin
+          last_id = process_followed(tweets) if tweets.any?
+          config.polling_interval.times do
+            begin
+              handle_input(STDIN.read_nonblock(128).chop)
+            rescue Errno::EAGAIN
+              nil
+            rescue TweetTooLong
+              puts "Too long".red
+            end
+            sleep 1
+          end
+          tweets = Twitter.home_timeline(:since_id => last_id)
+          failcount = 0
+        rescue Interrupt
+          break
+        rescue Twitter::ServiceUnavailable
+          if failcount > 2
+            puts "3 consecutive failures, giving up"
+          else
+            sleeptime = 60 * (failcount + 1)
+            print "(__-){".red
+            puts ": the fail whale has been rolled out, sleeping for #{sleeptime} seconds"
+            sleep sleeptime
+            failcount += 1
+          end
+        rescue Errno::ECONNRESET
+        rescue Errno::ETIMEDOUT
+          if failcount > 2
+            puts "3 consecutive failures, giving up"
+          else
+            failcount += 1
+          end
+        end
+      end
+    end
+
+    private
+
+    # The handling of the shared variable in the follow code makes a shitton
+    # more sense in the context of a class (ala the subcommands branch).  For
+    # now the kludginess must be tolerated
+
+    # @return last_id
+    def process_followed(tweets)
+      last_id = nil
+      tweets.reverse.each do |tweet|
+        id = @tweetstack << tweet
+        beep if config.beep? && tweet.text.mentions?(config.account_name)
+        format(tweet, @tweetstack.last)
+        last_id = tweet.id
+      end
+
+      return last_id
+    end
+
+    def handle_input(inp)
+      case inp
+      when /[rR][tT] ([0-9]{1,2})/
+        begin
+          retweet($1.to_i)
+        rescue NoSuchTweet
+          puts "No such tweet".red
+        end
+      else
+        # Assume they want to tweet something
+        raise TweetTooLong if inp.length > 140
+
+        Twitter.update(inp)
+      end
+    end
+
+    def retweet(idx)
+      raise NoSuchTweet unless @tweetstack.include?(idx)
+      Twitter.retweet(@tweetstack[idx].id)
+    end
+
+  end
+
+end

data/lib/twat/actions/follow_user.rb

@@ -0,0 +1,11 @@
+module Twat
+  class Actions
+
+    def follow_user
+      twitter_auth
+
+      Twitter.follow(opts[:user])
+    end
+
+  end
+end

data/lib/twat/actions/setoption.rb

@@ -0,0 +1,14 @@
+module Twat
+  class Actions
+
+    def setoption
+      k, v = opts[:optval].split("=")
+      raise RequiresOptVal unless v
+      options = Options.new
+      options.send(:"#{k}=", v)
+
+      puts "Successfully set #{k} as #{v}"
+    end
+
+  end
+end

data/lib/twat/actions/show.rb

@@ -0,0 +1,12 @@
+module Twat
+  class Actions
+
+    def show
+      twitter_auth
+      Twitter.home_timeline(:count => opts[:count]).reverse.each do |tweet|
+        format(tweet)
+      end
+    end
+
+  end
+end

data/lib/twat/actions/tweet.rb

@@ -0,0 +1,14 @@
+module Twat
+  class Actions
+
+    def tweet
+      twitter_auth
+
+      raise TweetTooLong if opts.msg.length > 140
+
+      Twitter.update(opts.msg)
+      #puts opts.msg
+    end
+
+  end
+end

data/lib/twat/actions/updateconfig.rb

@@ -0,0 +1,9 @@
+module Twat
+  class Actions
+
+    def updateconfig
+      config.update!
+    end
+
+  end
+end

data/lib/twat/actions/user_feed.rb

@@ -0,0 +1,17 @@
+module Twat
+  class Actions
+
+    def user_feed
+      twitter_auth
+
+      begin
+        Twitter.user_timeline(opts[:user], :count => opts[:count]).each do |tweet|
+          format(tweet)
+        end
+      rescue Twitter::NotFound
+        puts "#{opts[:user].bold.red} doesn't appear to be a valid user"
+      end
+    end
+
+  end
+end

data/lib/twat/actions/version.rb

@@ -0,0 +1,9 @@
+module Twat
+  class Actions
+
+    def version
+      puts "twat: #{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-02-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &15845540 !ruby/object:Gem::Requirement
+  requirement: &13247260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15845540
+  version_requirements: *13247260
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &15858800 !ruby/object:Gem::Requirement
+  requirement: &13246620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15858800
+  version_requirements: *13246620
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net
@@ -50,6 +50,16 @@ files:
 - bin/twat
 - lib/twat.rb
 - lib/twat/actions.rb
+- lib/twat/actions/add.rb
+- lib/twat/actions/delete.rb
+- lib/twat/actions/follow.rb
+- lib/twat/actions/follow_user.rb
+- lib/twat/actions/setoption.rb
+- lib/twat/actions/show.rb
+- lib/twat/actions/tweet.rb
+- lib/twat/actions/updateconfig.rb
+- lib/twat/actions/user_feed.rb
+- lib/twat/actions/version.rb
 - lib/twat/argparse.rb
 - lib/twat/config.rb
 - lib/twat/endpoint.rb
@@ -81,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Command line tool for tweeting and whatnot