unimidi 0.0.5-i686-linux → 0.0.6-i686-linux

data/README.rdoc

@@ -12,8 +12,13 @@ Platform independent realtime MIDI input and output for Ruby.
 
 == Requirements
 
+Platform
+
+* JRuby: {midi-jruby}[http://github.com/arirusso/midi-jruby]
 * Linux: {alsa-rawmidi}[http://github.com/arirusso/alsa-rawmidi]
-* Windows/Cygwin: {midi-winmm}[https://github.com/arirusso/midi-winmm] 
+* Windows/Cygwin: {midi-winmm}[http://github.com/arirusso/midi-winmm] 
+
+Note that if you are using JRuby you must be in 1.9 mode.  This is normally accomplished by passing --1.9 to JRuby at the command line.
 	
 == Install
 
@@ -34,8 +39,7 @@ Platform independent realtime MIDI input and output for Ruby.
 
 == To-do
 
-* JRuby implementation
-* OSX
+* OSX (coremidirb?) implementation
 	
 == Author 
 

data/lib/unimidi.rb

@@ -4,7 +4,7 @@
 #
 module UniMIDI
   
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
  
 end
 

data/lib/unimidi/adapter/alsa-rawmidi.rb

@@ -1,3 +1,5 @@
+require 'alsa-rawmidi'
+
 module UniMIDI
 
   module AlsaRawMIDIAdapter

data/lib/unimidi/adapter/midi-jruby.rb

@@ -0,0 +1,26 @@
+require 'midi-jruby'
+
+module UniMIDI
+
+  module AlsaRawMIDIAdapter
+    
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to MIDIJRuby::Device
+    end
+    
+    class Input
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Input
+      defer_to MIDIJRuby::Input
+    end
+
+    class Output
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Output
+      defer_to MIDIJRuby::Output
+    end
+
+  end
+
+end

data/lib/unimidi/adapter/midi-winmm.rb

@@ -1,3 +1,5 @@
+require 'midi-winmm'
+
 module UniMIDI
 
   module MIDIWinMMAdapter

data/lib/unimidi/congruous_api_adapter.rb

@@ -40,7 +40,10 @@ module UniMIDI
         end
         
         def all_by_type
-          
+          { 
+            :input => device_class.all_by_type[:input].map { |d| new(d) },
+            :output => device_class.all_by_type[:output].map { |d| new(d) }
+          }
         end
         
         def defer_to(klass)
@@ -59,6 +62,7 @@ module UniMIDI
    
       def self.included(base)
         base.extend(Device::ClassMethods)
+        base.extend(ClassMethods)
       end
 
       def gets(*a)
@@ -68,6 +72,14 @@ module UniMIDI
       def gets_bytestr(*a)
         @device.gets_bytestr(*a)
       end
+      
+      module ClassMethods
+        
+        def self.all
+          device_class.all_by_type[:input].map { |d| new(d) }
+        end
+        
+      end
 
     end
 
@@ -75,6 +87,7 @@ module UniMIDI
       
       def self.included(base)
         base.extend(Device::ClassMethods)
+        base.extend(ClassMethods)
       end
       
       def puts(*a)
@@ -84,6 +97,14 @@ module UniMIDI
       def puts_bytestr(*a)
         @device.puts_bytestr(*a)
       end
+      
+      module ClassMethods
+        
+        def self.all
+          device_class.all_by_type[:output].map { |d| new(d) }
+        end
+        
+      end
 
     end
 

data/lib/unimidi/platform.rb

@@ -10,16 +10,17 @@ module UniMIDI
       
       def initialize
         lib = case RUBY_PLATFORM
+          when /java/ then 'midi-jruby'
           when /linux/ then 'alsa-rawmidi'
-          when /win/ then 'midi-winmm'
           when /mingw/ then 'midi-winmm' #cygwin
+          when /win/ then 'midi-winmm'
         end
-        require(lib)
         require("unimidi/adapter/#{lib}")
         @interface = case RUBY_PLATFORM
+          when /java/ then MIDIJRuby
           when /linux/ then AlsaRawMIDIAdapter
-          when /win/ then MIDIWinMMAdapter 
           when /mingw/ then MIDIWinMMAdapter #cygwin
+          when /win/ then MIDIWinMMAdapter 
         end
       end
 

metadata

@@ -2,7 +2,7 @@
 name: unimidi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: i686-linux
 authors: 
 - Ari Russo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -04:00
+date: 2011-04-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +37,7 @@ files:
 - lib/unimidi.rb
 - lib/unimidi/adapter/midi-winmm.rb
 - lib/unimidi/adapter/alsa-rawmidi.rb
+- lib/unimidi/adapter/midi-jruby.rb
 - lib/unimidi/congruous_api_adapter.rb
 - lib/unimidi/platform.rb
 - LICENSE