lyp 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f4c3096919de344328ca239c4c6b2a779a292d6
-  data.tar.gz: 1ba4797c5d48dc6fb6643f6860d152580e922c4b
+  metadata.gz: ec8334dffcd62c410ebf9f6630d95b9d980e0ad9
+  data.tar.gz: 5aa416050909fc3b7c628e799390f94a977609d0
 SHA512:
-  metadata.gz: 6a1d79624bd39b291ef44d5fe7c1e08b9cffbd71a1dd5e7f5dedf37b05f2ad11eba83910bb93dcaaf877633a02dd12da7f9dbfd388ff2eee5465d8735e4fffae
-  data.tar.gz: 183a7c869054c9d4c03ff73ec4f61056c6cfdf496542fe09aeb94b7012b0cdb084620e9c22f4e3405f99884827bdf04da35847fefadfe63842c338fd79b31366
+  metadata.gz: 2e400ff952e684c0e8ba9da536e80ee015eebe742858a83c9ff9fbf4706c14b2b233881166f22fd7f63a3e17c03b6062c141942267edd8a3d0cdbf318c76375b
+  data.tar.gz: 5c7632c1626e763ac4463b0c3ad66cc78386eba95933511a213b8f3e7267924201514a3fcca2467656e47b53857f7e3e8652eacb0e294402d894bd0b9f364a7c

data/bin/install_release.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+LYP_VERSION="0.3.3"
+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/bin/lyp

@@ -3,4 +3,7 @@
 $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 
 require 'lyp'
-require 'lyp/cli'
+require 'lyp/cli'
+
+Lyp::Package.load_all_extensions
+Lyp::CLI.run

data/lib/lyp/base.rb

@@ -17,6 +17,7 @@ module Lyp
   LYP_DIRECTORY = File.expand_path('~/.lyp')
   LYP_BIN_DIRECTORY = File.join(LYP_DIRECTORY, 'bin')
   LYP_LIB_DIRECTORY = File.join(LYP_DIRECTORY, 'lib')
+  LYP_EXT_DIRECTORY = File.join(LYP_DIRECTORY, 'ext')
   DEFAULT_PACKAGE_DIRECTORY = File.join(LYP_DIRECTORY, 'packages')
   DEFAULT_LILYPONDS_DIRECTORY = File.join(LYP_DIRECTORY, 'lilyponds')
   
@@ -42,6 +43,10 @@ module Lyp
   def self.lilyponds_dir
     ensure_dir(DEFAULT_LILYPONDS_DIRECTORY)
   end
+  
+  def self.ext_dir
+    ensure_dir(LYP_EXT_DIRECTORY)
+  end
 
   def self.settings_file
     ensure_dir(LYP_DIRECTORY)

data/lib/lyp/cli.rb

@@ -64,7 +64,7 @@ class Lyp::CLI < Thor
     else
       search_package(pattern)
     end
-  end  
+  end
   
   no_commands do
     def search_lilypond(version)
@@ -303,12 +303,13 @@ class Lyp::CLI < Thor
       end
     end
   end
+  
+  def self.run
+    start(ARGV)
+  rescue => e
+    puts e.message
+    puts e.backtrace.join("\n") if $cmd_options[:verbose]
+    exit(1)
+  end
 end
 
-begin
-  Lyp::CLI.start(ARGV)
-rescue => e
-  puts e.message
-  puts e.backtrace.join("\n") if $cmd_options[:verbose]
-  exit(1)
-end

data/lib/lyp/etc/lyp.ly

@@ -1,16 +1,62 @@
 #(begin
+  ; 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 +68,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,71 +76,96 @@
     (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)))
-    )
-    (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)))
-    )
-    (lyp:package-file-path package path)
-  ))
-  
-  (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)))
-    )
-    (if (not (file-exists? path))
-      (throw 'lyp:failure "lyp:include-ly-file"
-        (format "File not found ~a" path) #f)
+
+  ; 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))))
     )
-    (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))
-  
-  (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"))
-      (loaded? (hash-ref lyp:package-loaded? name))
-      (prev-package-dir lyp:current-package-dir)
+    (if (not (file-exists? abs-path))
+      (throw 'lyp:failure "lyp:load"
+        (format "File not found ~a" abs-path) #f)
     )
-    (if (not loaded?) (begin
-      (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 #}
-      (set! lyp:current-package-dir prev-package-dir)
-    ))
+    (set! lyp:last-this-file abs-path)
+    (load abs-path)
+    (set! lyp:last-this-file current-file)
   ))
+
+  (define (lyp:do-include parser path)
+    (if (defined? '*parser*)
+      (ly:parser-parse-string (ly:parser-clone)
+        (format "\\include \"~a\"" path))
+      (ly:parser-parse-string (ly:parser-clone parser)
+        (format "\\include \"~a\"" path))))
 )
 
 % command form
-require = #(define-void-function (parser location ref)(string?)
-  (lyp:require ref))
-
+require = #(define-void-function (parser location ref)(string?) (let* (
+    (current-file (lyp:this-file))
+    (name (lyp:ref->name ref))
+    (package-dir (lyp:name->dir name))
+    (entry-point-path (lyp:join-path package-dir "package.ly"))
+    (loaded? (hash-ref lyp:package-loaded? name))
+    (prev-package-dir lyp:current-package-dir)
+  )
+  (if (not loaded?) (begin
+    (ly:debug "Loading package ~a at ~a" name package-dir)
+    (set! lyp:current-package-dir package-dir)
+    (hash-set! lyp:package-loaded? name #t)
+    
+    (set! lyp:last-this-file entry-point-path)
+    (lyp:do-include parser entry-point-path)
+    (set! lyp:last-this-file current-file)
+    
+    (set! lyp:current-package-dir prev-package-dir)
+  ))
+))
+    
+pinclude = #(define-void-function (parser location path)(string?) (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))))
+  )
+  (ly:debug (format "\\pinclude ~a\n" abs-path))
+  (if (not (file-exists? abs-path))
+    (throw 'lyp:failure "\\pinclude"
+      (format "File not found ~a" abs-path) #f))
 
-pinclude = #(define-void-function (parser location ref)(string?)
-  (lyp:include ref))
+  (hash-set! lyp:file-included? abs-path #t)
+  (set! lyp:last-this-file abs-path)
+  (lyp:do-include parser abs-path)
+  (set! lyp:last-this-file current-file)
+))
 
