beats 1.3.0 → 2.0.0

data/test/pattern_test.rb

@@ -1,6 +1,6 @@
 require 'includes'
 
-class PatternTest < Test::Unit::TestCase
+class PatternTest < Minitest::Test
   SAMPLE_RATE = 44100
   SECONDS_IN_MINUTE = 60.0
 
@@ -42,6 +42,60 @@ class PatternTest < Test::Unit::TestCase
     assert_equal(pattern.tracks.length, 3)
   end
 
+  def test_track
+    pattern = Pattern.new("whatevs")
+
+    assert_equal({}, pattern.tracks)
+
+    pattern.track("my_sound", "X...X...")
+    assert_pattern_tracks(pattern, {"my_sound" => {name: "my_sound", rhythm: "X...X..."}})
+
+    # Rhythm is shorter than length of current longer rhythm, so should be made same length
+    pattern.track("my_other_sound", "X...")
+    assert_pattern_tracks(pattern, {"my_sound"       => {name: "my_sound",       rhythm: "X...X..."},
+                                    "my_other_sound" => {name: "my_other_sound", rhythm: "X......."}})
+
+    # Track has same name as previous track, and longer rhythm than previous tracks.
+    # Track should have expected name, but pattern key be unique.
+    # The rhythm of other existing tracks should be lengthened.
+    pattern.track("my_sound", ".X..........")
+    assert_pattern_tracks(pattern, {"my_sound"       => {name: "my_sound",       rhythm: "X...X......."},
+                                    "my_other_sound" => {name: "my_other_sound", rhythm: "X..........."},
+                                    "my_sound2"      => {name: "my_sound",       rhythm: ".X.........."}})
+
+    pattern.track("my_sound2", "..X.........")
+    assert_pattern_tracks(pattern, {"my_sound"       => {name: "my_sound",       rhythm: "X...X......."},
+                                    "my_other_sound" => {name: "my_other_sound", rhythm: "X..........."},
+                                    "my_sound2"      => {name: "my_sound",       rhythm: ".X.........."},
+                                    "my_sound22"     => {name: "my_sound2",      rhythm: "..X........."}})
+
+    pattern.track("my_sound", "..")
+    assert_pattern_tracks(pattern, {"my_sound"       => {name: "my_sound",       rhythm: "X...X......."},
+                                    "my_other_sound" => {name: "my_other_sound", rhythm: "X..........."},
+                                    "my_sound2"      => {name: "my_sound",       rhythm: ".X.........."},
+                                    "my_sound22"     => {name: "my_sound2",      rhythm: "..X........."},
+                                    "my_sound3"      => {name: "my_sound",       rhythm: "............"},})
+  end
+
+  def test_track_unique_name_already_taken
+    pattern = Pattern.new("whatevs")
+
+    assert_equal({}, pattern.tracks)
+
+    pattern.track("my_sound2", "X...X...")
+    assert_pattern_tracks(pattern, {"my_sound2" => {name: "my_sound2", rhythm: "X...X..."}})
+
+    pattern.track("my_sound", "X.X.X.X.")
+    assert_pattern_tracks(pattern, {"my_sound2" => {name: "my_sound2", rhythm: "X...X..."},
+                                    "my_sound"  => {name: "my_sound",  rhythm: "X.X.X.X."}})
+
+    # The first attempt at a unique name would be "my_sound2", but that is already taken
+    pattern.track("my_sound", "XXXXXXXX")
+    assert_pattern_tracks(pattern, {"my_sound2" => {name: "my_sound2", rhythm: "X...X..."},
+                                    "my_sound"  => {name: "my_sound",  rhythm: "X.X.X.X."},
+                                    "my_sound3" => {name: "my_sound",  rhythm: "XXXXXXXX"}})
+  end
+
   def test_step_count
     test_patterns = generate_test_data
 
@@ -96,4 +150,15 @@ class PatternTest < Test::Unit::TestCase
     assert_equal(false, left_pattern.same_tracks_as?(something_extra))
     assert_equal(false, something_extra.same_tracks_as?(left_pattern))
   end
+
+  private
+
+  def assert_pattern_tracks(pattern, expected_pattern_structure)
+    assert_equal(expected_pattern_structure.keys, pattern.tracks.keys)
+
+    expected_pattern_structure.each do |pattern_key, expected_track|
+      assert_equal(expected_track[:name],   pattern.tracks[pattern_key].name)
+      assert_equal(expected_track[:rhythm], pattern.tracks[pattern_key].rhythm)
+    end
+  end
 end

data/test/song_swinger_test.rb

@@ -1,6 +1,6 @@
 require 'includes'
 
-class SongSwingerTest < Test::Unit::TestCase
+class SongSwingerTest < Minitest::Test
   def test_full_song_swing_rate_8
     base_path = File.dirname(__FILE__) + "/sounds"
     song, kit = SongParser.new.parse(base_path, File.read("test/fixtures/valid/example_mono_16_base_path.txt"))
@@ -145,7 +145,7 @@ class SongSwingerTest < Test::Unit::TestCase
       song = Song.new
       song.tempo = 100
 
-      assert_raise(Transforms::InvalidSwingRateError) do
+      assert_raises(Transforms::SongSwinger::InvalidSwingRateError) do
         song = Transforms::SongSwinger.transform(song, invalid_swing_rate)
       end
     end

data/test/song_test.rb

@@ -1,6 +1,6 @@
 require 'includes'
 
