osc-ruby 0.6.3 → 0.7.0

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2009 Colin Harris
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

data/Rakefile

@@ -23,23 +23,31 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+require 'rake/packagetask'
+require 'rake/gempackagetask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "osc-ruby"
-    gem.description = "a ruby client for the OSC protocol"
-    gem.summary = %Q{inital gem}
-    gem.email = "qzzzq1@gmail.com"
-    gem.homepage = "http://github.com/aberant/osc-ruby"
-    gem.authors = ["aberant"]
-    gem.files = FileList['Rakefile', 'examples/**/*', 'lib/**/*'].to_a
-    gem.test_files = FileList['spec/**/*.rb']
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
+### Task: gem
+gemspec = Gem::Specification.new do |gem|
+  gem.name = "osc-ruby"
+  gem.version   = File.read('VERSION')
+
+  gem.summary = "a ruby client for the OSC protocol"
+  gem.description = "This OSC gem originally created by Tadayoshi Funaba has been updated for ruby 1.9/JRuby compatibility"
+
+  gem.authors = "Colin Harris"
+  gem.email = "qzzzq1@gmail.com"
+  gem.homepage = "http://github.com/aberant/osc-ruby"
 
-  Jeweler::GemcutterTasks.new
+  gem.has_rdoc = true
+
+  gem.files = FileList['Rakefile', 'VERSION', 'LICENSE', 'examples/**/*', 'lib/**/*'].to_a
+  gem.test_files = FileList['spec/**/*.rb']
+end
 
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+Rake::GemPackageTask.new( gemspec ) do |task|
+  task.gem_spec = gemspec
+  task.need_tar = false
+  task.need_tar_gz = true
+  task.need_tar_bz2 = true
+  task.need_zip = true
 end

data/VERSION

@@ -0,0 +1 @@
+0.7.0

data/lib/osc-ruby/em_server.rb

@@ -18,7 +18,7 @@ module OSC
     end
 
     def run
-      EM::run { EM::open_datagram_socket "localhost",  @port, Connection }
+      EM::run { EM::open_datagram_socket "0.0.0.0",  @port, Connection }
     end
 
     def add_method(address_pattern, &proc)

data/lib/osc-ruby/server.rb

@@ -1,27 +1,27 @@
 module OSC
   class  Server
 
-    def initialize(port)
+    def initialize( port )
       @socket = UDPSocket.new
-      @socket.bind('', port)
-      @cb = []
+      @socket.bind( '', port )
+      @matchers = []
       @queue = Queue.new
     end
-    
+
     def run
       start_dispatcher
-      
+
       start_detector
     end
-    
+
     def stop
       @socket.close
     end
 
-    def add_method(address_pattern, &proc)
+    def add_method( address_pattern, &proc )
       matcher = AddressPattern.new( address_pattern )
-      
-      @cb << [matcher, proc]
+
+      @matchers << [matcher, proc]
     end
 
 private
@@ -33,7 +33,7 @@ private
 	      Thread.main.raise $!
       end
     end
-  
+
     def start_dispatcher
       Thread.fork do
 	      begin
@@ -44,14 +44,6 @@ private
       end
     end
 
-    def sendmesg(mesg)
-      @cb.each do |matcher, obj|
-	      if matcher.match?( mesg.address )
-	        obj.call( mesg )
-	      end
-      end
-    end
-
     def dispatcher
       loop do
 	      mesg = @queue.pop
@@ -59,33 +51,41 @@ private
       end
     end
 
-    def detector
-      loop do
-	      pa, network = @socket.recvfrom(16384)
-	      begin
-	        
-	        OSCPacket.messages_from_network(pa).each do |x| 
-	          @queue.push(x)
-          end
-          
-	      rescue EOFError
-	      end
-      end
-    end
-    
     def dispatch_message( message )
       diff = ( message.time || 0 ) - Time.now.to_ntp
-      
+
       if diff <= 0
         sendmesg( message)
       else # spawn a thread to wait until it's time
         Thread.fork do
-    	    sleep(diff)
-    	    sendmesg(mesg)
+    	    sleep( diff )
+    	    sendmesg( mesg )
     	    Thread.exit
     	  end
       end
     end
 
+    def sendmesg(mesg)
+      @matchers.each do |matcher, proc|
+	      if matcher.match?( mesg.address )
+	        proc.call( mesg )
+	      end
+      end
+    end
+
+    def detector
+      loop do
+	      osc_data, network = @socket.recvfrom( 16384 )
+	      begin
+
+	        OSCPacket.messages_from_network( osc_data ).each do |message|
+	          @queue.push(message)
+          end
+
+	      rescue EOFError
+	      end
+      end
+    end
+
   end
 end

metadata

@@ -1,31 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: osc-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
-- aberant
+- Colin Harris
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -06:00
+date: 2010-08-15 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: a ruby client for the OSC protocol
+description: This OSC gem originally created by Tadayoshi Funaba has been updated for ruby 1.9/JRuby compatibility
 email: qzzzq1@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - Rakefile
+- VERSION
+- LICENSE
 - examples/classic_server.rb
 - examples/event_machine_server.rb
-- lib/osc-ruby.rb
 - lib/osc-ruby/address_pattern.rb
 - lib/osc-ruby/bundle.rb
 - lib/osc-ruby/client.rb
@@ -38,35 +44,37 @@ files:
 - lib/osc-ruby/osc_packet.rb
 - lib/osc-ruby/osc_types.rb
 - lib/osc-ruby/server.rb
-- README.rdoc
+- lib/osc-ruby.rb
 has_rdoc: true
 homepage: http://github.com/aberant/osc-ruby
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: inital gem
+summary: a ruby client for the OSC protocol
 test_files: 
 - spec/builders/message_builder.rb
 - spec/spec_helper.rb

data/README.rdoc

@@ -1,72 +0,0 @@
-= An OSC client for Ruby
-
-http://opensoundcontrol.org/
-
-== Description
-
-This OSC gem originally created by Tadayoshi Funaba has been updated for ruby 1.9 compatibility.  I've made a point to make this code as expressive as possible and provide a test suite for confident hacking.  It also should be flexible enough to support most crazy ideas.
-
-Compatible with ruby 1.8, 1.9, and jruby
-
-== Install
-
-  sudo gem install osc-ruby
-  
-for the EMServer, you will need EventMachine
-
-  sudo gem install eventmachine
-
-== Event Machine example
-  
-  # compatible with ruby 1.8, 1.9, and jruby
-  require 'rubygems'
-  require 'osc-ruby'
-  require 'osc-ruby/em_server'
-  
-  @server = OSC::EMServer.new( 3333 )
-  @client = OSC::Client.new( 'localhost', 3333 )
-
-  @server.add_method '/greeting' do | message |
-    puts message.to_a
-  end
-
-  Thread.new do
-    @server.run
-  end
-
-  @client.send( OSC::Message.new( "/greeting" , "hullo!" ))
-
-  sleep( 3 )
-  
-== Classic example
-
-  # compatible with ruby 1.8
-  require 'rubygems'
-  require 'osc-ruby'
-
-
-  @server = OSC::Server.new( 3333 )
-  @client = OSC::Client.new( 'localhost', 3333 )
-
-  @server.add_method '/greeting' do | message |
-    puts message.inspect
-  end
-
-  Thread.new do
-    @server.run
-  end
-
-  @client.send( OSC::Message.new( "/greeting", "hullo!" ))
-
-  sleep( 3 )
-  
-  
-== Credits
-
-Originally created by...
-
-Tadayoshi Funaba
-
-http://www.funaba.org/en/
-
-thx also to Toby Tripp and Obtiva