unimidi 0.2.1 → 0.2.2

data/README.rdoc

@@ -14,7 +14,7 @@ Platform independent realtime MIDI input and output for Ruby.
 
 == Requirements
 
-Ruby 1.9.2 or JRuby 1.6.1 are strongly recommended
+Using Ruby 1.9.2 or JRuby 1.6.1 (or newer) is strongly recommended.  JRuby should be run in 1.9 mode
 
 One of the following libraries is required based on what platform you're using.  It should install automatically with the unimidi gem.  In some uncommon cases, they will all install
 
@@ -47,7 +47,7 @@ Here's another {blog post}[http://tx81z.blogspot.com/2011/06/osx-unimidi-and-mid
 
 == Tests
 
-There are a set of generic tests which assume that an output is connected to an input.  If you wish to run these tests, first edit {test/config.rb}[http://github.com/arirusso/unimidi/blob/master/test/config.rb] to configure it to your setup. 
+There are a set of tests which assume that an output is connected to an input.  You will be asked to select which input and output as the test is run.
 
 The tests can be run using
 

data/lib/unimidi.rb

@@ -6,7 +6,7 @@
 
 module UniMIDI
   
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
  
 end
 

data/lib/unimidi/adapter/ffi-coremidi.rb

@@ -16,7 +16,7 @@ module UniMIDI
     end
     
     class Device < CongruousApiDevice
-      defer_to CoreMIDI::Entity
+      defer_to CoreMIDI::Endpoint
       input_class Input
       output_class Output
     end

data/lib/unimidi/congruous_api_adapter.rb

@@ -27,6 +27,10 @@ module UniMIDI
         self
         end
       end
+      
+      def pretty_name
+        "#{id}: #{name}"
+      end
 
       # close the device
       def close(*a)
@@ -60,6 +64,11 @@ module UniMIDI
         def all
           all_by_type.values.flatten
         end
+        
+        # returns the device at <em>index</em>
+        def [](index)
+          all[index] 
+        end
 
         # returns all devices as a hash as such
         #   { :input => [input devices], :output => [output devices] }

data/test/helper.rb

@@ -8,7 +8,26 @@ require 'unimidi'
 
 module TestHelper
   
-  TestSysex = !RUBY_PLATFORM.include?("java") 
+  TestSysex = !RUBY_PLATFORM.include?("java")
+  
+  def self.select_devices
+    $test_device ||= {}
+    { :input => UniMIDI::Input.all, :output => UniMIDI::Output.all }.each do |type, devs|
+      puts ""
+      puts "select an #{type.to_s}..."
+      while $test_device[type].nil?
+        devs.each do |device|
+          puts device.pretty_name
+        end
+        selection = $stdin.gets.chomp
+        if selection != ""
+          selection = selection.to_i
+          $test_device[type] = devs.find { |d| d.id == selection }
+          puts "selected #{selection} for #{type.to_s}" unless $test_device[type]
+        end
+      end
+    end
+  end 
   
   def platform_test(adapter, mod)
     assert_equal(adapter, UniMIDI::Platform.instance.interface)
@@ -69,4 +88,4 @@ module TestHelper
     
 end
 
-require File.dirname(__FILE__) + '/config'
+TestHelper.select_devices

data/test/test_input_buffer.rb

@@ -6,16 +6,15 @@ class InputBufferTest < Test::Unit::TestCase
 
   include UniMIDI
   include TestHelper
-  include TestHelper::Config # before running these tests, adjust the constants in config.rb to suit your hardware setup
-  
+
  def test_input_buffer
     sleep(1)
 
     messages = VariousMIDIMessages
     bytes = []
 
-    TestOutput.open do |output|
-      TestInput.open do |input|
+    $test_device[:output].open do |output|
+      $test_device[:input].open do |input|
 
         messages.each do |msg|
 

data/test/test_io.rb

@@ -6,7 +6,6 @@ class IoTest < Test::Unit::TestCase
 
   include UniMIDI
   include TestHelper
-  include TestHelper::Config # before running these tests, adjust the constants in config.rb to suit your hardware setup
 
   # ** this test assumes that TestOutput is connected to TestInput
   def test_full_io
@@ -15,8 +14,8 @@ class IoTest < Test::Unit::TestCase
     messages_arr = messages.inject { |a,b| a+b }.flatten
     received_arr = []
     pointer = 0
-    TestOutput.open do |output|
-      TestInput.open do |input|
+    $test_device[:output].open do |output|
+      $test_device[:input].open do |input|
 
         messages.each do |msg|
 
@@ -52,8 +51,8 @@ class IoTest < Test::Unit::TestCase
     received_str = ""
     pointer = 0
 
-    TestOutput.open do |output|
-      TestInput.open do |input|
+    $test_device[:output].open do |output|
+      $test_device[:input].open do |input|
 
         messages.each do |msg|
 
@@ -86,8 +85,8 @@ class IoTest < Test::Unit::TestCase
     messages_arr = messages.map { |m| m.to_bytes }.flatten
     received_arr = []
     pointer = 0
-    TestOutput.open do |output|
-      TestInput.open do |input|
+    $test_device[:output].open do |output|
+      $test_device[:input].open do |input|
 
         messages.each do |msg|
 

data/test/test_platform.rb

@@ -6,8 +6,7 @@ class PlatformTest < Test::Unit::TestCase
 
   include UniMIDI
   include TestHelper
-  include TestHelper::Config
-    
+  
   def test_jruby
     if RUBY_PLATFORM.include?("java")
       platform_test(MIDIJRubyAdapter, MIDIJRuby)

metadata

@@ -1,72 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: unimidi
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-11 00:00:00 -04:00
-default_executable: unimidi
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: alsa-rawmidi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &79603120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ffi-coremidi
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *79603120
+- !ruby/object:Gem::Dependency
+  name: ffi-coremidi
+  requirement: &79602620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: midi-jruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *79602620
+- !ruby/object:Gem::Dependency
+  name: midi-jruby
+  requirement: &79602200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: midi-winmm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *79602200
+- !ruby/object:Gem::Dependency
+  name: midi-winmm
+  requirement: &79601840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *79601840
 description: Platform Independent, realtime MIDI input and output for Ruby
-email: 
+email:
 - ari.russo@gmail.com
-executables: 
+executables:
 - unimidi
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/unimidi
 - lib/unimidi.rb
 - lib/unimidi/adapter/ffi-coremidi.rb
@@ -77,39 +73,33 @@ files:
 - lib/unimidi/platform.rb
 - lib/unimidi/type_conversion.rb
 - test/helper.rb
-- test/config.rb
 - test/test_io.rb
 - test/test_input_buffer.rb
 - test/test_platform.rb
 - LICENSE
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/arirusso/unimidi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: unimidi
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Realtime MIDI input and output for Ruby
 test_files: []
-

data/test/config.rb

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-module TestHelper::Config
-
-  # adjust these constants to suit your hardware configuration
-  # before running tests
-
-  TestInput = UniMIDI::Input.first # this is the device you wish to use to test input
-  TestOutput = UniMIDI::Output.first # likewise for output
-
-  puts "connect #{TestInput.name} (#{TestInput.id}) to #{TestOutput.name} (#{TestOutput.id}) and press enter"
-  $stdin.gets.chomp
-
-end
-