multicast 0.2.0 → 0.2.1

data/README.rdoc

@@ -4,6 +4,10 @@ Ruby library and command line utils for multicasting
 
 This project is very young so some things might not work.
 
+== Install
+
+  gem install multicast
+
 == Listening
 
   mclisten -g 224.0.1.33 -p 4567

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/mclisten

@@ -48,31 +48,6 @@ puts "==== Multicast Listener ====\n"
 listener = Multicast::Listener.new(:group => Choice.choices[:group], :port => Choice.choices[:port])
 puts "---> Joining #{Choice.choices[:group]}:#{Choice.choices[:port]}"
 
-listener.listen do |msg, info|
-  puts "---> [#{info[2]} / #{info[3]}:#{info[1]} (#{msg.size} bytes)] #{msg}"
+listener.listen do |message|
+  puts "---> [#{message.hostname} / #{message.ip}:#{message.port} (#{message.message.size} bytes)] #{message.message}"
 end
-
-
-# puts "==== Multicast Listener ====\n"
-# 
-# multicast_group = Choice.choices[:group]
-# port = Choice.choices[:port]
-# ip =  IPAddr.new(multicast_group).hton + IPAddr.new("0.0.0.0").hton
-# puts "---> Joining #{multicast_group}:#{port}"
-# sock = UDPSocket.new
-# sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, ip)
-# sock.bind(Socket::INADDR_ANY, port)
-# 
-# loop do
-#   begin
-#   msg, info = sock.recvfrom(1024)
-#   #puts "MSG: #{msg} from #{info[2]} (#{info[3]})/#{info[1]} len #{msg.size}"
-#   puts "---> [#{info[2]} / #{info[3]}:#{info[1]} (#{msg.size} bytes)] #{msg}"
-#   
-#   rescue Interrupt
-#     sock.close
-#     puts "\n---> Exiting" 
-#     exit
-#   end
-# 
-# end

data/lib/multicast/listener.rb

@@ -16,10 +16,9 @@ module Multicast
       
       loop do
         begin
-        msg, info = sock.recvfrom(1024)
-        #puts "MSG: #{msg} from #{info[2]} (#{info[3]})/#{info[1]} len #{msg.size}"
-        #puts "---> [#{info[2]} / #{info[3]}:#{info[1]} (#{msg.size} bytes)] #{msg}"
-        yield(msg, info)
+          msg, info = sock.recvfrom(1024)
+          message = Message.new(:message => msg, :hostname => info[2], :ip => info[3], :port => info[1])
+          yield(message)
 
         rescue Interrupt
           sock.close

data/lib/multicast/message.rb

@@ -0,0 +1,13 @@
+module Multicast
+  class Message
+    attr_accessor :message, :hostname, :ip, :port
+    
+    def initialize(opts={})
+      @message    = opts[:message]
+      @hostname   = opts[:hostname]
+      @ip         = opts[:ip]
+      @port   = opts[:port]
+    end
+    
+  end
+end

data/lib/multicast.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'ipaddr'
 
+require File.dirname(__FILE__) + '/multicast/message'
 require File.dirname(__FILE__) + '/multicast/listener'
 require File.dirname(__FILE__) + '/multicast/sender'

data/multicast.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multicast}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marshall Huss"]
-  s.date = %q{2010-05-20}
+  s.date = %q{2010-05-21}
   s.description = %q{Multicasting in Ruby}
   s.email = %q{mwhuss@gmail.com}
   s.executables = ["mclisten", "mcsend"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "bin/mcsend",
      "lib/multicast.rb",
      "lib/multicast/listener.rb",
+     "lib/multicast/message.rb",
      "lib/multicast/sender.rb",
      "multicast.gemspec",
      "test/helper.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multicast
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Marshall Huss
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 -04:00
+date: 2010-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - bin/mcsend
 - lib/multicast.rb
 - lib/multicast/listener.rb
+- lib/multicast/message.rb
 - lib/multicast/sender.rb
 - multicast.gemspec
 - test/helper.rb