beats 1.1.0 → 1.2.0

data/test/track_test.rb

@@ -27,55 +27,80 @@ class TrackTest < Test::Unit::TestCase
   def test_initialize
     test_tracks = generate_test_data()
     
-    assert_equal(test_tracks[0].beats, [0])
-    assert_equal(test_tracks[0].name, "bass")
+    assert_equal([0], test_tracks[0].beats)
+    assert_equal("bass", test_tracks[0].name)
     
-    assert_equal(test_tracks[1].beats, [0, 1])
-    assert_equal(test_tracks[1].name, "bass")
+    assert_equal([0, 1], test_tracks[1].beats)
+    assert_equal("bass", test_tracks[1].name)
     
-    assert_equal(test_tracks[2].beats, [3, 1])
-    assert_equal(test_tracks[3].beats, [0, 2, 2, 2, 2])
-    assert_equal(test_tracks[4].beats, [4])
-    assert_equal(test_tracks[5].beats, [2, 4, 4, 4, 2, 4, 4, 4, 4])
+    assert_equal([3, 1], test_tracks[2].beats)
+    assert_equal([0, 2, 2, 2, 2], test_tracks[3].beats)
+    assert_equal([4], test_tracks[4].beats)
+    assert_equal([2, 4, 4, 4, 2, 4, 4, 4, 4], test_tracks[5].beats)
   end
   
+  def test_tick_count
+    test_tracks = generate_test_data()
+    
+    assert_equal(0,  test_tracks[0].tick_count())
+    assert_equal(1,  test_tracks[1].tick_count())
+    assert_equal(4,  test_tracks[2].tick_count())
+    assert_equal(8,  test_tracks[3].tick_count())
+    assert_equal(4,  test_tracks[4].tick_count())
+    assert_equal(32, test_tracks[5].tick_count())
+  end
+
+  def test_intro_sample_length
+    # TODO: Add tests for when tick_sample_length has a non-zero remainder
+    
+    test_tracks = generate_test_data()
+
+    tick_sample_length = W.sample_data.length        # 6179.0
+    assert_equal(0,     test_tracks[0].intro_sample_length(tick_sample_length))
+    assert_equal(0,     test_tracks[1].intro_sample_length(tick_sample_length))
+    assert_equal(18537, test_tracks[2].intro_sample_length(tick_sample_length))
+    assert_equal(0,     test_tracks[3].intro_sample_length(tick_sample_length))
+    assert_equal(24716, test_tracks[4].intro_sample_length(tick_sample_length))
+    assert_equal(12358, test_tracks[5].intro_sample_length(tick_sample_length))
+  end
+
   def test_sample_length
     tick_sample_lengths = [
-      W.sample_data.length,                           # 13860.0
-      (W.sample_rate * SECONDS_IN_MINUTE) / 99 / 4,   # 6681.81818181818
-      (W.sample_rate * SECONDS_IN_MINUTE) / 41 / 4    # 16134.1463414634
+      W.sample_data.length,                           # 13860.0 - FIXME, not correct
+      (W.sample_rate * SECONDS_IN_MINUTE) / 99 / 4,   # 6681.81818181818 - FIXME, not correct
+      (W.sample_rate * SECONDS_IN_MINUTE) / 41 / 4    # 16134.1463414634 - FIXME, not correct
     ]
 
-    tick_sample_lengths.each { |tick_sample_length| helper_test_sample_length(tick_sample_length) }
+    tick_sample_lengths.each {|tick_sample_length| helper_test_sample_length(tick_sample_length) }
   end
 
   def helper_test_sample_length(tick_sample_length)
     test_tracks = generate_test_data()
     
-    assert_equal(test_tracks[0].sample_length(tick_sample_length), 0)
-    assert_equal(test_tracks[0].sample_length(tick_sample_length), test_tracks[0].sample_data(tick_sample_length)[:primary].length)
+    assert_equal(0, test_tracks[0].sample_length(tick_sample_length))
+    assert_equal(test_tracks[0].sample_data(tick_sample_length)[:primary].length, test_tracks[0].sample_length(tick_sample_length))
     
-    assert_equal(test_tracks[1].sample_length(tick_sample_length), tick_sample_length.floor)
-    assert_equal(test_tracks[1].sample_length(tick_sample_length), test_tracks[1].sample_data(tick_sample_length)[:primary].length)
+    assert_equal(tick_sample_length.floor, test_tracks[1].sample_length(tick_sample_length))
+    assert_equal(test_tracks[1].sample_data(tick_sample_length)[:primary].length, test_tracks[1].sample_length(tick_sample_length))
     
