launchpad 0.2.1 → 0.2.2

data/README.rdoc

@@ -72,6 +72,10 @@ For more details, see the examples. examples/color_picker.rb is the most complex
 
 == Changelog
 
+=== v.0.2.2
+
+* single threading fix: prevent ThreadError when Launchpad::Interaction#stop is called within an action response
+
 === v.0.2.1
 
 * Launchpad::Interaction#close now properly stops interaction first

data/launchpad.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{launchpad}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Jachmann"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-24}
   s.description = %q{This gem provides an interface to access novation's launchpad programmatically. LEDs can be lighted and button presses can be evaluated using launchpad's MIDI input/output.}
   s.email = %q{tom.j@gmx.net}
   s.extra_rdoc_files = [

data/lib/launchpad/interaction.rb

@@ -74,7 +74,7 @@ module Launchpad
     # Optional options hash:
     # 
     # [<tt>:detached</tt>]  <tt>true/false</tt>,
-    #                       whether to detach the interaction, method is blocking when +false+
+    #                       whether to detach the interaction, method is blocking when +false+,
     #                       optional, defaults to +false+
     # 
     # Errors raised:
@@ -90,7 +90,7 @@ module Launchpad
       @reader_thread ||= Thread.new do
         begin
           while @active do
-            @device.read_pending_actions.each {|action| respond_to_action(action)}
+            @device.read_pending_actions.each {|action| Thread.new {respond_to_action(action)}}
             sleep @latency unless @latency <= 0
           end
         rescue Portmidi::DeviceError => e

data/lib/launchpad/version.rb

@@ -1,3 +1,3 @@
 module Launchpad
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/test/test_interaction.rb

@@ -278,4 +278,25 @@ class TestInteraction < Test::Unit::TestCase
     
   end
   
+  context 'regression tests' do
+    
+    should 'not raise an exception when calling stop within a response in attached mode' do
+      i = Launchpad::Interaction.new
+      # strangely, you have to sleep 0.001 or do anything else before
+      # calling i.stop - the ThreadError won't be thrown otherwise...
+      i.response_to(:mixer, :down) {|i,a| sleep 0.001; i.stop}
+      i.device.stubs(:read_pending_actions).returns([{
+        :timestamp  => 0,
+        :state      => :down,
+        :type       => :mixer
+      }])
+      assert_nothing_raised do
+        Thread.new do
+          i.start
+        end.join
+      end
+    end
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: launchpad
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Thomas Jachmann
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 +01:00
+date: 2010-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency