musa-dsl 0.21.1 → 0.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6666b6d9729d138be960000a3dd86a517f9ed94031d74a6eab25b76052d45c5
-  data.tar.gz: a6806869e3f06e54bc5596f71c35cfff8a9513504653a889e57287d227990419
+  metadata.gz: 5cc5aa748a51c09ce12d7ad6b17a7922d87d56742a7a03c61753e5cf05e0faac
+  data.tar.gz: a34656b54c6ed0997e897c8919c04e6361b85501b6c17d48b3df79797943d376
 SHA512:
-  metadata.gz: 531fbb701e5774e11a1a1dc373308fada1f777c6b8c7981e8a27ffd1ddb3c242bc1e5723555553010d4ff10259c7c69cd2e2428b9d0eab65ef96ae8b13b14f7b
-  data.tar.gz: c2db1fae44b49ee11fd8dd5d764dee4c7416c4b7fb6ce075213f84207d54cd7b5cc6301f59a74a723b467a103c74c779f68f9a946c0fcdd92fefbe77d26758c0
+  metadata.gz: 740ea84da6d43d290f970d4bf64d5634c80044d1be2a59508543c288dd86ed4550e990a4cedb5c1cda5a0e8c551bc1f6cf7e3625bba9748df1f438bafeb5b008
+  data.tar.gz: 4876305d8c5a27924796f29667fc2f4db73ef753646e561ca12b9ac2772f0dc9cf14df4996867bf64aa11af6792d0c4bfd7a423001d163a1e9afd8e943ab5db4

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

@@ -9,7 +9,7 @@ module Musa; module Logger
       @position_format = position_format || 3.3
 
       self.formatter = proc do |severity, time, progname, msg|
-        level = "[#{severity}]" unless severity == 'DEBUG'
+        level = "[#{severity}] " unless severity == 'DEBUG'
 
         if msg
           position = if @sequencer
@@ -19,7 +19,7 @@ module Musa; module Logger
                        "%#{integer_digits + decimal_digits + 1}s: " % ("%.#{decimal_digits}f" % sequencer.position.to_f)
                      end
 
-          progname = "[#{progname}]" if progname
+          progname = "[#{progname}] " if progname
 
           "#{position}#{level}#{progname}#{msg}\n"
         else

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

@@ -2,6 +2,10 @@ require 'set'
 require 'midi-message'
 
 require_relative '../core-ext/arrayfy'
+require_relative '../core-ext/array-explode-ranges'
+
+using Musa::Extension::Arrayfy
+using Musa::Extension::ExplodeRanges
 
 module Musa
   module MIDIVoices

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

@@ -5,9 +5,10 @@ module Musa
     class REPL
       @@repl_mutex = Mutex.new
 
-      def initialize(binder, port: nil, after_eval: nil)
+      def initialize(binder, port: nil, after_eval: nil, logger: nil)
         port ||= 1327
-        redirect_stderr ||= false
+
+        @logger = logger || Musa::Logger::Logger.new
 
         @block_source = nil
 
@@ -15,7 +16,7 @@ module Musa
             binder.receiver.sequencer.respond_to?(:on_error)
 
           binder.receiver.sequencer.on_error do |e|
-            send_exception e
+            send_exception e, output: @connection
           end
         end
 
@@ -25,12 +26,15 @@ module Musa
         @main_thread = Thread.new do
           @server = TCPServer.new(port)
           begin
-            while (connection = @server.accept) && @run
+            while (@connection = @server.accept) && @run
               @client_threads << Thread.new do
                 buffer = nil
 
                 begin
-                  while (line = connection.gets) && @run
+                  while (line = @connection.gets) && @run
+
+                    @logger.warn('REPL') { 'input line is nil; will close connection...' } if line.nil?
+
                     line.chomp!
                     case line
                     when '#begin'
@@ -40,11 +44,14 @@ module Musa
                         @block_source = buffer.string
 
                         begin
-                          send_echo @block_source, output: connection
+                          send_echo @block_source, output: @connection
                           binder.eval @block_source, "(repl)", 1
 
                         rescue StandardError, ScriptError => e
-                          send_exception e, output: connection
+                          @logger.debug('REPL') { 'code execution error' }
+                          @logger.debug('REPL') { e.full_message(highlight: true, order: :top) }
+
+                          send_exception e, output: @connection
                         else
                           after_eval.call @block_source if after_eval
                         end
@@ -53,16 +60,29 @@ module Musa
                       buffer.puts line
                     end
                   end
+
                 rescue IOError, Errno::ECONNRESET, Errno::EPIPE => e
-                  warn e.message
+                  @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
                 end
 
-                connection.close
               end
             end
           rescue Errno::ECONNRESET, Errno::EPIPE => e
-            warn e.message
+            @logger.warn('REPL') { 'connection failure while getting server port; will retry...' }
+            @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
             retry
