twat 0.5.4 → 0.6.0

data/lib/twat.rb

@@ -6,6 +6,8 @@ require 'yaml'
 require 'optparse'
 require 'oauth'
 
+require 'readline-ng'
+
 %w[config exceptions argparse actions migration options endpoint].each do |filename|
   require "twat/#{filename}"
 end
@@ -48,8 +50,8 @@ end
 
 module Twat
   VERSION_MAJOR = 0
-  VERSION_MINOR = 5
-  VERSION_PATCH = 4
+  VERSION_MINOR = 6
+  VERSION_PATCH = 0
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
   class Twat

data/lib/twat/actions.rb

@@ -22,17 +22,17 @@ module Twat
       idx = pad(idx) if idx
       text = deentitize(twt.text)
       if config.colors?
-        print "#{idx.cyan}:" if idx
+        buf = idx ? "#{idx.cyan}:" : ""
         if twt.user.screen_name == config.account_name.to_s
-          puts "#{twt.user.screen_name.bold.blue}: #{text}"
+          buf += "#{twt.user.screen_name.bold.blue}: #{text}"
         elsif text.mentions?(config.account_name)
-          puts "#{twt.user.screen_name.bold.red}: #{text}"
+          buf += "#{twt.user.screen_name.bold.red}: #{text}"
         else
-          puts "#{twt.user.screen_name.bold.cyan}: #{text}"
+          buf += "#{twt.user.screen_name.bold.cyan}: #{text}"
         end
       else
-        print "#{idx}:" if idx
-        puts "#{twt.user.screen_name}: #{text}"
+        buf = idx ? "#{idx}: " : ""
+        buf += "#{twt.user.screen_name}: #{text}"
       end
     end
 

data/lib/twat/actions/follow.rb

@@ -1,4 +1,5 @@
 module Twat
+  POLLING_RESOLUTION = 20
 
   class NoSuchTweet < Exception; end
 
@@ -42,10 +43,24 @@ module Twat
 
   class Actions
 
+    def initialize
+      @reader = ReadlineNG::Reader.new
+
+      def @reader.filter
+        case @buf.length
+        when 140
+          _print ""
+        when 139
+          _print ""
+        end
+      end
+    end
+
     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 :/
+      # Probably belongs to readline-ng
+      $stty_saved = `stty -g`
+      `stty -echo raw`
+
       twitter_auth
       failcount = 0
       @tweetstack = TweetStack.new
@@ -55,30 +70,29 @@ module Twat
       while true do
         begin
           last_id = process_followed(tweets) if tweets.any?
-          config.polling_interval.times do
+          (config.polling_interval * POLLING_RESOLUTION).times do
             begin
-              handle_input(STDIN.read_nonblock(128).chop)
-            rescue Errno::EAGAIN
-              nil
+              @reader.tick
+              @reader.each_line { |inp| handle_input(inp) }
             rescue TweetTooLong
               puts "Too long".red
             end
-            sleep 1
+            sleep 1.0/POLLING_RESOLUTION
           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 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
@@ -88,6 +102,8 @@ module Twat
           end
         end
       end
+    ensure
+      `stty #{$stty_saved}`
     end
 
     private
@@ -102,7 +118,7 @@ module Twat
       tweets.reverse.each do |tweet|
         id = @tweetstack << tweet
         beep if config.beep? && tweet.text.mentions?(config.account_name)
-        format(tweet, @tweetstack.last)
+        @reader.puts_above format(tweet, @tweetstack.last)
         last_id = tweet.id
       end
 
@@ -115,8 +131,12 @@ module Twat
         begin
           retweet($1.to_i)
         rescue NoSuchTweet
-          puts "No such tweet".red
+          print "No such tweet\n".red
         end
+      when /follow (.*)/
+        follow_user($1)
+      when /test/
+        @reader.puts_above "Testline!"
       else
         # Assume they want to tweet something
         raise TweetTooLong if inp.length > 140

data/lib/twat/actions/follow_user.rb

@@ -1,10 +1,10 @@
 module Twat
   class Actions
 
-    def follow_user
+    def follow_user(user = nil)
       twitter_auth
 
-      Twitter.follow(opts[:user])
+      Twitter.follow(user || opts[:user])
     end
 
   end

data/twat.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "twitter"
   s.add_dependency "oauth"
+  s.add_dependency "readline-ng"
 
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twat
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000Z
+date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &13247260 !ruby/object:Gem::Requirement
+  requirement: &10151740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13247260
+  version_requirements: *10151740
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &13246620 !ruby/object:Gem::Requirement
+  requirement: &10150460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13246620
+  version_requirements: *10150460
+- !ruby/object:Gem::Dependency
+  name: readline-ng
+  requirement: &10149800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *10149800
 description: Command line tool for tweeting and whatnot
 email:
 - richo@psych0tik.net
@@ -91,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Command line tool for tweeting and whatnot