ramekin 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999d9354b8f31a49551d78893fe986a38f9ff8ca4e2ecc880970bdde628e8ac0
-  data.tar.gz: f3e29e81592be14e9b888de2ca731cbc285fb43763b80e2320486bbf17694434
+  metadata.gz: 71e89ff9027d3342649de107de02ed46c622a95a9940fe94bb0ece781ac18790
+  data.tar.gz: 1d3b3a89ab873ab15e55a000912791ee7c232a53d462377803fdd8f9ef80e4e8
 SHA512:
-  metadata.gz: e4d0bba97851f3d9039710c750fbd1f2cdfb65f84d8279b628901b1e7e23990f5e7319264ba4f3dca4058bc7bc5b99b21078c8d65c0a20da06bb50cb6b740539
-  data.tar.gz: b69597095b27d7a1bfb268729bf44c510bdcf4109a747a677f6a5f9665948a71dcaf4a4c696d976c480373b84762b699cb2aad71749dfc21f64997e231ab9d8d
+  metadata.gz: e716543bbac8f7ae0fa72e5504fd3fad883b283b4adc3085f0de7bb5220bf1533dac433af06527d949a8acdb46a25beffa20334cf72bbb208ff2d2408a225fd1
+  data.tar.gz: 1cc81d357db65d9be8e5f54677ff3117c336656e1ee40ee53183b49f7ceee9c483d05cafdd190bc783dcc65d687af098f80ee7e54378c6c48eb2d62ebbbc64b7

data/README.md

@@ -53,9 +53,7 @@ ramekin compile -i filename.rmk [flags]
             output amk txt to this file.
             use a single dash (-) to print txt to stdout.
         --spc filename.spc
-            attempt to invoke AddmusicK to output an SPC
-            requires ADDMUSICK_DIR and ASAR_COMMAND
-            to be set.
+            attempt to invoke AddmusicK to output an SPC.
         --play
             play the generated SPC file. will automatically
             set up an SPC player if none is detected.
@@ -67,14 +65,14 @@ ramekin compile -i filename.rmk [flags]
             (non-windows only)
             render N seconds of the file to WAV.
 
-ramekin package [flags]
+ramekin pack [flags]
     flags:
         --update
-            download BRR packages from SMW Central.
+            download BRR packs from SMW Central.
         --search [text]
             search for BRR filenames.
         --list [text]
-            list all samples in packages matching [text].
+            list all samples in packs matching [text].
 
 ramekin setup [flags]
     flags:

data/gembin/ramekin

@@ -10,6 +10,11 @@ RAMEKIN_ASAR_DIR = './asar'
 RAMEKIN_SPC_PLAYER = '__auto__'
 RAMEKIN_VERSION = Gem.loaded_specs['ramekin'].version.to_s
 
+if ENV['RAMEKIN_DEBUG'] == '1'
+  require 'pry'
+  require 'pry-stack_explorer'
+end
+
 require_relative '../lib/ramekin'
 require_relative '../lib/ramekin/cli'
 

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

@@ -32,9 +32,7 @@ module Ramekin
       $stderr.puts "            output amk txt to this file."
       $stderr.puts "            use a single dash (-) to print txt to stdout."
       $stderr.puts "        --spc filename.spc"
-      $stderr.puts "            attempt to invoke AddmusicK to output an SPC"
-      $stderr.puts "            requires ADDMUSICK_DIR and ASAR_COMMAND"
-      $stderr.puts "            to be set."
+      $stderr.puts "            attempt to invoke AddmusicK to output an SPC."
       $stderr.puts "        --play"
       $stderr.puts "            play the generated SPC file. will automatically"
       $stderr.puts "            set up an SPC player if none is detected."
@@ -54,13 +52,14 @@ module Ramekin
       end
       $stderr.puts ""
       $stderr.puts "ramekin package [flags]"
+      $stderr.puts "ramekin pack [flags]"
       $stderr.puts "    flags:"
       $stderr.puts "        --update"
-      $stderr.puts "            download BRR packages from SMW Central."
+      $stderr.puts "            download BRR packs from SMW Central."
       $stderr.puts "        --search [text]"
       $stderr.puts "            search for BRR filenames."
       $stderr.puts "        --list [text]"
-      $stderr.puts "            list all samples in packages matching [text]."
+      $stderr.puts "            list all samples in packs matching [text]."
       $stderr.puts ""
       $stderr.puts "ramekin setup [flags]"
       $stderr.puts "    flags:"
@@ -107,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'
@@ -170,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,
@@ -367,7 +368,7 @@ module Ramekin
       case argv[0]
       when 'compile'
         compile(*argv[1..])
-      when 'package'
+      when 'package', 'pack'
         package(*argv[1..])
       when 'setup'
         setup(*argv[1..])

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
 
@@ -298,7 +300,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

@@ -57,15 +57,19 @@ module Ramekin
       end
     end
 
-    def length_amk(div)
-      if ticks % div != 0
+    def check_length!(t, div)
+      if t % 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
 

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"
@@ -239,6 +239,8 @@ module Ramekin
         else
           yield "p#{token.value} "
         end
+      when :n
+        yield "n#{token.value}"
       when :superloop
         yield " [[ "
       when :loop
@@ -295,13 +297,7 @@ module Ramekin
 
         ticks = sprintf("%02x", note.ticks)
         yield "$dd$#{ticks}$#{ticks}#{note.octave_amk}#{note.note.value}"
-
-        case peek
-        when NoteEvent
-          peek.extensions.concat(note.extensions)
-        else
-          yield "^=#{note.ticks}"
-        end
+        yield "^=#{note.ticks}"
 
         @octave = note.octave
       when 'legato'

data/lib/ramekin/sample_pack.rb

@@ -272,6 +272,7 @@ module Ramekin
         return
       end
 
+      $stderr.puts "downloading: #{name}:#{id}"
       download!
     end
 

data/lib/ramekin/tokenizer.rb

@@ -258,7 +258,7 @@ module Ramekin
       return [:l, m(1)] if match /l(\d+)/
       return [:amp] if match /[&]/
       return [:q, m(1)] if match /q(\d(?:,\h)?)/
-      return [:n, m(1)] if match /n(\h\h?)/
+      return [:n, m(1)] if match /n(\h\h)/
 
       error! "unknown token near: #{@scanner.peek(10)}", el: @last_token
 

metadata

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