musa-dsl 0.23.23 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d553a28107482bf41290cc93cdfca73a8096fa9525658b8c3f41d26681de062b
-  data.tar.gz: 7491c04165a88ac74ce1131e7721ee071d9e2bf54b0a3d1ca2b09844d2c5f174
+  metadata.gz: 369a811860e0450eeee36e6841fb47f90fdf5f9fbca1b9169cf1899b1998994f
+  data.tar.gz: 5ec80d77df612f31fbfe9535d0babf023c4f0155447d378d11ec31f4f115776c
 SHA512:
-  metadata.gz: d147175f329eb74f1660c11d643de3ff65abaea2c4d1ed2554322d353b626bade1d073e2c7d6c25d2c9982916253d8318f792d0f3b41f9294505954f642e5f45
-  data.tar.gz: 4938ef8a3b0115dad3ad7c09ce8410d0049844965f5cfcdb22c58de8f85353541fae483e3f1578b97c149daf168b37efd23b596808e72c1c45996ed05a2cd96a
+  metadata.gz: 2b20abc803e8ada74bcfdca8a4ae4a123c4b9ebafd6b584a9f47a210d7ed87b421c4a4130ccf9bee2a67cea85be731b63c5bbe701bcfa73c7c5b0006f1cd7d22
+  data.tar.gz: bafb8e3bb49789fd9b7800067e5d01d44ff3bc384e09cac0493e6c6336dc9951f51ad341a4c7d6e9b5154a96b9d9b2e366d51d372e642a8f2d1ac7090ce3f3bb

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/transport/input-midi-clock.rb

@@ -4,14 +4,15 @@ 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
@@ -22,17 +23,34 @@ module Musa
         @nibbler = Nibbler.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
+            @input.buffer.clear
+          else
+            @logger.warn('InputMidiClock') { 'Waiting for clock input MIDI port' }
+
+            @waiting_for_input = Thread.current
+            sleep
+            @waiting_for_input = nil
+
+            @logger.info('InputMidiClock') { "Assigned clock input MIDI port '#{@input.name}'" }
+          end
 
           messages = []
           stop_index = nil
 
-          raw_messages.each do |message|
+          raw_messages&.each do |message|
             mm = @nibbler.parse message[:data]
 
             if mm

data/lib/musa-dsl.rb

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