-pincludeOnce = #(define-void-function (parser location ref)(string?)
-  (lyp:include-once ref))
+pincludeOnce = #(define-void-function (parser location path)(string?) (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))))
+    (included?    (hash-ref lyp:file-included? abs-path))
+  )
+  (if (not included?) (begin
+    (ly:debug (format "\\pincludeOnce ~a\n" abs-path))
+    (if (not (file-exists? abs-path))
+      (throw 'lyp:failure "\\pincludeOnce"
+        (format "File not found ~a" abs-path) #f))
 
+    (hash-set! lyp:file-included? abs-path #t)
+    (set! lyp:last-this-file abs-path)
+    (lyp:do-include parser abs-path)
+    (set! lyp:last-this-file current-file)
+  )
+)))

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

@@ -72,7 +72,13 @@ module Lyp::Package
         install_package_fonts(info[:path], opts)
       end
       
-      puts "\nInstalled #{package}@#{info[:version]}\n\n" unless opts[:silent]
+      unless opts[:silent]
+        if info[:local_path]
+          puts "\nInstalled #{package}@#{info[:version]} => #{info[:local_path]}\n\n"
+        else
+          puts "\nInstalled #{package}@#{info[:version]}\n\n"
+        end
+      end
       
       if opts[:test]
         FileUtils.cd(info[:path]) do
@@ -85,7 +91,7 @@ module Lyp::Package
     end
     
     LOCAL_PACKAGE_WRAPPER = 
-      "#(set! lyp:current-package-dir \"%s\")\n\\include \"%s\"\n"
+      "#(set! lyp:current-package-dir \"%s\")\n\\pinclude \"%s\"\n"
     
     def install_from_local_files(package, version, opts)
       version =~ /^([^\:]+)\:(.+)$/
@@ -118,7 +124,9 @@ module Lyp::Package
 
       prepare_local_package_fonts(local_path, package_path)
       
-      {version: version, path: package_path}
+      load_package_ext_file("#{package}@#{version}", local_path)
+      
+      {version: version, path: package_path, local_path: local_path}
     end
     
     def prepare_local_package_fonts(local_path, package_path)
@@ -145,9 +153,20 @@ module Lyp::Package
       FileUtils.rm_rf(package_path)
       FileUtils.cp_r(tmp_path, package_path)
       
+      load_package_ext_file("#{package}@#{version}", package_path)
+      
       {version: version, path: package_path}
     end
     
+    def load_package_ext_file(package, path)
+      ext_path = File.join(path, 'ext.rb')
+      if File.file?(ext_path)
+        $installed_package = package
+        $installed_package_path = path
+        load_extension(ext_path)
+      end
+    end
+    
     def uninstall(package, opts = {})
       unless package =~ Lyp::PACKAGE_RE
         raise "Invalid package specifier #{package}"
@@ -163,6 +182,10 @@ module Lyp::Package
           puts "Uninstalling #{name}" unless opts[:silent]
           FileUtils.rm_rf(path)
         end
+        
+        Dir["#{Lyp.ext_dir}/#{File.basename(package_path)}*.rb"].each do |path|
+          FileUtils.rm_f(path)
+        end
       else
         if version
           package_path += "@#{version}"
@@ -187,6 +210,10 @@ module Lyp::Package
           name = package_path.gsub("#{Lyp.packages_dir}/", '')
           puts "Uninstalling #{name}" unless opts[:silent]
           FileUtils.rm_rf(package_path)
+          
+          Dir["#{Lyp.ext_dir}/#{File.basename(package_path)}.rb"].each do |path|
+            FileUtils.rm_f(path)
+          end
         else
           raise "Could not find package #{package}"
         end
@@ -431,7 +458,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
@@ -453,5 +480,25 @@ module Lyp::Package
         end
       end        
     end
+    
+    def load_all_extensions
+      Dir["#{Lyp.ext_dir}/*.rb"].each {|f| load_extension(f)}
+    end
+    
+    def load_extension(path)
+      load(path)
+    rescue => e
+      STDERR.puts "Error while loading extension #{path}"
+      STDERR.puts "  #{e.message}"
+    end
+  end
+end
+
+module Lyp
+  def self.install_extension(path)
+    # install extension only when installing the package
+    return unless $installed_package
+
+    FileUtils.cp(path, "#{Lyp.ext_dir}/#{$installed_package}.rb")
   end
 end

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 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
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient