ramekin 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41708c800b1be418fd2b822f186c05050cf6609d4c5df882d665f65a5d4271a3
-  data.tar.gz: 859b92263a4f5e0108436ce915c7e64bf4efcf6769fbf8b7400a91f323aa52ec
+  metadata.gz: dc9d8831c982112091407c651b5f183b750c75d43d1e3d2615fbd89dc7b4446b
+  data.tar.gz: 23b5db297f7166f9257609ab45888f81894e2d5df8d40a922920efe56f4e948d
 SHA512:
-  metadata.gz: 254ca788893263a8062aeaafdbf11be7430721a067fa3c76c731e53ef3e38e5f806db23fe472e48d221f9b2947c15148f8f37cdda5ead244af77f36354ebf3cc
-  data.tar.gz: 900584ddce1cb339de309b1d8d3f28d394d29513f128e9f5686ed75567dbd250367c6418424a29367ed78394c09e6684bcc59fc5a332bcbed20b870b52888f19
+  metadata.gz: bd69f5639e4f86fb7792b38021a13e02f0604fd375f1821e59909b674d7160b9df2efad996cae43a94d47540f1ba33e051097b00f5278e02806b9f460859d916
+  data.tar.gz: 449a4e060eba4cb7b93d6ab6ea92a10f7ba99411f2f66d6b94f105f465541547c7c92475fd23891208ac806395bf7b1a575ea0737b906c6f03c6a505005c88b7

data/README.md

@@ -76,11 +76,14 @@ ramekin filename.rmk [flags]
             set up an SPC player if none is detected.
         --package my-cool-folder/
             create a package directory suitable for submission
-            to SMWC, complete with README and packaged samples.
+            to SMWC, complete with packaged samples.
         --wav filename.wav
         --wav filename.wav:N
-            (non-windows only)
             render N seconds of the file to WAV.
+            (non-windows only - windows users should use --play
+            and render from the SPCPlay program)
+        --vis filename.png
+            outputs AddmusicK's ARAM visualization to a specified file
 
 ramekin pack [flags]
     flags:

data/lib/ramekin/amk_runner.rb

@@ -78,21 +78,26 @@ module Ramekin
         binding.pry if ENV['RAMEKIN_DEBUG'] == '1'
       end
 
+      $stderr.puts(File.read(stats_file))
+
       return res
     end
 
+    def sampledir_name
+      @meta.sample_path || basename
+    end
+
     def export(outdir)
       Dir.chdir outdir do
         FileUtils.cp(@filename, "./#{basename}.rmk")
         FileUtils.cp(spc_file, "./#{basename}.spc")
-        FileUtils.cp(stats_file, "./#{basename}.stats.txt")
-        FileUtils.cp("#@workdir/Visualizations/#{basename}.png", "./#{basename}.png")
+
         File.write("./#{basename}.txt", @txt)
 
         if @meta.instruments.any?
-          FileUtils.mkdir_p("samples/#{basename}")
+          FileUtils.mkdir_p("./#{sampledir_name}")
           @meta.instruments.each do |inst|
-            FileUtils.cp(inst.sample_path, "./samples/#{basename}/#{inst.sample_name}")
+            FileUtils.cp(inst.sample_path, "./#{sampledir_name}/#{inst.sample_name}")
           end
         end
 
@@ -132,6 +137,10 @@ module Ramekin
       "#@workdir/stats/#{basename}.txt"
     end
 
+    def vis_file
+      "#@workdir/Visualizations/#{basename}.png"
+    end
+
     def spc
       File.read(spc_file)
     end

data/lib/ramekin/cli.rb

@@ -53,12 +53,14 @@ module Ramekin
       $stderr.puts "            #{default_text}"
       $stderr.puts "        --package my-cool-folder/"
       $stderr.puts "            create a package directory suitable for submission"
-      $stderr.puts "            to SMWC, complete with README and packaged samples."
+      $stderr.puts "            to SMWC, complete with packaged samples."
       unless Ramekin.config.windows?
         $stderr.puts "        --wav filename.wav"
         $stderr.puts "        --wav filename.wav:N"
         $stderr.puts "            render N seconds of the file to WAV. Requires spct."
       end
+      $stderr.puts "        --vis filename.png"
+      $stderr.puts "            outputs AddmusicK's ARAM visualization to a specified file"
       $stderr.puts ""
       $stderr.puts "ramekin package [flags]"
       $stderr.puts "ramekin pack [flags]"
@@ -129,6 +131,8 @@ module Ramekin
           @sample_path = argv.shift or usage! 'missing path for --sample-path'
         when '--txt'
           @output_txt = argv.shift or usage! 'missing filename after --txt'
+        when '--vis'
+          @output_vis = argv.shift or usage! 'missing filename after --vis'
         when '--spc'
           @output_spc = argv.shift or usage! 'missing filename after --spc'
         when '--package'
@@ -219,12 +223,13 @@ module Ramekin
         exit 1
       end
 
-      unless @output_txt || @output_package || @output_spc
+      unless @output_txt || @output_package || @output_spc || @output_vis
         warn <<~WARN
           no output specified. use either:
             --txt my_cool_file.txt
             --spc my_cool_file.spc
             --package my_cool_output_dir
+            --vis my_cool_png.png
             --play
             --wav my_cool_file.wav
         WARN
@@ -236,7 +241,7 @@ module Ramekin
         File.write(@output_txt, txt)
       end
 
-      if @output_spc || @output_package
+      if @output_spc || @output_package || @output_vis
         runner = AMKRunner.new(@infile, channels.meta, txt)
         result = runner.compile
         unless result && result.success?
@@ -259,6 +264,11 @@ module Ramekin
         MSG
       end
 
+      binding.pry
+      if @output_vis
+        FileUtils.cp(runner.vis_file, @output_vis)
+      end
+
       if @wav_file
         SPCPlayer.instance.setup!
         SPCPlayer.instance.render(@play_spc, @wav_file, @wav_seconds)
@@ -276,6 +286,8 @@ module Ramekin
       end
 
       tempfiles.each { |path| FileUtils.rm_r(path) if path && !path.empty? }
+
+      return 0
     end
 
     def package(*argv)
@@ -296,6 +308,8 @@ module Ramekin
         when '--list'
           @mode = :list
           @term = argv.shift || ''
+        else
+          usage!("unknown argument: #{h.inspect}")
         end
       end
 
@@ -363,6 +377,8 @@ module Ramekin
       if @setup_packages
         SamplePack.download_all!
       end
+
+      return 0
     end
 
     def search(term, list_matched: false, search_brr: false)
@@ -385,6 +401,8 @@ module Ramekin
           end
         end
       end
+
+      return 0
     end
 
     def dump_brrs(pack, brrs)

data/lib/ramekin/meta.rb

@@ -14,7 +14,6 @@ module Ramekin
     attr_reader :volume
     attr_reader :tempo
     attr_reader :echo
-    attr_reader :sample_path
     def initialize(elements, sample_path=nil)
       @elements = elements
       @instruments = []
@@ -23,6 +22,21 @@ module Ramekin
       @options = {}
     end
 
+    def sample_path_unsafe
+      return @sample_path if @sample_path
+
+      return "#{@title.value} - #{@game.value}" if @title && @game
+      return (@title || @game).value if @title || @game
+      nil
+    end
+
+    def sample_path
+      p = sample_path_unsafe
+      return nil if p.nil?
+
+      p.gsub(/[\\\/.]/, '_').gsub(/\s+/m, ' ')
+    end
+
     def echo_channel_bits
       (@echo_channels ||= Set.new).map { |x| 1 << x }.inject(0, &:|)
     end

data/lib/ramekin/renderer.rb

@@ -26,9 +26,6 @@ module Ramekin
       SMW::BUILTINS.each do |name, id|
         @instrument_index[name] = id
       end
-
-      # optional default octaves for instrument switching
-      @default_octaves = Hash.new(4)
     end
 
     def render(&b)
@@ -54,7 +51,7 @@ module Ramekin
       yield "  #comment #{m.comment.value.inspect}\n" if m.comment
       yield "}\n\n"
 
-      yield "; generated from #{@filename} by Ramekin\n"
+      yield "; generated from #{@filename} by Ramekin v#{RAMEKIN_VERSION}\n"
       yield "; https://codeberg.org/jneen/ramekin\n\n"
 
       amk = @track.meta.amk&.value || 4
@@ -70,7 +67,7 @@ module Ramekin
         yield "#path #{(m.sample_path || @filename.chomp('.rmk')).inspect}\n"
         yield "#samples {\n"
         if m.sample_groups.empty?
-          yield "  #default"
+          yield "  #default\n"
         else
           m.sample_groups.each do |group|
             yield "  ##{group.value}\n"
@@ -85,7 +82,6 @@ module Ramekin
         yield "#instruments {\n"
         m.instruments.each_with_index do |inst, i|
           @instrument_index[inst.name.value] = 30 + i
-          @default_octaves[inst.name.value] = inst.octave
           yield "  #{inst.to_amk}\n"
         end
         yield "}\n\n"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ramekin
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - jneen
 bindir: gembin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strscan
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.6
 specification_version: 4
 summary: A tool for making SMW music with AddmusicK
 test_files: []