-class SongTest < Test::Unit::TestCase
+class SongTest < Minitest::Test
   FIXTURES = [:repeats_not_specified,
               :pattern_with_overflow,
               :example_no_kit,
@@ -50,40 +50,28 @@ class SongTest < Test::Unit::TestCase
 
     song.tempo = 150
     assert_equal(150, song.tempo)
-    
+
     song.tempo = 145.854
     assert_equal(145.854, song.tempo)
 
-    assert_raise(InvalidTempoError) do
-      song.tempo = -1
-    end
-
-    assert_raise(InvalidTempoError) do
-      song.tempo = -1.0
-    end
-
-    assert_raise(InvalidTempoError) do
-      song.tempo = "abc"
-    end
-
-    assert_raise(InvalidTempoError) do
-      song.tempo = "150"
+    [-1, -1.0, "abc", "150"].each do |invalid_tempo|
+      assert_raises(Song::InvalidTempoError) { song.tempo = invalid_tempo }
     end
   end
 
   def test_pattern
     song = Song.new
-    verse1 = song.pattern :Verse
+    verse1 = song.pattern(:Verse)
 
     assert_equal(:Verse, verse1.name)
     assert_equal({:Verse => verse1}, song.patterns)
 
-    verse2 = song.pattern :Verse
+    verse2 = song.pattern(:Verse)
     assert_equal(:Verse, verse2.name)
     assert_equal({:Verse => verse2}, song.patterns)
-    assert_not_equal(verse1, verse2)
+    refute_equal(verse1, verse2)
 
-    chorus = song.pattern :Chorus
+    chorus = song.pattern(:Chorus)
     assert_equal(2, song.patterns.length)
     assert_equal({:Chorus => chorus, :Verse => verse2}, song.patterns)
   end
@@ -128,7 +116,7 @@ class SongTest < Test::Unit::TestCase
     original_song = test_songs[:example_no_kit]
     cloned_song = original_song.copy_ignoring_patterns_and_flow
 
-    assert_not_equal(cloned_song, original_song)
+    refute_equal(cloned_song, original_song)
     assert_equal(cloned_song.tempo, original_song.tempo)
     assert_equal([], cloned_song.flow)
     assert_equal({}, cloned_song.patterns)
@@ -178,16 +166,4 @@ class SongTest < Test::Unit::TestCase
     assert_equal(3, test_songs[:example_no_kit].patterns.length)
     assert_equal(Hash, test_songs[:example_no_kit].patterns.class)
   end
-
-  def test_to_yaml
-    test_songs = generate_test_data
-    kit = Kit.new("test/sounds", {"bass"     => "bass_mono_8.wav",
-                                  "snare"    => "snare_mono_8.wav",
-                                  "hhclosed" => "hh_closed_mono_8.wav",
-                                  "hhopen"   => "hh_open_mono_8.wav"})
-
-    result = test_songs[:example_with_kit].to_yaml(kit)
-
-    assert_equal(File.read("test/fixtures/yaml/song_yaml.txt"), result)
-  end
 end

data/test/songoptimizer_test.rb

@@ -6,7 +6,7 @@ class MockSongOptimizer < SongOptimizer
   end
 end
 
-class SongOptimizerTest < Test::Unit::TestCase
+class SongOptimizerTest < Minitest::Test
   FIXTURE_BASE_PATH = File.dirname(__FILE__) + "/.."
 
   EXAMPLE_SONG_YAML = "
@@ -18,10 +18,10 @@ Song:
     - Verse:   x2
     - Chorus:  x4
   Kit:
-    - bass:       sounds/bass.wav
-    - snare:      sounds/snare.wav
-    - hh_closed:  sounds/hh_closed.wav
-    - agogo:      sounds/agogo_high.wav
+    - bass:       sounds/bass_mono_8.wav
+    - snare:      sounds/snare_mono_8.wav
+    - hh_closed:  sounds/hh_closed_mono_8.wav
+    - agogo:      sounds/agogo_high_mono_8.wav
 
 Verse:
   - bass:             X...X...X...X...
@@ -33,8 +33,8 @@ Chorus:
   - bass:             X...X...XX..X...
   - snare:            ....X.......X...
   - hh_closed:        X.XXX.XXX.XX..X.
-  - sounds/tom4.wav:  ...........X....
-  - sounds/tom2.wav:  ..............X."
+  - sounds/tom4_mono_8.wav:  ...........X....
+  - sounds/tom2_mono_8.wav:  ..............X."
 
   EXAMPLE_SONG_YAML_EMPTY_SUB_PATTERN = "
 Song:
@@ -42,8 +42,8 @@ Song:
   Flow:
     - Verse:   x1
   Kit:
-    - bass:   sounds/bass.wav
-    - snare:  sounds/snare.wav
+    - bass:   sounds/bass_mono_8.wav
+    - snare:  sounds/snare_mono_8.wav
 
 Verse:
   - bass:   X.......X...
@@ -55,7 +55,7 @@ Verse:
 
   def test_optimize
     parser = SongParser.new
-    original_song, kit = parser.parse(File.dirname(__FILE__) + "/..", EXAMPLE_SONG_YAML)
+    original_song, kit = parser.parse(File.dirname(__FILE__), EXAMPLE_SONG_YAML)
 
     optimizer = SongOptimizer.new
     optimized_song = optimizer.optimize(original_song, 4)
@@ -96,17 +96,17 @@ Verse:
     assert_equal(pattern.tracks["hh_closed"].rhythm, "X.XX")
 
     pattern = optimized_song.patterns[:chorus_8]
-    assert_equal(pattern.tracks.keys.sort, ["bass", "hh_closed", "sounds/tom4.wav"])
+    assert_equal(pattern.tracks.keys.sort, ["bass", "hh_closed", "sounds/tom4_mono_8.wav"])
     assert_equal(pattern.tracks["bass"].rhythm, "XX..")
     assert_equal(pattern.tracks["hh_closed"].rhythm, "X.XX")
-    assert_equal(pattern.tracks["sounds/tom4.wav"].rhythm, "...X")
+    assert_equal(pattern.tracks["sounds/tom4_mono_8.wav"].rhythm, "...X")
 
     pattern = optimized_song.patterns[:chorus_12]
-    assert_equal(pattern.tracks.keys.sort, ["bass", "hh_closed", "snare", "sounds/tom2.wav"])
+    assert_equal(pattern.tracks.keys.sort, ["bass", "hh_closed", "snare", "sounds/tom2_mono_8.wav"])
     assert_equal(pattern.tracks["bass"].rhythm, "X...")
     assert_equal(pattern.tracks["snare"].rhythm, "X...")
     assert_equal(pattern.tracks["hh_closed"].rhythm, "..X.")
-    assert_equal(pattern.tracks["sounds/tom2.wav"].rhythm, "..X.")
+    assert_equal(pattern.tracks["sounds/tom2_mono_8.wav"].rhythm, "..X.")
 
     assert_equal(optimized_song.flow, [:chorus_0, :chorus_0, :verse_8, :verse_12,
                                        :chorus_0, :chorus_0, :verse_8, :verse_12,
@@ -124,7 +124,7 @@ Verse:
 
   def test_optimize_song_nondivisible_max_pattern_length
     parser = SongParser.new
-    original_song, kit = parser.parse(File.dirname(__FILE__) + "/..", EXAMPLE_SONG_YAML_EMPTY_SUB_PATTERN)
+    original_song, kit = parser.parse(File.dirname(__FILE__), EXAMPLE_SONG_YAML_EMPTY_SUB_PATTERN)
 
     optimizer = SongOptimizer.new
     optimized_song = optimizer.optimize(original_song, 7)
@@ -151,7 +151,7 @@ Verse:
 
   def test_optimize_song_containing_empty_pattern
     parser = SongParser.new
-    original_song, kit = parser.parse(File.dirname(__FILE__) + "/..", EXAMPLE_SONG_YAML_EMPTY_SUB_PATTERN)
+    original_song, kit = parser.parse(File.dirname(__FILE__), EXAMPLE_SONG_YAML_EMPTY_SUB_PATTERN)
 
     optimizer = SongOptimizer.new
     optimized_song = optimizer.optimize(original_song, 4)
@@ -161,8 +161,8 @@ Verse:
     assert_equal("X...", pattern.tracks["bass"].rhythm)
 
     pattern = optimized_song.patterns[:verse_4]
-    assert_equal(["placeholder"], pattern.tracks.keys.sort)
-    assert_equal("....", pattern.tracks["placeholder"].rhythm)
+    assert_equal([Kit::PLACEHOLDER_TRACK_NAME], pattern.tracks.keys.sort)
+    assert_equal("....", pattern.tracks[Kit::PLACEHOLDER_TRACK_NAME].rhythm)
 
     pattern = optimized_song.patterns[:verse_8]
     assert_equal(["bass", "snare"], pattern.tracks.keys.sort)

data/test/songparser_test.rb

@@ -1,6 +1,6 @@
 require 'includes'
 
-class SongParserTest < Test::Unit::TestCase
+class SongParserTest < Minitest::Test
   FIXTURE_BASE_PATH = File.dirname(__FILE__) + "/.."
 
   # TODO: Add fixture for track with no rhythm
@@ -11,8 +11,8 @@ class SongParserTest < Test::Unit::TestCase
                       :example_no_kit,
                       :example_with_kit,
                       :example_with_empty_track,
+                      :track_with_spaces,
                       :multiple_tracks_same_sound,
-                      :with_structure,
                       :example_swung_8th,
                       :example_swung_16th,
                       :example_unswung]
@@ -24,7 +24,9 @@ class SongParserTest < Test::Unit::TestCase
                       :bad_swing_rate_2,
                       :no_header,
                       :no_flow,
+                      :with_structure,
                       :pattern_with_no_tracks,
+                      :leading_bar_line,
                       :sound_in_kit_not_found,
                       :sound_in_track_not_found,
                       :sound_in_kit_wrong_format,
@@ -84,6 +86,12 @@ class SongParserTest < Test::Unit::TestCase
     assert_equal("........", song.patterns[:verse].tracks["test/sounds/bass_mono_8.wav"].rhythm)
     assert_equal("X...X...", song.patterns[:verse].tracks["test/sounds/snare_mono_8.wav"].rhythm)
 
+    song = test_songs[:track_with_spaces]
+    assert_equal(1, song.patterns.length)
+    assert_equal(2, song.patterns[:verse].tracks.length)
+    assert_equal("X...X...X...X...", song.patterns[:verse].tracks["bass"].rhythm)
+    assert_equal("....X.......X...", song.patterns[:verse].tracks["snare"].rhythm)
+
     song = test_songs[:multiple_tracks_same_sound]
     assert_equal(2, song.patterns.length)
     assert_equal(7, song.patterns[:verse].tracks.length)
@@ -96,12 +104,14 @@ class SongParserTest < Test::Unit::TestCase
     assert_equal("..............X.", song.patterns[:verse].tracks["snare"].rhythm)
     assert_equal("X.XXX.XXX.X.X.X.", song.patterns[:verse].tracks["hh_closed"].rhythm)
     assert_equal("..............XX", song.patterns[:verse].tracks["agogo"].rhythm)
-
-    song = test_songs[:with_structure]
-    assert_equal([:verse, :verse], song.flow)
-    assert_equal(1, song.patterns.length)
-    assert_equal(1, song.patterns[:verse].tracks.length)
-    assert_equal("X...X...", song.patterns[:verse].tracks["test/sounds/bass_mono_8.wav"].rhythm)
+    assert_equal(["bass", "bass2", "hh_closed", "snare", "test/sounds/tom2_mono_16.wav", "test/sounds/tom4_mono_16.wav"],
+                 song.patterns[:chorus].tracks.keys.sort)
+    assert_equal("X...X...XX..X...", song.patterns[:chorus].tracks["bass"].rhythm)
+    assert_equal("....X.......X...", song.patterns[:chorus].tracks["snare"].rhythm)
+    assert_equal("X.XXX.XXX.XX..X.", song.patterns[:chorus].tracks["hh_closed"].rhythm)
+    assert_equal("..X..X..X..X..X.", song.patterns[:chorus].tracks["bass2"].rhythm)
+    assert_equal("...........X....", song.patterns[:chorus].tracks["test/sounds/tom4_mono_16.wav"].rhythm)
+    assert_equal("..............X.", song.patterns[:chorus].tracks["test/sounds/tom2_mono_16.wav"].rhythm)
 
     song = test_songs[:example_swung_8th]
     assert_equal(180, song.tempo)
@@ -139,12 +149,12 @@ class SongParserTest < Test::Unit::TestCase
 
   def test_invalid_parse
     INVALID_FIXTURES.each do |fixture|
-      assert_raise(SongParseError) do
+      assert_raises(SongParser::ParseError) do
         song = SongParserTest.load_fixture("invalid/#{fixture}.txt")
       end
     end
 
-    assert_raise(InvalidRhythmError) do
+    assert_raises(Track::InvalidRhythmError) do
       song = SongParserTest.load_fixture("invalid/bad_rhythm.txt")
     end
   end

data/test/track_test.rb

@@ -1,6 +1,6 @@
 require 'includes'
 
-class TrackTest < Test::Unit::TestCase
+class TrackTest < Minitest::Test
   def generate_test_data
     test_tracks = {}
 
@@ -8,8 +8,9 @@ class TrackTest < Test::Unit::TestCase
     test_tracks[:solo] = Track.new("bass", "X")
     test_tracks[:with_overflow] = Track.new("bass", "...X")
     test_tracks[:with_barlines] = Track.new("bass", "|X.X.|X.X.|")
+    test_tracks[:with_spaces] = Track.new("bass", "  X... X.X.   ")
     test_tracks[:placeholder] = Track.new("bass", "....")
-    test_tracks[:complicated] = Track.new("bass", "..X...X...X...X.X...X...X...X...")
+    test_tracks[:complicated] = Track.new("bass", "..XX..X...X...X.X...X...X...X...")
 
     test_tracks
   end
@@ -17,26 +18,39 @@ class TrackTest < Test::Unit::TestCase
   def test_initialize
     test_tracks = generate_test_data
 
-    assert_equal([0], test_tracks[:blank].beats)
+    assert_equal([0], test_tracks[:blank].trigger_step_lengths)
     assert_equal("bass", test_tracks[:blank].name)
     assert_equal("", test_tracks[:blank].rhythm)
 
-    assert_equal([0, 1], test_tracks[:solo].beats)
+    assert_equal([0, 1], test_tracks[:solo].trigger_step_lengths)
     assert_equal("bass", test_tracks[:solo].name)
     assert_equal("X", test_tracks[:solo].rhythm)
 
-    assert_equal([3, 1], test_tracks[:with_overflow].beats)
+    assert_equal([3, 1], test_tracks[:with_overflow].trigger_step_lengths)
     assert_equal("...X", test_tracks[:with_overflow].rhythm)
 
-    assert_equal([0, 2, 2, 2, 2], test_tracks[:with_barlines].beats)
+    assert_equal([0, 2, 2, 2, 2], test_tracks[:with_barlines].trigger_step_lengths)
     # Bar lines should be removed from rhythm:
     assert_equal("X.X.X.X.", test_tracks[:with_barlines].rhythm)
 
-    assert_equal([4], test_tracks[:placeholder].beats)
+    assert_equal([0, 4, 2, 2], test_tracks[:with_spaces].trigger_step_lengths)
+    # Spaces should be removed from rhythm:
+    assert_equal("X...X.X.", test_tracks[:with_spaces].rhythm)
+
+    assert_equal([4], test_tracks[:placeholder].trigger_step_lengths)
     assert_equal("....", test_tracks[:placeholder].rhythm)
 
-    assert_equal([2, 4, 4, 4, 2, 4, 4, 4, 4], test_tracks[:complicated].beats)
-    assert_equal("..X...X...X...X.X...X...X...X...", test_tracks[:complicated].rhythm)
+    assert_equal([2, 1, 3, 4, 4, 2, 4, 4, 4, 4], test_tracks[:complicated].trigger_step_lengths)
+    assert_equal("..XX..X...X...X.X...X...X...X...", test_tracks[:complicated].rhythm)
+  end
+
+  def test_invalid_rhythm
+    assert_raises(Track::InvalidRhythmError) { Track.new("bad_rhythm", "abcde") }
+    assert_raises(Track::InvalidRhythmError) { Track.new("bad_rhythm", "X.X.e.X") }
+
+    track = Track.new("test", "X...")
+    assert_raises(Track::InvalidRhythmError) { track.rhythm = "abcde" }
+    assert_raises(Track::InvalidRhythmError) { track.rhythm = "X.X.e.X" }
   end
 
   def test_step_count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beats
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Joel Strait
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile
@@ -16,33 +16,32 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
-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.
+        version: 0.8.1
+description: A command-line drum machine. Takes a song notated in a YAML file as input,
+  and outputs a *.wav sound file.
 email: joel dot strait at Google's popular web mail service
 executables:
 - beats
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.markdown
 - Rakefile
 - bin/beats
-- ext/mkrf_conf.rb
 - lib/beats.rb
 - lib/beats/audioengine.rb
 - lib/beats/audioutils.rb
 - lib/beats/beatsrunner.rb
 - lib/beats/kit.rb
+- lib/beats/kit_builder.rb
 - lib/beats/pattern.rb
 - lib/beats/song.rb
 - lib/beats/songoptimizer.rb
@@ -91,6 +90,7 @@ files:
 - test/fixtures/invalid/bad_swing_rate_1.txt
 - test/fixtures/invalid/bad_swing_rate_2.txt
 - test/fixtures/invalid/bad_tempo.txt
+- test/fixtures/invalid/leading_bar_line.txt
 - test/fixtures/invalid/no_flow.txt
 - test/fixtures/invalid/no_header.txt
 - test/fixtures/invalid/pattern_with_no_tracks.txt
@@ -98,7 +98,7 @@ files:
 - test/fixtures/invalid/sound_in_kit_wrong_format.txt
 - test/fixtures/invalid/sound_in_track_not_found.txt
 - test/fixtures/invalid/sound_in_track_wrong_format.txt
-- test/fixtures/invalid/template.txt
+- test/fixtures/invalid/with_structure.txt
 - test/fixtures/valid/example_mono_16.txt
 - test/fixtures/valid/example_mono_16_base_path.txt
 - test/fixtures/valid/example_mono_8.txt
@@ -110,17 +110,17 @@ files:
 - test/fixtures/valid/example_unswung.txt
 - test/fixtures/valid/example_with_empty_track.txt
 - test/fixtures/valid/example_with_kit.txt
-- test/fixtures/valid/foo.txt
 - test/fixtures/valid/fractional_tempo.txt
 - test/fixtures/valid/multiple_tracks_same_sound.txt
 - test/fixtures/valid/no_tempo.txt
 - test/fixtures/valid/optimize_pattern_collision.txt
 - test/fixtures/valid/pattern_with_overflow.txt
 - test/fixtures/valid/repeats_not_specified.txt
-- test/fixtures/valid/with_structure.txt
+- test/fixtures/valid/track_with_spaces.txt
 - test/fixtures/yaml/song_yaml.txt
 - test/includes.rb
 - test/integration_test.rb
+- test/kit_builder_test.rb
 - test/kit_test.rb
 - test/pattern_test.rb
 - test/song_swinger_test.rb
@@ -135,8 +135,6 @@ files:
 - test/sounds/agogo_low_mono_8.wav
 - test/sounds/agogo_low_stereo_16.wav
 - test/sounds/agogo_low_stereo_8.wav
-- test/sounds/bass.wav
-- test/sounds/bass2.wav
 - test/sounds/bass2_mono_16.wav
 - test/sounds/bass2_mono_8.wav
 - test/sounds/bass2_stereo_16.wav
@@ -189,7 +187,6 @@ files:
 - 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
@@ -214,32 +211,33 @@ files:
 - 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
 homepage: http://beatsdrummachine.com/
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message: Thanks for installing Beats Drum Machine! For information on
+  how to use Beats, or to download some drum sounds to use with Beats, visit http://beatsdrummachine.com
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-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.
+summary: A command-line drum machine. Takes a song notated in a YAML file as input,
+  and outputs a *.wav sound file.
 test_files:
 - test/audioengine_test.rb
 - test/audioutils_test.rb
@@ -282,6 +280,7 @@ test_files:
 - test/fixtures/invalid/bad_swing_rate_1.txt
 - test/fixtures/invalid/bad_swing_rate_2.txt
 - test/fixtures/invalid/bad_tempo.txt
+- test/fixtures/invalid/leading_bar_line.txt
 - test/fixtures/invalid/no_flow.txt
 - test/fixtures/invalid/no_header.txt
 - test/fixtures/invalid/pattern_with_no_tracks.txt
@@ -289,7 +288,7 @@ test_files:
 - test/fixtures/invalid/sound_in_kit_wrong_format.txt
 - test/fixtures/invalid/sound_in_track_not_found.txt
 - test/fixtures/invalid/sound_in_track_wrong_format.txt
-- test/fixtures/invalid/template.txt
+- test/fixtures/invalid/with_structure.txt
 - test/fixtures/valid/example_mono_16.txt
 - test/fixtures/valid/example_mono_16_base_path.txt
 - test/fixtures/valid/example_mono_8.txt
@@ -301,17 +300,17 @@ test_files:
 - test/fixtures/valid/example_unswung.txt
 - test/fixtures/valid/example_with_empty_track.txt
 - test/fixtures/valid/example_with_kit.txt
-- test/fixtures/valid/foo.txt
 - test/fixtures/valid/fractional_tempo.txt
 - test/fixtures/valid/multiple_tracks_same_sound.txt
 - test/fixtures/valid/no_tempo.txt
 - test/fixtures/valid/optimize_pattern_collision.txt
 - test/fixtures/valid/pattern_with_overflow.txt
 - test/fixtures/valid/repeats_not_specified.txt
-- test/fixtures/valid/with_structure.txt
+- test/fixtures/valid/track_with_spaces.txt
 - test/fixtures/yaml/song_yaml.txt
 - test/includes.rb
 - test/integration_test.rb
+- test/kit_builder_test.rb
 - test/kit_test.rb
 - test/pattern_test.rb
 - test/song_swinger_test.rb
@@ -326,8 +325,6 @@ test_files:
 - test/sounds/agogo_low_mono_8.wav
 - test/sounds/agogo_low_stereo_16.wav
 - test/sounds/agogo_low_stereo_8.wav
-- test/sounds/bass.wav
-- test/sounds/bass2.wav
 - test/sounds/bass2_mono_16.wav
 - test/sounds/bass2_mono_8.wav
 - test/sounds/bass2_stereo_16.wav
@@ -380,7 +377,6 @@ test_files:
 - 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
@@ -405,5 +401,4 @@ test_files:
 - 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