musa-dsl 0.23.23 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d553a28107482bf41290cc93cdfca73a8096fa9525658b8c3f41d26681de062b
-  data.tar.gz: 7491c04165a88ac74ce1131e7721ee071d9e2bf54b0a3d1ca2b09844d2c5f174
+  metadata.gz: f7f400c1a2c9841fc229ddb34343788eb688c4ab627e3f5ad8d4bcb57bd9ab90
+  data.tar.gz: f0a0bf769dc19d17fc54818f83ca92174b223a503fb1f5145b996ac743bc0a1a
 SHA512:
-  metadata.gz: d147175f329eb74f1660c11d643de3ff65abaea2c4d1ed2554322d353b626bade1d073e2c7d6c25d2c9982916253d8318f792d0f3b41f9294505954f642e5f45
-  data.tar.gz: 4938ef8a3b0115dad3ad7c09ce8410d0049844965f5cfcdb22c58de8f85353541fae483e3f1578b97c149daf168b37efd23b596808e72c1c45996ed05a2cd96a
+  metadata.gz: d35323bf0ef3686f839fcbdc4683fe3c7a05e9de99b4fab7a365f55576fd125704b52833bbea89bfae11db3c70d9d34a2fb2a2400252bd6fedf1d881483000ce
+  data.tar.gz: bf02e13897e2441ce2d48c82a0ac9d1a2ba25ba244a22597597232710fb18efd688c8f5228fa94ef8956f9fea9818725c251d122dfe05086d4e745e1c745538c

data/.github/workflows/gem-test-and-push.yml

@@ -0,0 +1,62 @@
+name: Generate gem and push to rubygems repository
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec -t \~slow
+
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    needs: test 
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7.x
+
+#    - name: Publish to GPR
+#      run: |
+#        mkdir -p $HOME/.gem
+#        touch $HOME/.gem/credentials
+#        chmod 0600 $HOME/.gem/credentials
+#        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+#        gem build *.gemspec
+#        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+#      env:
+#        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+#        OWNER: ${{ github.repository_owner }}
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/Gemfile

@@ -1,23 +1,3 @@
 source 'https://rubygems.org'
 
-ruby '2.7.4'
-
-gem 'logger', '~> 1.4', '>= 1.4.3'
-
-group :neuma do
-  gem 'citrus', '~> 3.0.0'
-end
-
-group :transport do
-  gem 'midi-message', '~> 0.4', '>= 0.4.9'
-  gem 'midi-nibbler', '~> 0.2', '>= 0.2.4'
-end
-
-group :test do
-  gem 'descriptive-statistics'
-  gem 'rspec', '~> 3.0'
-end
-
-group :documentation do
-  gem 'rdoc'
-end
+gemspec

data/lib/musa-dsl/core-ext/dynamic-proxy.rb

@@ -3,6 +3,8 @@ module Musa
     module DynamicProxy
       module DynamicProxyModule
         def method_missing(method_name, *args, **key_args, &block)
+          raise NoMethodError, "Method '#{method_name}' is unknown because self is a DynamicProxy with undefined receiver" unless @receiver
+
           if @receiver.respond_to? method_name
             @receiver.send method_name, *args, **key_args, &block
           else
@@ -11,37 +13,41 @@ module Musa
         end
 
         def respond_to_missing?(method_name, include_private)
-          @receiver.respond_to?(method_name, include_private) || super
+          @receiver&.respond_to?(method_name, include_private) || super
+        end
+
+        def has_receiver?
+          !@receiver.nil?
         end
 
         alias _is_a? is_a?
 
         def is_a?(klass)
-          _is_a?(klass) || @receiver.is_a?(klass)
+          _is_a?(klass) || @receiver&.is_a?(klass)
         end
 
         alias _kind_of? kind_of?
 
         def kind_of?(klass)
-          _kind_of?(klass) || @receiver.is_a?(klass)
+          _kind_of?(klass) || @receiver&.is_a?(klass)
         end
 
         alias _instance_of? instance_of?
 
         def instance_of?(klass)
-          _instance_of?(klass) || @receiver.instance_of?(klass)
+          _instance_of?(klass) || @receiver&.instance_of?(klass)
         end
 
         alias _equalequal ==
 
         def ==(object)
-          _equalequal(object) || @receiver.==(object)
+          _equalequal(object) || @receiver&.==(object)
         end
 
         alias _eql? eql?
 
         def eql?(object)
-          _eql?(object) || @receiver.eql?(object)
+          _eql?(object) || @receiver&.eql?(object)
         end
       end
 

data/lib/musa-dsl/core-ext/with.rb

@@ -6,8 +6,9 @@ module Musa
       def with(*value_parameters, **key_parameters, &block)
         binder = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
 
-        keep_proc_context = @keep_proc_context_on_with
         send_self_as_underscore_parameter = binder.parameters[0][1] == :_ unless binder.parameters.empty?
+
+        keep_proc_context = @keep_proc_context_on_with
         keep_proc_context ||= send_self_as_underscore_parameter
         keep_proc_context ||= false
 

data/lib/musa-dsl/datasets/gdv.rb

@@ -16,16 +16,20 @@ module Musa::Datasets
 
     attr_accessor :base_duration
 
+    # TODO create a customizable MIDI velocity to score dynamics bidirectional conversor
+    # ppp = 16 ... fff = 127 (-5 ... 4) the standard used by Musescore 3 and others starts at ppp = 16
+    VELOCITY_MAP = [1, 8, 16, 33, 49, 64, 80, 96, 112, 127].freeze
+
     def to_pdv(scale)
       pdv = {}.extend PDV
       pdv.base_duration = @base_duration
 
       if self[:grade]
         pdv[:pitch] = if self[:silence]
-                      :silence
-                    else
-                      scale[self[:grade]].sharp(self[:sharps] || 0).octave(self[:octave] || 0).pitch
-                    end
+                        :silence
+                      else
+                        scale[self[:grade]].sharp(self[:sharps] || 0).octave(self[:octave] || 0).pitch
+                      end
       end
 
       if self[:duration]
@@ -41,9 +45,19 @@ module Musa::Datasets
       end
 
       if self[:velocity]
-        # ppp = 16 ... fff = 127 (-5 ... 4) the standard used by Musescore 3 and others starts at ppp = 16
-        # TODO create a customizable MIDI velocity to score dynamics bidirectional conversor
-        pdv[:velocity] = [1, 8, 16, 33, 49, 64, 80, 96, 112, 127][self[:velocity] + 5]
+        index = if (-5..4).cover?(self[:velocity])
+                  self[:velocity]
+                else
+                  self[:velocity] < -5 ? -5 : 4
+                end
+        
+        index_min = index.floor
+        index_max = index.ceil
+
+        velocity = VELOCITY_MAP[index_min + 5] +
+          (VELOCITY_MAP[index_max + 5] - VELOCITY_MAP[index_min + 5]) * (self[:velocity] - index_min)
+
+        pdv[:velocity] = velocity
       end
 
       (keys - NaturalKeys).each { |k| pdv[k] = self[k] }
@@ -52,7 +66,7 @@ module Musa::Datasets
     end
 
     def to_neuma
-      @base_duration ||= Rational(1,4)
+      @base_duration ||= Rational(1, 4)
 
       attributes = []
 

data/lib/musa-dsl/midi/midi-recorder.rb

@@ -1,11 +1,11 @@
-require 'nibbler'
+require 'midi-parser'
 
 module Musa
   module MIDIRecorder
     class MIDIRecorder
       def initialize(sequencer)
         @sequencer = sequencer
-        @nibbler = Nibbler.new
+        @midi_parser = MIDIParser.new
 
         clear
       end
@@ -15,7 +15,7 @@ module Musa
       end
 
       def record(midi_bytes)
-        m = @nibbler.parse midi_bytes
+        m = @midi_parser.parse midi_bytes
         m = [m] unless m.is_a? Array
 
         m.each do |mm|
@@ -37,7 +37,7 @@ module Musa
           mm = m.message
 
           case mm
-          when MIDIMessage::NoteOn
+          when MIDIEvents::NoteOn
             if last_note[mm.channel]
               notes << { position: last_note[mm.channel], channel: mm.channel, pitch: :silence, duration: m.position - last_note[mm.channel] }
               last_note.delete mm.channel
@@ -50,7 +50,7 @@ module Musa
 
             notes << note
 
-          when MIDIMessage::NoteOff
+          when MIDIEvents::NoteOff
             note_on[mm.channel] ||= {}
 
             note = note_on[mm.channel][mm.note]

data/lib/musa-dsl/midi/midi-voices.rb

@@ -1,5 +1,5 @@
 require 'set'
-require 'midi-message'
+require 'midi-events'
 
 require_relative '../core-ext/arrayfy'
 require_relative '../core-ext/array-explode-ranges'
@@ -38,7 +38,7 @@ module Musa
 
         @voices.each(&:all_notes_off)
 
-        @output.puts MIDIMessage::SystemRealtime.new(0xff) if reset
+        @output.puts MIDIEvents::SystemRealtime.new(0xff) if reset
       end
     end
 
@@ -72,7 +72,7 @@ module Musa
       def fast_forward=(enabled)
         if @fast_forward && !enabled
           (0..127).each do |pitch|
-            @output.puts MIDIMessage::NoteOn.new(@channel, pitch, @active_pitches[pitch][:velocity]) unless @active_pitches[pitch][:note_controls].empty?
+            @output.puts MIDIEvents::NoteOn.new(@channel, pitch, @active_pitches[pitch][:velocity]) unless @active_pitches[pitch][:note_controls].empty?
           end
         end
 
@@ -114,7 +114,7 @@ module Musa
         @active_pitches.clear
         fill_active_pitches @active_pitches
 
-        @output.puts MIDIMessage::ChannelMessage.new(0xb, @channel, 0x7b, 0)
+        @output.puts MIDIEvents::ChannelMessage.new(0xb, @channel, 0x7b, 0)
       end
 
       def log(msg)
@@ -138,7 +138,26 @@ module Musa
           @output = output
           @channel = channel
 
-          @controller_map = { sustain_pedal: 0x40 }
+          @controller_map = { mod_wheel: 1,
+                              breath: 2,
+                              volume: 7,
+                              expression: 11,
+                              general_purpose_1: 16,
+                              general_purpose_2: 17,
+                              general_purpose_3: 18,
+                              general_purpose_4: 19,
+
+                              mod_wheel_lsb: 1 + 32,
+                              breath_lsb: 2 + 32,
+                              volume_lsb: 7 + 32,
+                              expression_lsb: 11 + 32,
+                              general_purpose_1_lsb: 16 + 32,
+                              general_purpose_2_lsb: 17 + 32,
+                              general_purpose_3_lsb: 18 + 32,
+                              general_purpose_4_lsb: 19 + 32,
+
+                              sustain_pedal: 64,
+                              portamento: 65 }
           @controller = []
         end
 
@@ -147,7 +166,7 @@ module Musa
           value ||= 0
 
           @controller[number] = [[0, value].max, 0xff].min
-          @output.puts MIDIMessage::ChannelMessage.new(0xb, @channel, number, @controller[number])
+          @output.puts MIDIEvents::ChannelMessage.new(0xb, @channel, number, @controller[number])
         end
 
         def [](controller_number_or_symbol)
@@ -202,7 +221,7 @@ module Musa
               @voice.active_pitches[pitch][:note_controls] << self
               @voice.active_pitches[pitch][:velocity] = velocity
 
-              msg = MIDIMessage::NoteOn.new(@voice.channel, pitch, velocity)
+              msg = MIDIEvents::NoteOn.new(@voice.channel, pitch, velocity)
               @voice.log "#{msg.verbose_name} velocity: #{velocity} duration: #{@duration}"
               @voice.output.puts msg if @voice.output && !@voice.fast_forward?
             else
@@ -235,7 +254,7 @@ module Musa
 
             next unless @voice.active_pitches[pitch][:note_controls].empty?
 
-            msg = MIDIMessage::NoteOff.new(@voice.channel, pitch, velocity_off)
+            msg = MIDIEvents::NoteOff.new(@voice.channel, pitch, velocity_off)
             @voice.log msg.verbose_name.to_s
             @voice.output.puts msg if @voice.output && !@voice.fast_forward?
           end

data/lib/musa-dsl/repl/repl.rb

@@ -6,21 +6,16 @@ module Musa
     class REPL
       @@repl_mutex = Mutex.new
 
-      def initialize(binder, port: nil, after_eval: nil, logger: nil)
+      def initialize(binder = nil, port: nil, after_eval: nil, logger: nil)
+
+        self.binder = binder
+
         port ||= 1327
 
         @logger = logger || Musa::Logger::Logger.new
 
         @block_source = nil
 
-        if binder.receiver.respond_to?(:sequencer) &&
-           binder.receiver.sequencer.respond_to?(:on_error)
-
-          binder.receiver.sequencer.on_error do |e|
-            send_exception e, output: @connection
-          end
-        end
-
         @client_threads = []
         @run = true
 
@@ -43,7 +38,7 @@ module Musa
 
                     when '#begin'
                       user_path = buffer&.string
-                      binder.receiver.instance_variable_set(:@user_pathname, Pathname.new(user_path)) if user_path
+                      @binder.receiver.instance_variable_set(:@user_pathname, Pathname.new(user_path)) if user_path
 
                       buffer = StringIO.new
 
@@ -53,7 +48,7 @@ module Musa
 
                         begin
                           send_echo @block_source, output: @connection
-                          binder.eval @block_source, "(repl)", 1
+                          @binder.eval @block_source, "(repl)", 1
 
                         rescue StandardError, ScriptError => e
                           @logger.warn('REPL') { 'code execution error' }
@@ -89,6 +84,22 @@ module Musa
         end
       end
 
+      def binder=(binder)
+        raise 'Already binded' if @binder
+
+        @binder = binder
+
+        return unless @binder
+
+        if @binder.receiver.respond_to?(:sequencer) &&
+           @binder.receiver.sequencer.respond_to?(:on_error)
+
+          @binder.receiver.sequencer.on_error do |e|
+            send_exception e, output: @connection
+          end
+        end
+      end
+
       def stop
         @run = false
 
