brevity 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a75a79f97d04f510ba6fe4b19c2f9d16ad4e29c4
-  data.tar.gz: ffd37ed1f4e1bdb122b5482fb06c6de9a9798549
+  metadata.gz: ad6e32b3d5a76cb443ee950e31cd4032b2327a3c
+  data.tar.gz: 3aef2e05e8f62bd4a6458003724d5d200d49ced8
 SHA512:
-  metadata.gz: a68eff07683640d944d6d620bd24f65f14263d399099dedeaea6a402f1bc80de4a05dfea84cb073ddd2f3b552655c6ab628202f58a6545042fb75e31b2e4b35d
-  data.tar.gz: 46252d7032b3ec064c85aa59f66685f7d0fdfe90eca956148ce8efcc79b8c936b553e38527ef9db1b088e0d8ae384f735819407b2eca90fd76e49f007372eed9
+  metadata.gz: d2a45ec2ce37828fc75074339194336976006fa4e322e987b805f90882828048cf279d978ea3519b954cc485a23024167403c5c15785ffb26d3aa55a1f49967c
+  data.tar.gz: a473944786b996ffef85412a6e84a6e620a1b364b73e5a3a10b5400dfd387270d132fd841c2c7ea72810ed4c6003daa7132396691d9a9320f30b4340c1f873bb

data/bin/debrief

@@ -10,14 +10,15 @@ doc = <<DOCOPT
 Parses a Brevity file, outputting a music-transcription parts as YAML.
 
 Usage:
-  #{exe_name} <input>
-  #{exe_name} <input> <output>
+  #{exe_name} <input>  [options]
+  #{exe_name} <input> <output> [options]
   #{exe_name} -h | --help
   #{exe_name} --version
 
 Options:
-  -h --help     Show this screen.
-  --version     Show version.
+  --validate  Check score validity and display any errors found
+  -h --help      Show this screen.
+  --version      Show version.
 
 DOCOPT
 
@@ -44,7 +45,19 @@ puts "complete"
 print "Making score..."
 score = sm.make_score
 puts "complete"
+
+if args["--validate"]
+  print "Validating score..."
+  errors = score.validate
+  puts "complete. #{errors.size} errors found."
   
+  if errors.any?
+    puts "Error list:"
+    errors.each {|e| puts "\t#{e}"}
+    puts ""
+  end
+end
+
 fout = args["[output]"]
 if fout.nil?
   fout = "#{File.dirname(fin)}/#{File.basename(fin,File.extname(fin))}.yml"

data/brevity.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   
   gem.add_dependency 'treetop'
-  gem.add_dependency 'music-transcription', '~> 0.7'
+  gem.add_dependency 'docopt'
+  gem.add_dependency 'music-transcription', '~> 0.7.2'
 end

data/lib/brevity/commands/part.rb

@@ -23,16 +23,15 @@ module Brevity
           note = p
           notes.push note
           offset += note.duration
-        when Music::Transcription::Dynamic
+        when Numeric
           dynamic = p
           if change_mark.nil?
-            change = Music::Transcription::Change::Immediate.new(dynamic)
+            dynamic_changes[offset] = Music::Transcription::Change::Immediate.new(dynamic)
           else
             duration = offset - change_mark
-            change = Music::Transcription::Change::Gradual.new(dynamic,duration)
+            dynamic_changes[change_mark] = Music::Transcription::Change::Gradual.new(dynamic,duration)
             change_mark = nil
           end
-          dynamic_changes[offset] = change
         when GradualNode
           change_mark = offset
         end

data/lib/brevity/parsing/expression/dynamic_nodes.rb

@@ -7,49 +7,49 @@ module Brevity
   
   class PianississimoNode < DynamicNode
     def to_dynamic
-      Music::Transcription::Dynamic::Pianississimo.new
+      Music::Transcription::Dynamics::PPP
     end
   end
   
   class PianissimoNode < DynamicNode
     def to_dynamic
-      Music::Transcription::Dynamic::Pianissimo.new
+      Music::Transcription::Dynamics::PP
     end
   end
   
   class PianoNode < DynamicNode
     def to_dynamic
-      Music::Transcription::Dynamic::Piano.new
+      Music::Transcription::Dynamics::P
     end
   end
   
   class MezzoPianoNode < DynamicNode
     def to_dynamic
-      Music::Transcription::Dynamic::MezzoPiano.new
+      Music::Transcription::Dynamics::MP
     end
   end
   
   class  MezzoForteNode < DynamicNode
     def to_dynamic
-      Music::Transcription::Dynamic::MezzoForte.new
+      Music::Transcription::Dynamics::MF
     end
   end
   
   class ForteNode < DynamicNode
     def to_dynamic
-      Music::Transcription::Dynamic::Forte.new
+      Music::Transcription::Dynamics::F
     end
   end
   
   class  FortissimoNode < DynamicNode
     def to_dynamic
-      Music::Transcription::Dynamic::Fortissimo.new
+      Music::Transcription::Dynamics::FF
     end
   end
   
   class FortississimoNode < DynamicNode
     def to_dynamic
-      Music::Transcription::Dynamic::Fortississimo.new
+      Music::Transcription::Dynamics::FFF
     end
   end
 end

data/lib/brevity/version.rb

@@ -1,4 +1,4 @@
 module Brevity
   # Brevity version
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/commands/part_spec.rb

@@ -8,8 +8,9 @@ describe 'Commands.part' do
   context 'given valid expression' do
     it 'should assign primitives to given label under @env[ENV_EXPRS]' do
       notes = [ Note::Half.new([C2]), Note::Half.new, Note::Quarter.new([E2]) ]
-      tgt = Part.new(notes: notes, dynamic_profile: Profile.new(Dynamics::MF))
-      @tester.part("hello","mf","/2C2 /2 /4D2+2")
+      dcs = { "1/2".to_r => Change::Gradual.new(Dynamics::FF, "1/2".to_r) }
+      tgt = Part.new(Dynamics::MF, notes: notes, dynamic_changes: dcs)
+      @tester.part("hello","mf","/2C2 < /2 ff /4D2+2")
       @tester.env[Commands::ENV_PARTS]["hello"].should eq(tgt)
     end
   end  

data/spec/parsing/expression/dynamic_nodes_spec.rb

@@ -21,7 +21,7 @@ describe DynamicNode do
     describe '#to_dynamic' do
       d = res.to_dynamic
       it 'should produce a Dynamic' do
-        d.should be_a Dynamic
+        d.should be_a Numeric
       end
       
       it 'should produce a value matching input str' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brevity
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: docopt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: music-transcription
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.2
 description: Parse and process brevity files, used for music notation. Convert them
   to other formats.
 email: jamestunnell@gmail.com