musicality 0.10.1 → 0.11.0

data/spec/performance/midi/score_sequencing_spec.rb

@@ -6,30 +6,30 @@ describe Score::Timed do
                     "/2A4 "*2 + "1G4").to_notes
       end
       s.parts["lhand"] = Part.new(Dynamics::MF) do |p|
-        p.notes += ("1C3,E3,G3 "*2 + 
+        p.notes += ("1C3,E3,G3 "*2 +
                     "1F2,A2,C3 1C3,E3,G3").to_notes
       end
       s.program.push 0...8
     end
   end
-  
+
   describe '#to_midi_seq' do
     it 'should produce a MIDI::Sequence' do
       seq = @score.to_midi_seq
       seq.should be_a MIDI::Sequence
     end
-  end  
+  end
 end
 
 describe Score::Tempo do
   before :all do
-    @score = Score::Tempo.new(TWO_FOUR, 120) do |s|
+    @score = Score::Tempo.new(120) do |s|
       s.parts["rhand"] = Part.new(Dynamics::MF) do |p|
         p.notes += ("/4C4 "*2 + "/4G4 "*2 +
                     "/4A4 "*2 + "/2G4").to_notes
       end
       s.parts["lhand"] = Part.new(Dynamics::MF) do |p|
-        p.notes += ("/2C3,E3,G3 "*2 + 
+        p.notes += ("/2C3,E3,G3 "*2 +
                     "/2F2,A2,C3 /2C3,E3,G3").to_notes
       end
       s.program.push 0...4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicality
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,14 +122,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-description: "The library is based around an abstract representation for music notation.
-  \\\n                          From here, functions are built up to make composing
-  elaborate pieces in this notation representation more manageable. \\\n                          Finally,
-  music performance is supported by providing translation to common formats, like
-  MIDI. "
+description: 'The library is based around an abstract representation '
 email:
 - jamestunnell@gmail.com
 executables:
+- auditions
 - collidify
 - lilify
 - midify
@@ -145,6 +142,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/auditions
 - bin/collidify
 - bin/lilify
 - bin/midify
@@ -159,6 +157,7 @@ files:
 - examples/notation/twinkle.score
 - lib/musicality.rb
 - lib/musicality/composition/convenience_methods.rb
+- lib/musicality/composition/dsl/part_methods.rb
 - lib/musicality/composition/dsl/score_dsl.rb
 - lib/musicality/composition/dsl/score_methods.rb
 - lib/musicality/composition/generation/counterpoint_generator.rb
@@ -180,6 +179,7 @@ files:
 - lib/musicality/notation/conversion/score_converter.rb
 - lib/musicality/notation/conversion/tempo_conversion.rb
 - lib/musicality/notation/model/articulations.rb
+- lib/musicality/notation/model/audition.rb
 - lib/musicality/notation/model/change.rb
 - lib/musicality/notation/model/dynamics.rb
 - lib/musicality/notation/model/instrument.rb
@@ -278,15 +278,16 @@ files:
 - lib/musicality/printing/lilypond/pitch_engraving.rb
 - lib/musicality/printing/lilypond/score_engraver.rb
 - lib/musicality/printing/lilypond/score_engraving.rb
+- lib/musicality/project/auditions_task.rb
 - lib/musicality/project/create_tasks.rb
 - lib/musicality/project/file_cleaner.rb
 - lib/musicality/project/file_raker.rb
-- lib/musicality/project/load_config.rb
 - lib/musicality/project/project.rb
 - lib/musicality/validatable.rb
 - lib/musicality/version.rb
 - musicality.gemspec
 - spec/composition/convenience_methods_spec.rb
+- spec/composition/dsl/part_methods_spec.rb
 - spec/composition/dsl/score_methods_spec.rb
 - spec/composition/generation/random_rhythm_generator_spec.rb
 - spec/composition/model/pitch_class_spec.rb
@@ -373,6 +374,7 @@ specification_version: 4
 summary: Music notation, composition, and performance
 test_files:
 - spec/composition/convenience_methods_spec.rb
+- spec/composition/dsl/part_methods_spec.rb
 - spec/composition/dsl/score_methods_spec.rb
 - spec/composition/generation/random_rhythm_generator_spec.rb
 - spec/composition/model/pitch_class_spec.rb

data/lib/musicality/project/load_config.rb

@@ -1,58 +0,0 @@
-module Musicality
-
-class Project
-  CONFIG_FILE_NAME = "config.yml"
-  BASE_SCORES_DIR = "scores"
-
-  DEFAULT_CONFIG = {
-    :scores => File.join(BASE_SCORES_DIR, "**", "*.score"),
-    :tempo_sample_rate => 200,
-    :audio_sample_rate => 44100, 
-    :audio_sample_format => "int16"
-  }
-
-  SAMPLE_FORMATS = ["int8", "int16", "int24", "int32", "mulaw", "alaw", "float"]
-
-  class ConfigError < RuntimeError
-  end
-
-  def self.check_config config
-    config.each do |k,v|
-      case k
-      when :audio_sample_format
-        raise ConfigError, "#{k} => #{v} is not allowed" unless SAMPLE_FORMATS.include?(v)
-      when :tempo_sample_rate, :audio_sample_rate
-        raise ConfigError, "#{k} => #{v} is not positive" unless v > 0
-      end
-    end
-  end
-
-  def self.load_config project_root_dir
-    globabl_config_path = File.join(project_root_dir,CONFIG_FILE_NAME)
-    
-    config = if File.exists? globabl_config_path
-      global_config = YAML.load(File.read(globabl_config_path))
-      DEFAULT_CONFIG.merge global_config
-    else
-      DEFAULT_CONFIG
-    end
-
-    # overrides from ENV
-    config.keys.each do |k|
-      k_str = k.to_s
-      if ENV.has_key? k_str
-        case k
-        when :tempo_sample_rate, :audio_sample_rate
-          config[k] = ENV[k_str].to_i
-        else
-          config[k] = ENV[k_str]
-        end
-      end
-    end
-
-    check_config config
-    return config
-  end
-end
-
-end