PerfectlyNormal-Twitorious 0.2.8 → 0.2.9

data/bin/twit

@@ -2,8 +2,6 @@
 require 'twitorious'
 require 'readline'
 
-Thread.abort_on_exception = true
-
 module Twitorious
   class Twit
     def initialize
@@ -24,6 +22,8 @@ module Twitorious
           cmd, *args = status.split(" ")
           case cmd
             when "!update": update
+            when "!timeline": fetch_timeline
+            when "!mentions": fetch_mentions
             when "!quit":   exit
             when "!exit":   exit
             else Twitorious::Update.new(status)
@@ -40,6 +40,15 @@ module Twitorious
     
     def update
       @timeline.fetch_timeline
+      @timeline.fetch_mentions
+    end
+    
+    def fetch_mentions
+      @timeline.fetch_mentions
+    end
+    
+    def fetch_timeline
+      @timeline.fetch_timeline
     end
   end
 end

data/bin/twit-notifier

@@ -8,6 +8,7 @@ module Twitorious
       timeline = Twitorious::Timeline.new(config)
       
       timeline.fetch_timeline
+      timeline.fetch_mentions
     end
   end
 end

data/lib/twitorious/api/twitter.rb

@@ -22,29 +22,75 @@ module Twitorious
       
       def fetch_timeline
         puts "Fetching timeline from #{@site[:name]}"
-        res = nil
-        Net::HTTP.start(@site[:url].host, @site[:url].port) do |http|
-          path  = @site[:url].path + "/statuses/friends_timeline.json"
-          path += "?count=200&since_id=#{@site[:since_id]}" if @site[:since_id]
-          req = Net::HTTP::Get.new(path, { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
-          req.basic_auth @site[:user], @site[:pass]
-          res = http.request(req)
-        end
-
-        updates = JSON.parse(res.body)
+        
+        path  = @site[:url].path + "/statuses/friends_timeline.json"
+        path += "?count=200&since_id=#{@site[:timeline_since_id]}" if @site[:timeline_since_id]
+        res   = fetch_body(@site[:url].host, @site[:url].port, path, @site[:user], @site[:pass])
+        
+        updates = JSON.parse(res)
         puts "  No updates" if updates.empty?
         return if updates.empty?
 
         puts "  Got #{updates.size} update#{"s" if updates.size > 1}"
-        updates.reverse.each do |update|
+        show_notifications(updates.reverse)
+
+        # Returning the last ID we saw, so we can update since_id for the site
+        return updates[0]["id"]
+      end
+      
+      def fetch_mentions
+        puts "Fetching mentions from #{@site[:name]}"
+        
+        path  = @site[:url].path + "/statuses/mentions.json"
+        path += "?since_id=#{@site[:mentions_since_id]}" if @site[:mentions_since_id]
+        res   = fetch_body(@site[:url].host, @site[:url].port, path, @site[:user], @site[:pass])
+        
+        updates = JSON.parse(res)
+        puts "  No new mentions" if updates.empty?
+        return if updates.empty?
+        
+        puts "  Got #{updates.size} new mentions" if updates.size > 1
+        puts "  Got one new mention" if updates.size == 1
+        
+        show_notifications(updates.reverse)
+        
+        # Returning the last ID we saw, so we can update since_id for the mentions
+        return updates[0]["id"]
+      end
+      
+      private
+      
+      def fetch_body(host, port, path, username = nil, password = nil)
+        res = nil
+        begin
+          Net::HTTP.start(host, port) do |http|
+            req = Net::HTTP::Get.new(path, { "User-Agent" => "Twitorious/#{Twitorious::VERSION}"})
+            req.basic_auth username, password if username
+            res = http.request(req) 
+          end
+        rescue => e
+          $stderr.puts "Unhandled exception! #{e.message}"
+        rescue Timeout::Error
+          $stderr.puts "Request to #{host} timed out. Retrying in five seconds"
+          sleep 5
+          retry
+        end
+        
+        if res.kind_of?(Net::HTTPNotFound)
+          $stderr.puts "404 Not Found! #{host}:#{port}/#{path}"
+          return "{}"
+        elsif res.kind_of?(Net::HTTPOK)
+          return res.body
+        end
+      end
+      
+      def show_notifications(updates)
+        updates.each do |update|
           image    = Twitorious::Image.from_url(update["user"]["profile_image_url"], @config.image_store)
           filename = image ? image.filename : @site[:icon] 
           @notifier.notify(update["user"]["screen_name"], update["text"], update["created_at"], filename)
           sleep @config.sleep_between_notifications.to_i
         end
-
-        # Returning the last ID we saw, so we can update since_id for the site
-        return updates[0]["id"]
       end
     end
   end

data/lib/twitorious/timeline.rb

@@ -10,11 +10,23 @@ module Twitorious
         case site[:api]
           when "Twitter": 
             since_id = Twitorious::API::Twitter.new(@config, site).fetch_timeline
-            site[:since_id] = since_id if since_id
+            site[:timeline_since_id] = since_id if since_id
           else puts "Unknown API #{site[:api]} for site #{site[:name]}"
         end
       end
       @config.save # Since we've gotten newer since_id's
     end
+    
+    def fetch_mentions
+      @config.sites.each do |site|
+        case site[:api]
+          when "Twitter":
+            since_id = Twitorious::API::Twitter.new(@config, site).fetch_mentions
+            site[:mentions_since_id] = since_id if since_id
+          else puts "Unknown API #{site[:api]} for site #{site[:name]}"
+        end
+      end
+      @config.save # Newer mentions_since_id's
+    end
   end
 end

data/lib/twitorious.rb

@@ -1,5 +1,5 @@
 module Twitorious
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
   
   class TooLongUpdate < StandardError; end
 

data/twitorious.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = "Twitorious"
-  s.version      = "0.2.8"
-	s.date         = "2009-04-01"
+  s.version      = "0.2.9"
+	s.date         = "2009-04-16"
   s.author       = "Per Christian B. Viken"
   s.email        = "perchr@northblue.org"
   s.homepage     = "http://eastblue.org/projects/twitorious/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: PerfectlyNormal-Twitorious
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Per Christian B. Viken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency