ramekin 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1454704618e8123c1ade7251f1a30cc66b2f2febacd10e1e8f438e4b3fe3023c
-  data.tar.gz: 82453a74e36685f30e7637092fc47d242a63b609c7e4b1f586b17fafae05289f
+  metadata.gz: e6d502b095f92786dc1c94da24e1144d744f8462f609a1d7623a9c46a541b5f9
+  data.tar.gz: 2de364d731e7760f8dc1111d18aad6b4de5a5b713e5d3ec424af3c80f180ec52
 SHA512:
-  metadata.gz: f33e028002e58ad86ae808bcc4a0a77b9c8b324e3a47f652bf20dcf1bc4a83381f13e23e3ec980f5350cad8686f13097f1996e08c3de798614e4092ca55a8cbf
-  data.tar.gz: 4df89465d887a660c7353a6e4b16e3817603efd861c60315c39ca531026af27b5a72bf0a7b32aa73328f9b0160f3f7f5aa868a2de9fbe6bf493bb4f1cc345aff
+  metadata.gz: 0a1aed7dde26850dd627da1ac9e0b7445d41097128dcae4ba464afc7c0868e7905f8adb2b395bfc93aa3d9ea28e7739cb2e5bb36fdf6de679726d938913de179
+  data.tar.gz: 6402af26f0cbd457a8246121eefcfe976a5331925ed97849520fec05faafbdf47c8124a95bdb398a38115dcb6a6dce2fd7ff0bac6e1678787d433e4e7cfcc247

data/lib/ramekin/meta.rb

@@ -282,7 +282,7 @@ module Ramekin
 
     def ext_gain
       gain = @extensions.select { |e| e.type == :gain }.last
-      gain && gain.value
+      gain && to_hex(gain.value.to_i(16))
     end
 
     def gain
@@ -299,7 +299,13 @@ module Ramekin
       adsr1 = ((7 - d)*16 | 0x80) + (15 - a)
       adsr2 = (s*32 + (31-r))
 
-      [adsr1.to_s(16), adsr2.to_s(16), g, t1, t2]
+      [to_hex(adsr1), to_hex(adsr2), g, t1, t2]
+    end
+
+    def to_hex(x)
+      return x if x.is_a?(String)
+
+      sprintf("%02x", x)
     end
 
     def to_amk

data/lib/ramekin/renderer.rb

@@ -58,7 +58,7 @@ module Ramekin
 
       render_preamble(&b)
 
-      @track.channels.each { |c| render_channel(c, &b) }
+      @track.channels.compact.each { |c| render_channel(c, &b) }
     end
 
     def render_preamble(&b)
@@ -188,13 +188,25 @@ module Ramekin
         end
       when :v
         vol, time = token.values.compact.map(&:to_i)
-        yield velocity_command(vol, time)
+
+        unless Token === peek && [:v, :relv].include?(peek.type)
+          yield velocity_command(vol, time)
+        end
+
         @volume = vol
       when :relv
         relvol, duration = token.values
-        yield velocity_command(@volume + relvol.to_i, duration)
+
+        unless Token === peek && [:v, :relv].include?(peek.type)
+          yield velocity_command(@volume + relvol.to_i, duration)
+        end
       when :q
-        yield "q#{token.value}"
+        token.value =~ /(\d),?(\h)?/
+        qval = $1
+        gain = $2 || 'F'
+        yield "q#{qval}#{gain}"
+      when :w
+        yield "w#{token.value}"
       when :adsr
         vals = token.value.split(',').map { |x| x.to_i(16) }
         error! 'invalid #adsr, expected 4 arguments' unless vals.size == 4

data/lib/ramekin/tokenizer.rb

@@ -228,7 +228,6 @@ module Ramekin
       return [:instrument, m(1)] if match /@(\w+)/
       return [:hex, m(1)] if match /[$](\h\h)/
       return [:t, m(1)] if match /t(\d+)/
-      return [:q, m(1)] if match /q(\d\h?)/
 
       return note(:note, m) if match /[abcdefg][+-]?/
       return note(:r) if match /r/
@@ -258,7 +257,7 @@ module Ramekin
       return [:w, m(1)] if match /w(\d+)/
       return [:l, m(1)] if match /l(\d+)/
       return [:amp] if match /[&]/
-      return [:q, m(1)] if match /q(\h\h)/
+      return [:q, m(1)] if match /q(\d(?:,\h)?)/
       return [:n, m(1)] if match /n(\h\h?)/
 
       error! "unknown token near: #{@scanner.peek(10)}", el: @last_token

data/lib/ramekin/util.rb

@@ -44,11 +44,24 @@ module Ramekin
       env = {}
       kw.each { |k, v| env[k.to_s] = v }
 
+      $stderr.puts "run: #{a.map(&method(:shell_inspect)).join(' ')}"
       system(env, *a.map(&:to_s))
     rescue Interrupt
       # allow interrupt out of the subprocess but capture it for ramekin itself
     end
 
+    # for diagnostic purposes only, not a real escape system.
+    # our shellouts don't need escapes since they are not actually
+    # interpreted by a shell.
+    def shell_inspect(s)
+      s = s.to_s
+      if s =~ /[\s'"&*]/
+        s.inspect
+      else
+        s
+      end
+    end
+
     def executable?(path)
       stat = File.stat(path)
       stat.file? && stat.executable?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ramekin
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - jneen
 autorequire:
 bindir: gembin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strscan