musa-dsl 0.26.8 → 0.26.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1598e463290a813acd81f7d4c2a380c2b4f904c266505efb1c0c76295a2e891
-  data.tar.gz: 7b6c53ec4109d923f6aab5a1c250672b87a0c1bcc275c0e3359e769b01dd9371
+  metadata.gz: ae2aa7f3e4406ef09886be36604113bb854d1f92c985a6e6bfda534520939652
+  data.tar.gz: 3e7ca1f99dc0dee8b2a2969a19807b9b6902caed27d94278503536d4787a664d
 SHA512:
-  metadata.gz: 8178a6d752685d3ae592c1e80374b85cba4f59ffdcc556d358d1f0c9a2787812421a74c6c247b890b80e05bf221ce3b490a60d2201361041419b0ca4e42f93cc
-  data.tar.gz: bfd208048b17a2e4f5374eedda0bd5dd5b2d6eb7268a867c63523477da6170f2a7a340d2dca8ab719467c58efd9662fed221118301d3d321c8176cb9785f380b
+  metadata.gz: 7b9d8fc55338beb1dbcb3b78e44738ecf5a51e478d75a8f2fb18f51e52c63e3038b6ffc05304aec34297097795e6e14adbe2055ac0267d2aa7a94ada8cb71d57
+  data.tar.gz: '098e5f968aad5bbd2eff7a7ed3c268c9411db65952be5824d02af06147ab00a185bb3d4eeff0a23e8ce8648919c400b9891393d2e19426c215fd102467fb7364'

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'rubocop', group: 'development'
-gem 'rubocop', group: 'development'
-gem 'rubocop', group: 'development'

data/lib/musa-dsl/neumas/neuma-gdv-decoder.rb

@@ -6,7 +6,7 @@ module Musa::Neumas
       def initialize(scale, base_duration: nil, transcriptor: nil, base: nil)
         @base_duration = base_duration
         @base_duration ||= base[:duration] if base
-        @base_duration ||= Rational(1,4)
+        @base_duration ||= Rational(1, 4)
 
         base ||= { grade: 0, octave: 0, duration: @base_duration, velocity: 1 }
 

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

@@ -123,6 +123,8 @@ module Musa
             "trying to print a message in MusaLCE but the client is not connected. Ignoring message \'#{message} \'."
           end
         end
+
+        nil
       end
 
       private

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

@@ -202,8 +202,8 @@ module Musa
         end
 
         def eval_command(block, value_parameters, key_parameters)
-          _value_parameters = value_parameters ? value_parameters.collect { |e| subcontext.eval_element(e) } : []
-          _key_parameters = key_parameters ? key_parameters.transform_values { |e| subcontext.eval_element(e) } : {}
+          _value_parameters = value_parameters&.collect { |e| subcontext.eval_element(e) } || []
+          _key_parameters = key_parameters&.transform_values { |e| subcontext.eval_element(e) } || {}
 
           # used instance_exec because the code on block comes from a neumalang source, so the correct
           # execution context is the neumalang context (no other context has any sense)

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

@@ -37,7 +37,7 @@ module Musa
         end
 
         private def _reset_timing
-          @position = @position_mutex.synchronize { 1r - @tick_duration }
+          @position = @position_mutex.synchronize { 1r + @offset - @tick_duration }
         end
 
         private def _quantize_position(position, warn: true)

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

@@ -13,11 +13,13 @@ module Musa
   module Sequencer
     class BaseSequencer
       attr_reader :beats_per_bar, :ticks_per_beat
+      attr_reader :offset
       attr_reader :running_position
       attr_reader :everying, :playing, :moving
       attr_reader :logger
 
       def initialize(beats_per_bar = nil, ticks_per_beat = nil,
+                     offset: nil,
                      logger: nil,
                      do_log: nil, do_error_log: nil, log_position_format: nil)
 
@@ -35,6 +37,8 @@ module Musa
           @logger.debug! if do_log
         end
 
+        @offset = offset || 0r
+
         if beats_per_bar && ticks_per_beat
           @beats_per_bar = Rational(beats_per_bar)
           @ticks_per_beat = Rational(ticks_per_beat)

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

@@ -9,6 +9,7 @@ module Musa
 
       def_delegators :@sequencer,
                      :beats_per_bar, :ticks_per_beat, :ticks_per_bar, :tick_duration,
+                     :offset,
                      :size, :empty?,
                      :on_debug_at, :on_error, :on_fast_forward, :before_tick,
                      :raw_at,
@@ -25,6 +26,7 @@ module Musa
 
       def initialize(beats_per_bar = nil,
                      ticks_per_beat = nil,
+                     offset: nil,
                      sequencer: nil,
                      logger: nil,
                      do_log: nil, do_error_log: nil, log_position_format: nil,
@@ -34,6 +36,7 @@ module Musa
 
         @sequencer = sequencer
         @sequencer ||= BaseSequencer.new beats_per_bar, ticks_per_beat,
+                                         offset: offset,
                                          logger: logger,
                                          do_log: do_log,
                                          do_error_log: do_error_log,

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

@@ -39,7 +39,7 @@ module Musa
       def eval_condition
         if @ticks
           @ticks -= 1
-          @ticks > 0
+          @ticks.positive?
         else
           @block.call
         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,
+                     offset: nil,
                      sequencer: nil,
                      before_begin: nil,
                      on_start: nil,
@@ -22,6 +23,8 @@ module Musa
 
         beats_per_bar ||= 4
         ticks_per_beat ||= 24
+        offset ||= 0r
+
         do_log ||= false
 
         @clock = clock
@@ -41,7 +44,7 @@ module Musa
         @do_log = do_log
 
         @sequencer = sequencer
-        @sequencer ||= Musa::Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, logger: logger, do_log: @do_log
+        @sequencer ||= Musa::Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, offset: offset, logger: logger, do_log: @do_log
 
         @clock.on_start do
           do_on_start
@@ -91,6 +94,7 @@ module Musa
         position += Rational(midi_beats, 4 * @sequencer.beats_per_bar) if midi_beats
         position += Rational(beats, @sequencer.beats_per_bar) if beats
 
+        position += @sequencer.offset
         position -= @sequencer.tick_duration
 
         raise ArgumentError, "undefined new position" unless position

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.26.8'.freeze
+  VERSION = '0.26.10'.freeze
 end
 
 require_relative 'musa-dsl/core-ext'

data/musa-dsl.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.26.8'
-  s.date        = '2023-05-30'
+  s.version     = '0.26.10'
+  s.date        = '2023-10-30'
   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']
   s.email       = 'javier.sy@gmail.com'
-  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|samples)/}) }
+  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|samples|\.github)/}) }
   s.homepage    = 'https://github.com/javier-sy/musa-dsl'
   s.license     = 'LGPL-3.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.26.8
+  version: 0.26.10
 platform: ruby
 authors:
 - Javier Sánchez Yeste
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -125,7 +125,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/gem-test-and-push.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.md
@@ -255,7 +254,7 @@ homepage: https://github.com/javier-sy/musa-dsl
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -271,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A simple Ruby DSL for making complex music
 test_files: []

data/.github/workflows/gem-test-and-push.yml

@@ -1,48 +0,0 @@
-name: Generate gem and push to rubygems repository
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ['2.7.8']
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rspec -t \~slow
-
-  build:
-    name: Build + Publish
-    runs-on: ubuntu-latest
-    needs: test 
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby 2.7.8
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7.8
-
-    - name: Publish to RubyGems
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${{secrets.GEM_HOST_API_KEY}}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem