musicality 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3af3d687ff5109e122bfa208ee1d566bc97674
-  data.tar.gz: 2d819234281b8639e5bb8dd58fcc4e1acb2c3834
+  metadata.gz: c80e6fa5fd903b82f6a850f9780739197b0a3c56
+  data.tar.gz: a110c580d68007bab242f7d7a647e4b583abd885
 SHA512:
-  metadata.gz: a3f3dd479c5350582fbe1ff5183dd25ae006e8fa9028d071da12123d1192adfe938dea47c4705fd4c95c192c6f34abf1cf37e473ef1d1e726631dbd375d1154e
-  data.tar.gz: 2cf2328e11b1f5b998483c894460e95582e4635c979b310840d0a02c272beadf7bb0f53f01d74b2edca2cc6fe7f57886053d53e971ca1674d7121c737f778ecd
+  metadata.gz: bc1b333be0c54a2171344aba9458f5e32c2e4a8c2737431821525f058c6a827bd2eb351261cf2a6d159518c1e3281d79dadc621d6c48dbe58a8cec9adfa383f0
+  data.tar.gz: a8e82d0a11291148498a6c54f17c0cb3db4f3071946946e0668cf7e5a335a6d8f3e782bf1137f49304e20efdd78b4441697fc980f6f229d73570122e4ecd6e54

data/ChangeLog.md

@@ -1,3 +1,10 @@
+### 0.10.1 / 2016-01-08
+* Kill sclang process with Process.kill(9,pid) when running on Windows. Otherwise use Process.kill('INT',pid)
+* Delete .scd after it is processed
+* Fix error in PartEngraver#make_body
+* Specify output directory in lilypond command line
+* Add lilypond .ly files to list of output files to be cleaned
+
 ### 0.10.0 / 2016-01-08
 * Remove uneeded gem dependency
 * Treat all offsets and durations in Score::Tempo as note offsets. Don't check if meter change offsets are integer anymore.

data/lib/musicality/performance/supercollider/conductor.rb

@@ -18,6 +18,7 @@ class Conductor
     bundles = bundles(selected_parts, lead_time)
     fpath = write_sc_code bundles, base_fpath
     exec_sc_code fpath, bundles.last.time, verbose
+    File.delete(fpath)
   end
 
   def bundles selected_parts = @performers.keys, lead_time
@@ -114,7 +115,11 @@ SCLANG
         when post_sclang_pid
           sclang_pid = $1.to_i
         when COMPLETION_MSG
-          Process.kill 'INT', sclang_pid
+          if OS.windows?
+            Process.kill 9, sclang_pid
+          else
+            Process.kill "INT", sclang_pid
+          end
         end
       end
     end

data/lib/musicality/printing/lilypond/part_engraver.rb

@@ -56,7 +56,7 @@ class PartEngraver
   def make_body sharpit
     i = 0
     pieces = @part.notes.map do |n|
-      if @triplet_flags[i]
+      str = if @triplet_flags[i]
         n.resize(n.duration * Rational(3,2)).to_lilypond(sharpit,
           begins_triplet: i == 0 || !@triplet_flags[i-1],
           ends_triplet: i == (@triplet_flags.size-1) || !@triplet_flags[i+1])
@@ -64,6 +64,7 @@ class PartEngraver
         n.to_lilypond(sharpit)
       end
       i += 1
+      str
     end
 
     output = ""

data/lib/musicality/project/create_tasks.rb

@@ -21,8 +21,9 @@ class Project
     ps_task = Tasks::FileRaker::Visual.new(lilypond_task.files, :ps)
 
     outfiles = (
-        yaml_task.files + midi_task.files + supercollider_task.files + wav_task.files + 
-        aiff_task.files + flac_task.files + pdf_task.files + png_task.files + ps_task.files
+        yaml_task.files + lilypond_task.files + midi_task.files + supercollider_task.files + 
+        pdf_task.files + png_task.files + ps_task.files + 
+        wav_task.files + aiff_task.files + flac_task.files
     ).select {|fname| File.exists? fname }
     clean_task = Tasks::FileCleaner.new(outfiles)  
   end

data/lib/musicality/project/file_raker.rb

@@ -97,7 +97,10 @@ class FileRaker < Rake::TaskLib
   class Visual < FileRaker
     def initialize lilypond_files, visual_file_type
       super(lilypond_files, visual_file_type, ".#{visual_file_type}") do |t|
-        sh "lilypond #{t.sources[0]} --#{visual_file_type}"
+        ly_fpath = t.sources[0]
+        out_dir = File.dirname(ly_fpath)
+        
+        sh "lilypond --output=\"#{out_dir}\" \"#{ly_fpath}\" --#{visual_file_type}"
       end
     end
   end

data/lib/musicality/version.rb

@@ -1,3 +1,3 @@
 module Musicality
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/lib/musicality.rb

@@ -110,6 +110,7 @@ require 'musicality/performance/midi/part_sequencer'
 require 'musicality/performance/midi/score_sequencer'
 require 'musicality/performance/midi/score_sequencing'
 
+require 'os'
 require 'musicality/performance/supercollider/message'
 require 'musicality/performance/supercollider/bundle'
 require 'musicality/performance/supercollider/server'

data/musicality.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "treetop", "~> 1.5"
   spec.add_dependency 'midilib', '~> 2.0'
   spec.add_dependency 'docopt', '~> 0.5'
+  spec.add_dependency 'os', '~> 0.9'
 
   spec.required_ruby_version = '>= 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicality
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - James Tunnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !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,