osc-ruby 0.6.1 → 0.6.2

data/Rakefile

@@ -3,6 +3,7 @@ require 'spec/rake/spectask'
 task :default => :spec
 
 Spec::Rake::SpecTask.new do |t|
+  t.libs << 'lib'
   t.warning = false
   t.rcov = false
   t.spec_opts = ["--colour"]

data/examples/classic_server.rb

@@ -1,6 +1,6 @@
 # compatible with ruby 1.8
-require File.join( File.dirname( __FILE__ ), '..', 'lib', 'osc-ruby' )
-
+$:.unshift File.join( File.dirname( __FILE__ ), '..', 'lib')
+require 'osc-ruby'
 
 @server = OSC::Server.new( 3333 )
 @client = OSC::Client.new( 'localhost', 3333 )

data/examples/event_machine_server.rb

@@ -1,5 +1,10 @@
 # compatible with ruby 1.8, 1.9, and jruby
-require File.join( File.dirname( __FILE__ ), '..', 'lib', 'osc-ruby', 'em_server' )
+$:.unshift File.join( File.dirname( __FILE__ ), '..', 'lib')
+require 'osc-ruby'
+
+require 'rubygems'
+require 'eventmachine'
+require 'osc-ruby/em_server'
 
 @server = OSC::EMServer.new( 3333 )
 @client = OSC::Client.new( 'localhost', 3333 )

data/lib/osc-ruby.rb

@@ -1,21 +1,14 @@
-# osc.rb: Written by Tadayoshi Funaba 2005,2006
-# $Id: osc.rb,v 1.4 2006-11-10 21:54:37+09 tadf Exp $
-require 'forwardable'
 require 'socket'
 require 'thread'
 
-
-$:.unshift( File.dirname( __FILE__ ) )
-
 # core extensions
-require 'osc-ruby/core_ext/object'
 require 'osc-ruby/core_ext/numeric'
 require 'osc-ruby/core_ext/time'
 
-
 # jus the basics
 require 'osc-ruby/osc_types'
 require 'osc-ruby/osc_packet'
+
 require 'osc-ruby/message'
 require 'osc-ruby/bundle'
 require 'osc-ruby/address_pattern'

data/lib/osc-ruby/em_server.rb

@@ -1,7 +1,3 @@
-require 'rubygems'
-require 'eventmachine'
-require File.join( File.dirname( __FILE__), '..', 'osc-ruby')
-
 module OSC
   Channel = EM::Channel.new
 

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
-require 'rubygems'
+require 'osc-ruby'
 require 'spec'
 
-$:.unshift( File.join( File.dirname( __FILE__), '..') )
-
-require 'lib/osc-ruby'
 require 'builders/message_builder'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: osc-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - aberant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -06:00
+date: 2010-01-17 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - lib/osc-ruby/bundle.rb
 - lib/osc-ruby/client.rb
 - lib/osc-ruby/core_ext/numeric.rb
-- lib/osc-ruby/core_ext/object.rb
 - lib/osc-ruby/core_ext/time.rb
 - lib/osc-ruby/em_server.rb
 - lib/osc-ruby/message.rb

data/lib/osc-ruby/core_ext/object.rb

@@ -1,37 +0,0 @@
-# lifted from the ruby programming language book, thx matz!
-
-# Obtain the Mutex associated with the object o, and then evaluate 
-# the block under the protection of that Mutex. 
-# This works like the synchronized keyword of Java. 
-def synchronized(o) 
-  o.mutex.synchronize { yield } 
-end 
-# Object.mutex does not actually exist. We've got to define it. 
-# This method returns a unique Mutex for every object, and 
-# always returns the same Mutex for any particular object. 
-# It creates Mutexes lazily, which requires synchronization for 
-# thread safety. 
-class Object 
-  # Return the Mutex for this object, creating it if necessary. 
-  # The tricky part is making sure that two threads don't call 
-  # this at the same time and end up creating two different mutexes. 
-  def mutex 
-    # If this object already has a mutex, just return it 
-    return @__mutex if @__mutex 
-        
-    # Otherwise, we've got to create a mutex for the object. 
-    # To do this safely we've got to synchronize on our class object. 
-    synchronized(self.class) { 
-      # Check again: by the time we enter this synchronized block, 
-      # some other thread might have already created the mutex. 
-      @__mutex = @__mutex || Mutex.new 
-    } 
-    # The return value is @__mutex 
-  end 
-end 
-# The Object.mutex method defined above needs to lock the class 
-# if the object doesn't have a Mutex yet. If the class doesn't have 
-# its own Mutex yet, then the class of the class (the Class object) 
-# will be locked. In order to prevent infinite recursion, we must 
-# ensure that the Class object has a mutex. 
-Class.instance_eval { @__mutex = Mutex.new }