unimidi 0.4.6 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a4f3cb4ead6e1ac868f749c5cf2dda0efa6e7b49
-  data.tar.gz: aa339b94d2f2f8cc50270c87928be812936dbeb8
+SHA256:
+  metadata.gz: ff9c1ebf95bb17c91eede1979d6abd50b2fbc3a906c3a4ab8d270acb33c4a9d8
+  data.tar.gz: 4fd0198e5aa8a1547e5c5a7f480157929dcf2d38165b2df48191b82acb054aa4
 SHA512:
-  metadata.gz: e2002458e871943b6021f2d2266d6e282d4ed03d3e111c0169c08778ab8222391742e6fa5305de44ecb18157141a1efa95ecc5f034ee9fb3b2a2c65f74338d94
-  data.tar.gz: 15f7796a4d71bcb8656950b8077fb7f6c14f179a8a3be23a85754ed937af5d936c1dc47b7bde03205ea1718f703e8ff676185947f306ef3c52c19e8e6754783b
+  metadata.gz: 4291dc97699243764f892f4374c553d68bac9a35d9e1b95d4ff1ed15c2f3a2c67e46389f5e851b6de9ed1b203ad05d3e681987e2fd73cf5ce1461672b332d59a
+  data.tar.gz: 5bea900c9ccd502d3d5980333d8904ae89832d598675fe5dd461cf3eaff7979a7be755b6231aece6e04abfda2a371a42f835c8aca0973d48e910768f30a1fce1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010-2014 Ari Russo
+Copyright 2010-2022 Ari Russo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -14,9 +14,7 @@ Also see [MicroMIDI](http://github.com/arirusso/micromidi) which builds a full M
 
 ### Requirements
 
-Using Ruby 1.9.2 or JRuby 1.6.1 (or newer) is strongly recommended.  JRuby should be run in 1.9 mode where applicable
-
-UniMIDI uses one of the following libraries, depending on which platform you're using it on.  The necessary library should install automatically with the unimidi gem. 
+UniMIDI uses one of the following libraries, depending on which platform you're using it on.  The necessary library should install automatically with the unimidi gem.
 
 Platform
 
@@ -24,7 +22,7 @@ Platform
 * Linux: [alsa-rawmidi](http://github.com/arirusso/alsa-rawmidi)
 * OSX: [ffi-coremidi](http://github.com/arirusso/ffi-coremidi)
 * Windows/Cygwin: [midi-winmm](http://github.com/arirusso/midi-winmm)
-	
+
 ### Install
 
 If you're using Bundler, add this line to your application's Gemfile:
@@ -34,7 +32,7 @@ If you're using Bundler, add this line to your application's Gemfile:
 Otherwise...
 
 `gem install unimidi`
-	
+
 ### Usage
 
 ##### Blog Posts
@@ -57,7 +55,7 @@ UniMIDI includes a set of tests which assume that an output is connected to an i
 
 The tests can be run using
 
-`rake test`
+`rake spec`
 
 See below for additional notes on testing with JRuby
 
@@ -69,19 +67,18 @@ See below for additional notes on testing with JRuby
 
 ##### JRuby
 
-* You must be in 1.9 mode.  This is normally accomplished by passing --1.9 to JRuby at the command line.  For testing in 1.9 mode, use `jruby --1.9 -S rake test`
 * javax.sound has some documented issues with SysEx messages in some versions OSX Snow Leopard which do affect this library.
 
 ##### Linux
 
 * *libasound* and *libasound-dev* packages are required
-	
-### Author 
+
+### Author
 
 [Ari Russo](http://github.com/arirusso) <ari.russo at gmail.com>
-		
+
 ### License
 
 Apache 2.0, See the file LICENSE
 
-Copyright (c) 2010-2014 Ari Russo  
+Copyright (c) 2010-2022 Ari Russo  

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

@@ -1,15 +1,12 @@
-require "alsa-rawmidi"
+# frozen_string_literal: true
+require 'alsa-rawmidi'
 
 module UniMIDI
-
   module Adapter
-
     # Load underlying devices using the alsa-rawmidi gem
     module AlsaRawMIDI
-
       module Loader
-
-        extend self
+        module_function
 
         # @return [Array<AlsaRawMIDI::Input>]
         def inputs
@@ -20,11 +17,7 @@ module UniMIDI
         def outputs
           ::AlsaRawMIDI::Device.all_by_type[:output]
         end
-
       end
-
     end
-
   end
-
 end

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

@@ -1,15 +1,13 @@
-require "coremidi"
+# frozen_string_literal: true
 
-module UniMIDI
+require 'coremidi'
 
+module UniMIDI
   module Adapter
-
     # Load underlying devices using the coremidi gem
     module CoreMIDI
-
       module Loader
-
-        extend self
+        module_function
 
         # @return [Array<CoreMIDI::Source>]
         def inputs
@@ -20,11 +18,7 @@ module UniMIDI
         def outputs
           ::CoreMIDI::Endpoint.all_by_type[:destination]
         end
-
       end
-
     end
-
   end
-
 end

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

@@ -1,15 +1,13 @@
-require "midi-jruby"
+# frozen_string_literal: true
 
-module UniMIDI
+require 'midi-jruby'
 
+module UniMIDI
   module Adapter
-
     # Load underlying devices using the midi-jruby gem
     module MIDIJRuby
-
       module Loader
-
-        extend self
+        module_function
 
         # @return [Array<MIDIJRuby::Input>]
         def inputs
@@ -20,11 +18,7 @@ module UniMIDI
         def outputs
           ::MIDIJRuby::Device.all_by_type[:output]
         end
-
       end
-
     end
-
   end
-
 end

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

@@ -1,15 +1,13 @@
-require "midi-winmm"
+# frozen_string_literal: true
 
-module UniMIDI
+require 'midi-winmm'
 
+module UniMIDI
   module Adapter
-
     # Load underlying devices using the midi-winmm gem
     module MIDIWinMM
-
       module Loader
-
-        extend self
+        module_function
 
         # @return [Array<MIDIWinMM::Input>]
         def inputs
@@ -20,11 +18,7 @@ module UniMIDI
         def outputs
           ::MIDIWinMM::Device.all_by_type[:output]
         end
-
       end
-
     end
-
   end
-
 end

data/lib/unimidi/command.rb

@@ -1,26 +1,24 @@
-module UniMIDI
+# frozen_string_literal: true
 
+module UniMIDI
   # Module for command-line use of UniMIDI.  Used by the bin/unimidi script
   module Command
-
-    extend self
+    module_function
 
     # Execute a command
     # @param [Symbol] command
     # @param [Hash] options
     # @return [Boolean]
-    def exec(command, options = {})
-      if [:l, :list, :list_devices].include?(command)
-        puts "input:"
+    def exec(command, _options = {})
+      if %i[l list list_devices].include?(command)
+        puts 'input:'
         Input.list
-        puts "output:"
+        puts 'output:'
         Output.list
         true
       else
-        raise "Command #{command.to_s} not found"
-      end   
+        raise "Command #{command} not found"
+      end
     end
-
   end
-
 end

data/lib/unimidi/device.rb

@@ -1,16 +1,15 @@
-module UniMIDI
+# frozen_string_literal: true
 
+module UniMIDI
   # Common logic that is shared by both Input and Output devices
   module Device
-
     # Methods that are shared by both Input and Output classes
     module ClassMethods
-
       include Enumerable
 
       # Iterate over all devices of this direction (eg Input, Output)
       def each(&block)
-        all.each { |device| yield(device) }
+        all.each(&block)
       end
 
       # Prints ids and names of each device to the console
@@ -35,16 +34,20 @@ module UniMIDI
       def gets(&block)
         device = nil
         direction = get_direction
-        puts ""
+        puts ''
         puts "Select a MIDI #{direction}..."
         while device.nil?
           list
-          print "> "
+          print '> '
           selection = $stdin.gets.chomp
-          if selection != ""
-            selection = Integer(selection) rescue nil
-            device = all.find { |d| d.id == selection } unless selection.nil?
+          next unless selection != ''
+
+          selection = begin
+            Integer(selection)
+          rescue StandardError
+            nil
           end
+          device = all.find { |d| d.id == selection } unless selection.nil?
         end
         device.open(&block)
         device
@@ -63,46 +66,49 @@ module UniMIDI
       end
 
       # Select the device at the given index and enable it
-      # @param [Fixnum] index
+      # @param [Integer] index
       # @return [Input, Output]
       def use(index, &block)
         index = case index
                 when :first then 0
-                when :last then all.size - 1
+                when :last then all.count - 1
                 else index
                 end
-        use_device(all[index], &block)
+        use_device(at(index), &block)
       end
-      alias_method :open, :use
+      alias open use
 
       # Select the device at the given index
-      # @param [Fixnum] index
+      # @param [Integer] index
       # @return [Input, Output]
-      def [](index)
+      def at(index)
         all[index]
       end
+      alias [] at
 
       private
 
       # The direction of the device eg "input", "output"
       # @return [String]
       def get_direction
-        self.name.split("::").last.downcase
+        name.split('::').last.downcase
       end
 
       # Enable the given device
       # @param [Input, Output] device
       # @return [Input, Output]
       def use_device(device, &block)
-        device.open(&block) unless device.enabled?
+        if device.enabled?
+          yield(device) if block_given?
+        else
+          device.open(&block)
+        end
         device
       end
-
     end
 
     # Methods that are shared by both Input and Output instances
     module InstanceMethods
-
       # @param [AlsaRawMIDI::Input, AlsaRawMIDI::Output, CoreMIDI::Destination, CoreMIDI::Source, MIDIJRuby::Input, MIDIJRuby::Output, MIDIWinMM::Input, MIDIWinMM::Output] device
       def initialize(device)
         @device = device
@@ -116,7 +122,7 @@ module UniMIDI
       # Can be passed a block to which the device will be passed in as the yieldparam
       # @param [*Object] args
       # @return [Input, Output] self
-      def open(*args, &block)
+      def open(*args)
         unless @enabled
           @device.open(*args)
           @enabled = true
@@ -155,6 +161,12 @@ module UniMIDI
         end
       end
 
+      # Returns true if the device is not enabled
+      # @return [Boolean]
+      def closed?
+        !@enabled
+      end
+
       # Add attributes for the device instance
       # :direction, :id, :name
       def self.included(base)
@@ -171,9 +183,9 @@ module UniMIDI
       # Populate the direction attribute
       def populate_direction
         @direction = case @device.type
-                when :source, :input then :input
-                when :destination, :output then :output
-                end
+                     when :source, :input then :input
+                     when :destination, :output then :output
+                     end
       end
 
       # Populate attributes from the underlying device object
@@ -182,9 +194,6 @@ module UniMIDI
         @name = @device.name
         populate_direction
       end
-
     end
-
   end
-
 end

data/lib/unimidi/input/buffer_access.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module UniMIDI
+  class Input
+    module BufferAccess
+      # The device buffer
+      # @return [Array<Hash>]
+      def buffer
+        @device.buffer
+      end
+
+      # Clears the input buffer
+      # @return [Array]
+      def clear_buffer
+        @device.buffer.clear
+      end
+
+      # Gets any messages in the buffer in the same format as Input::StreamReader#gets. This doesn't remove
+      # the messages from the buffer or have any effect on the StreamReader pointer position
+      # @param [*Object] args
+      # @return [Array<Hash>]
+      def gets_buffer(*_args)
+        @device.buffer
+      end
+
+      # Gets any messages in the buffer in the same format as Input#gets_s. This doesn't remove
+      # the messages from the buffer or have any effect on the StreamReader pointer position
+      # @param [*Object] args
+      # @return [Array<Hash>]
+      def gets_buffer_s(*_args)
+        @device.buffer.map do |msg|
+          msg[:data] = TypeConversion.numeric_byte_array_to_hex_string(msg[:data])
+          msg
+        end
+      end
+
+      # Gets any messages in the buffer in the same format as Input#gets_data. . This doesn't remove
+      # the messages from the buffer or have any effect on the StreamReader pointer position
+      # @param [*Object] args
+      # @return [Array<Integer>]
+      def gets_buffer_data(*_args)
+        @device.buffer.map { |msg| msg[:data] }
+      end
+    end
+  end
+end

data/lib/unimidi/input/stream_reader.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module UniMIDI
+  class Input
+    module StreamReader
+      # Returns any data in the input buffer that have been received since the last call to a
+      # StreamReader method. If a StreamReader method has not yet been called, all data received
+      # since the program was initialized will be returned
+      #
+      # The data is returned as array of MIDI event hashes as such:
+      #   [
+      #     { :data => [144, 60, 100], :timestamp => 1024 },
+      #     { :data => [128, 60, 100], :timestamp => 1100 },
+      #     { :data => [144, 40, 120], :timestamp => 1200 }
+      #   ]
+      #
+      # In this case, the data is an array of Numeric bytes
+      # The timestamp is the number of millis since this input was enabled
+      # Arguments are passed to the underlying device object
+      #
+      # @param [*Object] args
+      # @return [Array<Hash>]
+      def gets(*args)
+        @device.gets(*args)
+      rescue SystemExit, Interrupt
+        exit
+      end
+
+      # Returns any data in the input buffer that have been received since the last call to a
+      # StreamReader method. If a StreamReader method has not yet been called, all data received
+      # since the program was initialized will be returned
+      #
+      # Similar to Input#gets except that the returned message data as string of hex digits eg:
+      #   [
+      #     { :data => "904060", :timestamp => 904 },
+      #     { :data => "804060", :timestamp => 1150 },
+      #     { :data => "90447F", :timestamp => 1300 }
+      #   ]
+      #
+      # @param [*Object] args
+      # @return [Array<Hash>]
+      def gets_s(*args)
+        @device.gets_s(*args)
+      rescue SystemExit, Interrupt
+        exit
+      end
+      alias gets_bytestr gets_s
+      alias gets_hex gets_s
+
+      # Returns any data in the input buffer that have been received since the last call to a
+      # StreamReader method. If a StreamReader method has not yet been called, all data received
+      # since the program was initialized will be returned
+      #
+      # Similar to Input#gets except that the returned message data as an array of data bytes such as
+      #   [144, 60, 100, 128, 60, 100, 144, 40, 120]
+      #
+      # @param [*Object] args
+      # @return [Array<Integer>]
+      def gets_data(*args)
+        arr = gets(*args)
+        arr.map { |msg| msg[:data] }.inject(:+)
+      end
+
+      # Returns any data in the input buffer that have been received since the last call to a
+      # StreamReader method. If a StreamReader method has not yet been called, all data received
+      # since the program was initialized will be returned
+      #
+      # Similar to Input#gets except that the returned message data as a string of data such as
+      #   "90406080406090447F"
+      #
+      # @param [*Object] args
+      # @return [String]
+      def gets_data_s(*args)
+        arr = gets_bytestr(*args)
+        arr.map { |msg| msg[:data] }.join
+      end
+      alias gets_data_bytestr gets_data_s
+      alias gets_data_hex gets_data_s
+    end
+  end
+end

data/lib/unimidi/input.rb

@@ -1,113 +1,20 @@
-module UniMIDI
+# frozen_string_literal: true
+
+require 'unimidi/input/buffer_access'
+require 'unimidi/input/stream_reader'
 
+module UniMIDI
   # A MIDI input device
   class Input
-
     extend Device::ClassMethods
+    include BufferAccess
     include Device::InstanceMethods
+    include StreamReader
 
     # All MIDI input devices -- used to populate the class
     # @return [Array<Input>]
     def self.all
-      Loader.devices(:direction => :input)
-    end
-
-    # The device buffer
-    # @return [Array<Hash>]
-    def buffer
-      @device.buffer
-    end
-
-    #
-    # Plucks data from the input buffer and returns it as array of MIDI event hashes as such:
-    #   [
-    #     { :data => [144, 60, 100], :timestamp => 1024 },
-    #     { :data => [128, 60, 100], :timestamp => 1100 },
-    #     { :data => [144, 40, 120], :timestamp => 1200 }
-    #   ]
-    #
-    # In this case, the data is an array of Numeric bytes
-    # The timestamp is the number of millis since this input was enabled
-    # Arguments are passed to the underlying device object
-    #
-    # @param [*Object] args
-    # @return [Array<Hash>]
-    def gets(*args)
-      @device.gets(*args)
-    rescue SystemExit, Interrupt
-      exit
-    end
-
-    #
-    # Plucks data from the input buffer and returns it as array of MIDI event hashes.
-    # Similar to Input#gets except that the returned message data as string of hex digits eg:
-    #   [
-    #     { :data => "904060", :timestamp => 904 },
-    #     { :data => "804060", :timestamp => 1150 },
-    #     { :data => "90447F", :timestamp => 1300 }
-    #   ]
-    #
-    # @param [*Object] args
-    # @return [Array<Hash>]
-    def gets_s(*args)
-      @device.gets_s(*args)
-    rescue SystemExit, Interrupt
-      exit
-    end
-    alias_method :gets_bytestr, :gets_s
-    alias_method :gets_hex, :gets_s
-
-    #
-    # Plucks data from the input buffer and returns it as an array of data bytes such as
-    #   [144, 60, 100, 128, 60, 100, 144, 40, 120]
-    #
-    # @param [*Object] args
-    # @return [Array<Fixnum>]
-    def gets_data(*args)
-      arr = gets(*args)
-      arr.map { |msg| msg[:data] }.inject(:+)
+      Loader.devices(direction: :input)
     end
-
-    #
-    # Plucks data from the input buffer and returns it as a string of data such as
-    #   "90406080406090447F"
-    #
-    # @param [*Object] args
-    # @return [String]
-    def gets_data_s(*args)
-      arr = gets_bytestr(*args)
-      arr.map { |msg| msg[:data] }.join
-    end
-    alias_method :gets_data_bytestr, :gets_data_s
-    alias_method :gets_data_hex, :gets_data_s
-
-    # Clears the input buffer
-    # @return [Array]
-    def clear_buffer
-      @device.buffer.clear
-    end
-
-    # Gets any messages in the buffer in the same format as Input#gets, without removing them from the buffer
-    # @param [*Object] args
-    # @return [Array<Hash>]
-    def gets_buffer(*args)
-      @device.buffer
-    end
-
-    # Gets any messages in the buffer in the same format as Input#gets_s, without removing them from the buffer
-    # @param [*Object] args
-    # @return [Array<Hash>]
-    def gets_buffer_s(*args)
-      @device.buffer.map { |msg| msg[:data] = TypeConversion.numeric_byte_array_to_hex_string(msg[:data]); msg }
-    end
-
-    # Gets any messages in the buffer in the same format as Input#gets_data without removing them from the buffer
-    # @param [*Object] args
-    # @return [Array<Fixnum>]
-    def gets_buffer_data(*args)
-      @device.buffer.map { |msg| msg[:data] }
-    end
-
   end
-
 end