twibot 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,13 @@
+== 0.1.4 / 2009-03-24
+
+* Removed some warnings
+* Added error handling to avoid Twibot crashing when Twitter is down (Ben Vandgrift)
+* Fixed bug: receiving tweets from named users crashed Twibot (Jens Ohlig)
+
+== 0.1.3 / 2009-03-19
+
+* Ruby 1.9 support
+
 == 0.1.2 / 2009-03-18
 
 * Removed some warnings

data/Readme.rdoc

@@ -134,6 +134,8 @@ reaches max_interval, where it will stay until Twibot finds anything.
 == Contributors
 
  * Dan Van Derveer (bug fixes) - http://dan.van.derveer.com/
+ * Ben Vandgrift (Twitter downtime error handling) - http://neovore.com/
+ * Jens Ohlig (warnings)
 
 == License
 

data/lib/twibot/bot.rb

@@ -48,7 +48,13 @@ module Twibot
       @processed[:message] = messages.first.id if messages.length > 0
 
       handle_tweets = @handlers[:tweet].length + @handlers[:reply].length > 0
-      tweets = handle_tweets ? @twitter.timeline_for(:me, { :count => 1 }) : []
+      tweets = []
+      begin
+        tweets = handle_tweets ? @twitter.timeline_for(:me, { :count => 1 }) : []
+      rescue Twitter::RESTError => e
+        log.error("Failed to connect to Twitter.  It's likely down for a bit:")
+	log.error(e.to_s)
+      end
       @processed[:tweet] = tweets.first.id if tweets.length > 0
       @processed[:reply] = tweets.first.id if tweets.length > 0
 
@@ -84,7 +90,13 @@ module Twibot
       return false unless handlers[type].length > 0
       options = {}
       options[:since_id] = @processed[type] if @processed[type]
-      dispatch_messages(type, @twitter.messages(:received, options), %w{message messages})
+      begin
+        dispatch_messages(type, @twitter.messages(:received, options), %w{message messages})
+      rescue Twitter::RESTError => e
+        log.error("Failed to connect to Twitter.  It's likely down for a bit:")
+	log.error(e.to_s)
+	0
+      end
     end
 
     #
@@ -95,7 +107,15 @@ module Twibot
       return false unless handlers[type].length > 0
       options = {}
       options[:since_id] = @processed[type] if @processed[type]
-      dispatch_messages(type, @twitter.timeline_for(:me, options), %w{tweet tweets})
+      begin
+        dispatch_messages(type, 
+      	  @twitter.timeline_for(config[:include_friends] ? :friends : :me, 
+	  options), %w{tweet tweets})
+      rescue Twitter::RESTError => e
+        log.error("Failed to connect to Twitter.  It's likely down for a bit:")
+	log.error(e.to_s)
+	0
+      end
     end
 
     #
@@ -106,8 +126,14 @@ module Twibot
       return false unless handlers[type].length > 0
       options = {}
       options[:since_id] = @processed[type] if @processed[type]
-      num = dispatch_messages(type, @twitter.status(:replies, options), %w{reply replies})
-      num
+      begin
+        dispatch_messages(type, @twitter.status(:replies, options), %w{reply replies})
+      rescue Twitter::RESTError => e
+        log.error("Failed to connect to Twitter.  It's likely down for a bit:")
+	log.error(e.to_s)
+	0
+      end
+      
     end
 
     #
@@ -171,13 +197,14 @@ module Twibot
           @config.password = hl.ask("Twitter password: ") { |q| q.echo = '*' } unless @conf[:password]
           @conf = @config.to_hash
         rescue LoadError
-          raise SystemExit.new <<-HELP
+          raise SystemExit.new( <<-HELP
 Unable to continue without login and password. Do one of the following:
   1) Install the HighLine gem (gem install highline) to be prompted for credentials
   2) Create a config/bot.yml with login: and password:
   3) Put a configure { |conf| conf.login = "..." } block in your bot application
   4) Run bot with --login and --password options
           HELP
+          )
         end
       end
 

data/lib/twibot/config.rb

@@ -28,7 +28,8 @@ module Twibot
       :login => nil,
       :password => nil,
       :prompt => false,
-      :daemonize => false
+      :daemonize => false,
+      :include_friends => false
     }
 
     def initialize(settings = {})

data/lib/twibot/handlers.rb

@@ -69,7 +69,8 @@ module Twibot
       return false if @options[:pattern] && message.text !~ @options[:pattern] # Pattern check
 
       users = @options[:from] ? @options[:from] : nil
-      return false if users && !users.include?(message.sender.screen_name) # Check allowed senders
+      sender = message.respond_to?(:sender) ? message.sender : message.user
+      return false if users && !users.include?(sender.screen_name) # Check allowed senders
       true
     end
 

data/lib/twibot.rb

@@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), 'hash')
 module Twibot
 
   # :stopdoc:
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/test/test_bot.rb

@@ -81,6 +81,14 @@ class TestBot < Test::Unit::TestCase
     assert_equal 1, bot.receive_tweets
   end
 
+  should "receive friend tweets if configured" do
+    bot = Twibot::Bot.new(Twibot::Config.new({:log_level => "error", :include_friends => true}))
+    bot.add_handler(:tweet, Twibot::Handler.new)
+    Twitter::Client.any_instance.expects(:timeline_for).with(:friends, {}).returns([tweet("cjno", "Hei der!")])
+
+    assert_equal 1, bot.receive_tweets
+  end
+
   should "remember received tweets" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error"))
     bot.add_handler(:tweet, Twibot::Handler.new)

data/test/test_handler.rb

@@ -121,6 +121,12 @@ class TestHandler < Test::Unit::TestCase
     assert handler.recognize?(message)
   end
 
+  should "recognize tweets from allowed users" do
+    handler = Twibot::Handler.new :from => [:cjno, :irbno]
+    message = tweet "cjno", "time oslo norway"
+    assert handler.recognize?(message)
+  end
+
   should "accept options as only argument" do
     handler = Twibot::Handler.new :from => :cjno
     assert_equal(:cjno, handler.instance_eval { @options[:from] })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twibot
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 +01:00
+date: 2009-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency