ruby-iarm 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,2 +1,5 @@
+v0.0.3. Many bugfixes and enhancements.  First production-ready version
+
 v0.0.2. Move unneeded files from bin to test
+
 v0.0.1. First version

data/Manifest

@@ -7,7 +7,9 @@ example/IARMserver.rb
 example/chattest.rb
 example/chattest_sniffer.rb
 lib/iarm.rb
+lib/iarm/channel.rb
 lib/iarm/client.rb
+lib/iarm/handle.rb
 lib/iarm/msg.rb
 lib/iarm/msg/channel_member.rb
 lib/iarm/msg/join.rb
@@ -16,7 +18,6 @@ lib/iarm/msg/timeout.rb
 lib/iarm/msg/topic.rb
 lib/iarm/server.rb
 lib/iarm/timer.rb
-ruby-iarm.gemspec
 test/performance_test.rb
 test/test_iarm.rb
 Manifest

data/Rakefile

@@ -1,3 +1,6 @@
 require 'echoe'
-Echoe.new('ruby-iarm')
-    
+Echoe.new('ruby-iarm') do |g|
+ g.summary = 'IRC-like Messaging Server for Ruby'
+ g.author = 'Andrew Snow'
+ g.email = 'andrew@modulus.org'
+end

data/lib/iarm.rb

@@ -1,5 +1,5 @@
 
-['timer', 'msg', 'server', 'client'].each do |x|
+['timer', 'msg', 'server', 'client', 'handle', 'channel'].each do |x|
   require("#{File.dirname(__FILE__)}/iarm/" + x)
 end
 

data/lib/iarm/channel.rb

@@ -0,0 +1,29 @@
+
+module Iarm
+  class Channel
+  
+  
+    attr_reader :created_at, :name
+    attr_accessor :members, :topic, :key
+  
+    def initialize(name)
+      @name = name
+      @key = key
+      @members = {}
+      @created_at = Time.now.to_i
+      @topic = nil
+    end
+    
+    def post(handle, msg)
+      handle.say(self, msg)
+    end
+    
+    def empty?
+      @members.empty?
+    end
+    
+    def members_by_name
+      @members.keys.inject({}) {|hash,handle| hash[handle.name] = @members[handle] ; hash }
+    end
+  end
+end

data/lib/iarm/handle.rb

@@ -0,0 +1,83 @@
+
+module Iarm
+  class Handle
+  
+    attr_reader :touched_at, :created_at, :name, :timer
+    attr_accessor :ttl, :channels
+  
+    def initialize(name)
+      @msg_mutex = Mutex.new
+      @channels = {}
+      @name = name
+      @timer = Iarm::Timer.new
+      @created_at = Time.now.to_i
+      @ttl = 90
+      @msgs = []
+      self.touch
+    end
+  
+    def timed_out?
+      (@touched_at + @ttl) < Time.now.to_i
+    end
+  
+    def next_msg
+      @msg_mutex.synchronize { @msgs.shift }
+    end
+    
+    def push_msg(msg)
+      @msg_mutex.synchronize { @msgs << msg }
+    end
+  
+    def no_msgs?
+      @msgs.empty?
+    end
+  
+    def touch
+      @touched_at = Time.now.to_i
+    end
+    
+    def timeout # returns list of channels that this handle was a member of
+      @channels.keys.select do |channel|
+        channel.members.delete(self) 
+        channel.post(self, Msg::Timeout.new(channel.name, self.name))
+        @channels.delete(channel)
+        true
+      end
+    end
+
+
+    def depart(channel) # returns a list of channels that we departed
+      @channels.keys.select do |ch|
+        if channel.nil? || ch == channel
+          ch.members.delete(self)
+          @channels.delete(ch)
+          ch.post(self, Msg::Part.new(ch.name, self.name))
+          true
+        end
+      end
+    end
+    
+    def join(channel)
+      @channels[channel] = channel.members[self] = Time.now.to_i
+      send_msg(channel.topic) if channel.topic
+      channel.post(self, Msg::Join.new(channel.name, self.name, @channels[channel]))
+    end
+    
+    def send_msg(msg)
+      if(msg.kind_of?(Msg::Topic) || @name != msg.from)
+        #puts "MSG[#{msg.class}] <##{msg.channel}:#{msg.from}> #{@name} : #{msg.data}"
+        self.push_msg(msg)
+        self.poke
+      end
+    end
+    
+    def poke
+      @timer.poke
+    end
+    
+    def say(channel, msg)
+      channel.members.each_key {|member| member.send_msg(msg) }
+    end
+    
+  end
+end

data/lib/iarm/msg.rb

@@ -1,8 +1,7 @@
 
-
 Iarm::Msg = Struct.new(:channel, :from, :data)
 
 ['join', 'part', 'channel_member', 'timeout', 'topic'].each do |x|
-  require("#{File.dirname(__FILE__)}/msg/" + x)
+  require("#{File.dirname(__FILE__)}/msg/#{x}")
 end
 

data/lib/iarm/server.rb

@@ -3,63 +3,51 @@ require 'thread'
 require 'drb'
 
 
-
 module Iarm
   class Server
 
-    def ping
+    def ping(nickname=nil)
+      touch_nickname(nickname) if nickname
       'pong'
     end
-    def ttl(ttl_secs)
-      @ttl_secs = ttl_secs
+
+    def ttl(nickname, ttl_secs)
+      handle = touch_nickname(nickname)
+      handle.ttl = ttl_secs
     end
 
     def list(pattern=nil)
       pattern ? @channels.keys.grep(pattern) : @channels.keys
     end
     
-    def who(channel)
-      if(@channels.has_key?(channel))
-        @channel_members[channel] #.each {|w,time| post_msg(who, Msg::ChannelMember.new(channel, w, time)) } 
-      else
-        {}
-      end
+    def who(channelname)
+      (ch = find_channel(channelname)) && ch.members_by_name || {}
     end
 
-    def join(who, channel, key=nil)      # returns true if joined, false if denied, and nil if new channel formed
+    def join(who, channelname, key=nil)      # returns true if joined, false if denied, and nil if new channel formed
       retval = nil
-      touch_nickname(who)
-      @mutex.synchronize do
-        if(@channels.has_key?(channel))
-          retval = (@channels[channel] == key) 
+      handle = touch_nickname(who)
+      @channel_mutex.synchronize do
+        if(channel = find_channel(channelname))
+          retval = channel.key == key		# verify password
         else
-          @channels[channel] = key
+          @channels[channelname].key = key 	# create the channel
         end
 
         if(retval != false)  # if retval is true (joined existing) or nil (new channel formed)
-          if(!@channel_members[channel].has_key?(who)) # don't re-join them if they've already joined before
-            @channel_members[channel][who] = clockval
-            @channels_joined[who] << channel
-            send_msg(Msg::Join.new(channel, who, @channel_members[channel][who]))
-            post_msg(who, @topics[channel]) if @topics.has_key?(channel)
+          if(!(channel = @channels[channelname]).members.has_key?(handle)) # don't re-join them if they've already joined before
+            handle.join(channel)
           end
         end
       end
       retval
     end 
 
-    def depart(who, channel=nil)  # nil=depart ALL channels and log out client
-      @mutex.synchronize do
-        (channel.nil? ? @channels_joined[who] : [ channel ]).each do |ch|
-          @channels_joined[who].delete(ch)
-          if @channel_members[ch].delete(who)
-            send_msg(Msg::Part.new(ch, who))
-          end
-          check_channel_empty(ch)
-        end
-        kill_client(who) if(channel.nil?)
-      end
-      
+    def depart(nickname, channelname=nil)  # nil=depart ALL channels and log out client
+      handle = touch_nickname(nickname)
+      channel = (find_channel(channelname) if channelname)
+      handle.depart(channel).each {|ch| check_channel_empty(ch) }
+      @handles.delete(nickname) if channelname.nil?
     end
 
     # getmsg(): NOTES
@@ -68,28 +56,15 @@ module Iarm
       # if who=nil then it listens on all channels, but only one client can do this at once
       # if another client is already listening with the same who-id, it has the effect of making them return immediately (before their timeout is up)
     def getmsg(who, timeout=0)
-      if(@msgs[who].empty? && timeout != 0)
-        wait_existing = false
-        msg = @mutex.synchronize do
-          wait_existing = Iarm::Timer.poke(@listeners[who])
-          next_msg(who)
-        end
-        return msg if(msg)
-        
-        if(wait_existing)
-          Thread.pass while(@mutex.synchronize { @listeners.has_key?(who) })
-        end
+      handle = touch_nickname(who)
+      if(timeout != 0 && handle.no_msgs?)
+        handle.poke
 
