mtk 0.0.3.2 → 0.0.3.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtk
 version: !ruby/object:Gem::Version
-  version: 0.0.3.2
+  version: 0.0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
@@ -59,13 +59,28 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: unimidi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: A music library and domain-specific language for generating music via
   MIDI.
 email: adam@compusition.com
 executables:
 - mtk
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
@@ -76,7 +91,7 @@ files:
 - .yardopts
 - bin/mtk
 - examples/crescendo.rb
-- examples/drum_pattern1.rb
+- examples/drum_pattern.rb
 - examples/dynamic_pattern.rb
 - examples/gets_and_play.rb
 - examples/notation.rb
@@ -86,36 +101,39 @@ files:
 - examples/syntax_to_midi.rb
 - examples/test_output.rb
 - examples/tone_row_melody.rb
-- lib/mtk/chord.rb
-- lib/mtk/constants/durations.rb
-- lib/mtk/constants/intensities.rb
-- lib/mtk/constants/intervals.rb
-- lib/mtk/constants/pitch_classes.rb
-- lib/mtk/constants/pitches.rb
-- lib/mtk/duration.rb
+- lib/mtk/core/duration.rb
+- lib/mtk/core/intensity.rb
+- lib/mtk/core/interval.rb
+- lib/mtk/core/pitch.rb
+- lib/mtk/core/pitch_class.rb
 - lib/mtk/events/event.rb
 - lib/mtk/events/note.rb
 - lib/mtk/events/parameter.rb
-- lib/mtk/helpers/collection.rb
-- lib/mtk/helpers/convert.rb
-- lib/mtk/helpers/lilypond.rb
-- lib/mtk/helpers/output_selector.rb
-- lib/mtk/helpers/pitch_collection.rb
-- lib/mtk/helpers/pseudo_constants.rb
-- lib/mtk/intensity.rb
-- lib/mtk/interval.rb
+- lib/mtk/events/timeline.rb
+- lib/mtk/groups/chord.rb
+- lib/mtk/groups/collection.rb
+- lib/mtk/groups/melody.rb
+- lib/mtk/groups/pitch_class_set.rb
+- lib/mtk/groups/pitch_collection.rb
+- lib/mtk/io/dls_synth_device.rb
+- lib/mtk/io/dls_synth_output.rb
+- lib/mtk/io/jsound_input.rb
+- lib/mtk/io/jsound_output.rb
+- lib/mtk/io/midi_file.rb
+- lib/mtk/io/midi_input.rb
+- lib/mtk/io/midi_output.rb
+- lib/mtk/io/notation.rb
+- lib/mtk/io/unimidi_input.rb
+- lib/mtk/io/unimidi_output.rb
+- lib/mtk/lang/durations.rb
+- lib/mtk/lang/intensities.rb
+- lib/mtk/lang/intervals.rb
 - lib/mtk/lang/mtk_grammar.citrus
 - lib/mtk/lang/parser.rb
-- lib/mtk/melody.rb
-- lib/mtk/midi/dls_synth_device.rb
-- lib/mtk/midi/dls_synth_output.rb
-- lib/mtk/midi/file.rb
-- lib/mtk/midi/input.rb
-- lib/mtk/midi/jsound_input.rb
-- lib/mtk/midi/jsound_output.rb
-- lib/mtk/midi/output.rb
-- lib/mtk/midi/unimidi_input.rb
-- lib/mtk/midi/unimidi_output.rb
+- lib/mtk/lang/pitch_classes.rb
+- lib/mtk/lang/pitches.rb
+- lib/mtk/lang/pseudo_constants.rb
+- lib/mtk/lang/variable.rb
 - lib/mtk/numeric_extensions.rb
 - lib/mtk/patterns/chain.rb
 - lib/mtk/patterns/choice.rb
