unimidi 0.2.3-java → 0.3.0-java

data/lib/unimidi.rb

@@ -6,7 +6,7 @@
 
 module UniMIDI
   
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
  
 end
 
@@ -22,8 +22,10 @@ module UniMIDI
   
   def self.command(command, options = {})
     if [:l, :list, :list_devices].include?(command)
-      require 'pp'
-      pp Device::all
+      puts "input:"
+      Input.list
+      puts "output:"
+      Output.list
     else
       raise "Command #{command.to_s} not found"
     end      

data/lib/unimidi/congruous_api_adapter.rb

@@ -11,7 +11,7 @@ module UniMIDI
         @device = device_obj
         @id = @device.id
         @name = @device.name
-        @type = @device.type
+        populate_type
       end
       
       def enabled?
@@ -20,7 +20,7 @@ module UniMIDI
 
       # enable the device for use, can be passed a block to which the device will be passed back
       def open(*a, &block)
-        @device.open(*a)
+        @device.open(*a) unless enabled?
         unless block.nil?
           begin
             yield(self)
@@ -33,7 +33,7 @@ module UniMIDI
       end
       
       def pretty_name
-        "#{id}: #{name}"
+        "#{id}) #{name}"
       end
 
       # close the device
@@ -50,6 +50,29 @@ module UniMIDI
 
       module ClassMethods
         
+        def list
+          all.each { |device| puts(device.pretty_name) }
+        end
+        
+        # streamlined console prompt that asks the user to select a device
+        def gets
+          device = nil
+          class_name = self.name.split("::").last.downcase
+          grammer = %w{o i}.include?(class_name[0]) ? "n" : ""
+          puts ""
+          puts "Select a#{grammer} #{class_name}..."
+          while device.nil?
+            list
+            print "> "
+            selection = $stdin.gets.chomp
+            if selection != ""
+              selection = Integer(selection) rescue nil
+              device = all.find { |d| d.id == selection }
+            end
+          end
+          device
+        end
+        
         # returns the first device for this class
         def first(&block)
           use_device(all.first, &block)
@@ -65,11 +88,18 @@ module UniMIDI
           all_by_type.values.flatten
         end
         
-        # returns the device at <em>index</em>
+        # returns the device at <em>index</em> and opens it
         def use(index, &block)
+          index = case index
+            when :first then 0
+            when :last then all.size - 1
+            else index
+          end
           use_device(all[index], &block) 
         end
+        alias_method :open, :use
         
+        # returns the device at <em>index</em>
         def [](index)
           all[index]
         end
@@ -114,11 +144,20 @@ module UniMIDI
         end
         
         def use_device(device, &block)
-          device.open(&block) unless block.nil?
+          device.open(&block)
           device         
         end
 
       end
+      
+      private
+      
+      def populate_type
+        @type = case @device.type
+          when :source, :input then :input
+          when :destination, :output then :output
+        end
+      end
 
     end
 

data/test/helper.rb

@@ -12,20 +12,8 @@ module TestHelper
   
   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
+    { :input => UniMIDI::Input, :output => UniMIDI::Output }.each do |type, klass|
+      $test_device[type] = klass.gets
     end
   end 
   

data/test/test_congruous_api_adapter.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'helper'
+
+class CongruousApiAdapterTest < Test::Unit::TestCase
+
+  include UniMIDI
+  include TestHelper
+  
+  def test_input_type
+    i = $test_device[:input]
+    assert_equal(:input, i.type)
+  end
+  
+  def test_output_type
+    o = $test_device[:output]
+    assert_equal(:output, o.type)    
+  end
+  
+end

data/test/test_selectors.rb

@@ -48,6 +48,14 @@ class SelectorTest < Test::Unit::TestCase
     assert_equal(Input.all.first, i)    
   end
   
+  def test_use_with_symbol
+    sleep(1)
+    i = Input.use(:first)
+    assert_equal(true, i.enabled?) 
+    assert_equal(Input.first, i)
+    assert_equal(Input.all.first, i)       
+  end
+  
   def test_all
     i = Input.all
     assert_equal(Device.all_by_type[:input], Input.all)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unimidi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: java
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000Z
+date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-jruby
-  requirement: &70346288664740 !ruby/object:Gem::Requirement
+  requirement: &70234497254760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346288664740
+  version_requirements: *70234497254760
 description: Platform Independent, realtime MIDI input and output for Ruby
 email:
 - ari.russo@gmail.com
@@ -40,6 +40,7 @@ files:
 - lib/unimidi/type_conversion.rb
 - lib/unimidi.rb
 - test/helper.rb
+- test/test_congruous_api_adapter.rb
 - test/test_input_buffer.rb
 - test/test_io.rb
 - test/test_platform.rb