-        #puts "Timer.wait: timeout=#{timeout}"
-        Iarm::Timer.wait(timeout) do |mode|
-          @mutex.synchronize do
-            mode ? @listeners[who] = Thread.current : @listeners.delete(who)
-          end
-          #puts "IARM getmsg: #{who} #{mode ? 'entering' : 'exiting'} wait with msgcount=#{@msgs[who].length}"
-          Iarm::Timer.poke(Thread.current) if mode && @msgs[who].length>0  # don't bother sleeping if we already have a new message waiting
+        handle.timer.wait(timeout) do |mode|
+          mode && handle.no_msgs?
         end
       end
-      @mutex.synchronize { next_msg(who) }
+      handle.next_msg
     end
     
     def getmsgs(who, timeout=0)
@@ -100,30 +75,31 @@ module Iarm
       res
     end
 
-    def say(who, channel, data)
-      post(Iarm::Msg.new(channel, who, data))
+    def say(nickname, channelname, data)
+      handle = touch_nickname(nickname)
+      if(channel = find_channel(channelname))
+        channel.post(handle, Iarm::Msg.new(channelname, nickname, data))
+      end
     end
     
-    def set_topic(who, channel, data)
-      touch_nickname(who)
-      if @channels.has_key?(channel)
-        data = Msg::Topic.new(channel, who, data) unless data.kind_of?(Msg::Topic)
-        if(@topics[channel] != data)
-          @mutex.synchronize { @topics[channel] = data }
-          post(data)
-          data
+    def set_topic(nickname, channelname, topic_data)
+      handle = touch_nickname(nickname)
+      if(channel = find_channel(channelname))
+        topic_data = Msg::Topic.new(channelname, nickname, topic_data) unless topic_data.kind_of?(Msg::Topic)
+        if(channel.topic != topic_data)
+          channel.topic = topic_data
+          channel.post(handle, topic_data)
+          topic_data
         end
       end
     end
     
-    def get_topic(channel)
-      @topics[channel]
+    def get_topic(channelname)
+      if(channel = find_channel(channelname))
+        channel.topic
+      end
     end
 
-    def post(msg)
-      @mutex.synchronize { send_msg(msg) } if(msg.kind_of?(Msg))
-    end
-    
     def self.start(uri=nil)
       DRb.start_service(uri, self.new)
       DRb.thread
@@ -133,43 +109,30 @@ module Iarm
     REAPER_GRANULARITY = 5  #seconds
     
     def initialize
-      @mutex = Mutex.new()
-      @reaper_mutex = Mutex.new()
-      @ttl_secs = 60
-      @listeners = Hash.new()            # { who => Thread }
-      @msgs = Hash.new() {|hsh,key| hsh[key] = [ ] }  # { who => [ msg1, msg2, ...] }
-      @clients = Hash.new()            # { who => time_of_last_activity }
-      @channel_members = Hash.new() {|hsh,key| hsh[key] = { } }  # { channelname => { who1 => join_time }, who2 =>  ...] }
-      @channels_joined = Hash.new() {|hsh,key| hsh[key] = [ ] }  # { who => [ channel1, channel2 ] }
-      @channels = Hash.new()             # { channelname => password }
-      @topics = Hash.new()		# { channelname => topic }
+      @channel_mutex = Mutex.new()
+      @handle_mutex = Mutex.new()
+      @handles = Hash.new()            # { nickname => Handle object }
+      @channels = Hash.new() {|hsh,key| hsh[key] = Iarm::Channel.new(key) }
       @timeout_queue = []
       reaper_thread
     end
     
-    def touch_nickname(nickname) #TODO: call this
-      # UPTO THERE
-      timeout_box = @ttl_secs / REAPER_GRANULARITY #/
-      @reaper_mutex.synchronize do
-        @timeout_queue[timeout_box] ||= []
-        @timeout_queue[timeout_box] << nickname
-        @clients[nickname] = clockval
+    def touch_nickname(nickname, refresh=true) # returns Handle object
+      if !@handles.has_key?(nickname)
+        @handle_mutex.synchronize { @handles[nickname] ||= Iarm::Handle.new(nickname) }
+      end
+      handle = @handles[nickname]
+      handle.touch
+      if(refresh)
+        timeout_box = (handle.ttl.to_f / REAPER_GRANULARITY).ceil.to_i #/
+        @timeout_queue[timeout_box] ||= {}
+        @timeout_queue[timeout_box][handle] = true
       end
+      handle
     end
     
-    
-=begin
-  reaper ideas
-  ------------
-  
-  have a linked list which is in order of things to timeout
-  when taking something off the list, check its actual timeout value and put it back to sleep if needed
-  this could be a binary search down the track, for performance
-  
-=end    
-    
-    def timed_out?(nickname)
-      (tla = @clients[nickname]) && (tla + @ttl_secs) < clockval
+    def find_channel(channelname)
+      @channels[channelname] if @channels.has_key?(channelname)
     end
     
     def reaper_thread
@@ -177,25 +140,12 @@ module Iarm
         loop do
           kill_list = []
           sleep REAPER_GRANULARITY
-          @reaper_mutex.synchronize do
-            timeoutlist = @timeout_queue.shift
-            if timeoutlist
-              timeoutlist.each do |who|
-                kill_list << who if timed_out?(who)
-              end
-            end
+          if(timeoutlist = @timeout_queue.shift)
+            kill_list = timeoutlist.keys.select {|who| who.timed_out? }
           end
-          @mutex.synchronize do
-            kill_list.each do |who|
-              if(@channels_joined.has_key?(who))
-                @channels_joined[who].each do |ch|
-                  @channel_members[ch].delete(who)
-                  send_msg(Msg::Timeout.new(ch, who))
-                  check_channel_empty(ch)
-                end
-              end
-              kill_client(who)
-            end
+          kill_list.each do |who|
+            who.timeout.each {|ch| check_channel_empty(ch) }
+            @handles.delete(who.name)
           end
         end
       end
@@ -204,37 +154,11 @@ module Iarm
     def clockval
       Time.new.to_i
     end
-    
-    def send_msg(msg)
-      @channel_members[msg.channel].each_key {|w| post_msg(w, msg) }
-      post_msg(nil, msg) if(@clients.has_key?(nil))
-    end
-    def post_msg(who, msg)
-      if(msg.kind_of?(Msg::Topic) || who != msg.from)
-        @msgs[who] << msg
-        Iarm::Timer.poke(@listeners[who]) if(@listeners.has_key?(who))
-      end
-    end
-    def next_msg(who) # returns msg or nil
-      touch_nickname(who)
-      @msgs[who].shift
-    end
+
     def check_channel_empty(channel)
-      if(@channel_members[channel].empty?)
-        @channels.delete(channel)
-        @channel_members.delete(channel)
-        @topics.delete(channel)
-      end
-    end
-    def kill_client(who)
-      @channels_joined[who].each do |ch|
-        @channel_members[ch].delete(who)
-        check_channel_empty(ch)
+      @channel_mutex.synchronize do
+        @channels.delete(channel.name) if channel.empty?
       end
-      @channels_joined.delete(who)
-      @clients.delete(who)
-      @msgs.delete(who)
-      @listeners.delete(who)
     end
 
   end

data/lib/iarm/timer.rb

@@ -6,44 +6,83 @@ module Iarm
     class Timeout < Exception; end
     class Poke < Exception; end
     
-    def self.poke(thr)
-      crit do
-        if(thr)# && thr.stop?)
-          thr.raise(Poke.new)
-          true
-        else
-          false
-        end
+    def initialize
+      @poked = false
+      @mutex = Mutex.new
+      @resource = ConditionVariable.new
+    end
+    
+    def poke(timeout=false)
+      @mutex.synchronize do 
+        @poked = true if timeout
+        @resource.signal
       end
     end
     
-    def self.wait(timeout)
+    def wait(timeout)
       timer = create_timer(timeout)
-      yield(true) if block_given?
-      Thread.stop
+      should_wait = true
+      should_wait = yield(true) if block_given?
+      if should_wait
+        @mutex.synchronize do 
+          @resource.wait(@mutex) 
+        end
+      end
+      @poked
     rescue Timeout
-      return false
-    rescue Poke
-      return true
     ensure
       Thread.kill(timer) if(timer && timer.alive?)
