musa-dsl 0.21.3 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc5aa748a51c09ce12d7ad6b17a7922d87d56742a7a03c61753e5cf05e0faac
-  data.tar.gz: a34656b54c6ed0997e897c8919c04e6361b85501b6c17d48b3df79797943d376
+  metadata.gz: dae00405142514f16df2be12de1eb9327893f3996ad3c86ec76fc315db521e7d
+  data.tar.gz: f3ebf69b72452ab83ec33ab873221ee1f0d59954e2c67277c2386fc174278a7c
 SHA512:
-  metadata.gz: 740ea84da6d43d290f970d4bf64d5634c80044d1be2a59508543c288dd86ed4550e990a4cedb5c1cda5a0e8c551bc1f6cf7e3625bba9748df1f438bafeb5b008
-  data.tar.gz: 4876305d8c5a27924796f29667fc2f4db73ef753646e561ca12b9ac2772f0dc9cf14df4996867bf64aa11af6792d0c4bfd7a423001d163a1e9afd8e943ab5db4
+  metadata.gz: 006f3143b93237b86600bde3b7229f14cae909a50603af4c0d1f33050835c582988325f8b2db63b74d20826d1682f09d51960e32d977f47ce86d69b4d25cd53b
+  data.tar.gz: 7c07575e0bcf7a2b5f9e6361d8ae2b64193b8bba31bec3badfbf02f8c83f8a3595bc84df42aa6c8976c947528c82752f9869ed7c19240c9d0d536cb435b4da86

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

@@ -39,6 +39,7 @@ module Musa
                     case line
                     when '#begin'
                       buffer = StringIO.new
+
                     when '#end'
                       @@repl_mutex.synchronize do
                         @block_source = buffer.string
@@ -48,8 +49,8 @@ module Musa
                           binder.eval @block_source, "(repl)", 1
 
                         rescue StandardError, ScriptError => e
-                          @logger.debug('REPL') { 'code execution error' }
-                          @logger.debug('REPL') { e.full_message(highlight: true, order: :top) }
+                          @logger.warn('REPL') { 'code execution error' }
+                          @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
 
                           send_exception e, output: @connection
                         else
@@ -65,12 +66,6 @@ module Musa
                   @logger.warn('REPL') { 'lost connection' }
                   @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
 
-                rescue Exception, SystemExit, Interrupt
-                  puts "EXCEPTION / SYSTEM EXIT / INTERUPT"
-                  $stdout.flush
-                  @logger.warn('REPL') { 'received interruption; will close connection...' }
-                  raise
-
                 ensure
                   @logger.debug("REPL") { "closing connection (running #{@run})" }
                   @connection.close
@@ -92,6 +87,7 @@ module Musa
 
         @main_thread.terminate
         Thread.pass
+
         @main_thread = nil
 
         @client_threads.each { |t| t.terminate; Thread.pass }

data/lib/musa-dsl/sequencer/base-sequencer-implementation-play-helper.rb

@@ -13,7 +13,7 @@ module Musa
           when :neumalang
             NeumalangModePlayEval.new block_procedure_binder, decoder, nl_context
           else
-            raise ArgumentError, "Mode #{mode} not allowed"
+            raise ArgumentError, "Unknown mode #{mode}"
           end
         end
 

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

@@ -66,7 +66,7 @@ module Musa
             @timeslots[at_position] << value
           end
         else
-          _log "BaseSequencer._raw_numeric_at: warning: ignoring past at command for #{at_position}" if @do_log
+          @logger.warn('BaseSequencer') { "._raw_numeric_at: warning: ignoring past at command for #{at_position}" }
         end
 
         nil
@@ -90,7 +90,7 @@ module Musa
         key_parameters[:control] = control if block_key_parameters_binder.key?(:control)
 
         if at_position == @position
-          @debug_at.call if debug && @debug_at
+          @on_debug_at.each { |c| c.call } if @logger.sev_threshold >= ::Logger::Severity::DEBUG
 
           begin
             locked = @tick_mutex.try_lock
@@ -103,13 +103,17 @@ module Musa
 
           @timeslots[at_position] ||= []
 
-          @timeslots[at_position] << { parent_control: control, block: @on_debug_at } if debug && @on_debug_at
+          if @logger.sev_threshold <= ::Logger::Severity::DEBUG
+            @on_debug_at.each do |block|
+              @timeslots[at_position] << { parent_control: control, block: block }
+            end
+          end
 
           @timeslots[at_position] << { parent_control: control, block: block_key_parameters_binder,
                                        value_parameters: value_parameters,
                                        key_parameters: key_parameters }
         else
-          _log "BaseSequencer._numeric_at: warning: ignoring past 'at' command for #{at_position}" if @do_log
+          @logger.warn('BaseSequencer') { "._numeric_at: warning: ignoring past 'at' command for #{at_position}" }
         end
 
         nil
@@ -661,10 +665,8 @@ module Musa
       end
 
       def _rescue_error(e)
-        if @do_error_log
-          log e
-          log e.full_message(order: :top)
-        end
+        @logger.error('BaseSequencer') { e.to_s }
+        @logger.error('BaseSequencer') { e.full_message(highlight: true, order: :top) }
 
         @on_error.each do |block|
           block.call e

data/lib/musa-dsl/sequencer/base-sequencer-tick-based.rb

@@ -48,11 +48,9 @@ module Musa
             original_position = position
             position = ticks_position.round * @tick_duration
 
-            if @do_log
-              _log "BaseSequencer._numeric_at: warning: rounding "\
-                  "position #{position} (#{original_position.to_f.round(5)}) "\
-                  "to tick precision: #{position} (#{position.to_f.round(5)})"
-            end
+            @logger.warn('BaseSequencer') { "._numeric_at: warning: rounding "\
+                "position #{position} (#{original_position.to_f.round(5)}) "\
+                "to tick precision: #{position} (#{position.to_f.round(5)})" }
           end
 
           position

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

@@ -4,13 +4,20 @@ require 'nibbler'
 module Musa
   module Clock
     class InputMidiClock < Clock
-      def initialize(input, do_log: nil)
+      def initialize(input, logger: nil, do_log: nil)
         do_log ||= false
 
         super()
 
         @input = input
-        @do_log = do_log
+        @logger = logger
+
+        if logger
+          @logger = logger
+        else
+          @logger = Musa::Logger::Logger.new
+          @logger.debug! if do_log
+        end
 
         @nibbler = Nibbler.new
       end
@@ -52,7 +59,7 @@ module Musa
                 messages[index + 1].name == 'Song Position Pointer' &&
                 messages[index + 2].name == 'Continue'
 
-              warn 'InputMidiClock: processing Stop + Song Position Pointer + Continue...' if @do_log
+              @logger.debug('InputMidiClock') { 'processing Stop + Song Position Pointer + Continue...' }
 
               process_start unless @started
 
@@ -62,7 +69,7 @@ module Musa
 
               index += 2
 
-              warn 'InputMidiClock: processing Stop + Song Position Pointer + Continue... done' if @do_log
+              @logger.debug('InputMidiClock') { 'processing Stop + Song Position Pointer + Continue... done' }
 
             else
               process_message messages[index] do
@@ -84,12 +91,12 @@ module Musa
       private
 
       def process_start
-        warn 'InputMidiClock: processing Start...' if @do_log
+        @logger.debug('InputMidiClock') { 'processing Start...' }
 
         @on_start.each(&:call)
         @started = true
 
-        warn 'InputMidiClock: processing Start... done' if @do_log
+        @logger.debug('InputMidiClock') { 'processing Start... done' }
       end
 
       def process_message(m)
@@ -98,16 +105,16 @@ module Musa
           process_start
 
         when 'Stop'
-          warn 'InputMidiClock: processing Stop...' if @do_log
+          @logger.debug('InputMidiClock') { 'processing Stop...' }
 
           @on_stop.each(&:call)
           @started = false
 
-          warn 'InputMidiClock: processing Stop... done' if @do_log
+          @logger.debug('InputMidiClock') { 'processing Stop... done' }
 
         when 'Continue'
-          warn 'InputMidiClock: processing Continue...' if @do_log
-          warn 'InputMidiClock: processing Continue... done' if @do_log
+          @logger.debug('InputMidiClock') { 'processing Continue...' }
+          @logger.debug('InputMidiClock') { 'processing Continue... done' }
 
         when 'Clock'
           yield if block_given? && @started
@@ -116,9 +123,9 @@ module Musa
           new_position_in_midi_beats =
               m.data[0] & 0x7F | ((m.data[1] & 0x7F) << 7)
 
-          warn "InputMidiClock: processing Song Position Pointer new_position_in_midi_beats #{new_position_in_midi_beats}..." if @do_log
+          @logger.debug('InputMidiClock') { "processing Song Position Pointer new_position_in_midi_beats #{new_position_in_midi_beats}..." }
           @on_change_position.each { |block| block.call midi_beats: new_position_in_midi_beats }
-          warn "InputMidiClock: processing Song Position Pointer new_position_in_beats #{new_position_in_midi_beats}... done" if @do_log
+          @logger.debug('InputMidiClock') { "processing Song Position Pointer new_position_in_beats #{new_position_in_midi_beats}... done" }
         end
       end
     end

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

@@ -126,21 +126,21 @@ module Musa
       private
 
       def do_before_begin
-        logger.debug('Transport') { 'doing before_begin initialization...' unless @before_begin.empty? }
+        logger.debug('Transport') { 'doing before_begin initialization...' } unless @before_begin.empty?
         @before_begin.each { |block| block.call @sequencer }
-        logger.debug('Transport') { 'doing before_begin initialization... done' unless @before_begin.empty? }
+        logger.debug('Transport') { 'doing before_begin initialization... done' } unless @before_begin.empty?
       end
 
       def do_on_start
-        logger.debug('Transport') { 'starting...' unless @on_start.empty? }
+        logger.debug('Transport') { 'starting...' } unless @on_start.empty?
         @on_start.each { |block| block.call @sequencer }
-        logger.debug('Transport') { 'starting... done' unless @on_start.empty? }
+        logger.debug('Transport') { 'starting... done' } unless @on_start.empty?
       end
 
       def do_stop
-        logger.debug('Transport') { 'stopping...' unless @after_stop.empty? }
+        logger.debug('Transport') { 'stopping...' } unless @after_stop.empty?
         @after_stop.each { |block| block.call @sequencer }
-        logger.debug('Transport') { 'stopping... done' unless @after_stop.empty? }
+        logger.debug('Transport') { 'stopping... done' } unless @after_stop.empty?
 
         logger.debug('Transport') { 'resetting sequencer...' }
         @sequencer.reset

data/musa-dsl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.21.3'
+  s.version     = '0.21.4'
   s.date        = '2020-10-20'
   s.summary     = 'A simple Ruby DSL for making complex music'
   s.description = 'Musa-DSL: A Ruby DSL for algorithmic music composition, device language neutral (MIDI, OSC, etc)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.21.4
 platform: ruby
 authors:
 - Javier Sánchez Yeste