midi-eye 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e90eda3aee9f3edfbeb121e91a8de5332499ae1
-  data.tar.gz: 50cc2dc4499ca9f22c61183c0583ba4b98b9694d
+  metadata.gz: e2b3e0af881e2a337de19d43af2ba0e0119e99c3
+  data.tar.gz: 60027129b318dbb0056535890bb43baa383d0080
 SHA512:
-  metadata.gz: 91a4e30f101d2762dabb0d220fd4ca9d12591fbd7821ffe023c86e3aedba9810e2729625b8979aa129fa54943a374485d5e48ca3cfdd8b1f6e0a1581ddaa9dd1
-  data.tar.gz: b08bb9377641d90d296334000a76dfda3a5f70b2c45c33dec5c263a769ce332c2c251cac5fe26b02f7e6016205cb0053dc4cfbf687c2061e64c520d96fd88d99
+  metadata.gz: c532eb1705410cfe8250f09730765d9e0fce8dd52548cdc3c233554b7fdb7a6435b17655b9230629050e322c7526311c84ac8cd15a7dc37429fcb0364396ce70
+  data.tar.gz: 84d9b10631497e3f14b176197b5b9008ee5a1778ec2bcc3a43904a13b4aec3c2dd9b69bb05976cf051c8443b09f9d299b7c08694c2e33cb8a54888c5718190bd

data/lib/midi-eye.rb

@@ -18,6 +18,6 @@ require "midi-eye/source"
 
 module MIDIEye
 
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 
 end

data/lib/midi-eye/listener.rb

@@ -79,7 +79,7 @@ module MIDIEye
         @listener.join
       rescue Exception => exception
         @listener.kill
-        raise exception
+        Thread.main.raise(exception)
       end
       self
     end

data/test/helper.rb

@@ -1,7 +1,7 @@
 dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift(dir + "/../lib")
 
-require "test/unit"
+require "minitest/autorun"
 require "mocha/test_unit"
 require "shoulda-context"
 
@@ -11,21 +11,15 @@ module TestHelper
 
   extend self
 
+  attr_reader :device
+
   def select_devices
-    $test_device ||= {}
+    @device ||= {}
     { :input => UniMIDI::Input, :output => UniMIDI::Output }.each do |type, klass|
-      $test_device[type] = klass.gets
+      @device[type] = klass.gets
     end
   end
 
-  def close_all(input, output, listener)
-    listener.close
-    input.clear_buffer
-    input.close
-    output.close
-    sleep(0.1)
-  end
-
 end
 
 TestHelper.select_devices

data/test/listener_test.rb

@@ -1,118 +1,138 @@
 require "helper"
 
-class ListenerTest < Test::Unit::TestCase
+class ListenerTest < Minitest::Test
 
   context "Listener" do
 
     setup do
       sleep(0.2)
-      @output = $test_device[:output]
-      @input = $test_device[:input]
+      @output = TestHelper.device[:output]
+      @input = TestHelper.device[:input]
       @listener = MIDIEye::Listener.new(@input)
     end
 
-    context "basic" do
+    teardown do
+      @listener.close
+      @input.clear_buffer
+      @input.close
+      @output.close
+      sleep(0.5)
+    end
 
-      setup do
-        @i = 0
-        @listener.listen_for do |event|
-          @i += 1
-          assert_equal(1, @i)
-          TestHelper.close_all(@input, @output, @listener)
+    context "#listen_for" do
+
+      context "no filter" do
+
+        setup do
+          @i = 0
+          @listener.listen_for do |event|
+            @i += 1
+          end
+          @listener.start(:background => true)
+          sleep(0.5)
+        end
+
+        should "receive messages" do
+          @output.puts(0x90, 0x40, 0x10)
+          sleep(0.2)
+          assert_equal 1, @i
         end
-        @listener.start(:background => true)
-        sleep(0.5)
-      end
 
-      should "receive messages" do
-        @output.puts(0x90, 0x40, 0x10)
-        @listener.join
       end
 
-    end
+      context "filter on control change" do
 
-    context "rapid control change" do
+        context "rapid messages" do
 
-      setup do
-        @i = 0
-        @listener.listen_for(:class => MIDIMessage::ControlChange) do |event|
-          @i += 1
-          if @i == 5 * 126
-            TestHelper.close_all(@input, @output, @listener)
-            assert_equal(5 * 126, @i)
+          setup do
+            @i = 0
+            @listener.listen_for(:class => MIDIMessage::ControlChange) do |event|
+              @i += 1
+            end
+            @listener.start(:background => true)
+            sleep(0.5)
           end
-        end
-        @listener.start(:background => true)
-        sleep(0.5)
-      end
 
-      should "receive messages" do
-        5.times do
-          126.times do |i|
-            @output.puts(176, 1, i+1)
+          should "receive messages" do
+            5.times do
+              126.times do |i|
+                @output.puts(176, 1, i+1)
+              end
+            end
+            sleep(1)
+            assert_equal(5 * 126, @i)
           end
+
         end
-        @listener.join
-      end
 
-    end
+        context "normal messages" do
+
+          setup do
+            @event = nil
+            @listener.listen_for(:class => MIDIMessage::ControlChange) do |event|
+              @event = event
+            end
+            @listener.start(:background => true)
+            sleep(0.5)
+            @input.clear_buffer
+          end
 
-    context "control change" do
+          should "receive messages" do
+            @output.puts(176, 1, 35)
+            sleep(0.2)
+            refute_nil @event
+            assert_equal(MIDIMessage::ControlChange, @event[:message].class)
+            assert_equal(1, @event[:message].index)
+            assert_equal(35, @event[:message].value)
+            assert_equal([176, 1, 35], @event[:message].to_bytes)
+          end
 
-      setup do
-        @listener.listen_for(:class => MIDIMessage::ControlChange) do |event|
-          assert_equal(MIDIMessage::ControlChange, event[:message].class)
-          assert_equal(1, event[:message].index)
-          assert_equal(35, event[:message].value)
-          assert_equal([176, 1, 35], event[:message].to_bytes)
-          TestHelper.close_all(@input, @output, @listener)
         end
-        @listener.start(:background => true)
-        sleep(0.5)
-      end
 
-      should "receive messages" do
-        @output.puts(176, 1, 35)
-        @listener.join
       end
-    end
 
-    context "sysex" do
+      context "filter on sysex" do
 
-      setup do
-        @listener.listen_for(:class => MIDIMessage::SystemExclusive::Command) do |event|
-          assert_equal(MIDIMessage::SystemExclusive::Command, event[:message].class)
-          assert_equal([0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7], event[:message].to_byte_array)
-          TestHelper.close_all(@input, @output, @listener)
+        setup do
+          @event = nil
+          @listener.listen_for(:class => MIDIMessage::SystemExclusive::Command) do |event|
+            @event = event
+          end
+          @listener.start(:background => true)
+          sleep(0.5)
+        end
+
+        should "receive messages" do
+          @output.puts(0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7)
+          sleep(0.2)
+          refute_nil @event
+          assert_equal(MIDIMessage::SystemExclusive::Command, @event[:message].class)
+          assert_equal([0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7], @event[:message].to_byte_array)
         end
-        @listener.start(:background => true)
-        sleep(0.5)
-      end
 
-      should "receive messages" do
-        @output.puts(0xF0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7F, 0x00, 0x41, 0xF7)
-        @listener.join
       end
 
-    end
+      context "filter on note on" do
 
-    context "note on" do
+        setup do
+          @event = nil
+          @listener.listen_for(:class => MIDIMessage::NoteOff) do |event|
+            @event = event
+          end
+          @listener.start(:background => true)
+          sleep(0.5)
+        end
 
-      setup do
-        @listener.listen_for(:class => MIDIMessage::NoteOff) do |event|
-          assert_equal(MIDIMessage::NoteOff, event[:message].class)
-          assert_equal(0x50, event[:message].note)
-          assert_equal(0x40, event[:message].velocity)
-          assert_equal([0x80, 0x50, 0x40], event[:message].to_bytes)
-          TestHelper.close_all(@input, @output, @listener)
+        should "receive messages" do
+          @output.puts(0x80, 0x50, 0x40)
+          sleep(0.2)
+          refute_nil @event
+          assert_equal(MIDIMessage::NoteOff, @event[:message].class)
+          assert_equal(0x50, @event[:message].note)
+          assert_equal(0x40, @event[:message].velocity)
+          assert_equal([0x80, 0x50, 0x40], @event[:message].to_bytes)
         end
-        @listener.start(:background => true)
-        sleep(0.5)
-      end
 
-      should "receive messages" do
-        @output.puts(0x80, 0x50, 0x40)
-        @listener.join
       end
 
     end
@@ -120,19 +140,19 @@ class ListenerTest < Test::Unit::TestCase
     context "#delete_event" do
 
       setup do
+        @event = nil
         @listener.listen_for(:listener_name => :test) do |event|
-          assert_equal(1, @listener.event.count)
-          @listener.delete_event(:test)
-          assert_equal(0, @listener.event.count)
-          TestHelper.close_all(@input, @output, @listener)
+          @event = event
         end
+        @output.puts(0x90, 0x70, 0x20)
         @listener.start(:background => true)
         sleep(0.5)
       end
 
-      should "receive messages" do
-        @output.puts(0x90, 0x70, 0x20)
-        @listener.join
+      should "delete event" do
+        assert_equal(1, @listener.event.count)
+        @listener.delete_event(:test)
+        assert_equal(0, @listener.event.count)
       end
 
     end
@@ -170,17 +190,13 @@ class ListenerTest < Test::Unit::TestCase
     context "#close" do
 
       setup do
-        @listener.listen_for(:class => MIDIMessage::NoteOff) do |event|
-          TestHelper.close_all(@input, @output, @listener)
-        end
         @listener.start(:background => true)
-        sleep(0.5)
         @output.puts(0x80, 0x50, 0x40)
-        @listener.join
       end
 
       should "close" do
         assert @listener.close
+        sleep(0.5)
         refute @listener.running?
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi-eye
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-message