<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>plugins/help.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,4 +2,22 @@ This is an under-heavy-development bot for the Campfire web-based chat system.
 
 It aims to be multi-purpose and extensible.
 
- - Tim Riley &lt;tim at openmonkey dot com&gt;
\ No newline at end of file
+ - Tim Riley &lt;tim at openmonkey dot com&gt;
+ 
+Requirements:
+
+rubygems
+timriley-tinder
+hpricot
+mime-types
+activesupport 
+
+Configuration: 
+
+in config.yml
+
+Running:
+
+Run script/bot with the environment name as the argument
+
+script/bot.rb development
\ No newline at end of file</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -21,15 +21,23 @@ module CampfireBot
     attr_reader :campfire, :room, :config
   
     def initialize
-      @config   = YAML::load(File.read(&quot;#{BOT_ROOT}/config.yml&quot;))[BOT_ENVIRONMENT]
+      @config = YAML::load(File.read(&quot;#{BOT_ROOT}/config.yml&quot;))[BOT_ENVIRONMENT]
     end
   
     def connect
       load_plugins
     
-      @campfire = Tinder::Campfire.new(@config['site'], :ssl =&gt; !!@config['use_ssl'])
-      @campfire.login(@config['username'], @config['password'])
-      @room = @campfire.find_room_by_name(@config['room'])
+      if @config['guesturl']
+        baseurl, guest_token = @config['guesturl'].split(/.com\//)
+        @campfire = Tinder::Campfire.new(@config['site'], :guesturl =&gt; @config['guesturl'], :ssl =&gt; !!@config['ssl'])
+        roomid    = @campfire.guestlogin(@config['guesturl'], @config['nickname'])
+        @room     = Tinder::Room.new(@campfire, roomid, @config['room'])
+      else
+        @campfire = Tinder::Campfire.new(@config['site'], :ssl =&gt; !!@config['use_ssl'])
+        @campfire.login(@config['username'], @config['password'])
+        @room = @campfire.find_room_by_name(@config['room'])
+      end
+      
       @room.join
       puts &quot;Ready.&quot;
     end</diff>
      <filename>lib/bot.rb</filename>
    </modified>
    <modified>
      <diff>@@ -39,7 +39,7 @@ module CampfireBot
           msg[:message][0..0] == '!' || 
           msg[:message]       =~ Regexp.new(&quot;^#{bot.config['nickname']},&quot;, Regexp::IGNORECASE)
         ) &amp;&amp;
-        msg[:message].gsub(/^!/, '').gsub(Regexp.new(&quot;#{bot.config['nickname']},\\s*&quot;, Regexp::IGNORECASE), '').split(' ')[0].to_s.downcase == @matcher.downcase
+        msg[:message].gsub(/^!/, '').gsub(Regexp.new(&quot;#{bot.config['nickname']}(,|:)?\\s*&quot;, Regexp::IGNORECASE), '').split(' ')[0].to_s.downcase == @matcher.downcase
         # FIXME - the above should be just done with one regexp to pull out the first non-! non-&lt;bot name&gt; word.
       end
   </diff>
      <filename>lib/event.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>de33e1ff91a4ae39ea91541dc250e4ff5e25dd62</id>
    </parent>
  </parents>
  <author>
    <name>Tim Riley</name>
    <email>tim@openmonkey.com</email>
  </author>
  <url>http://github.com/timriley/campfire-bot/commit/a838b0d1ab643fb2dc6cd9b24f609fe344563b07</url>
  <id>a838b0d1ab643fb2dc6cd9b24f609fe344563b07</id>
  <committed-date>2008-11-24T04:44:26-08:00</committed-date>
  <authored-date>2008-11-24T04:44:26-08:00</authored-date>
  <message>merge in some sterling work by joshwand</message>
  <tree>77c87259bffec56f0f562304d7230888481b3102</tree>
  <committer>
    <name>Tim Riley</name>
    <email>tim@openmonkey.com</email>
  </committer>
</commit>
