lyp-win 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 548bf1aec3730d747d797cfff7f947ff3cabd73a
-  data.tar.gz: 5ead4fbb024fdca33db526cab5d7651d06302b31
+  metadata.gz: 92d7c8b45c2774b839d4e20d3726c5532879a05b
+  data.tar.gz: 6cb8087783571a956f952e0f81a922d25397af83
 SHA512:
-  metadata.gz: c5de2eb91046c04e0f6ef983e0356b074a8000b16fd643f2cb8bc4629b3f53c7438eadc84df4ea72c40f4ecff56481baa15732f4ab2237b86e60087390f31f71
-  data.tar.gz: 15f41f76805248b92b83da04ce01e36c2100bd533c037016c0dc1f1dfe8fb899eeaeaac88877c20ea1e02d6cf8576c109128e25b2db61d9c5754a744be61c031
+  metadata.gz: 0e6d13810fba7603cfc1640d1c752ad926f3e8ef4c679e252c6e4d8a1cb1a27d5a533f475e06df83f1d0825dead5e765ca941bb804f4ef4f444236551f5c881a
+  data.tar.gz: 8a53bebf7bcbfbc40b8106a42614a8b756c7bd1504301eef54bc3ac202ac84adfb045f68c136a100987fcc75346307177f529b9baae273811870f1a38869fa45

data/bin/install_release.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+LYP_VERSION="0.3.2"
+WORKDIR="/tmp/lyp-release-installer"
+URL_BASE="https://github.com/noteflakes/lyp/releases/download/v$LYP_VERSION"
+
 shopt -s extglob
 set -o errtrace
 set -o errexit
@@ -17,10 +21,6 @@ download() {
   fi
 }
     
-WORKDIR="/tmp/lyp-release-installer"
-LYP_VERSION="0.3.1"
-URL_BASE="https://github.com/noteflakes/lyp/releases/download/v$LYP_VERSION"
-
 PLATFORM=`uname -sp`
 case $PLATFORM in
   "Linux x86_64")

data/bin/lilypond

@@ -29,7 +29,7 @@ def process_argv
       argv_clean << arg
     end
   end
-  
+
   [options, argv_clean]
 end
 $options, $argv = process_argv
@@ -55,7 +55,7 @@ end
 $lilypond_path = get_lilypond_path
 
 if $options[:raw]
