mm-lilypond 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ad079b960a30f3524640a6584595d7d755af516
-  data.tar.gz: b89ab3e471ea7530c80b7c67a8fc206442472dee
+SHA256:
+  metadata.gz: cd930b1d2e25368ab27876e5c0a80e7551eec8f599353892322ed8514f5dfdab
+  data.tar.gz: 02d6e331e9768b36cbbdd38aed6b72ea94fe73c6b7d5c85f0c9b0bbbcb0ae101
 SHA512:
-  metadata.gz: c8801f4f401d22d69ebf0dcb5f0f9ac61f36760a64b1878e339243a16888fabd4bbc94f6ce7e5e63f62f4b1f107115c1cefef46248b28e781f2b81b222f9a439
-  data.tar.gz: 28f695ef56880379d3a361b0834540c080e81b22351f3ec00a3b36c32115a71dce64bb9f84557e5acf84f80c33f7f55998388eea582cccc3d53642e5f94b1c53
+  metadata.gz: 48e39b98a3f8896df5dd14da6d366b4c07e7f4ebf5e8298bf332db59bf152caa8ee59bae2f803750d5ab83891a15093d678a653cca85f19816d1c1817dc2d3be
+  data.tar.gz: cab4a1af508f392e4bb1e073198eeaf69bdfd7861badaf070d4fe948297d38d4069253a15115f007d2b6737efa3ee1e48d86557b75cfc57d033cf2c622867f4a

data/.autotest

@@ -1,25 +1,25 @@
-# -*- ruby -*-
-
-require "autotest/restart"
-
-# Autotest.add_hook :initialize do |at|
-#   at.testlib = "minitest/unit"
-#
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception "vendor"
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end
+# -*- ruby -*-
+
+require "autotest/restart"
+
+# Autotest.add_hook :initialize do |at|
+#   at.testlib = "minitest/unit"
+#
+#   at.extra_files << "../some/external/dependency.rb"
+#
+#   at.libs << ":../some/external"
+#
+#   at.add_exception "vendor"
+#
+#   at.add_mapping(/dependency.rb/) do |f, _|
+#     at.files_matching(/test_.*rb$/)
+#   end
+#
+#   %w(TestA TestB).each do |klass|
+#     at.extra_class_map[klass] = "test/test_misc.rb"
+#   end
+# end
+
+# Autotest.add_hook :run_command do |at|
+#   system "rake build"
+# end

data/History.txt

@@ -1,6 +1,6 @@
-=== 1.0.0 / 2014-07-22
-
-* 1 major enhancement
-
-  * Birthday!
-
+=== 1.0.0 / 2014-07-22
+
+* 1 major enhancement
+
+  * Birthday!
+

data/Manifest.txt

@@ -1,8 +1,8 @@
-.autotest
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-lib/mm/lilypond.rb
-test/mm/test_lilypond.rb
-test/test_template.ly.erb
+.autotest
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+lib/mm/lilypond.rb
+test/mm/test_lilypond.rb
+test/test_template.ly.erb

data/README.txt

@@ -1,6 +1,5 @@
 = mm-lilypond
 
-* http://www.lilypond.org
 * http://www.andrewchristophersmith.com
 
 == DESCRIPTION:

data/Rakefile

@@ -6,7 +6,8 @@ require "hoe"
 # Hoe.plugin :compiler
 # Hoe.plugin :gem_prelude_sucks
 # Hoe.plugin :inline
-# Hoe.plugin :minitest
+Hoe.plugin :minitest
+Hoe.plugin :gemspec
 # Hoe.plugin :racc
 # Hoe.plugin :rcov
 # Hoe.plugin :rdoc

data/lib/mm/lilypond.rb

@@ -1,118 +1,119 @@
-require 'mm'
-require 'erb'
-
-class MM::Lilypond
-  VERSION = "1.0.0"
-
-  attr_accessor :offset, :basenames, :prime_limit, :prime_steps
-
-  def initialize prime_limit: nil
-    @offset = 2 
-    @basenames = ["c", "g", "d", "a", "e", "b", 
-                  "fsharp", "csharp", "gsharp", "dsharp", "asharp", "esharp", "bsharp", 
-                  "fdoublesharp", "cdoublesharp", "gdoublesharp", "ddoublesharp", "adoublesharp", "edoublesharp", "bdoublesharp", 
-                  "fdoubleflat", "cdoubleflat", "gdoubleflat", "ddoubleflat", "adoubleflat", "edoubleflat", "bdoubleflat",
-                  "fflat", "cflat", "gflat", "dflat", "aflat", "eflat", "bflat", "f"]
-    @prime_limit = prime_limit
-    @prime_steps = [1, 4, -2, -1, 3]
-  end
-
-  def get_pitch ratio
-    basename = get_basename ratio
-    alteration = get_alteration ratio
-    octave = get_octave ratio
-    basename + alteration + octave
-  end
-
-  def get_basename ratio
-    @basenames[@offset + get_steps(ratio)].dup
-  end
-
-  def get_alteration ratio
-    ratio.factors.reject {|f| @prime_limit && f[0] > @prime_limit}.map {|f|
-      case f[0]
-      when 5
-        collect_string f[1], "f"
-      when 7
-        collect_string f[1], "s"
-      when 11
-        collect_string f[1] * -1, "e"
-      when 13
-        collect_string f[1], "t"
-      end
-    }.join("")
-  end
-
-  def get_octave ratio
-    offset = (@offset * 4) % 7
-    degrees = ratio.factors.inject(0) {|d, f|
-      d + case f[0]
-      when 2
-        f[1] * 7
-      when 3
-        f[1] * 11
-      when 5
-        f[1] * 17
-      when 7
-        f[1] * 20
-      when 11
-        f[1] * 24
-      when 13
-        f[1] * 26
-      else
-        0
-      end
-    } + offset
-    if degrees > 0
-      (degrees / 7.0).floor.times.map {"'"}.join("")
-    else
-      (degrees / -7.0).ceil.times.map {","}.join("")
-    end
-  end
-
-  def get_duration ratio
-    "1*#{ratio.reciprocal.to_s}"
-  end
-
-  def full_note ratio
-    get_pitch(ratio) + get_duration(ratio)
-  end
-
-  attr_writer :template
-
-  def render ratios
-    my_music = ratios.map {|r| self.full_note r}.join(" ")
-    output = ERB.new @template
-    output.result(binding)
-  end
-
-  private
-
-  def collect_string times, string
-    if times > 0
-      times.times.collect {"D#{string}"}
-    else
-      (times * -1).times.collect {"U#{string}"}
-    end
-  end
-
-  def get_steps ratio
-    ratio.factors.inject(0) {|memo, f|
-      memo + case f[0]
-      when 3
-        f[1] * @prime_steps[0]
-      when 5
-        f[1] * @prime_steps[1]
-      when 7
-        f[1] * @prime_steps[2]
-      when 11
-        f[1] * @prime_steps[3]
-      when 13
-        f[1] * @prime_steps[4]
-      else
-        0
-      end
-    }
-  end
-end
-
+require 'mm'
+require 'pry'
+require 'erb'
+
+class MM::Lilypond
+  VERSION = "1.1.0"
+
+  attr_accessor :offset, :basenames, :prime_limit, :prime_steps
+  attr_writer :template
+
+  def initialize prime_limit: nil
+    # offset is around the circle of fifths
+    @offset = 2 
+    @basenames = ["c", "g", "d", "a", "e", "b", 
+                  "fsharp", "csharp", "gsharp", "dsharp", "asharp", "esharp", "bsharp", 
+                  "fdoublesharp", "cdoublesharp", "gdoublesharp", "ddoublesharp", "adoublesharp", "edoublesharp", "bdoublesharp", 
+                  "fdoubleflat", "cdoubleflat", "gdoubleflat", "ddoubleflat", "adoubleflat", "edoubleflat", "bdoubleflat",
+                  "fflat", "cflat", "gflat", "dflat", "aflat", "eflat", "bflat", "f"]
+    @prime_limit = prime_limit
+    @prime_steps = [1, 4, -2, -1, 3]
+  end
+
+  def get_pitch ratio
+    basename = get_basename ratio
+    alteration = get_alteration ratio
+    octave = get_octave ratio
+    basename + alteration + octave
+  end
+
+  def get_basename ratio
+    @basenames[@offset + get_steps(ratio)].dup
+  end
+
+  def get_alteration ratio
+    ratio.factors.reject {|f| @prime_limit && f[0] > @prime_limit}.map {|f|
+      case f[0]
+      when 5
+        collect_string f[1], "f"
+      when 7
+        collect_string f[1], "s"
+      when 11
+        collect_string f[1] * -1, "e"
+      when 13
+        collect_string f[1], "t"
+      end
+    }.join("")
+  end
+
+  def get_octave ratio
+    offset = (@offset * 4) % 7
+    degrees = ratio.factors.inject(0) {|d, f|
+      d + case f[0]
+      when 2
+        f[1] * 7
+      when 3
+        f[1] * 11
+      when 5
+        f[1] * 16
+      when 7
+        f[1] * 20
+      when 11
+        f[1] * 24
+      when 13
+        f[1] * 26
+      else
+        0
+      end
+    } + offset
+    if degrees > 0
+      (degrees / 7.0).floor.times.map {"'"}.join("")
+    else
+      (degrees / -7.0).ceil.times.map {","}.join("")
+    end
+  end
+
+  def get_duration ratio
+    "1*#{ratio.reciprocal.to_s}"
+  end
+
+  def full_note ratio
+    get_pitch(ratio) + get_duration(ratio)
+  end
+
+  def render ratios
+    my_music = ratios.map {|r| self.full_note r}.join(" ")
+    output = ERB.new @template
+    output.result(binding)
+  end
+
+  private
+
+  def collect_string times, string
+    if times > 0
+      times.times.collect {"D#{string}"}
+    else
+      (times * -1).times.collect {"U#{string}"}
+    end
+  end
+
+  def get_steps ratio
+    ratio.factors.inject(0) {|memo, f|
+      memo + case f[0]
+      when 3
+        f[1] * @prime_steps[0]
+      when 5
+        f[1] * @prime_steps[1]
+      when 7
+        f[1] * @prime_steps[2]
+      when 11
+        f[1] * @prime_steps[3]
+      when 13
+        f[1] * @prime_steps[4]
+      else
+        0
+      end
+    }
+  end
+end
+

