twat 0.5.2 → 0.5.3

data/lib/twat.rb

@@ -45,7 +45,7 @@ end
 module Twat
   VERSION_MAJOR = 0
   VERSION_MINOR = 5
-  VERSION_PATCH = 2
+  VERSION_PATCH = 3
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat

data/lib/twat/actions.rb

@@ -2,6 +2,45 @@ 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
@@ -82,18 +121,39 @@ module Twat
 
     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)
+        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
@@ -102,17 +162,22 @@ module Twat
       # 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?
-          sleep config.polling_interval
+          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 Twitter::ServiceUnavailable
         rescue Interrupt
+          break
+        rescue Twitter::ServiceUnavailable
           if failcount > 2
             puts "3 consecutive failures, giving up"
           else
@@ -155,10 +220,16 @@ module Twat
 
     private
 
+    def pad(n)
+      "%02d" % n
+    end
+
     # Format a tweet all pretty like
-    def format(twt)
+    def format(twt, idx = nil)
+      idx = pad(idx) if idx
       text = deentitize(twt.text)
       if config.colors?
+        print "#{idx.cyan}:" if idx
         if twt.user.screen_name == config.account_name.to_s
           puts "#{twt.user.screen_name.bold.blue}: #{text}"
         elsif text.mentions?(config.account_name)
@@ -167,6 +238,7 @@ module Twat
           puts "#{twt.user.screen_name.bold.cyan}: #{text}"
         end
       else
+        print "#{idx}:" if idx
         puts "#{twt.user.screen_name}: #{text}"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &26440540 !ruby/object:Gem::Requirement
+  requirement: &15845540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26440540
+  version_requirements: *15845540
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &26439880 !ruby/object:Gem::Requirement
+  requirement: &15858800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26439880
+  version_requirements: *15858800
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net
@@ -86,4 +86,3 @@ signing_key:
 specification_version: 3
 summary: Command line tool for tweeting and whatnot
 test_files: []
-has_rdoc: