picotune 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44e2be4c9ca5912ade8b1a2fc671fb2db219b9b49e4f2230fb4a8d6c28f47bd
-  data.tar.gz: 867c8d74c717daf05c2af573844f7bc7d455f2f1bb2cd1cac05c67f1869be13e
+  metadata.gz: a35c7146e96a70bdf13083331db163fda9137e6cd10baac06e0fd6ef517de77e
+  data.tar.gz: acd8d878432d7770e168aa0307b5d3496c502f22593ad2df5e2dcac651d91b94
 SHA512:
-  metadata.gz: c7ca9b3f10545cb1fa0a850bc615ae53e600be99b5eacf6bae966d75292525ff9d44501b7ef6ad8f035ce6684685bfcfafa124d69d29ab70f0afb4694c1e4eb0
-  data.tar.gz: c2313de52696a143dd00002f82a8ca96be25b7b28b79389f2ea5b7cb9bcaf79077fd15a3cdb374df55e6fab5fc3ca26e41e0ad6aebd4afb5e62062b0d781ded2
+  metadata.gz: 7607d472022133602b24139e9508d9bd68b4066994f445386faf2dac2272e132d5df6601423dbb0f292c10170f75f72650ed4ba38711c63d83e11e246c182efe
+  data.tar.gz: 4e5dbb38360c7f2db24cc0f7801a8973b79d4448cc72565913b4fd52d147514973c4ea3a2f1781602373d8d51d2e3b8d22211243b3996d2c3fa944c2a1e51657

data/lib/picotune.rb

@@ -221,10 +221,14 @@ class PicoTune::Phrase
 
       @melodies.each do |melody|
         temp = Array.new(buffer_size) { PicoTune::Sample.new } if melody.instrument.reverb?
-        sub_buffer_size = buffer_size / (@beats * @subbeats)
+        sub_buffer_size = (buffer_size.to_f / (@beats * @subbeats)).ceil
         last_step_number = -1
         carry_over = 0
 
+        if melody.pattern.steps.count != @beats * @subbeats
+          raise "Mismatch between Pattern \"#{melody.pattern.name}\", which has #{melody.pattern.steps.count} steps, and Phrase \"#{@name}\", which has #{@beats} beats and #{subbeats} subbeats (meaning any pattern it uses should have #{@beats * @subbeats} steps). Please check your pattern and phrase definitions to find the discrepancy!"
+        end
+
         melody.pattern.steps.each_with_index do |note, step_number|
           unless note == '.'
             buffer_pointer = step_number * sub_buffer_size
@@ -445,8 +449,13 @@ class PicoTune::Assembler
     phrases = list.select { |item| item['type'] == 'phrase' }.map do |item|
       melodies = item['melodies'].map do |m|
         instrument = instruments.find { |i| i.name == m[0] }
+
+        raise "Instrument named \"#{m[0]}\" doesn't exist!" unless instrument
+
         pattern = patterns.find { |p| p.name == m[1] }
 
+        raise "Pattern named \"#{m[1]}\" doesn't exist!" unless pattern
+
         PicoTune::Melody.new instrument, pattern
       end
 
@@ -460,13 +469,16 @@ class PicoTune::Assembler
     end
 
     sequence = list.find { |item| item['type'] == 'sequence' }
+
+    raise "Please define a sequence in your txt file with \"sequence s1 s2 s3...\" where s1/s2/s3/etc are names of phrases" unless sequence
+
     sequence['list'].each do |phrase_name|
       raise "undefined phrase \"#{phrase_name}\" in sequence" unless phrases.find { |p| p.name == phrase_name }
     end
 
-
     tune = list.find { |item| item['type'] == 'tune' }
-    raise 'undefined tune name' unless tune['name']
+
+    raise "Please define your tune's name in your txt file  with \"tune <tune name>\"" unless tune && tune['name']
 
     PicoTune::Tune.new tune['name'], sequence['list'], phrases
   end
@@ -497,9 +509,9 @@ class PicoTune::Parser
           item['list'] = parts[1..-1]
         elsif parts[0] == 'pattern'
           item['name'] = parts[1]
-          item['list'] = pattern_steps(parts[2])
+          item['list'] = pattern_steps parts[2..-1].join
         else
-          item['name'] = parts[1]
+          item['name'] = parts[1..-1].join
         end
 
         bag << item
@@ -512,7 +524,7 @@ class PicoTune::Parser
         elsif collecting_melodies
           bag.last['melodies'].push parts
         else
-          bag.last[parts[0]] = parts[1]
+          bag.last[parts[0]] = parts[1..-1].join
         end
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picotune
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Zachary Schroeder