musa-dsl 0.23.19 → 0.23.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69d8893b895c8b836a51be4f7fc7b51fbab501383c6e3780d0af52e82f1bb324
-  data.tar.gz: 017f7f8a8fb2cd5b3104d6c1f5c5acd535ea3db4c4285d15f1c81fe792cf123c
+  metadata.gz: d553a28107482bf41290cc93cdfca73a8096fa9525658b8c3f41d26681de062b
+  data.tar.gz: 7491c04165a88ac74ce1131e7721ee071d9e2bf54b0a3d1ca2b09844d2c5f174
 SHA512:
-  metadata.gz: 681651cd39523a69d2cbe3fe7271b79ab6f8c0d616cabd8f7d9ef4e0af8f8bbaaed39d41977c35900a748057af8a274b5672762340b98537b9f1d2cba7c5b401
-  data.tar.gz: 29cc0e37bf4f3513d78e32776c9df7a6a622c913a965f7bef8944bd0961ef7f8e23bfc348dbbe9eb7d18a211e224f6f27acc95210340bbad05aacde0d34f5404
+  metadata.gz: d147175f329eb74f1660c11d643de3ff65abaea2c4d1ed2554322d353b626bade1d073e2c7d6c25d2c9982916253d8318f792d0f3b41f9294505954f642e5f45
+  data.tar.gz: 4938ef8a3b0115dad3ad7c09ce8410d0049844965f5cfcdb22c58de8f85353541fae483e3f1578b97c149daf168b37efd23b596808e72c1c45996ed05a2cd96a

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'
@@ -94,6 +101,10 @@ module Musa
         @client_threads.clear
       end
 
+      def puts(message)
+        send output: @connection, content: message
+      end
+
       private
 
       def send_echo(e, output:)

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/sequencer/sequencer-dsl.rb

@@ -43,8 +43,8 @@ module Musa
         @dsl.with &block if block_given?
       end
 
-      def with(&block)
-        @dsl.with &block
+      def with(*value_parameters, **key_parameters, &block)
+        @dsl.with(*value_parameters, **key_parameters, &block)
       end
 
       class DSLContext

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

@@ -28,9 +28,9 @@ module Musa
             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}s)"
+                @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}s)"
+                @logger.warn "Timer delayed #{tick_errors.round(2)} ticks (#{-to_sleep.round(3)}s)"
               end
             end
 

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

@@ -12,6 +12,7 @@ module Musa
       def initialize(clock,
                      beats_per_bar = nil,
                      ticks_per_beat = nil,
+                     sequencer: nil,
                      before_begin: nil,
                      on_start: nil,
                      after_stop: nil,
@@ -39,7 +40,8 @@ module Musa
 
         @do_log = do_log
 
-        @sequencer = Musa::Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, logger: logger, do_log: @do_log
+        @sequencer = sequencer
+        @sequencer ||= Musa::Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, logger: logger, do_log: @do_log
 
         @clock.on_start do
           do_on_start

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.23.19'
+  VERSION = '0.23.23'
 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.19'
-  s.date        = '2021-09-28'
+  s.version     = '0.23.23'
+  s.date        = '2021-10-27'
   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.19
+  version: 0.23.23
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus