ramekin 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f693295d87c86072d5d220f3a9cfed4b8a19aa5ae1bcfc468c4554eb89063945
-  data.tar.gz: 5d4890321e9f3d49ce4487e0539babe104bb03a1719ecf641040d22eadc7ba2a
+  metadata.gz: 05452ce105a35c32216d5236506aaddbe28564e7645a8f3aa53c517eaedc44db
+  data.tar.gz: a65a65ac28b44078bf626a141ec6ecc9b3a725b65d562f957d6c67fee2a57d0d
 SHA512:
-  metadata.gz: 530beedb41422b51818f44445802ff95ba1b23c73f43e24b1d44c563bbe4479c46ac55c3a6c26ee722e1dd4e555ef61bd66f501380853085cd766734117b919b
-  data.tar.gz: 45a1589c63119cef6fc062feff81afe66445356974260953bbb8adb79a25e570329afecaf695b6b4781bbce9b067b25d4d85c5c7d9fc257262a44e4d9c77c86b
+  metadata.gz: 050f82c12f9f39d82b224cbab93244913b21cde8f08cdfe4ecd389dd6c1a97348fc9066978cce076935bcaa44f027263070461f6dd9ac12df1a8030047f888c5
+  data.tar.gz: a9cad79a5b20128fa0d2d8a3838af346a9c01d43635a984c2ae25ce907f0a74e1907a5ba0fe057e724e7eb7aea34ba1c6e04ee521ceb03f31898ce8d015b0477

data/lib/ramekin/amk_runner.rb

@@ -49,7 +49,7 @@ module Ramekin
       ln("#@amk_path/samples/optimized", "#@workdir/samples/optimized")
       ln("#@amk_path/samples/EMPTY.brr", "#@workdir/samples/EMPTY.brr")
       if @meta.instruments.any?
-        sample_dir = "#@workdir/samples/#{basename}"
+        sample_dir = "#@workdir/samples/#{@meta.sample_path || basename}"
         FileUtils.mkdir_p(sample_dir)
 
         @meta.instruments.each do |inst|
@@ -80,9 +80,11 @@ module Ramekin
         FileUtils.cp("#@workdir/Visualizations/#{basename}.png", "./#{basename}.png")
         File.write("./#{basename}.txt", @txt)
 
-        FileUtils.mkdir_p("samples/#{basename}")
-        @meta.instruments.each do |inst|
-          FileUtils.cp(inst.sample_path, "./samples/#{basename}/#{inst.sample_name}")
+        if @meta.instruments.any?
+          FileUtils.mkdir_p("samples/#{basename}")
+          @meta.instruments.each do |inst|
+            FileUtils.cp(inst.sample_path, "./samples/#{basename}/#{inst.sample_name}")
+          end
         end
 
         packs = @meta.instruments.map(&:pack).uniq

data/lib/ramekin/channel_separator.rb

@@ -1,11 +1,12 @@
 module Ramekin
   class ChannelSeparator
-    def self.parse(stream)
-      new.tap { |x| x.parse(stream) }
+    def self.parse(stream, *a)
+      new(*a).tap { |x| x.parse(stream) }
     end
 
     attr_reader :preamble, :channels, :meta
-    def initialize
+    def initialize(sample_path=nil)
+      @sample_path = sample_path
       @preamble = []
       @channels = []
 
@@ -19,7 +20,7 @@ module Ramekin
     def parse(stream)
       stream.each do |el|
         if Token === el && el.type == :channel
-          @meta = Meta.new(@preamble.dup).tap(&:parse) if preamble?
+          @meta = Meta.new(@preamble.dup, @sample_path).tap(&:parse) if preamble?
           @meta.parse
 
           @current = (@channels[el.value.to_i] ||= [])

data/lib/ramekin/cli.rb

@@ -106,6 +106,8 @@ module Ramekin
         when '--help', '-help', '-h', '-?'
           usage
           return 0
+        when '--sample-path'
+          @sample_path = argv.shift or usage! 'missing path for --sample-path'
         when '--txt'
           @output_txt = argv.shift or usage! 'missing filename after --txt'
         when '--spc'
@@ -169,7 +171,7 @@ module Ramekin
 
       expanded = outer_chain.call(tokens)
 
-      channels = ChannelSeparator.parse(expanded)
+      channels = ChannelSeparator.parse(expanded, @sample_path)
 
       inner_chain = Processor.compose(
         NoteAggregator,

data/lib/ramekin/legato.rb

@@ -29,13 +29,19 @@ module Ramekin
 
   class LegatoLastNote < NoteWrapper
     def ticks
-      @note.ticks / 2
+      @note.ticks
     end
 
     def to_amk(current_octave=nil, divisor=1)
-      post_ticks = @note.ticks - ticks
+      post_ticks = @note.ticks - divisor
+      if post_ticks <= 0 || post_ticks % divisor != 0
+        return error! "too fast for legato: must have at least #{divisor*2} ticks at this bpm.", el: self
+      end
+
+      post_ticks /= divisor
+
       post_len = KNOWN_LENGTHS.fetch(post_ticks) { "=#{post_ticks}" }
-      "#{octave_amk(current_octave)}#{note_name}#{length_amk(divisor)}$f4$01^#{post_len}"
+      "#{octave_amk(current_octave)}#{note_name}=1$f4$01^#{post_len}"
     end
 
     def inspect

data/lib/ramekin/meta.rb

@@ -14,10 +14,12 @@ module Ramekin
     attr_reader :volume
     attr_reader :tempo
     attr_reader :echo
-    def initialize(elements)
+    attr_reader :sample_path
+    def initialize(elements, sample_path=nil)
       @elements = elements
       @instruments = []
       @sample_groups = []
+      @sample_path = sample_path
       @options = {}
     end
 
@@ -76,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
@@ -86,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
@@ -298,7 +305,7 @@ module Ramekin
 
     def pack_hexes
       # TODO: alts
-      @pack_hexes ||= @pack.tunings_for(sample_name).first
+      @pack_hexes ||= @pack.tunings_for(@path.value).first
     end
 
     def pack_gain

data/lib/ramekin/note_aggregator.rb

@@ -99,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

@@ -77,7 +77,7 @@ module Ramekin
       yield "#amk #{@track.meta.amk&.value || 2}\n\n"
 
       if m.instruments.any?
-        yield "#path #{@filename.chomp('.rmk').inspect}\n"
+        yield "#path #{(m.sample_path || @filename.chomp('.rmk')).inspect}\n"
         yield "#samples {\n"
         if m.sample_groups.empty?
           yield "  #default"

metadata

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