-    assert_equal(test_tracks[2].sample_length(tick_sample_length), (tick_sample_length * 4).floor)
-    assert_equal(test_tracks[2].sample_length(tick_sample_length), test_tracks[2].sample_data(tick_sample_length)[:primary].length)
+    assert_equal((tick_sample_length * 4).floor, test_tracks[2].sample_length(tick_sample_length))
+    assert_equal(test_tracks[2].sample_data(tick_sample_length)[:primary].length, test_tracks[2].sample_length(tick_sample_length))
     
-    assert_equal(test_tracks[3].sample_length(tick_sample_length), (tick_sample_length * 8).floor)
-    assert_equal(test_tracks[3].sample_length(tick_sample_length), test_tracks[3].sample_data(tick_sample_length)[:primary].length)
+    assert_equal((tick_sample_length * 8).floor, test_tracks[3].sample_length(tick_sample_length))
+    assert_equal(test_tracks[3].sample_data(tick_sample_length)[:primary].length, test_tracks[3].sample_length(tick_sample_length))
     
-    assert_equal(test_tracks[4].sample_length(tick_sample_length), (tick_sample_length * 4).floor)
-    assert_equal(test_tracks[4].sample_length(tick_sample_length), test_tracks[4].sample_data(tick_sample_length)[:primary].length)
+    assert_equal((tick_sample_length * 4).floor, test_tracks[4].sample_length(tick_sample_length))
+    assert_equal(test_tracks[4].sample_data(tick_sample_length)[:primary].length, test_tracks[4].sample_length(tick_sample_length))
     
-    assert_equal(test_tracks[5].sample_length(tick_sample_length), (tick_sample_length * 32).floor)
-    assert_equal(test_tracks[5].sample_length(tick_sample_length), test_tracks[5].sample_data(tick_sample_length)[:primary].length)
+    assert_equal((tick_sample_length * 32).floor, test_tracks[5].sample_length(tick_sample_length))
+    assert_equal(test_tracks[5].sample_data(tick_sample_length)[:primary].length, test_tracks[5].sample_length(tick_sample_length))
   end
   
   def test_sample_length_with_overflow
     tick_sample_lengths = [
-      W.sample_data.length,                           # 13860.0
-      (W.sample_rate * SECONDS_IN_MINUTE) / 99 / 4,   # 6681.81818181818
-      (W.sample_rate * SECONDS_IN_MINUTE) / 41 / 4    # 16134.1463414634
+      W.sample_data.length,                           # 13860.0 - FIXME, not correct
+      (W.sample_rate * SECONDS_IN_MINUTE) / 99 / 4,   # 6681.81818181818 - FIXME, not correct
+      (W.sample_rate * SECONDS_IN_MINUTE) / 41 / 4    # 16134.1463414634 - FIXME, not correct
     ]
 
     tick_sample_lengths.each { |tick_sample_length| helper_test_sample_length_with_overflow(tick_sample_length) }
@@ -86,69 +111,50 @@ class TrackTest < Test::Unit::TestCase
     test_tracks = generate_test_data()
     
     sample_data = test_tracks[0].sample_data(tick_sample_length)
-    assert_equal(test_tracks[0].sample_length_with_overflow(tick_sample_length), 0)
-    assert_equal(test_tracks[0].sample_length_with_overflow(tick_sample_length), sample_data[:primary].length + sample_data[:overflow].length)
+    assert_equal(0, test_tracks[0].sample_length_with_overflow(tick_sample_length))
+    assert_equal(sample_data[:primary].length + sample_data[:overflow].length, test_tracks[0].sample_length_with_overflow(tick_sample_length))
     
     sample_data = test_tracks[1].sample_data(tick_sample_length)
     if(wave_sample_length > tick_sample_length * test_tracks[1].beats.last)
-      assert_equal(test_tracks[1].sample_length_with_overflow(tick_sample_length), wave_sample_length)
+      assert_equal(wave_sample_length, test_tracks[1].sample_length_with_overflow(tick_sample_length))
     else
-      assert_equal(test_tracks[1].sample_length_with_overflow(tick_sample_length), tick_sample_length.floor)
-      assert_equal(test_tracks[1].sample_length_with_overflow(tick_sample_length), sample_data[:primary].length + sample_data[:overflow].length)
+      assert_equal(tick_sample_length.floor, test_tracks[1].sample_length_with_overflow(tick_sample_length))
+      assert_equal(sample_data[:primary].length + sample_data[:overflow].length, test_tracks[1].sample_length_with_overflow(tick_sample_length))
     end
     
     sample_data = test_tracks[2].sample_data(tick_sample_length)
     if(wave_sample_length > tick_sample_length * test_tracks[2].beats.last)
-      assert_equal(test_tracks[2].sample_length_with_overflow(tick_sample_length), (tick_sample_length * 4).floor + (wave_sample_length - tick_sample_length.floor))
-      assert_equal(test_tracks[2].sample_length_with_overflow(tick_sample_length), sample_data[:primary].length + sample_data[:overflow].length)
+      assert_equal((tick_sample_length * 4).floor + (wave_sample_length - tick_sample_length.floor), test_tracks[2].sample_length_with_overflow(tick_sample_length))
+      assert_equal(sample_data[:primary].length + sample_data[:overflow].length, test_tracks[2].sample_length_with_overflow(tick_sample_length))
     else
-      assert_equal(test_tracks[2].sample_length_with_overflow(tick_sample_length), (tick_sample_length * 4).floor)
-      assert_equal(test_tracks[2].sample_length_with_overflow(tick_sample_length), sample_data[:primary].length + sample_data[:overflow].length)
+      assert_equal((tick_sample_length * 4).floor, test_tracks[2].sample_length_with_overflow(tick_sample_length))
+      assert_equal(sample_data[:primary].length + sample_data[:overflow].length, test_tracks[2].sample_length_with_overflow(tick_sample_length))
     end
     
     sample_data = test_tracks[3].sample_data(tick_sample_length)
     if(wave_sample_length > tick_sample_length * test_tracks[3].beats.last)
-      assert_equal(test_tracks[3].sample_length_with_overflow(tick_sample_length), (tick_sample_length * 8).floor + (wave_sample_length - (tick_sample_length * 2).floor))
-      assert_equal(test_tracks[3].sample_length_with_overflow(tick_sample_length), sample_data[:primary].length + sample_data[:overflow].length)
+      assert_equal((tick_sample_length * 8).floor + (wave_sample_length - (tick_sample_length * 2).floor), test_tracks[3].sample_length_with_overflow(tick_sample_length))
+      assert_equal(sample_data[:primary].length + sample_data[:overflow].length, test_tracks[3].sample_length_with_overflow(tick_sample_length))
     else
-      assert_equal(test_tracks[3].sample_length_with_overflow(tick_sample_length), (tick_sample_length * 8).floor)
-      assert_equal(test_tracks[3].sample_length_with_overflow(tick_sample_length), sample_data[:primary].length + sample_data[:overflow].length)
+      assert_equal((tick_sample_length * 8).floor, test_tracks[3].sample_length_with_overflow(tick_sample_length))
+      assert_equal(sample_data[:primary].length + sample_data[:overflow].length, test_tracks[3].sample_length_with_overflow(tick_sample_length))
     end
     
     sample_data = test_tracks[4].sample_data(tick_sample_length)
-    assert_equal(test_tracks[4].sample_length_with_overflow(tick_sample_length), (tick_sample_length * 4).floor)
-    assert_equal(test_tracks[4].sample_length_with_overflow(tick_sample_length), sample_data[:primary].length + sample_data[:overflow].length)
+    assert_equal((tick_sample_length * 4).floor, test_tracks[4].sample_length_with_overflow(tick_sample_length))
+    assert_equal(sample_data[:primary].length + sample_data[:overflow].length, test_tracks[4].sample_length_with_overflow(tick_sample_length))
     
     sample_data = test_tracks[5].sample_data(tick_sample_length)
-    assert_equal(test_tracks[5].sample_length_with_overflow(tick_sample_length), (tick_sample_length * 32).floor)
-    assert_equal(test_tracks[5].sample_length_with_overflow(tick_sample_length), sample_data[:primary].length + sample_data[:overflow].length)
+    assert_equal((tick_sample_length * 32).floor, test_tracks[5].sample_length_with_overflow(tick_sample_length))
+    assert_equal(sample_data[:primary].length + sample_data[:overflow].length, test_tracks[5].sample_length_with_overflow(tick_sample_length))
   end
-  
-  def test_sample_data_overflow
-    track = generate_test_data()[2]
-    tick_sample_length = W.sample_data.length   # 6179.0
     
-    overflow = W.sample_data[(W.sample_data.length / 2)..W.sample_data.length]
-    expected_sample_data = zeroes(tick_sample_length * 3) + W.sample_data
-    expected_sample_data[0...overflow.length] = overflow
-    actual_sample_data = track.sample_data(tick_sample_length, overflow)
-    assert_equal(actual_sample_data[:primary], expected_sample_data)
-
-    # Call sample_data() again with different overflow, to verify that cached
-    # sample data only contains the primary sample data.
-    overflow = W.sample_data[0..(W.sample_data.length / 2)]
-    expected_sample_data = zeroes(tick_sample_length * 3) + W.sample_data
-    expected_sample_data[0...overflow.length] = overflow
-    actual_sample_data = track.sample_data(tick_sample_length, overflow)
-    assert_equal(actual_sample_data[:primary], expected_sample_data)
-  end
-  
   def test_sample_data
     sample_data = W.sample_data
     
     tick_sample_length = W.sample_data.length   # 6179.0
     test_tracks = generate_test_data()
-    assert_equal(test_tracks[0].sample_data(tick_sample_length), {:primary => [], :overflow => []})
+    assert_equal({:primary => [], :overflow => []}, test_tracks[0].sample_data(tick_sample_length))
     helper_test_sample_data(test_tracks[1], tick_sample_length, sample_data[0...tick_sample_length], [])
     helper_test_sample_data(test_tracks[2], tick_sample_length, zeroes(tick_sample_length * 3) + sample_data, [])
     helper_test_sample_data(test_tracks[3], tick_sample_length, (sample_data + zeroes(tick_sample_length)) * 4, [])
@@ -158,7 +164,7 @@ class TrackTest < Test::Unit::TestCase
 
     tick_sample_length = (W.sample_rate * 60.0) / 220 / 4   # 3006.818181818181818
     test_tracks = generate_test_data()
-    assert_equal(test_tracks[0].sample_data(tick_sample_length), {:primary => [], :overflow => []})
+    assert_equal({:primary => [], :overflow => []}, test_tracks[0].sample_data(tick_sample_length))
     helper_test_sample_data(test_tracks[1], tick_sample_length, sample_data[0...tick_sample_length.floor], sample_data[tick_sample_length.floor...sample_data.length])
     #helper_test_sample_data(test_tracks[2], tick_sample_length, zeroes(tick_sample_length * 3) + sample_data[0..tick_sample_length.floor], sample_data[(tick_sample_length.floor)...sample_data.length])
     #helper_test_sample_data(test_tracks[3], tick_sample_length,
@@ -172,7 +178,7 @@ class TrackTest < Test::Unit::TestCase
 
     tick_sample_length = (W.sample_rate * 60.0) / 99 / 4   # 6681.818181818181818
     test_tracks = generate_test_data()    
-    assert_equal(test_tracks[0].sample_data(tick_sample_length), {:primary => [], :overflow => []})
+    assert_equal({:primary => [], :overflow => []}, test_tracks[0].sample_data(tick_sample_length))
     helper_test_sample_data(test_tracks[1], tick_sample_length, sample_data + zeroes(tick_sample_length - W.sample_data.length), [])
     helper_test_sample_data(test_tracks[2], tick_sample_length, zeroes(tick_sample_length * 3) + sample_data + zeroes(tick_sample_length - sample_data.length + 1), [])
     helper_test_sample_data(test_tracks[3], tick_sample_length,
@@ -187,12 +193,12 @@ class TrackTest < Test::Unit::TestCase
   def helper_test_sample_data(track, tick_sample_length, expected_primary, expected_overflow)
     sample_data = track.sample_data(tick_sample_length)
     
-    assert_equal(sample_data.class, Hash)
-    assert_equal(sample_data.keys.map{|key| key.to_s}.sort, ["overflow", "primary"])
-    assert_equal(sample_data[:primary].length, expected_primary.length)
-    assert_equal(sample_data[:overflow].length, expected_overflow.length)
-    assert_equal(sample_data[:primary], expected_primary)
-    assert_equal(sample_data[:overflow], expected_overflow)
+    assert_equal(Hash,                      sample_data.class)
+    assert_equal(["overflow", "primary"],   sample_data.keys.map{|key| key.to_s}.sort)
+    assert_equal(expected_primary.length,   sample_data[:primary].length)
+    assert_equal(expected_overflow.length,  sample_data[:overflow].length)
+    assert_equal(expected_primary,          sample_data[:primary])
+    assert_equal(expected_overflow,         sample_data[:overflow])
   end
   
 private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beats
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Joel Strait
@@ -9,20 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -04:00
+date: 2010-07-13 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: wavefile
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
-description: A drum machine that uses text files. Feed it a YAML file, and it will produce a Wave file.
+dependencies: []
+
+description: A command-line drum machine. Feed it a song notated in YAML, and it will produce a precision-milled Wave file of impeccable timing and feel.
 email: ""
 executables: 
 - beats
@@ -33,24 +24,162 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - README.markdown
+- lib/beats.rb
+- lib/beatswavefile.rb
 - lib/kit.rb
 - lib/pattern.rb
 - lib/song.rb
+- lib/songoptimizer.rb
 - lib/songparser.rb
+- lib/songsplitter.rb
 - lib/track.rb
+- lib/wavefile.rb
 - bin/beats
+- test/examples/combined.wav
+- test/examples/split-agogo_high.wav
+- test/examples/split-bass.wav
+- test/examples/split-hh_closed.wav
+- test/examples/split-snare.wav
+- test/examples/split-tom2.wav
+- test/examples/split-tom4.wav
+- test/fixtures/expected_output/example_combined_mono_16.wav
+- test/fixtures/expected_output/example_combined_mono_8.wav
+- test/fixtures/expected_output/example_combined_stereo_16.wav
+- test/fixtures/expected_output/example_combined_stereo_8.wav
+- test/fixtures/expected_output/example_split_mono_16-agogo.wav
+- test/fixtures/expected_output/example_split_mono_16-bass.wav
+- test/fixtures/expected_output/example_split_mono_16-hh_closed.wav
+- test/fixtures/expected_output/example_split_mono_16-snare.wav
+- test/fixtures/expected_output/example_split_mono_16-tom2_mono_16.wav
+- test/fixtures/expected_output/example_split_mono_16-tom4_mono_16.wav
+- test/fixtures/expected_output/example_split_mono_8-agogo.wav
+- test/fixtures/expected_output/example_split_mono_8-bass.wav
+- test/fixtures/expected_output/example_split_mono_8-hh_closed.wav
+- test/fixtures/expected_output/example_split_mono_8-snare.wav
+- test/fixtures/expected_output/example_split_mono_8-tom2_mono_8.wav
+- test/fixtures/expected_output/example_split_mono_8-tom4_mono_8.wav
+- test/fixtures/expected_output/example_split_stereo_16-agogo.wav
+- test/fixtures/expected_output/example_split_stereo_16-bass.wav
+- test/fixtures/expected_output/example_split_stereo_16-hh_closed.wav
+- test/fixtures/expected_output/example_split_stereo_16-snare.wav
+- test/fixtures/expected_output/example_split_stereo_16-tom2_stereo_16.wav
+- test/fixtures/expected_output/example_split_stereo_16-tom4_stereo_16.wav
+- test/fixtures/expected_output/example_split_stereo_8-agogo.wav
+- test/fixtures/expected_output/example_split_stereo_8-bass.wav
+- test/fixtures/expected_output/example_split_stereo_8-hh_closed.wav
+- test/fixtures/expected_output/example_split_stereo_8-snare.wav
+- test/fixtures/expected_output/example_split_stereo_8-tom2_stereo_8.wav
+- test/fixtures/expected_output/example_split_stereo_8-tom4_stereo_8.wav
+- test/fixtures/invalid/bad_repeat_count.txt
+- test/fixtures/invalid/bad_rhythm.txt
+- test/fixtures/invalid/bad_structure.txt
+- test/fixtures/invalid/bad_tempo.txt
+- test/fixtures/invalid/no_header.txt
+- test/fixtures/invalid/no_structure.txt
+- test/fixtures/invalid/pattern_with_no_tracks.txt
+- test/fixtures/invalid/sound_in_kit_not_found.txt
+- test/fixtures/invalid/sound_in_track_not_found.txt
+- test/fixtures/invalid/template.txt
+- test/fixtures/valid/example_mono_16.txt
+- test/fixtures/valid/example_mono_8.txt
+- test/fixtures/valid/example_no_kit.txt
+- test/fixtures/valid/example_stereo_16.txt
+- test/fixtures/valid/example_stereo_8.txt
+- test/fixtures/valid/example_with_empty_track.txt
+- test/fixtures/valid/example_with_kit.txt
+- test/fixtures/valid/no_tempo.txt
+- test/fixtures/valid/pattern_with_overflow.txt
+- test/fixtures/valid/repeats_not_specified.txt
+- test/fixtures/yaml/song_yaml.txt
 - test/includes.rb
+- test/integration.rb
 - test/kit_test.rb
 - test/pattern_test.rb
 - test/song_test.rb
+- test/songoptimizer_test.rb
 - test/songparser_test.rb
+- test/sounds/agogo_high_mono_16.wav
+- test/sounds/agogo_high_mono_8.wav
+- test/sounds/agogo_high_stereo_16.wav
+- test/sounds/agogo_high_stereo_8.wav
+- test/sounds/agogo_low_mono_16.wav
+- test/sounds/agogo_low_mono_8.wav
+- test/sounds/agogo_low_stereo_16.wav
+- test/sounds/agogo_low_stereo_8.wav
+- test/sounds/bass2_mono_16.wav
+- test/sounds/bass2_mono_8.wav
+- test/sounds/bass2_stereo_16.wav
+- test/sounds/bass2_stereo_8.wav
 - test/sounds/bass_mono_16.wav
 - test/sounds/bass_mono_8.wav
 - test/sounds/bass_stereo_16.wav
+- test/sounds/bass_stereo_8.wav
+- test/sounds/clave_high_mono_16.wav
+- test/sounds/clave_high_mono_8.wav
+- test/sounds/clave_high_stereo_16.wav
+- test/sounds/clave_high_stereo_8.wav
+- test/sounds/clave_low_mono_16.wav
+- test/sounds/clave_low_mono_8.wav
+- test/sounds/clave_low_stereo_16.wav
+- test/sounds/clave_low_stereo_8.wav
+- test/sounds/conga_high_mono_16.wav
+- test/sounds/conga_high_mono_8.wav
+- test/sounds/conga_high_stereo_16.wav
+- test/sounds/conga_high_stereo_8.wav
+- test/sounds/conga_low_mono_16.wav
+- test/sounds/conga_low_mono_8.wav
+- test/sounds/conga_low_stereo_16.wav
+- test/sounds/conga_low_stereo_8.wav
+- test/sounds/cowbell_high_mono_16.wav
+- test/sounds/cowbell_high_mono_8.wav
+- test/sounds/cowbell_high_stereo_16.wav
+- test/sounds/cowbell_high_stereo_8.wav
+- test/sounds/cowbell_low_mono_16.wav
+- test/sounds/cowbell_low_mono_8.wav
+- test/sounds/cowbell_low_stereo_16.wav
+- test/sounds/cowbell_low_stereo_8.wav
+- test/sounds/hh_closed_mono_16.wav
 - test/sounds/hh_closed_mono_8.wav
+- test/sounds/hh_closed_stereo_16.wav
+- test/sounds/hh_closed_stereo_8.wav
+- test/sounds/hh_open_mono_16.wav
 - test/sounds/hh_open_mono_8.wav
+- test/sounds/hh_open_stereo_16.wav
+- test/sounds/hh_open_stereo_8.wav
+- test/sounds/ride_mono_16.wav
 - test/sounds/ride_mono_8.wav
+- test/sounds/ride_stereo_16.wav
+- test/sounds/ride_stereo_8.wav
+- test/sounds/rim_mono_16.wav
+- test/sounds/rim_mono_8.wav
+- test/sounds/rim_stereo_16.wav
+- test/sounds/rim_stereo_8.wav
+- test/sounds/sine-mono-8bit.wav
+- test/sounds/snare2_mono_16.wav
+- test/sounds/snare2_mono_8.wav
+- test/sounds/snare2_stereo_16.wav
+- test/sounds/snare2_stereo_8.wav
+- test/sounds/snare_mono_16.wav
 - test/sounds/snare_mono_8.wav
+- test/sounds/snare_stereo_16.wav
+- test/sounds/snare_stereo_8.wav
+- test/sounds/tom1_mono_16.wav
+- test/sounds/tom1_mono_8.wav
+- test/sounds/tom1_stereo_16.wav
+- test/sounds/tom1_stereo_8.wav
+- test/sounds/tom2_mono_16.wav
+- test/sounds/tom2_mono_8.wav
+- test/sounds/tom2_stereo_16.wav
+- test/sounds/tom2_stereo_8.wav
+- test/sounds/tom3_mono_16.wav
+- test/sounds/tom3_mono_8.wav
+- test/sounds/tom3_stereo_16.wav
+- test/sounds/tom3_stereo_8.wav
+- test/sounds/tom4_mono_16.wav
+- test/sounds/tom4_mono_8.wav
+- test/sounds/tom4_stereo_16.wav
+- test/sounds/tom4_stereo_8.wav
+- test/sounds/tone.wav
 - test/track_test.rb
 has_rdoc: true
 homepage: http://beatsdrummachine.com/
@@ -79,18 +208,151 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: A drum machine that uses text files. Feed it a YAML file, and it will produce a Wave file.
+summary: A command-line drum machine. Feed it a song notated in YAML, and it will produce a precision-milled Wave file of impeccable timing and feel.
 test_files: 
+- test/examples/combined.wav
+- test/examples/split-agogo_high.wav
+- test/examples/split-bass.wav
+- test/examples/split-hh_closed.wav
+- test/examples/split-snare.wav
+- test/examples/split-tom2.wav
+- test/examples/split-tom4.wav
+- test/fixtures/expected_output/example_combined_mono_16.wav
+- test/fixtures/expected_output/example_combined_mono_8.wav
+- test/fixtures/expected_output/example_combined_stereo_16.wav
+- test/fixtures/expected_output/example_combined_stereo_8.wav
+- test/fixtures/expected_output/example_split_mono_16-agogo.wav
+- test/fixtures/expected_output/example_split_mono_16-bass.wav
+- test/fixtures/expected_output/example_split_mono_16-hh_closed.wav
+- test/fixtures/expected_output/example_split_mono_16-snare.wav
+- test/fixtures/expected_output/example_split_mono_16-tom2_mono_16.wav
+- test/fixtures/expected_output/example_split_mono_16-tom4_mono_16.wav
+- test/fixtures/expected_output/example_split_mono_8-agogo.wav
+- test/fixtures/expected_output/example_split_mono_8-bass.wav
+- test/fixtures/expected_output/example_split_mono_8-hh_closed.wav
+- test/fixtures/expected_output/example_split_mono_8-snare.wav
+- test/fixtures/expected_output/example_split_mono_8-tom2_mono_8.wav
+- test/fixtures/expected_output/example_split_mono_8-tom4_mono_8.wav
+- test/fixtures/expected_output/example_split_stereo_16-agogo.wav
+- test/fixtures/expected_output/example_split_stereo_16-bass.wav
+- test/fixtures/expected_output/example_split_stereo_16-hh_closed.wav
+- test/fixtures/expected_output/example_split_stereo_16-snare.wav
+- test/fixtures/expected_output/example_split_stereo_16-tom2_stereo_16.wav
+- test/fixtures/expected_output/example_split_stereo_16-tom4_stereo_16.wav
+- test/fixtures/expected_output/example_split_stereo_8-agogo.wav
+- test/fixtures/expected_output/example_split_stereo_8-bass.wav
+- test/fixtures/expected_output/example_split_stereo_8-hh_closed.wav
+- test/fixtures/expected_output/example_split_stereo_8-snare.wav
+- test/fixtures/expected_output/example_split_stereo_8-tom2_stereo_8.wav
+- test/fixtures/expected_output/example_split_stereo_8-tom4_stereo_8.wav
+- test/fixtures/invalid/bad_repeat_count.txt
+- test/fixtures/invalid/bad_rhythm.txt
+- test/fixtures/invalid/bad_structure.txt
+- test/fixtures/invalid/bad_tempo.txt
+- test/fixtures/invalid/no_header.txt
+- test/fixtures/invalid/no_structure.txt
+- test/fixtures/invalid/pattern_with_no_tracks.txt
+- test/fixtures/invalid/sound_in_kit_not_found.txt
+- test/fixtures/invalid/sound_in_track_not_found.txt
+- test/fixtures/invalid/template.txt
+- test/fixtures/valid/example_mono_16.txt
+- test/fixtures/valid/example_mono_8.txt
+- test/fixtures/valid/example_no_kit.txt
+- test/fixtures/valid/example_stereo_16.txt
+- test/fixtures/valid/example_stereo_8.txt
+- test/fixtures/valid/example_with_empty_track.txt
+- test/fixtures/valid/example_with_kit.txt
+- test/fixtures/valid/no_tempo.txt
+- test/fixtures/valid/pattern_with_overflow.txt
+- test/fixtures/valid/repeats_not_specified.txt
+- test/fixtures/yaml/song_yaml.txt
 - test/includes.rb
+- test/integration.rb
 - test/kit_test.rb
 - test/pattern_test.rb
 - test/song_test.rb
+- test/songoptimizer_test.rb
 - test/songparser_test.rb
+- test/sounds/agogo_high_mono_16.wav
+- test/sounds/agogo_high_mono_8.wav
+- test/sounds/agogo_high_stereo_16.wav
+- test/sounds/agogo_high_stereo_8.wav
+- test/sounds/agogo_low_mono_16.wav
+- test/sounds/agogo_low_mono_8.wav
+- test/sounds/agogo_low_stereo_16.wav
+- test/sounds/agogo_low_stereo_8.wav
+- test/sounds/bass2_mono_16.wav
+- test/sounds/bass2_mono_8.wav
+- test/sounds/bass2_stereo_16.wav
+- test/sounds/bass2_stereo_8.wav
 - test/sounds/bass_mono_16.wav
 - test/sounds/bass_mono_8.wav
 - test/sounds/bass_stereo_16.wav
+- test/sounds/bass_stereo_8.wav
+- test/sounds/clave_high_mono_16.wav
+- test/sounds/clave_high_mono_8.wav
+- test/sounds/clave_high_stereo_16.wav
+- test/sounds/clave_high_stereo_8.wav
+- test/sounds/clave_low_mono_16.wav
+- test/sounds/clave_low_mono_8.wav
+- test/sounds/clave_low_stereo_16.wav
+- test/sounds/clave_low_stereo_8.wav
+- test/sounds/conga_high_mono_16.wav
+- test/sounds/conga_high_mono_8.wav
+- test/sounds/conga_high_stereo_16.wav
+- test/sounds/conga_high_stereo_8.wav
+- test/sounds/conga_low_mono_16.wav
+- test/sounds/conga_low_mono_8.wav
+- test/sounds/conga_low_stereo_16.wav
+- test/sounds/conga_low_stereo_8.wav
+- test/sounds/cowbell_high_mono_16.wav
+- test/sounds/cowbell_high_mono_8.wav
+- test/sounds/cowbell_high_stereo_16.wav
+- test/sounds/cowbell_high_stereo_8.wav
+- test/sounds/cowbell_low_mono_16.wav
+- test/sounds/cowbell_low_mono_8.wav
+- test/sounds/cowbell_low_stereo_16.wav
+- test/sounds/cowbell_low_stereo_8.wav
+- test/sounds/hh_closed_mono_16.wav
 - test/sounds/hh_closed_mono_8.wav
+- test/sounds/hh_closed_stereo_16.wav
+- test/sounds/hh_closed_stereo_8.wav
+- test/sounds/hh_open_mono_16.wav
 - test/sounds/hh_open_mono_8.wav
+- test/sounds/hh_open_stereo_16.wav
+- test/sounds/hh_open_stereo_8.wav
+- test/sounds/ride_mono_16.wav
 - test/sounds/ride_mono_8.wav
+- test/sounds/ride_stereo_16.wav
+- test/sounds/ride_stereo_8.wav
+- test/sounds/rim_mono_16.wav
+- test/sounds/rim_mono_8.wav
+- test/sounds/rim_stereo_16.wav
+- test/sounds/rim_stereo_8.wav
+- test/sounds/sine-mono-8bit.wav
+- test/sounds/snare2_mono_16.wav
+- test/sounds/snare2_mono_8.wav
+- test/sounds/snare2_stereo_16.wav
+- test/sounds/snare2_stereo_8.wav
+- test/sounds/snare_mono_16.wav
 - test/sounds/snare_mono_8.wav
+- test/sounds/snare_stereo_16.wav
+- test/sounds/snare_stereo_8.wav
+- test/sounds/tom1_mono_16.wav
+- test/sounds/tom1_mono_8.wav
+- test/sounds/tom1_stereo_16.wav
+- test/sounds/tom1_stereo_8.wav
+- test/sounds/tom2_mono_16.wav
+- test/sounds/tom2_mono_8.wav
+- test/sounds/tom2_stereo_16.wav
+- test/sounds/tom2_stereo_8.wav
+- test/sounds/tom3_mono_16.wav
+- test/sounds/tom3_mono_8.wav
+- test/sounds/tom3_stereo_16.wav
+- test/sounds/tom3_stereo_8.wav
+- test/sounds/tom4_mono_16.wav
+- test/sounds/tom4_mono_8.wav
+- test/sounds/tom4_stereo_16.wav
+- test/sounds/tom4_stereo_8.wav
+- test/sounds/tone.wav
 - test/track_test.rb