-  exec("#{$lilypond_path} #{$argv[1..-1].join(' ')}")
+  exec("#{$lilypond_path} #{$argv.join(' ')}")
 end
 
 OVERRIDING_LILYPOND_SWITCHES = %w{
@@ -78,7 +78,7 @@ case $argv.first
 when nil, *OVERRIDING_LILYPOND_SWITCHES
   STDERR.puts "Lyp version #{Lyp::VERSION}"
   exec("#{$lilypond_path} #{$argv.join(' ')}")
-  
+
 when *LILYPOND_HELP_SWITCHES
   STDERR.puts "Lyp version #{Lyp::VERSION}"
   puts `#{$lilypond_path} #{$argv.join(' ')}`

data/lib/lyp/etc/lyp.ly

@@ -1,16 +1,64 @@
 #(begin
+  (display "\nlyp.ly\n")
+
+  ; file/path procedures based on code from oll-core:
+  ;   https://github.com/openlilylib/oll-core/
+
+  (use-modules
+    (lily)
+    (ice-9 regex))
+
   (define lyp:path-separator "/")
-  (define (lyp:file-join . ls) (string-join ls lyp:path-separator))
+  (define (lyp:join-path . ls) (string-join ls lyp:path-separator))
+
+  ; convert back-slashes to forward slashes (for use in lyp:split-path)
+  (define (lyp:normalize-path path)
+    (regexp-substitute/global #f "[\\]+" path 'pre "/" 'post)
+  )
+
+  (define (lyp:split-path path)
+    (string-split (lyp:normalize-path path) #\/))
+
+  (define lyp:absolute-path-pattern
+    (if (eq? PLATFORM 'windows) "^[a-zA-Z]:" "^/"))
+
+  (define (lyp:absolute-path? path)
+    (string-match lyp:absolute-path-pattern path))
+
+  ; return an absolute path, resolving any . or .. parts
+  (define (lyp:expand-path path) (let* (
+      ; create a path list by joining the current directory
+      (tmp-path (if (lyp:absolute-path? path)
+                    path (lyp:join-path (ly-getcwd) path)))
+      (src-list (lyp:split-path tmp-path))
+      (dst-list '())
+    )
+    (for-each
+      (lambda (p)
+        (cond
+          ((eq? (length dst-list) 0) ; start of path
+            (set! dst-list (list p)))
+          ((or (string=? p "") (string=? p ".")) ; ignore empty part
+            #f)
+          ((string=? p "..") ; go up a level (remove last part from list)
+            (set! dst-list (reverse (cdr (reverse dst-list)))))
+          (else
+            (set! dst-list (append dst-list (list p))))))
+      src-list)
+    (apply lyp:join-path dst-list)
+  ))
+
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
   ; hash table mapping package refs to package names
   (define lyp:package-refs (make-hash-table))
-  
+
   ; hash table mapping package names to package directories
   (define lyp:package-dirs (make-hash-table))
-  
+
   ; hash table mapping package names to loaded state
   (define lyp:package-loaded? (make-hash-table))
-  
+
   ; hash table mapping file paths to included state
   (define lyp:file-included? (make-hash-table))
 
@@ -22,7 +70,7 @@
     (or name (throw 'lyp:failure "lyp:ref->name"
       (format "Invalid package ref ~a" ref) #f))
   ))
-  
+
   ; convert package reef to directory
   (define (lyp:name->dir name) (let (
       (dir (hash-ref lyp:package-dirs name))
@@ -30,50 +78,58 @@
     (or dir (throw 'lyp-failure "lyp:name->dir"
       (format "Invalid package name ~a" ref) #f))
   ))
-  
-  ; converts a package-relative path to absolute path. If the package is null,
-  ; uses lyp:current-package-dir (which value is valid only on package loading)
-  (define (lyp:package-file-path package path) (let* (
-      (base-path (if (null? package) 
-        lyp:current-package-dir (lyp:name->dir package)))
+
+  ; Because the *location* in lilypond is kinda broken (it becomes unusable 
+  ; when using nested includes, even in > 2.19.22, we provide an alternative 
+  ; for keeping track of the current file, and thus be able to include files
+  ; using relative path names (relative to the current file).
+  (define lyp:last-this-file #f)
+  (define (lyp:this-file) (or lyp:last-this-file lyp:input-filename))
+  (define (lyp:this-dir) (dirname (lyp:this-file)))
+
+  (define (lyp:load path) (let* (
+      (current-file (lyp:this-file))
+      (current-dir  (dirname current-file))
+      (abs-path     (if (lyp:absolute-path? path)
+                        path
+                        (lyp:expand-path (lyp:join-path current-dir path))))
     )
-    (lyp:file-join base-path path)
-  ))
-  
-  ; converts a package file reference to absolute path
-  (define (lyp:fileref->path ref) (let* (
-      (split (string-split ref #\:))
-      (qualified? (eq? (length split) 2))
-      (package (if qualified? (list-ref split 0) %nil))
-      (path (if qualified? (list-ref split 1) (list-ref split 0)))
+    (if (not (file-exists? abs-path))
+      (throw 'lyp:failure "lyp:load"
+        (format "File not found ~a" abs-path) #f)
     )
-    (lyp:package-file-path package path)
+    (set! lyp:last-this-file abs-path)
+    (load abs-path)
+    (set! lyp:last-this-file current-file)
   ))
-  
-  (define (lyp:load ref) (load (lyp:fileref->path ref)))
-  
+
   (define (lyp:include-ly-file path once-only?) (let* (
-      (included? (and once-only? (hash-ref lyp:file-included? path)))
+      (current-file (lyp:this-file))
+      (current-dir  (dirname current-file))
+      (abs-path     (if (lyp:absolute-path? path)
+                        path
+                        (lyp:expand-path (lyp:join-path current-dir path))))
+      (included?    (and once-only? (hash-ref lyp:file-included? abs-path)))
     )
-    (if (not (file-exists? path))
+    (ly:debug (format "lyp:include ~a\n" abs-path))
+    (if (not (file-exists? abs-path))
       (throw 'lyp:failure "lyp:include-ly-file"
-        (format "File not found ~a" path) #f)
+        (format "File not found ~a" abs-path) #f)
     )
     (if (not included?) (begin
-      (hash-set! lyp:file-included? path #t)
-      #{ \include #path #}
-    ))
-  ))
-  
-  (define (lyp:include ref)
-    (lyp:include-ly-file (lyp:fileref->path ref) #f))
-  (define (lyp:include-once ref)
-    (lyp:include-ly-file (lyp:fileref->path ref) #t))
-  
+      (hash-set! lyp:file-included? abs-path #t)
+      (set! lyp:last-this-file abs-path)
+      #{ \include #abs-path #}
+      (set! lyp:last-this-file current-file)
+    ))))
+
+  (define (lyp:include      path) (lyp:include-ly-file path #f))
+  (define (lyp:include-once path) (lyp:include-ly-file path #t))
+
   (define (lyp:require ref) (let* (
       (name (lyp:ref->name ref))
       (package-dir (lyp:name->dir name))
-      (entry-point-path (lyp:file-join package-dir "package.ly"))
+      (entry-point-path (lyp:join-path package-dir "package.ly"))
       (loaded? (hash-ref lyp:package-loaded? name))
       (prev-package-dir lyp:current-package-dir)
     )
@@ -81,20 +137,17 @@
       (ly:debug "Loading package ~a at ~a" name package-dir)
       (set! lyp:current-package-dir package-dir)
       (hash-set! lyp:package-loaded? name #t)
-      #{ \include #entry-point-path #}
+      (lyp:include entry-point-path)
       (set! lyp:current-package-dir prev-package-dir)
-    ))
-  ))
+    ))))
 )
 
 % command form
 require = #(define-void-function (parser location ref)(string?)
   (lyp:require ref))
 
-
 pinclude = #(define-void-function (parser location ref)(string?)
   (lyp:include ref))
 
 pincludeOnce = #(define-void-function (parser location ref)(string?)
   (lyp:include-once ref))
-

data/lib/lyp/lilypond.rb

@@ -48,6 +48,19 @@ module Lyp::Lilypond
       settings[:current]
     end
     
+    def current_lilypond_version
+      path = current_lilypond
+      version = File.basename(File.expand_path("#{File.dirname(path)}/../.."))
+
+      unless (Gem::Version.new(version) rescue nil)
+        resp = `#{path} -v`
+        if resp.lines.first =~ /LilyPond ([0-9\.]+)/i
+          version = $1
+        end
+      end
+      version
+    end
+    
     def set_current_lilypond(path)
       settings = get_session_settings
       settings[:current] = path
@@ -560,9 +573,14 @@ module Lyp::Lilypond
         success = exit_value == 0
       end
       if !success && raise_on_failure
-        raise "Error executing cmd #{cmd}: #{$_err}"
+        raise "Error executing cmd #{cmd}:\n#{parse_error_msg($_err)}"
       end
       success
     end
+    
+    def parse_error_msg(msg)
+      (msg =~ /[^\n]+: error.+failed files: ".+"/m) ?
+        $& : msg
+    end
   end
 end

data/lib/lyp/package.rb

@@ -431,7 +431,7 @@ module Lyp::Package
     
     def perform_test(fn, stats)
       stats[:test_count] += 1
-      unless Lyp::Lilypond.compile([fn], mode: :system, force_wrap: true)
+      unless Lyp::Lilypond.compile([fn], mode: :system)
         stats[:fail_count] += 1
       end
     end

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/lyp/wrapper.rb

@@ -11,12 +11,10 @@ module Lyp
     # copy current_package_dir option
     r[:current_package_dir] = opts[:current_package_dir]
 
-    if !r[:package_dirs].empty? || opts[:force_wrap]
-      FileUtils.mkdir_p("#{Lyp::TMP_ROOT}/wrappers")
-      fn = "#{Lyp::TMP_ROOT}/wrappers/#{File.basename(fn)}" 
+    FileUtils.mkdir_p("#{Lyp::TMP_ROOT}/wrappers")
+    fn = "#{Lyp::TMP_ROOT}/wrappers/#{File.basename(fn)}" 
   
-      File.open(fn, 'w+') {|f| f << WRAPPER_TEMPLATE.render(r)}
-    end
+    File.open(fn, 'w+') {|f| f << WRAPPER_TEMPLATE.render(r)}
     fn
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp-win
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient