viking-biobot 0.0.3 → 0.0.4

data/.gitignore

@@ -1,6 +1,7 @@
 .*swp
 old
 pkg
+log
 test/db.sqlite3
 test.rb
 Session.vim

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/biobot

@@ -2,7 +2,6 @@
 require 'optparse'
 require 'yaml'
 require 'biobot'
-require 'daemonize'
 
 options = {}
 OptionParser.new do |opts|
@@ -25,11 +24,4 @@ raise Errno::ENOENT   unless File.exist?(options[:config])
 
 biobot = Biobot::Base.new(YAML.load_file(options[:config]))
 biobot.start
-Signal.trap("TERM") do
-  puts "Stopping biobot..."
-  biobot.stop
-end
-
-Daemonize.daemonize   if options[:daemon]
-loop do
-end
+biobot.join

data/biobot.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{biobot}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = %q{2009-06-11}
+  s.date = %q{2009-06-12}
   s.default_executable = %q{biobot}
   s.description = %q{An XMPP bot for Vanderbilt Biostatistics}
   s.email = %q{viking415@gmail.com}

data/lib/biobot.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'xmpp4r'
+require 'logger'
 require 'active_record'
 
 require File.dirname(__FILE__) + '/biobot/base'

data/lib/biobot/base.rb

@@ -7,7 +7,11 @@ module Biobot
 
     @@periodicals = []
     def self.register_periodical(method, delay)
-      @@periodicals << [method, delay]
+      @@periodicals << {
+        :method => method,
+        :delay  => delay,
+        :last_run => nil
+      }
     end
 
     def initialize(config)
@@ -19,10 +23,12 @@ module Biobot
         ActiveRecord::Base.establish_connection(config['database'])
       end
 
+      @log = config['logfile'] ? Logger.new(config['logfile']) : nil
+
       @client = Jabber::Client.new(@jid)
       @presence = Jabber::Presence.new
 
-      @threads = []
+      @message_buffer = []
     end
 
     def process(message)
@@ -42,19 +48,40 @@ module Biobot
       @client.send(@presence)
 
       @client.add_message_callback do |message|
-        process(message) if message.body
+        @message_buffer << message  if message.body
       end
+      main_loop
+    end
+
+    def main_loop
+      @main = Thread.new do
+        loop do
+          while !@message_buffer.empty?
+            process(@message_buffer.shift)
+          end
+          @@periodicals.size.times do |i|
+            last_run = @@periodicals[i][:last_run]
+            if last_run.nil? || (Time.now - last_run) >= @@periodicals[i][:delay]
+              @log.info "Running #{@@periodicals[i][:method]}"      if @log
 
-      @@periodicals.each do |(method, delay)|
-        thread = Thread.new { loop { self.send(method); sleep(delay) } }
-        @threads << thread
+              self.send(@@periodicals[i][:method])
+              @@periodicals[i][:last_run] = Time.now
+
+              @log.info "Done running #{@@periodicals[i][:method]}" if @log
+            end
+          end
+          sleep 1
+        end
       end
     end
 
+    def join
+      @main.join
+    end
+
     def stop
-      @threads.each { |t| t.exit }
-      @threads.clear
       @client.close!
+      @main.kill
     end
   end
 end

data/test/biobot/test_base.rb

@@ -77,9 +77,10 @@ class TestBase < Test::Unit::TestCase
 
   def test_timers_for_periodicals_on_start
     clear_periodicals
-    Biobot::Base.register_periodical(:leetsaurus, 0.3)
-    Thread.expects(:new).once
-    Biobot::Base.new(@config).start
+    Biobot::Base.register_periodical(:leetsaurus, 10)
+    biobot = Biobot::Base.new(@config)
+    biobot.expects(:leetsaurus)
+    biobot.start
   end
 
   def test_active_record_usage
@@ -95,6 +96,18 @@ class TestBase < Test::Unit::TestCase
   def test_stop
     @client.expects(:close!)
     biobot = Biobot::Base.new(@config)
+    biobot.start
     biobot.stop
   end
+
+  def test_logger
+    Logger.expects(:new).with('biobot.log')
+    @config['logfile'] = 'biobot.log'
+    biobot = Biobot::Base.new(@config)
+  end
+
+  def test_nil_logger
+    Logger.expects(:new).never
+    biobot = Biobot::Base.new(@config)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viking-biobot
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jeremy Stephens
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-11 00:00:00 -07:00
+date: 2009-06-12 00:00:00 -07:00
 default_executable: biobot
 dependencies: 
 - !ruby/object:Gem::Dependency