lyp 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8e7eff9d0273f1f122a7cef54b14742090cbc56
-  data.tar.gz: c2c62ae013980d248bc3b1f7f3c2640000b387d3
+  metadata.gz: b51e26364d2db0d4433ba21cdff532f05afa846c
+  data.tar.gz: 0305882ebc3ec0aee3a484f4bbea47cc39c6ccc1
 SHA512:
-  metadata.gz: 55d99aabb7837d1d4bb7ef91d8a96daadecc84fefe292b0796ba68d45961213fbc5d6161dc6412d43a7d903cd9524dc28dd27ae864f10e8463cb72ad6c856f42
-  data.tar.gz: ed708b1226d8611769fd14f559113c907c47834f32d51c19ce0908cffa0ec9cac4c9261603fe073b9659d0dedb2f22d3d5b11516b048cf5b4cb606ff769e6253
+  metadata.gz: 27f6770fa7d43f96e399c951cac4ef3afd45b952d01857113608bf95a8e62c3a05e2fa8530596255b28d3f38a7b45804808096521905439a800fede2b244019f
+  data.tar.gz: 318b2daf11c8507e082ee493b91a4f5d79f0b9c6bc55048b4db2a07be36a6ac6489bf347cd05de71aca4e0b6b374c66f143349a87c75a597913074d155631c89

data/README.md

