musa-dsl 0.23.18 → 0.23.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b3da8a6794922e430f83799de2679402d3bfefda3208fa1788f0beedb1ae55e
-  data.tar.gz: 8583d5e0e518ff221cdf8b3f7cd6bc96ffe5a2c8b6c86ae53eb7d339b2a0eabd
+  metadata.gz: e29d8270f71037a8b9463b9aeecb86a1b1e2387078ff31c0db4d9e2688d91a8a
+  data.tar.gz: 1c10fd8b4656376184274828d75fc32162ee45247fd9b660ecdd792ebbf0469b
 SHA512:
-  metadata.gz: 06642f37659b697dca34396cca40aaa0ee30788cb2905e29ae9e2be16d3df570e1195996d50b81d10506059b37ef319f0c7c0aec8ccf789a35dc5d4734ba19ce
-  data.tar.gz: bd2c24988b5f1ef6e11d3b426de27a8ed46a9ca14f08f4d7eb1fbcff95e6854f839bb369e716c3ed05b393852571440bffbb223e2d3333a82900b62ffd0ce0db
+  metadata.gz: 2c6257b0fe2142959b31e66be05c14ea98ec7754a962ebd047f414e1e694b4e8ccab6cfc284a55002951e6bdb93d807b14b4e513305d3da45b4ac692122111e5
+  data.tar.gz: ced439462deba1da30f80e3c1fd4e8a822583a89f6c48bf133fb47d08a3eb7c8d45cde012f640fb5bc43793db92a7d036572ad18bac313612b85a4058096d058

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

@@ -1,4 +1,5 @@
 require 'socket'
+require 'pathname'
 
 module Musa
   module REPL
@@ -37,7 +38,13 @@ module Musa
 
                     line.chomp!
                     case line
+                    when '#path'
+                      buffer = StringIO.new
+
                     when '#begin'
+                      user_path = buffer&.string
+                      binder.receiver.instance_variable_set(:@user_pathname, Pathname.new(user_path)) if user_path
+
                       buffer = StringIO.new
 
                     when '#end'

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

@@ -4,7 +4,7 @@ module Musa::Sequencer
   class BaseSequencer
     using Musa::Extension::InspectNice
 
-    private def _play_timed(timed_serie, control, &block)
+    private def _play_timed(timed_serie, start_position, control, &block)
 
       if first_value_sample = timed_serie.peek_next_value
         debug "_play_timed: first_value_sample #{first_value_sample}"
@@ -25,7 +25,7 @@ module Musa::Sequencer
       binder = Musa::Extension::SmartProcBinder::SmartProcBinder.new(block)
 
       _play_timed_step(hash_mode, component_ids, extra_attribute_names, timed_serie,
-                       position, last_positions, binder, control)
+                       start_position, last_positions, binder, control)
     end
 
     private def _play_timed_step(hash_mode,

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

@@ -21,9 +21,9 @@ module Musa
                      logger: nil,
                      do_log: nil, do_error_log: nil, log_position_format: nil)
 
-        raise ArgumentError,
-              "'beats_per_bar' and 'ticks_per_beat' parameters should be both nil or both have values" \
-              unless beats_per_bar && ticks_per_beat || beats_per_bar.nil? && ticks_per_beat.nil?
+        unless beats_per_bar && ticks_per_beat || beats_per_bar.nil? && ticks_per_beat.nil?
+          raise ArgumentError, "'beats_per_bar' and 'ticks_per_beat' parameters should be both nil or both have values"
+        end
 
         if logger
           @logger = logger
@@ -39,9 +39,9 @@ module Musa
           @beats_per_bar = Rational(beats_per_bar)
           @ticks_per_beat = Rational(ticks_per_beat)
 
-          self.singleton_class.include TickBasedTiming
+          singleton_class.include TickBasedTiming
         else
-          self.singleton_class.include TicklessBasedTiming
+          singleton_class.include TicklessBasedTiming
         end
 
         _init_timing
@@ -215,10 +215,13 @@ module Musa
       end
 
       def play_timed(timed_serie,
+                     at: nil,
                      on_stop: nil,
                      after_bars: nil, after: nil,
                      &block)
 
+        at ||= position
+
         control = PlayTimedControl.new(@event_handlers.last,
                                        on_stop: on_stop, after_bars: after_bars, after: after)
 
@@ -230,7 +233,7 @@ module Musa
 
         @event_handlers.push control
 
-        _play_timed(timed_serie.instance, control, &block)
+        _play_timed(timed_serie.instance, at, control, &block)
 
         @event_handlers.pop
 

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

@@ -3,7 +3,7 @@ require_relative 'clock'
 module Musa
   module Clock
     class TimerClock < Clock
-      def initialize(period = nil, ticks_per_beat: nil, bpm: nil, correction: nil, logger: nil, do_log: nil)
+      def initialize(period = nil, ticks_per_beat: nil, bpm: nil, correction: nil, delayed_ticks_error: nil, logger: nil, do_log: nil)
         do_log ||= false
 
         super()
@@ -20,6 +20,7 @@ module Musa
         @started = false
         @paused = false
 
+        @delayed_ticks_error = delayed_ticks_error
         @logger = logger
         @do_log = do_log
       end
@@ -56,7 +57,12 @@ module Musa
         @run = true
 
         while @run
-          @timer = Timer.new(@period, correction: @correction, stop: true, logger: @logger, do_log: @do_log)
+          @timer = Timer.new(@period,
+                             correction: @correction,
+                             stop: true,
+                             delayed_ticks_error: @delayed_ticks_error,
+                             logger: @logger,
+                             do_log: @do_log)
 
           @timer.run do
             yield if block_given?

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

@@ -3,10 +3,12 @@ module Musa
     class Timer
       attr_accessor :period
 
-      def initialize(period_in_seconds, correction: nil, stop: nil, logger: nil, do_log: nil)
-        @period = period_in_seconds.rationalize
+      def initialize(tick_period_in_seconds, correction: nil, stop: nil, delayed_ticks_error: nil, logger: nil, do_log: nil)
+        @period = tick_period_in_seconds.rationalize
         @correction = (correction || 0r).rationalize
         @stop = stop || false
+
+        @delayed_ticks_error = delayed_ticks_error || 1.0
         @logger = logger
         @do_log = do_log
       end
@@ -21,10 +23,15 @@ module Musa
             yield
 
             @next_moment += @period
-            to_sleep = (@next_moment  + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
-
-            if @do_log && to_sleep.negative?
-              @logger&.error "Timer delayed #{-to_sleep}s (near #{(-to_sleep / @period).round} ticks)"
+            to_sleep = (@next_moment + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+            if @do_log && to_sleep.negative? & @logger
+              tick_errors = -to_sleep / @period
+              if tick_errors >= @delayed_ticks_error
+                @logger.error "Timer delayed #{tick_errors.round(2)} ticks (#{-to_sleep.round(3)}s)"
+              else
+                @logger.warn "Timer delayed #{tick_errors.round(2)} ticks (#{-to_sleep.round(3)}s)"
+              end
             end
 
             sleep to_sleep if to_sleep > 0.0

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.23.18'
+  VERSION = '0.23.22'
 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.18'
-  s.date        = '2021-09-28'
+  s.version     = '0.23.22'
+  s.date        = '2021-10-26'
   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']

metadata

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