ramekin 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71e89ff9027d3342649de107de02ed46c622a95a9940fe94bb0ece781ac18790
-  data.tar.gz: 1d3b3a89ab873ab15e55a000912791ee7c232a53d462377803fdd8f9ef80e4e8
+  metadata.gz: e86782ed3b91b2d539e25a9c2a43887ad60e0f978659fc0d993a9c697980e551
+  data.tar.gz: 8065e561cd4a385b97914e8874b8302c427bfd38c7fd4976d2d3698db3292af2
 SHA512:
-  metadata.gz: e716543bbac8f7ae0fa72e5504fd3fad883b283b4adc3085f0de7bb5220bf1533dac433af06527d949a8acdb46a25beffa20334cf72bbb208ff2d2408a225fd1
-  data.tar.gz: 1cc81d357db65d9be8e5f54677ff3117c336656e1ee40ee53183b49f7ceee9c483d05cafdd190bc783dcc65d687af098f80ee7e54378c6c48eb2d62ebbbc64b7
+  metadata.gz: d379d84449a16292615ec3313d4e030da6b90f8c13817d7322aa9ecfb3aa2614b1c713363fa51045f6d060e3d07c3b8b619c024676a08e06de0f05193e14de45
+  data.tar.gz: 24e1619066857f8378cdf5bebd36f9d0b4580d0f6d71d4469849990dd347f3fbb9094ec811fb0fe16c77b679e8a32da0b64f90f33d80058da08908501b87cab7

data/README.md

@@ -73,6 +73,9 @@ ramekin pack [flags]
             search for BRR filenames.
         --list [text]
             list all samples in packs matching [text].
+        --list-smw
+            list the builtin instruments from SMW that can be used
+            without a pack.
 
 ramekin setup [flags]
     flags:

data/lib/ramekin/cli.rb

@@ -60,6 +60,9 @@ module Ramekin
       $stderr.puts "            search for BRR filenames."
       $stderr.puts "        --list [text]"
       $stderr.puts "            list all samples in packs matching [text]."
+      $stderr.puts "        --list-smw"
+      $stderr.puts "            list the builtin instruments from SMW that can be used"
+      $stderr.puts "            without a pack."
       $stderr.puts ""
       $stderr.puts "ramekin setup [flags]"
       $stderr.puts "    flags:"
@@ -260,6 +263,8 @@ module Ramekin
       @search = nil
       while (h = argv.shift)
         case h
+        when '--list-smw'
+          @list_smw = true
         when '--update'
           @update = true
         when '--search'
@@ -271,6 +276,14 @@ module Ramekin
         end
       end
 
+      if @list_smw
+        width = SMW::BUILTINS.keys.map(&:size).max
+        $stderr.puts ";;; List of builtin instruments from SMW: ;;;"
+        SMW::BUILTINS.each do |name, id|
+          puts "@#{name.ljust(width)} ; @#{id}"
+        end
+      end
+
       if @update
         $stderr.puts "=== updating packages... ==="
         SamplePack.download_all!

data/lib/ramekin/meta.rb

@@ -78,9 +78,13 @@ module Ramekin
       end
     end
 
+    def done?
+      @elements.empty? && @peek.nil?
+    end
+
     def parse
       loop do
-        break if @elements.empty?
+        break if done?
         next!
 
         case @current.type
@@ -88,7 +92,8 @@ module Ramekin
         when :amk then @amk = @current
         when :option then @options[@current.value] = true
         when :w then @volume = @current
-        when :t, :bpm then @tempo = @current; @t_with_divisor = nil
+        when :t, :bpm then
+          @tempo = @current; @t_with_divisor = nil
         else
           error! 'invalid token in header'
         end

data/lib/ramekin/note_aggregator.rb

@@ -57,19 +57,15 @@ module Ramekin
       end
     end
 
-    def check_length!(t, div)
-      if t % div != 0
+    def length_amk(div)
+      if ticks % div != 0
         divisible = div == 2 ? 'even' : "divisible by #{div}"
         error!("too fast! tick count must be #{divisible} at this tempo", el: self)
       end
-    end
-
-    def length_amk(div)
-      check_length!(ticks, div)
 
       t = ticks / div
       # we use l16
-      # return '' if t == 12
+      return '' if t == 12
       KNOWN_LENGTHS.fetch(t) { "=#{t}" }
     end
 
@@ -103,15 +99,13 @@ module Ramekin
     end
 
     def ticks
-      if @extensions.empty? && default_length.nil?
-        return 192 / 16
-      end
-
       exts = @extensions
-      exts = [default_length] if exts.empty?
+      default = default_length&.value || '16'
+      exts = [default] if exts.empty?
 
       base = exts.map do |ext|
         ext = ext.value if Token === ext
+        ext ||= default
 
         case ext
         when /\A=(\d+)\z/ then $1.to_i

data/lib/ramekin/renderer.rb

@@ -23,31 +23,9 @@ module Ramekin
         @instrument_index[i.to_s] = i
       end
 
-      @instrument_index['smwflute'] = 0
-      @instrument_index['smwstring'] = 1
-      @instrument_index['smwglock'] = 2
-      @instrument_index['smwmarimba'] = 3
-      @instrument_index['smwcello'] = 4
-      @instrument_index['smwsteelguitar'] = 5
-      @instrument_index['smwtrumpet'] = 6
-      @instrument_index['smwsteeldrum'] = 7
-      @instrument_index['smwacousticbass'] = 8
-      @instrument_index['smwpiano'] = 9
-      @instrument_index['smwsnare'] = 10
-      @instrument_index['smwstring2'] = 11
-      @instrument_index['smwbongo'] = 12
-      @instrument_index['smwep'] = 13
-      @instrument_index['smwslapbass'] = 14
-      @instrument_index['smworchhit'] = 15
-      @instrument_index['smwharp'] = 16
-      @instrument_index['smwdistguitar'] = 17
-      @instrument_index['smwkick'] = 21
-      @instrument_index['smwhat'] = 22
-      @instrument_index['smwshaker'] = 23
-      @instrument_index['smwwoodblock'] = 24
-      @instrument_index['smwhiwoodblock'] = 25
-      @instrument_index['smwdrums'] = 28
-      @instrument_index['smwpower'] = 29
+      SMW::BUILTINS.each do |name, id|
+        @instrument_index[name] = id
+      end
 
       # optional default octaves for instrument switching
       @default_octaves = Hash.new(4)
@@ -297,7 +275,13 @@ module Ramekin
 
         ticks = sprintf("%02x", note.ticks)
         yield "$dd$#{ticks}$#{ticks}#{note.octave_amk}#{note.note.value}"
-        yield "^=#{note.ticks}"
+
+        case peek
+        when NoteEvent
+          peek.extensions.concat(note.extensions)
+        else
+          yield "^=#{note.ticks}"
+        end
 
         @octave = note.octave
       when 'legato'

data/lib/ramekin/smw.rb

@@ -0,0 +1,31 @@
+module Ramekin
+  module SMW
+    BUILTINS = {
+      'smwflute'        => 0,
+      'smwstring'       => 1,
+      'smwglock'        => 2,
+      'smwmarimba'      => 3,
+      'smwcello'        => 4,
+      'smwsteelguitar'  => 5,
+      'smwtrumpet'      => 6,
+      'smwsteeldrum'    => 7,
+      'smwacousticbass' => 8,
+      'smwpiano'        => 9,
+      'smwsnare'        => 10,
+      'smwstring2'      => 11,
+      'smwbongo'        => 12,
+      'smwep'           => 13,
+      'smwslapbass'     => 14,
+      'smworchhit'      => 15,
+      'smwharp'         => 16,
+      'smwdistguitar'   => 17,
+      'smwkick'         => 21,
+      'smwhat'          => 22,
+      'smwshaker'       => 23,
+      'smwwoodblock'    => 24,
+      'smwhiwoodblock'  => 25,
+      'smwdrums'        => 28,
+      'smwpower'        => 29,
+    }
+  end
+end

data/lib/ramekin.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require_relative 'ramekin/util'
+require_relative 'ramekin/smw'
 require_relative 'ramekin/config'
 require_relative 'ramekin/amk_setup'
 require_relative 'ramekin/spc_player'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ramekin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - jneen
-autorequire:
 bindir: gembin
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strscan
@@ -66,7 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-description:
 email: jneen@jneen.net
 executables:
 - ramekin
@@ -92,6 +90,7 @@ files:
 - lib/ramekin/processor.rb
 - lib/ramekin/renderer.rb
 - lib/ramekin/sample_pack.rb
+- lib/ramekin/smw.rb
 - lib/ramekin/spc_player.rb
 - lib/ramekin/tokenizer.rb
 - lib/ramekin/util.rb
@@ -101,7 +100,6 @@ licenses:
 - GPL-3.0-only
 metadata:
   source_code_uri: https://codeberg.org/jneen/ramekin
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: A tool for making SMW music with AddmusicK
 test_files: []