lyp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af573692d11d242223f7cacfd3c03aafd2013e75
-  data.tar.gz: ebd0f0f9b0f1da5c7561df7cbea69c41db9d4665
+  metadata.gz: da31da8efa75b8704dab5d48b0c44173cae0d9ff
+  data.tar.gz: da5431609dfffd0e2a0f813231ced74b17a47878
 SHA512:
-  metadata.gz: 9e0839bada15ee142ce3b4d8d5a9f827cdedc235bc53cfa0760be0af3129963e2ce8c691bcef7bffb77b65965981cdddb9566fa5c420d7a36e452ba9b697f1f3
-  data.tar.gz: 3795e21469164bb52b2e10a96f2d96641ae2b28e678b50cfeccd38153d1a65506ae7ea9c1f42229d006caaad1d9d9a3d285baa5496d9c29676da6b9ce17302e6
+  metadata.gz: b6dc9a5578f26af2c369a76cb8c9e1798cfd563c8a9bdb620f55dc25b8d75f39aa8a4a93f377ebacc4c9ebfff7b8912765c2a8831c5f9e11cb80eb94a3ea6b54
+  data.tar.gz: ba944bce979da2914064406b47ef8dcccd09e52069d32c12c637ba0c37e3415373b93695f3ef29b56fdca72624bbac0437456808314309856a8e746414d328f8

data/README.md

@@ -53,7 +53,7 @@ or with Wget:
 wget -qO- https://git.io/getlyp | bash
 ```
 
-**Note**: installing the standalone release of lyp requires a having git installed.
+**Note**: installing the standalone release of lyp requires having git on your machine.
 
 ### How lyp works
 
@@ -209,10 +209,10 @@ In order to facilitate writing complex packages, lyp defines a few lilypond comm
 
 The following variables are defined:
 
+- `lyp-current-package-dir` - the absolute directory path for the current package
 - `lyp-input-filename` - the absolute path for the user's file being compiled
 - `lyp-input-dirname` - the absolute directory path for the user's file being compiled
 - `lyp-cwd` - the current working directory
-- `current-package-dir` - the absolute directory path for the current package
 
 In addition, lyp provides the `\pinclude` command for including files residing in the current package using relative paths. The `\pinclude` commands loads a given file only once:
 

data/bin/install_release.sh

@@ -21,7 +21,7 @@ download() {
 }
     
 WORKDIR="/tmp/lyp-release-installer"
-LYP_VERSION="0.1.3"
+LYP_VERSION="0.1.4"
 URL_BASE="https://github.com/noteflakes/lyp/releases/download/v$LYP_VERSION"
 
 PLATFORM=`uname -sp`

data/lib/lyp/package.rb

@@ -73,11 +73,15 @@ module Lyp::Package
       info[:version]
     end
     
+    LOCAL_PACKAGE_WRAPPER = 
+      "#(set! lyp-current-package-dir \"%s\")\n\\include \"%s\"\n"
+    
     def install_from_local_files(package, version, opts)
       version =~ /^([^\:]+)\:(.+)$/
       version, local_path = $1, $2
       
       entry_point_path = nil
+      local_path = File.expand_path(local_path)
       if File.directory?(local_path)
         ly_path = File.join(local_path, "package.ly")
         if File.file?(ly_path)
@@ -91,13 +95,14 @@ module Lyp::Package
         raise "Could not find #{local_path}"
       end
       
+      entry_point_dirname = File.dirname(entry_point_path)
       package_path = "#{Lyp.packages_dir}/#{package}@#{version}"
       package_ly_path = "#{package_path}/package.ly"
       
       FileUtils.rm_rf(package_path)
       FileUtils.mkdir_p(package_path)
       File.open(package_ly_path, 'w+') do |f|
-        f << "\\include \"#{entry_point_path}\"\n"
+        f << LOCAL_PACKAGE_WRAPPER % [entry_point_dirname, entry_point_path]
       end
       
       {version: version, path: package_path}

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sharon Rosner