@@ -126,39 +144,35 @@ files:
 - lib/mtk/patterns/palindrome.rb
 - lib/mtk/patterns/pattern.rb
 - lib/mtk/patterns/sequence.rb
-- lib/mtk/pitch.rb
-- lib/mtk/pitch_class.rb
-- lib/mtk/pitch_class_set.rb
 - lib/mtk/sequencers/event_builder.rb
 - lib/mtk/sequencers/legato_sequencer.rb
 - lib/mtk/sequencers/rhythmic_sequencer.rb
 - lib/mtk/sequencers/sequencer.rb
 - lib/mtk/sequencers/step_sequencer.rb
-- lib/mtk/timeline.rb
-- lib/mtk/variable.rb
 - lib/mtk.rb
-- spec/mtk/chord_spec.rb
-- spec/mtk/constants/durations_spec.rb
-- spec/mtk/constants/intensities_spec.rb
-- spec/mtk/constants/intervals_spec.rb
-- spec/mtk/constants/pitch_classes_spec.rb
-- spec/mtk/constants/pitches_spec.rb
-- spec/mtk/duration_spec.rb
+- spec/mtk/core/duration_spec.rb
+- spec/mtk/core/intensity_spec.rb
+- spec/mtk/core/interval_spec.rb
+- spec/mtk/core/pitch_class_spec.rb
+- spec/mtk/core/pitch_spec.rb
 - spec/mtk/events/event_spec.rb
 - spec/mtk/events/note_spec.rb
 - spec/mtk/events/parameter_spec.rb
-- spec/mtk/helpers/collection_spec.rb
-- spec/mtk/helpers/pseudo_constants_spec.rb
-- spec/mtk/intensity_spec.rb
-- spec/mtk/interval_spec.rb
+- spec/mtk/events/timeline_spec.rb
+- spec/mtk/groups/chord_spec.rb
+- spec/mtk/groups/collection_spec.rb
+- spec/mtk/groups/melody_spec.rb
+- spec/mtk/groups/pitch_class_set_spec.rb
+- spec/mtk/io/midi_file_spec.rb
+- spec/mtk/io/midi_output_spec.rb
+- spec/mtk/lang/durations_spec.rb
+- spec/mtk/lang/intensities_spec.rb
+- spec/mtk/lang/intervals_spec.rb
 - spec/mtk/lang/parser_spec.rb
-- spec/mtk/melody_spec.rb
-- spec/mtk/midi/file_spec.rb
-- spec/mtk/midi/jsound_input_spec.rb
-- spec/mtk/midi/jsound_output_spec.rb
-- spec/mtk/midi/output_spec.rb
-- spec/mtk/midi/unimidi_input_spec.rb
-- spec/mtk/midi/unimidi_output_spec.rb
+- spec/mtk/lang/pitch_classes_spec.rb
+- spec/mtk/lang/pitches_spec.rb
+- spec/mtk/lang/pseudo_constants_spec.rb
+- spec/mtk/lang/variable_spec.rb
 - spec/mtk/numeric_extensions_spec.rb
 - spec/mtk/patterns/chain_spec.rb
 - spec/mtk/patterns/choice_spec.rb
@@ -169,20 +183,14 @@ files:
 - spec/mtk/patterns/palindrome_spec.rb
 - spec/mtk/patterns/pattern_spec.rb
 - spec/mtk/patterns/sequence_spec.rb
-- spec/mtk/pitch_class_set_spec.rb
-- spec/mtk/pitch_class_spec.rb
-- spec/mtk/pitch_spec.rb
 - spec/mtk/sequencers/event_builder_spec.rb
 - spec/mtk/sequencers/legato_sequencer_spec.rb
 - spec/mtk/sequencers/rhythmic_sequencer_spec.rb
 - spec/mtk/sequencers/sequencer_spec.rb
 - spec/mtk/sequencers/step_sequencer_spec.rb
-- spec/mtk/timeline_spec.rb
-- spec/mtk/variable_spec.rb
 - spec/spec_coverage.rb
 - spec/spec_helper.rb
 - spec/test.mid
-- ext/mkrf_conf.rb
 homepage: http://github.com/adamjmurray/mtk
 licenses: []
 post_install_message: 
@@ -195,12 +203,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3315185627907297240
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3315185627907297240
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/ext/mkrf_conf.rb

@@ -1,25 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb'
-begin
-  Gem::Command.build_args = ARGV
-rescue NoMethodError
-end
-inst = Gem::DependencyInstaller.new
-begin
-  if RUBY_PLATFORM == 'java'
-    puts "Installing jsound gem for MIDI I/O on JRuby"
-    inst.install 'jsound', '~> 0.1'
-  else
-    puts "Installing unimidi gem for MIDI I/O"
-    inst.install 'unimidi', '>= 0.3'
-  end
-rescue
-  STERR.puts $!
-  exit(1)
-end
-
-# This is a hack, see http://www.programmersparadox.com/2012/05/21/gemspec-loading-dependent-gems-based-on-the-users-system/
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
-f.write("task :default\n")
-f.close

data/lib/mtk/chord.rb

@@ -1,55 +0,0 @@
-module MTK
-
-  # A sorted collection of distinct {Pitch}es.
-  #
-  # The "vertical" (simultaneous) pitch collection.
-  #
-  # @see Melody
-  # @see PitchClassSet
-  #
-  class Chord < Melody
-
-    # @param pitches [#to_a] the collection of pitches
-    # @note duplicate pitches will be removed. See #{Melody} if you want to maintain duplicates.
-    # @see MTK#Chord
-    #
-    def initialize(pitches)
-      pitches = pitches.to_a.clone
-      pitches.uniq!
-      pitches.sort!
-      @pitches = pitches.freeze
-    end
-
-    # Generate a chord inversion (positive numbers move the lowest notes up an octave, negative moves the highest notes down)
-    def inversion(number)
-      number = number.to_i
-      pitch_set = Array.new(@pitches.uniq.sort)
-      if number > 0
-        number.times do |count|
-          index = count % pitch_set.length
-          pitch_set[index] += 12
-        end
-      else
-        number.abs.times do |count|
-          index = -(count + 1) % pitch_set.length # count from -1 downward to go backwards through the list starting at the end
-          pitch_set[index] -= 12
-        end
-      end
-      self.class.new pitch_set.sort
-    end
-
-    # Transpose the chord so that it's lowest pitch is the given pitch class.
-    def nearest(pitch_class)
-      self.transpose @pitches.first.pitch_class.distance_to(pitch_class)
-    end
-  end
-
-  # Construct an ordered {Melody} with no duplicates.
-  # @see #Chord
-  # @see #Melody
-  def Chord(*anything)
-    Chord.new Helpers::Convert.to_pitches(*anything)
-  end
-  module_function :Chord
-
-end

data/lib/mtk/duration.rb

