multicast 0.1.0 → 0.2.0

data/README.rdoc

@@ -1,16 +1,20 @@
 = multicast
 
-Description goes here.
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+Ruby library and command line utils for multicasting
+
+This project is very young so some things might not work.
+
+== Listening
+
+  mclisten -g 224.0.1.33 -p 4567
+
+== Sending
+
+  mcsend -g 224.0.1.33 -p 4567 -m "Multicasting like a champ"
+
+== Contact
+
+You can find me on @mwhuss[http://twitter.com/mwhuss]
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/mclisten

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../lib/multicast'
 require 'choice'
 
-
+PROGRAM_VERSION = File.exist?('VERSION') ? File.read('VERSION') : ""
 
 
 Choice.options do
@@ -38,33 +38,41 @@ Choice.options do
     long '--version'
     desc 'Show version'
     action do
-      puts "ftpd.rb FTP server v#{PROGRAM_VERSION}"
+      puts "mclisten v#{PROGRAM_VERSION}"
       exit
     end
   end
 end
 
-
 puts "==== Multicast Listener ====\n"
+listener = Multicast::Listener.new(:group => Choice.choices[:group], :port => Choice.choices[:port])
+puts "---> Joining #{Choice.choices[:group]}:#{Choice.choices[:port]}"
 
-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}"
+listener.listen do |msg, info|
   puts "---> [#{info[2]} / #{info[3]}:#{info[1]} (#{msg.size} bytes)] #{msg}"
-  
-  rescue Interrupt
-    sock.close
-    puts "\n---> Exiting" 
-    exit
-  end
+end
+
 
-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/bin/mcsend

@@ -0,0 +1,56 @@
+#! /usr/bin/ruby
+
+require File.dirname(__FILE__) + '/../lib/multicast'
+require 'choice'
+
+PROGRAM_VERSION = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+Choice.options do
+  header ''
+  header 'Specific options:'
+
+  option :group, :required => true do
+    short '-g'
+    long '--group=GROUP'
+    desc 'The multicast group to send to'
+  end
+
+  option :port, :required => true do
+    short '-p'
+    long '--port=PORT'
+    desc 'The port to send on'
+    cast Integer
+  end
+  
+  option :message do
+    short '-m'
+    long '--message=MESSAGE'
+    desc 'The message to send to the multicast group'
+    default "Multicast Message from Ruby Multicast lib"
+  end
+
+  separator ''
+  separator 'Common options: '
+
+  option :help do
+    long '--help'
+    desc 'Show this message'
+  end
+
+  option :version do
+    short '-v'
+    long '--version'
+    desc 'Show version'
+    action do
+      puts "mcsend v#{PROGRAM_VERSION}"
+      exit
+    end
+  end
+end
+
+puts "==== Multicast Sender ====\n"
+sender = Multicast::Sender.new(:group => Choice.choices[:group], :port => Choice.choices[:port])
+puts "---> Sending message to #{Choice.choices[:group]}:#{Choice.choices[:port]}"
+puts "---> #{Choice.choices[:message]}"
+
+sender.send(Choice.choices[:message])

data/lib/multicast/listener.rb

@@ -0,0 +1,34 @@
+module Multicast
+  class Listener
+    attr_accessor :group, :port
+    
+    def initialize(opts={})
+      @group  = opts[:group]
+      @port   = opts[:port]
+    end
+    
+    def listen(&block)
+      
+      ip =  IPAddr.new(@group).hton + IPAddr.new("0.0.0.0").hton
+      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}"
+        yield(msg, info)
+
+        rescue Interrupt
+          sock.close
+          puts "\n---> Exiting" 
+          exit
+        end
+
+      end
+    end
+    
+  end
+end

data/lib/multicast/sender.rb

@@ -0,0 +1,22 @@
+module Multicast
+  class Sender
+    attr_accessor :group, :port
+    
+    def initialize(opts={})
+      @group  = opts[:group]
+      @port   = opts[:port]
+    end
+    
+    def send(message)
+      
+      begin
+        socket = UDPSocket.open
+        socket.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, [1].pack('i'))
+        socket.send(message, 0, @group, @port)
+      ensure
+        socket.close 
+      end
+    end
+    
+  end
+end

data/lib/multicast.rb

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

data/multicast.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multicast}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marshall Huss"]
-  s.date = %q{2010-05-19}
-  s.default_executable = %q{mclisten}
+  s.date = %q{2010-05-20}
   s.description = %q{Multicasting in Ruby}
   s.email = %q{mwhuss@gmail.com}
-  s.executables = ["mclisten"]
+  s.executables = ["mclisten", "mcsend"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -26,7 +25,10 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/mclisten",
+     "bin/mcsend",
      "lib/multicast.rb",
+     "lib/multicast/listener.rb",
+     "lib/multicast/sender.rb",
      "multicast.gemspec",
      "test/helper.rb",
      "test/test_multicast.rb"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multicast
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marshall Huss
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -04:00
-default_executable: mclisten
+date: 2010-05-20 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -52,6 +52,7 @@ description: Multicasting in Ruby
 email: mwhuss@gmail.com
 executables: 
 - mclisten
+- mcsend
 extensions: []
 
 extra_rdoc_files: 
@@ -65,7 +66,10 @@ files:
 - Rakefile
 - VERSION
 - bin/mclisten
+- bin/mcsend
 - lib/multicast.rb
+- lib/multicast/listener.rb
+- lib/multicast/sender.rb
 - multicast.gemspec
 - test/helper.rb
 - test/test_multicast.rb