-      yield(false) if block_given?
+      yield(false)  if block_given?
     end
     
-    def self.crit
-      yield
-    end
-
     private
-    def self.create_timer(timeout)
+    def create_timer(timeout)
       return nil if(timeout.nil?)
-
       waiter = Thread.current
       Thread.start do
-        Thread.pass
         sleep(timeout)
-    #      Thread.critical = true
-        waiter.raise(Timeout.new)
+        poke(true)
+      end
+    end
+    
+    class << self 
+      def poke(thr)
+        if(thr)# && thr.stop?)
+          thr.raise(Poke.new)
+          true
+        else
+          false
+        end
+      end
+      
+      def wait(timeout)
+        timer = create_timer(timeout)
+        yield(true) if block_given?
+        Thread.stop
+      rescue Timeout
+        return false
+      rescue Poke
+        return true
+      ensure
+        Thread.kill(timer) if(timer && timer.alive?)
+        yield(false) if block_given?
+      end
+      
+      def crit
+        (@mutex ||= Mutex.new).synchronize { yield }
+      end
+
+      private
+      def create_timer(timeout)
+        return nil if(timeout.nil?)
+
+        waiter = Thread.current
+        Thread.start do
+          Thread.pass
+          sleep(timeout)
+      #      Thread.critical = true
+          waiter.raise(Timeout.new)
+        end
       end
     end
   end

data/ruby-iarm.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-iarm}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = [""]
-  s.date = %q{2010-06-07}
-  s.description = %q{}
-  s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "README.textile", "lib/iarm.rb", "lib/iarm/client.rb", "lib/iarm/msg.rb", "lib/iarm/msg/channel_member.rb", "lib/iarm/msg/join.rb", "lib/iarm/msg/part.rb", "lib/iarm/msg/timeout.rb", "lib/iarm/msg/topic.rb", "lib/iarm/server.rb", "lib/iarm/timer.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "README", "README.textile", "Rakefile", "example/IARMserver.rb", "example/chattest.rb", "example/chattest_sniffer.rb", "lib/iarm.rb", "lib/iarm/client.rb", "lib/iarm/msg.rb", "lib/iarm/msg/channel_member.rb", "lib/iarm/msg/join.rb", "lib/iarm/msg/part.rb", "lib/iarm/msg/timeout.rb", "lib/iarm/msg/topic.rb", "lib/iarm/server.rb", "lib/iarm/timer.rb", "ruby-iarm.gemspec", "test/performance_test.rb", "test/test_iarm.rb", "Manifest"]
+  s.authors = ["Andrew Snow"]
+  s.date = %q{2010-08-25}
+  s.description = %q{IRC-like Messaging Server for Ruby}
+  s.email = %q{andrew@modulus.org}
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "README.textile", "lib/iarm.rb", "lib/iarm/channel.rb", "lib/iarm/client.rb", "lib/iarm/handle.rb", "lib/iarm/msg.rb", "lib/iarm/msg/channel_member.rb", "lib/iarm/msg/join.rb", "lib/iarm/msg/part.rb", "lib/iarm/msg/timeout.rb", "lib/iarm/msg/topic.rb", "lib/iarm/server.rb", "lib/iarm/timer.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "README", "README.textile", "Rakefile", "example/IARMserver.rb", "example/chattest.rb", "example/chattest_sniffer.rb", "lib/iarm.rb", "lib/iarm/channel.rb", "lib/iarm/client.rb", "lib/iarm/handle.rb", "lib/iarm/msg.rb", "lib/iarm/msg/channel_member.rb", "lib/iarm/msg/join.rb", "lib/iarm/msg/part.rb", "lib/iarm/msg/timeout.rb", "lib/iarm/msg/topic.rb", "lib/iarm/server.rb", "lib/iarm/timer.rb", "test/performance_test.rb", "test/test_iarm.rb", "Manifest", "ruby-iarm.gemspec"]
   s.homepage = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ruby-iarm", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ruby-iarm}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{}
+  s.summary = %q{IRC-like Messaging Server for Ruby}
   s.test_files = ["test/test_iarm.rb", "test/performance_test.rb"]
 
   if s.respond_to? :specification_version then

data/test/performance_test.rb

@@ -1 +1,27 @@
 
+require "#{File.dirname(__FILE__)}/../lib/iarm"
+Thread.abort_on_exception = true
+
+socket_path = 'drbunix:/tmp/.s.perftestiarm'
+num_clients = 4
+  
+server_pid = fork do 
+  puts "#{$$} Starting server"
+  Iarm::Server.start(socket_path)
+  loop { sleep 10 }
+end
+
+client_pids = []
+
+
+# handle sigpipe, check exit values, shutdown on any failures
+
+
+num_clients.times do 
+  Iarm::Client.connect(socket_path) or raise 'Cannot connect'
+  
+end
+
+
+puts "Finished"
+Process.kill(9, server_pid)

data/test/test_iarm.rb

@@ -36,7 +36,37 @@ end
 class TestIarm < Test::Unit::TestCase
   include TestIarmServer
   
-  def test_join_and_speak
+  def test_getmsg_with_timeout
+    @client1.join('client1', 'test_channel')
+    @client2.join('client2', 'test_channel')
+    
+    # first test timeout with no messages
+    starttime = Time.now.to_f
+    msg = @client2.getmsg('client2', 2)
+    assert_nil msg
+    assert_in_delta(2, (Time.now.to_f - starttime), 0.5)  # should have waited 2 seconds
+
+    testerthread = Thread.start do
+      sleep 1
+      new_connection = new_client
+      new_connection.say('client1', 'test_channel', 'TEST message!')
+    end
+    
+    begin
+      starttime = Time.now.to_f
+      msg = @client2.getmsg('client2', 4)
+      
+      assert_in_delta(1, (Time.now.to_f - starttime), 1) # make sure we didn't wait 4 seconds
+      assert_instance_of Iarm::Msg, msg
+      assert_equal 'client1', msg.from
+      assert_equal 'test_channel', msg.channel
+      assert_equal 'TEST message!', msg.data
+    ensure
+      testerthread.join
+    end
+  end
+  
+  def test_join
     @client1.join('client1', 'test_channel')
     @client2.join('client2', 'test_channel')
 
@@ -125,10 +155,12 @@ class TestIarm < Test::Unit::TestCase
   end
   
   def test_timeout
-    @client1.ttl(2)
     @client1.join('client1', 'test_channel')
+    @client1.ttl('client1', 2)
     assert_equal ['client1'], @client2.who('test_channel').keys
-    sleep(Iarm::Server::REAPER_GRANULARITY + 1)
+    assert_equal 'pong', @client1.ping('client1')
+    countdown = Iarm::Server::REAPER_GRANULARITY  * 2 + 1
+    sleep 1 while((countdown -= 1) >= 0 && !@client2.who('test_channel').empty?)
     assert_equal [], @client2.who('test_channel').keys
   end
 end

metadata

@@ -1,26 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-iarm
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
-- ""
+- Andrew Snow
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 +10:00
+date: 2010-08-25 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
-description: ""
-email: ""
+description: IRC-like Messaging Server for Ruby
+email: andrew@modulus.org
 executables: []
 
 extensions: []
@@ -31,7 +31,9 @@ extra_rdoc_files:
 - README
 - README.textile
 - lib/iarm.rb
+- lib/iarm/channel.rb
 - lib/iarm/client.rb
+- lib/iarm/handle.rb
 - lib/iarm/msg.rb
 - lib/iarm/msg/channel_member.rb
 - lib/iarm/msg/join.rb
@@ -50,7 +52,9 @@ files:
 - example/chattest.rb
 - example/chattest_sniffer.rb
 - lib/iarm.rb
+- lib/iarm/channel.rb
 - lib/iarm/client.rb
+- lib/iarm/handle.rb
 - lib/iarm/msg.rb
 - lib/iarm/msg/channel_member.rb
 - lib/iarm/msg/join.rb
@@ -59,10 +63,10 @@ files:
 - lib/iarm/msg/topic.rb
 - lib/iarm/server.rb
 - lib/iarm/timer.rb
-- ruby-iarm.gemspec
 - test/performance_test.rb
 - test/test_iarm.rb
 - Manifest
+- ruby-iarm.gemspec
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -102,7 +106,7 @@ rubyforge_project: ruby-iarm
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: ""
+summary: IRC-like Messaging Server for Ruby
 test_files: 
 - test/test_iarm.rb
 - test/performance_test.rb