@@ -1,211 +0,0 @@
-module MTK
-
-  # A measure of time in musical beats.
-  # May be negative to indicate a rest, which uses the absolute value for the effective duration.
-  class Duration
-
-    include Comparable
-
-    # The names of the base durations. See {MTK::Constants::Durations} for more info.
-    NAMES = %w[w h q i s r x].freeze
-
-    VALUES_BY_NAME = {
-      'w' => 4,
-      'h' => 2,
-      'q' => 1,
-      'i' => Rational(1,2),
-      's' => Rational(1,4),
-      'r' => Rational(1,8),
-      'x' => Rational(1,16)
-    }
-
-    @flyweight = {}
-
-    # The number of beats, typically represented as a Rational
-    attr_reader :value
-
-    def initialize( length_in_beats )
-      @value = length_in_beats
-    end
-
-    # Return a duration, only constructing a new instance when not already in the flyweight cache
-    def self.[](length_in_beats)
-      if length_in_beats.is_a? Fixnum
-        value = length_in_beats
-      else
-        value = Rational(length_in_beats)
-      end
-      @flyweight[value] ||= new(value)
-    end
-
-    class << self
-      alias :from_f :[]
-      alias :from_i :[]
-    end
-
-    # Lookup a duration by name.
-    # This method supports appending any combination of '.' and 't' for more fine-grained values.
-    # each '.' multiplies by 3/2, and each 't' multiplies by 2/3.
-    # You may use the prefix '-' to negate the duration (which turns it into a rest of the same length).
-    # You may also prefix (after the '-' if present) the base duration name with an integer, float, or rational number
-    # to multiply the base duration value. Rationals are in the form "#{{numerator_integer}}/#{{denominator_integer}}".
-    # @example lookup value of 'q.', which is 1.5 times a quarter note (1.5 beats):
-    #          MTK::Duration.from_s('q.')
-    # @example lookup the value of 3/4w, which three-quarters of a whole note (3 beats):
-    #          MTK::Duration.from_s('3/4w')
-    def self.from_s(s)
-      if s =~ /^(-)?(\d+([\.\/]\d+)?)?([whqisrx])((\.|t)*)$/i
-        name = $4.downcase
-        modifier = $5.downcase
-        modifier << $1 if $1 # negation
-        multiplier = $2
-      else
-        raise ArgumentError.new("Invalid Duration string '#{s}'")
-      end
-
-      value = VALUES_BY_NAME[name]
-      modifier.each_char do |mod|
-        case mod
-          when '-' then value *= -1
-          when '.' then value *= Rational(3,2)
-          when 't' then value *= Rational(2,3)
-        end
-      end
-
-      if multiplier
-        case multiplier
-          when /\./
-            value *= multiplier.to_f
-          when /\//
-            numerator, denominator = multiplier.split('/')
-            value *= Rational(numerator.to_i, denominator.to_i)
-          else
-            value *= multiplier.to_i
-        end
-      end
-
-      self[value]
-    end
-
-    class << self
-      alias :from_name :from_s
-    end
-
-    # The magnitude (absolute value) of the duration.
-    # This is the actual duration for rests.
-    # @see #rest?
-    def length
-      @value < 0 ? -@value : @value
-    end
-
-    # Durations with negative values are rests.
-    # @see #length
-    # @see #-@
-    def rest?
-      @value < 0
-    end
-
-    # The number of beats as a floating point number
-    def to_f
-      @value.to_f
-    end
-
-    # The numerical value for the nearest whole number of beats
-    def to_i
-      @value.round
-    end
-
-    def to_s
-      value = @value.to_s
-      value = sprintf '%.2f', @value if value.length > 6 # threshold is 6 for no particular reason...
-      "#{value} #{@value.abs > 1 || @value==0 ? 'beats' : 'beat'}"
-    end
-
-    def inspect
-      "#<#{self.class}:#{object_id} @value=#{@value}>"
-    end
-
-    def ==( other )
-      if other.is_a? MTK::Duration
-        other.value == @value
-      else
-        other == @value
-      end
-    end
-
-    def <=> other
-      if other.respond_to? :value
-        @value <=> other.value
-      else
-        @value <=> other
-      end
-    end
-
-    # Add this duration to another.
-    # @return a new Duration that has a value of the sum of the arguments.
-    def + duration
-      if duration.is_a? MTK::Duration
-        MTK::Duration[@value + duration.value]
-      else
-        MTK::Duration[@value + duration]
-      end
-    end
-
-    # Subtract another duration from this one.
-    # @return a new Duration that has a value of the difference of the arguments.
-    def - duration
-      if duration.is_a? MTK::Duration
-        MTK::Duration[@value - duration.value]
-      else
-        MTK::Duration[@value - duration]
-      end
-    end
-
-    # Multiply this duration with another.
-    # @return a new Duration that has a value of the product of the arguments.
-    def * duration
-      if duration.is_a? MTK::Duration
-        MTK::Duration[@value * duration.value]
-      else
-        MTK::Duration[@value * duration]
-      end
-    end
-
-    # Divide this duration with another.
-    # @return a new Duration that has a value of the division of the arguments.
-    def / duration
-      if duration.is_a? MTK::Duration
-        MTK::Duration[to_f / duration.value]
-      else
-        MTK::Duration[to_f / duration]
-      end
-    end
-
-    # Negate the duration value.
-    # Turns normal durations into rests and vice versa.
-    # @return a new Duration that has a negated value.
-    # @see #rest?
-    def -@
-      MTK::Duration[@value * -1]
-    end
-
-    # Allow basic math operations with Numeric objects.
-    def coerce(other)
-      return MTK::Duration[other], self
-    end
-
-  end
-
-  # Construct a {Duration} from any supported type
-  def Duration(*anything)
-    anything = anything.first if anything.length == 1
-    case anything
-      when Numeric then MTK::Duration[anything]
-      when String, Symbol then MTK::Duration.from_s(anything)
-      when Duration then anything
-      else raise "Duration doesn't understand #{anything.class}"
-    end
-  end
-  module_function :Duration
-
-end

data/lib/mtk/helpers/convert.rb

@@ -1,36 +0,0 @@
-module MTK
-  module Helpers
-
-    module Convert
-
-      def to_pitch_classes(*anything)
-        anything = anything.first if anything.length == 1
-        if anything.respond_to? :to_pitch_classes
-          anything.to_pitch_classes
-        else
-          case anything
-            when Enumerable then anything.map{|item| PitchClass(item) }
-            else [PitchClass(anything)]
-          end
-        end
-      end
-      module_function :to_pitch_classes
-
-
-      def to_pitches(*anything)
-        anything = anything.first if anything.length == 1
-        if anything.respond_to? :to_pitches
-          anything.to_pitches
-        else
-          case anything
-            when Enumerable then anything.map{|item| Pitch(item) }
-            else [Pitch(anything)]
-          end
-        end
-      end
-      module_function :to_pitches
-
-    end
-
-  end
-end

data/lib/mtk/helpers/output_selector.rb

@@ -1,67 +0,0 @@
-require 'mtk/midi/output'
-
-module MTK
-  module Helpers
-
-    # Optional class for loading the preferred platform-specific implementation of an output,
-    # and methods to assist with selecting an output.
-    class OutputSelector
-
-      class << self
-
-        def output
-          MTK::MIDI::Output
-        end
-
-        # Look for an output by name using case insensitive matching,
-        # treating underscore like either an underscore or whitespace
-        def search output_name_pattern
-          output.find_by_name(/#{output_name_pattern.to_s.sub '_','(_|\\s+)'}/i)
-        end
-
-        # Command line interface to list output choices and select an output.
-        def prompt_for_output
-          devices_by_name = output.devices_by_name
-          names_by_number = {}
-
-          puts "Available MIDI outputs:"
-          devices_by_name.keys.each_with_index do |name,index|
-            number = index+1
-            names_by_number[number] = name
-            puts " #{number} => #{name}"
-          end
-
-          print "Enter the number of the output to test: "
-          device = nil
-          loop do
-            begin
-              number = STDIN.gets.to_i
-              name = names_by_number[number]
-              device = devices_by_name[name]
-              return output.open(device) if device
-            rescue
-              if $DEBUG
-                puts $!
-                puts $!.backtrace
-              end
-              # keep looping
-            end
-            print "Invalid input. Enter a number listed above: "
-          end
-        end
-
-
-        def ensure_output name=nil
-          output = nil
-          if name
-            output = search name
-            puts "Output '#{name}' not found." unless output
-          end
-          output || prompt_for_output
-        end
-
-      end
-
-    end
-  end
-end