+
           end
         end
       end
@@ -71,9 +91,10 @@ module Musa
         @run = false
 
         @main_thread.terminate
-        @client_threads.each { |t| t.terminate }
-
+        Thread.pass
         @main_thread = nil
+
+        @client_threads.each { |t| t.terminate; Thread.pass }
         @client_threads.clear
       end
 
@@ -87,6 +108,8 @@ module Musa
 
       def send_exception(e, output:)
 
+        @logger.error('REPL') { e.full_message(highlight: true, order: :top) }
+
         send output: output, command: '//error'
 
         selected_backtrace_locations = e.backtrace_locations.select { |bt| bt.path == '(repl)' }

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

@@ -1,6 +1,9 @@
 require_relative '../core-ext/smart-proc-binder'
+require_relative '../core-ext/inspect-nice'
 require_relative '../sequencer'
 
+using Musa::Extension::InspectNice
+
 module Musa
   module Transport
     class Transport
@@ -15,6 +18,7 @@ module Musa
                      on_start: nil,
                      after_stop: nil,
                      on_position_change: nil,
+                     logger: nil,
                      do_log: nil)
 
         beats_per_bar ||= 4
@@ -37,7 +41,7 @@ module Musa
 
         @do_log = do_log
 
-        @sequencer = Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, do_log: @do_log
+        @sequencer = Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, logger: logger, do_log: @do_log
 
         @clock.on_start do
           do_on_start
@@ -78,15 +82,20 @@ module Musa
       end
 
       def change_position_to(bars: nil, beats: nil, midi_beats: nil)
-        warn "Transport: asked to change position to #{"#{bars} bars " if bars}#{"#{beats} beats " if beats}#{"#{midi_beats} midi beats " if midi_beats}" if @do_log
+        logger.debug('Transport') do
+          "asked to change position to #{"#{bars} bars " if bars}#{"#{beats} beats " if beats}" \
+          "#{"#{midi_beats} midi beats " if midi_beats}"
+        end
 
         position = bars&.rationalize || 1r
         position += Rational(midi_beats, 4 * @sequencer.beats_per_bar) if midi_beats
         position += Rational(beats, @sequencer.beats_per_bar) if beats
 
+        position -= @sequencer.tick_duration
+
         raise ArgumentError, "undefined new position" unless position
 
-        warn "Transport: received message position change to #{position}" if @do_log
+        logger.debug('Transport') { "received message position change to #{position.inspect}" }
 
         start_again_later = false
 
@@ -95,7 +104,7 @@ module Musa
           start_again_later = true
         end
 
-        warn "Transport: setting sequencer position #{position}" if @do_log
+        logger.debug('Transport') { "setting sequencer position #{position.inspect}" }
 
         @sequencer.raw_at position, force_first: true do
           @on_change_position.each { |block| block.call @sequencer }
@@ -110,28 +119,32 @@ module Musa
         @clock.terminate
       end
 
+      def logger
+        @sequencer.logger
+      end
+
       private
 
       def do_before_begin
-        warn 'Transport: doing before_begin initialization...' unless @before_begin.empty? || !@do_log
+        logger.debug('Transport') { 'doing before_begin initialization...' unless @before_begin.empty? }
         @before_begin.each { |block| block.call @sequencer }
-        warn 'Transport: doing before_begin initialization... done' unless @before_begin.empty? || !@do_log
+        logger.debug('Transport') { 'doing before_begin initialization... done' unless @before_begin.empty? }
       end
 
       def do_on_start
-        warn 'Transport: starting...' unless @on_start.empty? || !@do_log
+        logger.debug('Transport') { 'starting...' unless @on_start.empty? }
         @on_start.each { |block| block.call @sequencer }
-        warn 'Transport: starting... done'  unless @on_start.empty? || !@do_log
+        logger.debug('Transport') { 'starting... done' unless @on_start.empty? }
       end
 
       def do_stop
-        warn 'Transport: stoping...' unless @after_stop.empty? || !@do_log
+        logger.debug('Transport') { 'stopping...' unless @after_stop.empty? }
         @after_stop.each { |block| block.call @sequencer }
-        warn 'Transport: stoping... done' unless @after_stop.empty? || !@do_log
+        logger.debug('Transport') { 'stopping... done' unless @after_stop.empty? }
 
-        warn 'Transport: resetting sequencer...' if @do_log
+        logger.debug('Transport') { 'resetting sequencer...' }
         @sequencer.reset
-        warn 'Transport: resetting sequencer... done' if @do_log
+        logger.debug('Transport') { 'resetting sequencer... done' }
 
         do_before_begin
         @before_begin_already_done = true

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.21.1'
-  s.date        = '2020-10-09'
+  s.version     = '0.21.3'
+  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)'
   s.authors     = ['Javier Sánchez Yeste']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.3
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus