lyp 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 740fc3de7bbd6fd400d0b05b60749a21be457748
-  data.tar.gz: 6253323f9eb74d6f49624aa39cc7305654da8dde
+  metadata.gz: 6f28f86c500facbce865fc51918e2713f50b9b6f
+  data.tar.gz: 6d21e73c9255593957c147c553601f808e0a9170
 SHA512:
-  metadata.gz: 081d0271f29770041a28b4f2e90a0076c687df53b067891f185805a8c669f86cff869f55c5e24e94d1af8eda2305b0616c5cb6a681a8372bc36322d9fea1d5f9
-  data.tar.gz: 177a44664d2ff5532b0d7ca8ac70fd0daee24ab2c2a3a1ea0a08a428f464c9c8475c7461dc2393a3e9e7d8eb6970670647080a4038aa4002026c2f0ecedb6341
+  metadata.gz: b5fa6afbf2d9d64b41a34a16839847d3eb6328a7e0988ea1e5004e4ba132f04b7e7f103433c38842dcc02d81f5f7c764331fb220460c363dd50d07f0b7da0c7a
+  data.tar.gz: 2b9f8378409264e79bd77f88caccde271697cb33b628fcf700eca698753a067046b112b24208c8d7fd2c35a216de28968dc85f1b8987fd2f51696ce6d214813b

data/README.md

@@ -5,9 +5,9 @@
   <a href="https://github.com/lyp-packages/index#readme">The lyp package index</a>
 </p>
 
-# lyp - The Lilypond Swiss-Army Knife
+# lyp - The Lilypond Swiss Army Knife
 
-Use lyp to install and manage packages for Lilypond, and install and manage multiple versions of Lilypond on your machine, and improve your Lilypond workflow.
+Use lyp to install and manage packages for [Lilypond](http://lilypond.org/), install and manage multiple versions of Lilypond on your machine, and improve your Lilypond workflow.
 
 __Code reuse__: lyp lets you install packages that act as Lilypond code libraries and can be used to enhance your Lilypond files with additional functionality. Packages can depend on other packages. Lyp resolves both direct and transitive package dependencies, and automatically selects the correct version to use for each package.
 

data/bin/install_release.sh

@@ -1,25 +1,11 @@
 #!/usr/bin/env bash
 
-echo "Detecting latest lyp version..."
-LATEST_RELEASE=`curl -s https://github.com/noteflakes/lyp/releases/latest`
-VERSION_REGEX="tag/v([0-9\.]+)"
-if [[ $LATEST_RELEASE =~ $VERSION_REGEX ]]
-then
-  LYP_VERSION="${BASH_REMATCH[1]}"
-else
-  echo "Could not get latest version from GitHub."
-fi
-
-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
 
 fail() { log "\nERROR: $*\n"; exit 1; }
 has() { type "$1" > /dev/null 2>&1; }
-
 download() {
   if has "curl"; then
     curl -L -o $*
@@ -30,6 +16,25 @@ download() {
   fi
 }
 
+echo "Detecting latest lyp version..."
+if has "curl"; then
+  LATEST_RELEASE=`curl -s https://github.com/noteflakes/lyp/releases/latest`
+elif has "wget"; then
+  LATEST_RELEASE=`wget -qO- https://github.com/noteflakes/lyp/releases/latest`
+else
+  fail "Could not find curl or wget"
+fi
+
+VERSION_REGEX="tag/v([0-9\.]+)"
+if [[ $LATEST_RELEASE =~ $VERSION_REGEX ]]
+then
+  LYP_VERSION="${BASH_REMATCH[1]}"
+else
+  echo "Could not get latest version from GitHub."
+fi
+
+WORKDIR="/tmp/lyp-release-installer"
+URL_BASE="https://github.com/noteflakes/lyp/releases/download/v$LYP_VERSION"
 PLATFORM=`uname -sp`
 case $PLATFORM in
   "Linux x86_64")

data/lib/lyp/lilypond.rb

@@ -24,7 +24,7 @@ module Lyp::Lilypond
       when '-A', '--auto-install-deps'
         options[:resolve] = true
       when '-c', '--cropped'
-        argv_clean += ['-dbackend=eps', '-daux-files=#f']
+        argv_clean.concat ['-dbackend=eps', '-daux-files=#f']
       when '-E', '--env'
         unless ENV['LILYPOND_VERSION']
           STDERR.puts "$LILYPOND_VERSION not set"
@@ -33,6 +33,11 @@ module Lyp::Lilypond
         options[:use_version] = ENV['LILYPOND_VERSION']
       when '-F', '--force-version'
         options[:force_version] = true
+      when '-I', '--include'
+        path = argv.shift
+        options[:include_paths] ||= []
+        options[:include_paths] << path
+        argv_clean << "--include=#{path}"
       when '-n', '--install'
         options[:install] = true
       when '-O', '--open'
@@ -46,7 +51,7 @@ module Lyp::Lilypond
       when '-R', '--raw'
         options[:raw] = true
       when '-S', '--snippet'
-        argv_clean += ['-dbackend=eps', '-daux-files=#f', '--png', '-dresolution=600']
+        argv_clean.concat ['-dbackend=eps', '-daux-files=#f', '--png', '-dresolution=600']
         options[:snippet_paper_preamble] = true
       when '-u', '--use'
         options[:use_version] = argv.shift
@@ -98,6 +103,9 @@ module Lyp::Lilypond
     end
 
     def compile(argv, opts = {})
+      opts[:include_paths] ||= []
+      opts[:include_paths] << current_lilypond_include_path
+      
       unless argv.last == '-'
         fn = Lyp.wrap(argv.pop, opts)
         argv << fn
@@ -159,11 +167,19 @@ module Lyp::Lilypond
       settings[:current]
     end
 
+    def current_lilypond_base_path
+      File.expand_path("#{File.dirname(current_lilypond)}/..")
+    end
+
     def current_lilypond_bin_path
       lilypond = current_lilypond
       lilypond && File.dirname(lilypond)
     end
 
+    def current_lilypond_include_path
+      File.join(current_lilypond_base_path, "share/lilypond/current/ly")
+    end
+
     def current_lilypond_version
       path = current_lilypond
       version = File.basename(File.expand_path("#{File.dirname(path)}/../.."))

data/lib/lyp/resolver.rb

@@ -216,13 +216,21 @@ module Lyp
         return if $1 == 'null'
         ref = $2
       end
-      qualified_path = File.expand_path(ref, dir)
 
-      unless File.file?(qualified_path)
-        error("Invalid include file specified in %s", location)
+      full_path = find_include_file(ref, dir, location)
+      queue_file_for_processing(full_path, leaf)
+    end
+
+    def find_include_file(ref, dir, location)
+      search_paths = [dir]
+      search_paths += @opts[:include_paths] if @opts[:include_paths]
+
+      search_paths.each do |path|
+        full_path = File.expand_path(ref, path)
+        return full_path if File.file?(full_path)
       end
 
-      queue_file_for_processing(qualified_path, leaf)
+      error("Missing include file specified in %s", location)
     end
 
     def process_require_command(ref, dir, leaf, opts, location)

data/lib/lyp/system.rb

@@ -14,14 +14,13 @@ module Lyp::System
     end
     
     def find_rugged_gem
-      found = Gem::Specification.find_all_by_name('rugged').find do |s|
-        RUGGED_REQ =~ s.version
-      end
-      
+      dep = Gem::Dependency.new("rugged", RUGGED_REQ)
+      found = !dep.matching_specs.empty?
+
       require_rugged_gem if found
       found
     end
-    
+
     def require_rugged_gem
       gem 'rugged', RUGGED_REQ.to_s
       req_ext 'rugged'

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient