tuio-ruby 0.2.4 → 0.2.5

data/Rakefile

@@ -4,6 +4,8 @@ require 'spec/rake/spectask'
 task :default => :spec
 
 Spec::Rake::SpecTask.new do |t|
+  t.ruby_opts = ["-rubygems"]
+  t.libs << 'lib'
   t.warning = false
   t.rcov = false
   t.spec_opts = ["--colour"]
@@ -33,15 +35,14 @@ begin
     gem.authors = ["aberant"]
     gem.files = FileList['Rakefile', 'examples/**/*', 'lib/**/*'].to_a
     gem.test_files = FileList['spec/**/*.rb']
-    gem.add_dependency('osc-ruby', '>= 0.1.6')
+    gem.add_dependency('osc-ruby', '>= 0.6.2')
     gem.rubyforge_project = "tuio-ruby"
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
+  Jeweler::GemcutterTasks.new
+
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/examples/tuio_dump.rb

@@ -1,5 +1,8 @@
-require File.join( File.dirname( __FILE__ ), '..', 'lib', 'tuio-ruby' )
+require 'rubygems'
+require 'osc-ruby'
 
+$:.unshift( File.join( File.dirname( __FILE__ ), '..', 'lib' ))
+require 'tuio-ruby'
 
 @tc = TuioClient.new
 

data/lib/tuio-ruby.rb

@@ -1,5 +1,3 @@
-$: << File.dirname( __FILE__ )
-
 require 'tuio-ruby/tuio_cursor_parameter'
 require 'tuio-ruby/tuio_object_parameter'
 

data/lib/tuio-ruby/tuio_client.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'osc-ruby'
 
 # core exts
@@ -10,7 +9,6 @@ class TuioClient
 
   attr_reader :tuio_objects, :tuio_cursors
 
-
   client_events :object_creation, :object_update, :object_removal
   client_events :cursor_creation, :cursor_update, :cursor_removal
 

data/lib/tuio-ruby/tuio_object.rb

@@ -2,7 +2,7 @@ require File.join( File.dirname( __FILE__ ), 'tuio_container' )
 
 class TuioObject < TuioContainer
   attr_reader :angle, :fiducial_id, :rotation_vector, :rotation_accel
-  
+
   def self.from_params( params )
     new(
       params.session_id,
@@ -12,19 +12,18 @@ class TuioObject < TuioContainer
       params.angle
     )
   end
-  
-  
+
   def initialize( session_id, fiducial_id, x_pos,  y_pos, angle )
     super( session_id, x_pos, y_pos )
-    
+
     @fiducial_id = fiducial_id
     @angle = angle
-    
+
     @rotation_vector = 0.0
     @rotation_accel = 0.0
   end
-  
-  def update_from_params( tuio_params ) 
+
+  def update_from_params( tuio_params )
     update(
       tuio_params.x_pos,
       tuio_params.y_pos,
@@ -36,18 +35,18 @@ class TuioObject < TuioContainer
       tuio_params.rotation_accel
     )
   end
-  
+
   def update( x_pos, y_pos, angle, x_speed, y_speed, rotation_vector, motion_accel, rotation_accel )
     super( x_pos, y_pos, x_speed, y_speed, motion_accel )
-    
+
     @angle = angle
     @rotation_vector = rotation_vector
     @rotation_accel = rotation_accel
   end
-  
+
   def equal_to_local_params?( params )
     fiducial_id == params.fiducial_id &&
-    rotation_vector.approx_equal?( params.rotation_vector ) && 
-    rotation_accel.approx_equal?( params.rotation_accel ) 
+    rotation_vector.approx_equal?( params.rotation_vector ) &&
+    rotation_accel.approx_equal?( params.rotation_accel )
   end
 end

data/lib/tuio-ruby/tuio_object_parameter.rb

@@ -2,7 +2,6 @@ require File.join( File.dirname( __FILE__ ), 'tuio_parameter' )
 
 # /tuio/2Dobj set s i x y a X Y A m r
 
-
 class TuioObjectParameter < TuioParameter
   attr_reader :angle, :fiducial_id, :rotation_vector, :rotation_accel
   

data/spec/integration/tuio_event_spec.rb

@@ -79,10 +79,6 @@ describe "tuio object" do
         @server.tuio_objects.size.should == 1
       end
     end
-    
-    describe "fseq" do
-      it "should probably have a test!"
-    end
   end
 end
 

data/spec/spec_helper.rb

@@ -1,10 +1,6 @@
-require 'rubygems'
-require 'spec'
 require 'osc-ruby'
-
-$: << File.join( File.dirname( __FILE__ ), '..', 'lib' )
-
 require 'tuio-ruby'
+require 'spec'
 
 # monkey patch to get at osc core to send messages
 class TuioClient

data/spec/unit/tuio_object_parameter_spec.rb

@@ -3,8 +3,6 @@ require File.join( File.dirname(__FILE__) , 'tuio_parameter_spec' )
 
 # /tuio/2Dobj set s i x y a X Y A m r
 # /tuio/2Dcur set s x y X Y m
-#def initialize( session_id, fiducial_id, x_pos, y_pos, angle, 
-#  x_speed, y_speed, rotation_vector, motion_accel, rotation_accel )
 
 describe TuioObjectParameter do
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuio-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - aberant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 -06:00
+date: 2010-01-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.6
+        version: 0.6.2
     version: 
 description: 
 email: qzzzq1@gmail.com