@@ -102,7 +113,11 @@ module Musa
       end
 
       def puts(message)
-        send output: @connection, content: message
+        if @connection
+          send output: @connection, content: message&.to_s
+        else
+          @logger.warn('REPL') { "trying to print a message in Atom client but the client is not connected. Ignoring message \'#{message} \'." }
+        end
       end
 
       private

data/lib/musa-dsl/sequencer/base-sequencer-implementation-every.rb

@@ -28,7 +28,8 @@ module Musa::Sequencer
           control.do_on_stop.each(&:call)
 
           control.do_after.each do |do_after|
-            _numeric_at position + (interval || 0) + do_after[:bars], control, &do_after[:block]
+            # _numeric_at position + (interval || 0) + do_after[:bars], control, &do_after[:block]
+            _numeric_at position + do_after[:bars], control, &do_after[:block]
           end
         else
           _numeric_at control._start_position + control._execution_counter * interval, control do

data/lib/musa-dsl/transport/input-midi-clock.rb

@@ -1,17 +1,19 @@
+require 'midi-parser'
+
 require_relative 'clock'
-require 'nibbler'
 
 module Musa
   module Clock
     class InputMidiClock < Clock
-      def initialize(input, logger: nil, do_log: nil)
+      def initialize(input = nil, logger: nil, do_log: nil)
         do_log ||= false
 
         super()
 
-        @input = input
         @logger = logger
 
+        self.input = input
+
         if logger
           @logger = logger
         else
@@ -19,21 +21,41 @@ module Musa
           @logger.debug! if do_log
         end
 
-        @nibbler = Nibbler.new
+        @midi_parser = MIDIParser.new
+      end
+
+      attr_reader :input
+
+      def input=(input_midi_port)
+        @input = input_midi_port
+        @waiting_for_input&.wakeup
       end
 
       def run
         @run = true
 
         while @run
-          raw_messages = @input.gets
-          @input.buffer.clear
+          if @input
+            raw_messages = @input.gets
+          else
+            @logger.warn('InputMidiClock') { 'Waiting for clock input MIDI port' }
+
+            @waiting_for_input = Thread.current
+            sleep
+            @waiting_for_input = nil
+
+            if @input
+              @logger.info('InputMidiClock') { "Assigned clock input MIDI port '#{@input.name}'" }
+            else
+              @logger.warn('InputMidiClock') { 'Clock input MIDI port not found' }
+            end
+          end
 
           messages = []
           stop_index = nil
 
-          raw_messages.each do |message|
-            mm = @nibbler.parse message[:data]
+          raw_messages&.each do |message|
+            mm = @midi_parser.parse message[:data]
 
             if mm
               if mm.is_a? Array
@@ -48,10 +70,6 @@ module Musa
             end
           end
 
-          @nibbler.processed.clear
-          @nibbler.rejected.clear
-          @nibbler.messages.clear
-
           size = messages.size
           index = 0
           while index < size

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.23.23'
+  VERSION = '0.26.2'.freeze
 end
 
 require_relative 'musa-dsl/core-ext'

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.23.23'
-  s.date        = '2021-10-27'
+  s.version     = '0.26.2'
+  s.date        = '2021-11-25'
   s.summary     = 'A simple Ruby DSL for making complex music'
   s.description = 'Musa-DSL: A Ruby framework and DSL for algorithmic sound and musical thinking and composition'
   s.authors     = ['Javier Sánchez Yeste']
@@ -20,8 +20,13 @@ Gem::Specification.new do |s|
     # "changelog_uri" => ""
   #}
 
-  s.add_runtime_dependency 'citrus', '~> 3.0.0', '>= 3.0.0'
+  s.add_runtime_dependency 'logger', '~> 1.4', '>= 1.4.3'
 
-  s.add_runtime_dependency 'midi-message', '~> 0.4', '>= 0.4.9'
-  s.add_runtime_dependency 'midi-nibbler', '~> 0.2', '>= 0.2.4'
+  s.add_runtime_dependency 'citrus', '~> 3.0', '>= 3.0.0'
+
+  s.add_runtime_dependency 'midi-events', '~> 0.5', '>= 0.5.0'
+  s.add_runtime_dependency 'midi-parser', '~> 0.3', '>= 0.3.0'
+
+  s.add_development_dependency 'descriptive-statistics', '~> 2.2'
+  s.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,22 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.23.23
+  version: 0.26.2
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -26,50 +46,78 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: midi-message
+  name: midi-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: midi-nibbler
+  name: midi-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: descriptive-statistics
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: 'Musa-DSL: A Ruby framework and DSL for algorithmic sound and musical
   thinking and composition'
 email: javier.sy@gmail.com
@@ -77,6 +125,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem-test-and-push.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.md