data/test/mm/test_lilypond.rb

@@ -1,68 +1,70 @@
-require "minitest/autorun"
-require "mm/lilypond"
-
-module TestMM; end
-
-class TestMM::TestLilypond < Minitest::Test
-  def setup
-    @lily_parser = MM::Lilypond.new
-  end
-
-  def test_get_duration
-    assert_equal "1*2/3", @lily_parser.get_duration(MM::Ratio.new(3,2))
-  end
-
-  def test_get_basename
-    assert_equal "e", @lily_parser.get_basename(MM::Ratio.new(9,8))
-    assert_equal "fsharp", @lily_parser.get_basename(MM::Ratio.new(5,4))
-    assert_equal "c", @lily_parser.get_basename(MM::Ratio.new(7,4))
-    assert_equal "g", @lily_parser.get_basename(MM::Ratio.new(11,8))
-  end
-
-  def test_get_alteration
-    assert_equal "Df", @lily_parser.get_alteration(MM::Ratio.new(5,4))
-    assert_equal "Ds", @lily_parser.get_alteration(MM::Ratio.new(7,4))
-  end
-
-  def test_get_octave
-    assert_equal ",,", @lily_parser.get_octave(MM::Ratio.new(1,4))
-    assert_equal "'", @lily_parser.get_octave(MM::Ratio.new(9,4))
-    assert_equal "", @lily_parser.get_octave(MM::Ratio.new(7,4))
-  end
-
-  def test_get_pitch
-    assert_equal "a", @lily_parser.get_pitch(MM::Ratio.new(3,2))
-    assert_equal "fsharpDf", @lily_parser.get_pitch(MM::Ratio.new(5,4))
-    assert_equal "cDs", @lily_parser.get_pitch(MM::Ratio.new(7,4))
-    assert_equal "cDs,", @lily_parser.get_pitch(MM::Ratio.new(7,8))
-    assert_equal "d'", @lily_parser.get_pitch(MM::Ratio.new(2,1))
-    assert_equal "d,", @lily_parser.get_pitch(MM::Ratio.new(1,2))
-  end
-
-  def test_get_full_note
-    assert_equal "d'1*1/2", @lily_parser.full_note(MM::Ratio.new(2,1))
-    assert_equal "aflatUfDs1*5/7", @lily_parser.full_note(MM::Ratio.new(7,5))
-  end
-
-  def test_render
-    @lily_parser.template = File.read("test/test_template.ly.erb")
-    exp = "music = { a1*2/3 cDs1*4/7 }\n"
-    result = @lily_parser.render([MM::Ratio.new(3,2), MM::Ratio.new(7,4)])
-    assert_equal exp, result
-  end
-
-  def test_offset
-    @lily_parser.offset = 0
-    assert_equal "c", @lily_parser.get_pitch(MM::Ratio.new(1,1))
-    assert_equal "eDf", @lily_parser.get_pitch(MM::Ratio.new(5,4))
-  end
-
-  def test_prime_limit
-    @lily_parser.prime_limit = 3
-    @lily_parser.prime_steps[3] = 6
-    assert_equal "bflat", @lily_parser.get_pitch(MM::Ratio.new(14, 9))
-    assert_equal "fsharp", @lily_parser.get_pitch(MM::Ratio.new(5, 4))
-    assert_equal "gsharp", @lily_parser.get_pitch(MM::Ratio.new(11, 8))
-  end
-end
-
+require "minitest/autorun"
+require "mm/lilypond"
+
+module TestMM; end
+
+class TestMM::TestLilypond < Minitest::Test
+  def setup
+    @lily_parser = MM::Lilypond.new
+  end
+
+  def test_get_duration
+    assert_equal "1*2/3", @lily_parser.get_duration(MM::Ratio.new(3,2))
+  end
+
+  def test_get_basename
+    assert_equal "e", @lily_parser.get_basename(MM::Ratio.new(9,8))
+    assert_equal "fsharp", @lily_parser.get_basename(MM::Ratio.new(5,4))
+    assert_equal "c", @lily_parser.get_basename(MM::Ratio.new(7,4))
+    assert_equal "g", @lily_parser.get_basename(MM::Ratio.new(11,8))
+  end
+
+  def test_get_alteration
+    assert_equal "Df", @lily_parser.get_alteration(MM::Ratio.new(5,4))
+    assert_equal "Ds", @lily_parser.get_alteration(MM::Ratio.new(7,4))
+  end
+
+  def test_get_octave
+    assert_equal ",,", @lily_parser.get_octave(MM::Ratio.new(1,4))
+    assert_equal "'", @lily_parser.get_octave(MM::Ratio.new(9,4))
+    assert_equal "'", @lily_parser.get_octave(MM::Ratio.new(7,4))
+  end
+
+  def test_get_pitch
+    assert_equal "d", @lily_parser.get_pitch(MM::Ratio.new(1,1))
+    assert_equal "a", @lily_parser.get_pitch(MM::Ratio.new(3,2))
+    assert_equal "fsharpDf", @lily_parser.get_pitch(MM::Ratio.new(5,4))
+    assert_equal "cDs'", @lily_parser.get_pitch(MM::Ratio.new(7,4))
+    assert_equal "cDs", @lily_parser.get_pitch(MM::Ratio.new(7,8))
+    assert_equal "d'", @lily_parser.get_pitch(MM::Ratio.new(2,1))
+    assert_equal "d,", @lily_parser.get_pitch(MM::Ratio.new(1,2))
+  end
+
+  def test_get_full_note
+    assert_equal "d'1*1/2", @lily_parser.full_note(MM::Ratio.new(2,1))
+    assert_equal "aflatUfDs1*5/7", @lily_parser.full_note(MM::Ratio.new(7,5))
+  end
+
+  def test_render
+    @lily_parser.template = File.read("test/test_template.ly.erb")
+    exp = "music = { a1*2/3 cDs'1*4/7 }\n"
+    result = @lily_parser.render([MM::Ratio.new(3,2), MM::Ratio.new(7,4)])
+    assert_equal exp, result
+  end
+
+  def test_offset
+    @lily_parser.offset = 0
+    assert_equal "c", @lily_parser.get_pitch(MM::Ratio.new(1,1))
+    assert_equal "eDf", @lily_parser.get_pitch(MM::Ratio.new(5,4))
+    assert_equal "bDf", @lily_parser.get_pitch(MM::Ratio.new(15,8))
+  end
+
+  def test_prime_limit
+    @lily_parser.prime_limit = 3
+    @lily_parser.prime_steps[3] = 6
+    assert_equal "bflat", @lily_parser.get_pitch(MM::Ratio.new(14, 9))
+    assert_equal "fsharp", @lily_parser.get_pitch(MM::Ratio.new(5, 4))
+    assert_equal "gsharp", @lily_parser.get_pitch(MM::Ratio.new(11, 8))
+  end
+end
+

data/test/test_template.ly.erb

@@ -1 +1 @@
-music = { <%= my_music %> }
+music = { <%= my_music %> }

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mm-lilypond
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.16'
 description: FIX (describe your package)
 email:
 - andrewchristophersmith@gmail.com
@@ -56,7 +70,7 @@ files:
 - lib/mm/lilypond.rb
 - test/mm/test_lilypond.rb
 - test/test_template.ly.erb
-homepage: http://www.lilypond.org
+homepage: http://www.andrewchristophersmith.com
 licenses:
 - MIT
 metadata: {}
@@ -78,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: FIX (describe your package)