@@ -1,4 +1,9 @@
-[![Build Status](https://travis-ci.org/noteflakes/lyp.svg?branch=master)](https://travis-ci.org/noteflakes/lyp)
+<p align="center">
+  <a href="https://travis-ci.org/noteflakes/lyp"><img src="https://travis-ci.org/noteflakes/lyp.svg?branch=master"</a>
+</p>
+<p align="center">
+  <a href="https://github.com/lyp-packages/index#readme">The lyp package index</a>
+</p>
 
 # lyp - a package manager for lilypond
 
@@ -130,7 +135,7 @@ The difference between merely copying and including a lilypond file in your musi
 
 In lyp, a package should contain at least a single lilypond file named `package.ly` in its root directory. A package could contain additional lilypond files referenced in the main package file (using relative includes). A package could also depend on other packages by using the `\require` command (see below).
 
-Lilypond packages are expected to be published as git repositories. The packages is then versioned using git tags. A package can be referenced either using its git URL, a short name (if it's registered in the [lyp package index](https://github.com/noteflakes/lyp-index)), or alternatively as a local path (which is meant for package development more than anything else).
+Lilypond packages are expected to be published as git repositories. The packages is then versioned using git tags. A package can be referenced either using its git URL, a short name (if it's registered in the [lyp package index](https://github.com/lyp-packages/index)), or alternatively as a local path (which is meant for package development more than anything else).
 
 ### Installing packages
 
@@ -197,7 +202,7 @@ To install the `assert` package required in the file we run:
 ```bash
 $ lyp resolve test.ly
 #=>
-Cloning https://github.com/noteflakes/lyp-assert.git...
+Cloning https://github.com/lyp-packages/assert.git...
 
 Installed assert@0.2.0
 ```
@@ -216,17 +221,17 @@ A package is normally referenced by its git URL. Lyp lets you provide either ful
 
 ```bash
 # Fully-qualified URLs
-$ lyp install https://github.com/noteflakes/lyp-package-template.git
-$ lyp install https://github.com/noteflakes/lyp-package-template
+$ lyp install https://github.com/lyp-packages/package-template.git
+$ lyp install https://github.com/lyp-packages/package-template
 
 # Partially-qualified URL
-$ lyp install github.com/noteflakes/lyp-package-template
+$ lyp install github.com/lyp-packages/package-template
 
 # Github repository id
 $ lyp install noteflakes/lyp-package-template
 ```
 
-In addition, lyp also provides an [index of publically available package](https://github.com/noteflakes/lyp-index), which maps a package name to its URL (see also below). Using the index, packages are referenced by their published name instead of by their git URL:
+In addition, lyp also provides an [index of publically available package](https://github.com/lyp-packages/index), which maps a package name to its URL (see also below). Using the index, packages are referenced by their published name instead of by their git URL:
 
 ```bash
 $ lyp install dummy
@@ -326,9 +331,18 @@ Lyp also defines a `lyp:load` scheme function for loading scheme files using rel
 
 Loading scheme files that way is a better technique than adding directorys to `%load-path`, because this way one avoids possible name clashes, which may lead to unexpected behavior.
 
+### Conditional includes
+
+Files can also be included conditionally by evaluating a scheme expression using the `\pcondInclude` and `\pcondIncludeOnce` commands:
+
+```lilypond
+% include edition-specific tweaks
+\pcondInclude #(eq? edition 'urtext) "urtext_tweaks.ly"
+```
+
 ### Including fonts
 
-Lyp also supports automatic installation of fonts, based on work by [Abraham Leigh](https://github.com/tisimst). When a package is installed, lyp will copy any font files residing in the `fonts` directory into the corresponding `otf` and `svg` directories of all installed versions of lilypond.
+Lyp also supports automatic installation of fonts, based on work by [Abraham Lee](https://github.com/tisimst). When a package is installed, lyp will copy any font files residing in the `fonts` directory into the corresponding `otf` and `svg` directories of all installed versions of lilypond.
 
 **Note**: fonts will be only installed in versions of lilypond starting from than 2.18.2. Lyp automatically patches any version ower than 2.19.12 in order to support custom fonts. 
 
@@ -343,13 +357,13 @@ $ lyp test .
 
 A test file can either be a simple lilypond file which includes the package files and results in a lilypond score, or a lilypond file that performs unit tests on scheme code.
 
-For more information on testing, see the [lyp-assert](https://github.com/noteflakes/lyp-assert) package, which is meant to be used for unit testing lilypond code, and serves as an example of how to test a package.
+For more information on testing, see the [lyp-assert](https://github.com/lyp-packages/assert) package, which is meant to be used for unit testing lilypond code, and serves as an example of how to test a package.
 
 ### Publishing packages
 
 In order for your package to be available to all users, you'll need to first push your code to a publically accessible git repository (for example on github). Users will then be able to install your package by using the git URL of the public repository.
 
-You can also add your package to the lyp [public package index](https://github.com/noteflakes/lyp-index), by cloning it, editing [index.yaml](https://github.com/noteflakes/lyp-index/blob/master/index.yaml), and creating a pull request.
+You can also add your package to the lyp [public package index](https://github.com/lyp-packages/index), by cloning it, editing [index.yaml](https://github.com/lyp-packages/index/blob/master/index.yaml), and creating a pull request.
 
 ## Installing and Using Lilypond
 

data/bin/install_release.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-LYP_VERSION="0.3.6"
+LYP_VERSION="0.3.7"
 WORKDIR="/tmp/lyp-release-installer"
 URL_BASE="https://github.com/noteflakes/lyp/releases/download/v$LYP_VERSION"
 

data/bin/lilypond

@@ -25,6 +25,7 @@ LYP_LY_HELP = <<EOF
 Lyp-provided options:
   -E, --env                           use version specified in $LILYPOND_VERSION
   -n, --install                       install the specified version if not found
+  -O, --open                          open the target file after compilation
   -R, --raw                           run raw lilypond (no pre-processing)
   -r, --require=PACKAGE               preload the specified package
   -u, --use=VERSION                   use the given version of lilypond

data/lib/lyp/etc/lyp.ly

@@ -115,6 +115,25 @@
     (if (defined? '*parser*)
       (ly:parser-include-string str)
       (ly:parser-include-string parser str)))
+      
+  (define (lyp:include parser location path once)  (let* (
+      (current-dir  (lyp:this-dir))
+      (abs-path     (if (lyp:absolute-path? path)
+                        path
+                        (lyp:expand-path (lyp:join-path current-dir path))))
+      (included?    (and once (hash-ref lyp:file-included? abs-path)))
+    )
+    
+    (if (not included?) (begin
+      (ly:debug "include ~a\n" abs-path)
+      (if (not (file-exists? abs-path))
+        (throw 'lyp:failure "lyp:include"
+          (format "File not found ~a" abs-path) #f))
+
+      (hash-set! lyp:file-included? abs-path #t)
+      (lyp:include-string (lyp:fmt-include abs-path))
+    ))
+  ))
 )
 
 % command form
@@ -132,35 +151,15 @@ require = #(define-void-function (parser location ref)(string?) (let* (
   ))
 ))
     
-pinclude = #(define-void-function (parser location path)(string?) (let* (
-    (current-dir  (lyp:this-dir))
-    (abs-path     (if (lyp:absolute-path? path)
-                      path
-                      (lyp:expand-path (lyp:join-path current-dir path))))
-  )
-  (ly:debug "\\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 path)(string?) 
+  (lyp:include parser location path #f))
 
-  (hash-set! lyp:file-included? abs-path #t)
-  (lyp:include-string (lyp:fmt-include abs-path))
-))
+pcondInclude = #(define-void-function (parser location expr path)(scheme? string?)
+  (if expr (lyp:include parser location path #f)))
 
-pincludeOnce = #(define-void-function (parser location path)(string?) (let* (
-    (current-dir  (lyp:this-dir))
-    (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))
+pincludeOnce = #(define-void-function (parser location path)(string?) 
+  (lyp:include parser location path #t))
+
+pcondIncludeOnce = #(define-void-function (parser location path)(string?) 
+  (if expr (lyp:include parser location path #t)))
 
-    (hash-set! lyp:file-included? abs-path #t)
-    (lyp:include-string (lyp:fmt-include abs-path))
-  )
-)))

data/lib/lyp/lilypond.rb

@@ -30,6 +30,8 @@ module Lyp::Lilypond
           options[:use_version] = $1
         when '-n', '--install'
           options[:install] = true
+        when '-O', '--open'
+          options[:open] = true
         else
           argv_clean << arg
         end
@@ -68,7 +70,7 @@ module Lyp::Lilypond
     
     def invoke(argv, opts = {})
       lilypond = current_lilypond
-
+      
       case opts[:mode]
       when :system
         system("#{lilypond} #{argv.join(" ")}")
@@ -409,9 +411,9 @@ module Lyp::Lilypond
   
     def download_lilypond(url, fn, opts)
       require 'httpclient'
-      
+
       STDERR.puts "Downloading #{url}" unless opts[:silent]
-      
+
       download_count = 0
       client = HTTPClient.new
       conn = client.get_async(url)
@@ -669,8 +671,7 @@ module Lyp::Lilypond
     end
     
     def parse_error_msg(msg)
-      (msg =~ /[^\n]+: error.+failed files: ".+"/m) ?
-        $& : msg
+      (msg =~ /[^\n]+: error.+failed files: ".+"/m) ? $& : msg
     end
   end
 end

data/lib/lyp/package.rb

@@ -339,7 +339,7 @@ module Lyp::Package
       end
     end
     
-    LYP_INDEX_URL = "https://raw.githubusercontent.com/noteflakes/lyp-index/master/index.yaml"
+    LYP_INDEX_URL = "https://raw.githubusercontent.com/lyp-packages/index/master/index.yaml"
     
     def search_lyp_index(package)
       entry = lyp_index['packages'][package]
@@ -447,14 +447,17 @@ module Lyp::Package
     # Runs all tests found in local directory
     def run_local_tests(dir, opts = {})
       package_dir = File.expand_path(dir)
-      test_files = Dir["#{package_dir}/**/*_test.ly"]
       run_tests(opts) do |stats|
-        test_files.each do |f|
+        find_test_files(package_dir).each do |f|
           perform_test(f, stats)
         end
       end
     end
     
+    def find_test_files(dir)
+      Dir["#{dir}/**/*_test.ly", "#{dir}/**/*-test.ly"]
+    end
+    
     # This method runs tests by yielding the test statistics.
     # The caller should then call #perform_test to run each test file.
     def run_tests(opts = {})
@@ -493,7 +496,7 @@ module Lyp::Package
       
       run_tests(opts) do |stats|
         packages.each do |path|
-          files = Dir["#{path}/**/*_test.ly"]
+          files = find_test_files(path)
           next if files.empty?
 
           FileUtils.cd(path) do

data/lib/lyp/template.rb

@@ -5,7 +5,11 @@ module Lyp
 
     INTERPOLATION_START = "{{".freeze
     INTERPOLATION_END = "}}".freeze
-    INTERPOLATION_RE = /#{INTERPOLATION_START}((?:(?!#{INTERPOLATION_END}).)*)#{INTERPOLATION_END}/m
+    INTERPOLATION_RE = /#{INTERPOLATION_START}([^\?\/](?:(?!#{INTERPOLATION_END}).)*)#{INTERPOLATION_END}/m
+    
+    IF_START = "{{?".freeze
+    IF_END = "{{/}}".freeze
+    IF_RE = /\{\{\?((?:(?!#{INTERPOLATION_END}).)*)#{INTERPOLATION_END}((?:(?!#{IF_END}).)*)#{IF_END}/m
 
     ESCAPED_QUOTE = '\\"'.freeze
     QUOTE = '"'.freeze
@@ -30,13 +34,27 @@ EOF
 
       metaclass.instance_eval method_str
     end
-  
+    
+    def convert_interpolation(s)
+      s.gsub(INTERPOLATION_RE) do
+        code = $1.gsub(ESCAPED_QUOTE, QUOTE) 
+        "\#{#{code}}"
+      end
+    end
+
     def convert_literal(s)
       # look for interpolated values, wrap them with #{}
       s = s.inspect.gsub(INTERPOLATION_RE) do
         code = $1.gsub(ESCAPED_QUOTE, QUOTE) 
         "\#{#{code}}"
       end
+      
+      s = s.gsub(IF_RE) do 
+        test, code = $1, $2
+        test = test.strip.gsub(ESCAPED_QUOTE, QUOTE)
+        "\#\{if #{test}; \"#{code}\"; end}"
+      end
+
       "__emit__[#{s}]"
     end
     

data/lib/lyp/templates/deps_wrapper.rb

@@ -66,5 +66,6 @@ end
 
 `
 \include {{quote_path[user_filename]}}
-`
 
+#(if (defined? 'assert:summary) (assert:summary))
+`

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/lyp/wrapper.rb

@@ -10,6 +10,7 @@ module Lyp
 
     # copy current_package_dir option
     r[:current_package_dir] = opts[:current_package_dir]
+    r[:opts] = opts
 
     FileUtils.mkdir_p("#{Lyp::TMP_ROOT}/wrappers")
     fn = "#{Lyp::TMP_ROOT}/wrappers/#{File.basename(fn)}" 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Lyp is a package manager for lilypond