lyp-win 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2658b2c6b915cfcb4aea08d0c7a7297eacff23d2
-  data.tar.gz: 6d21e73c9255593957c147c553601f808e0a9170
+  metadata.gz: 534ac9d88a77c484848182c3e3afaf7e7218b6a7
+  data.tar.gz: b1174d32d32e5cea1188e8bdb541ee6abdeb5625
 SHA512:
-  metadata.gz: 138b589dbbe5d989782bf2dc9309ea946196101f72d8845ee6c86b1c4ed3e762fa4b780476a31f9b55aa5dc5d52599e565108a545501cdcf41f0ebdb4f9af64c
-  data.tar.gz: 2b9f8378409264e79bd77f88caccde271697cb33b628fcf700eca698753a067046b112b24208c8d7fd2c35a216de28968dc85f1b8987fd2f51696ce6d214813b
+  metadata.gz: f3f7f1f4138f391723cc5b79f045101c99aa189b365a535ed7065b8e99e2950eb00fa18c498ccc78bd95f60f8aa6ddc6c783cede0e60c7756a7cbd779875e8db
+  data.tar.gz: a9c51b25bf4975211790f3b300f6e6e4e6166fc3e5319c632f5fdbeeb6a3bcb1771c7eb7b7b809c6fc5ddc2b818af02e684b1d1d6cbe1dcb5572ca5c1022cbe6

data/README.md

@@ -667,9 +667,9 @@ Runs a Lilypond script (using the currently selected version of Lilypond).
 
 ### lyp flatten
 
-Synopsis: `lyp flatten FILE`
+Synopsis: `lyp flatten SOURCE [DEST]`
 
-Flattens a source file and all included files into a single file.
+Flattens the given input file at `SOURCE` and all included files into a single file to be written to `DEST`. If `DEST` is not specified, the file is written to `STDOUT`.
 
 ### lyp install
 

data/lib/lyp/cli.rb

@@ -160,10 +160,21 @@ class Lyp::CLI < Thor
   end
 
   desc "flatten FILE", "Flatten a file and included files into a single output file"
+  method_option :include, aliases: '-I', type: :string, desc: 'Add to include search path'
   def flatten(input_path, output_path = nil)
     input_path = File.expand_path(input_path)
     output_path = File.expand_path(output_path) if output_path
-    flat = Lyp::Transform.flatten(input_path)
+
+
+    opts = {include_paths: []}
+    if options[:include]
+      opts[:include_paths] << options[:include]
+    end
+    if Lyp::Lilypond.current_lilypond
+      opts[:include_paths] << Lyp::Lilypond.current_lilypond_include_path
+    end
+
+    flat = Lyp::Transform.flatten(input_path, opts)
     if output_path
       File.open(output_path, 'w+') {|f| f << flat}
     else

data/lib/lyp/transform.rb

@@ -2,27 +2,45 @@ module Lyp::Transform
   class << self
     R = Lyp::DependencyResolver
 
-    def flatten(path, ctx = {})
+    def flatten(path, opts = {})
+      resolver = Lyp::DependencyResolver.new(path, opts)
+      flatten_file(path, opts)
+    end
+
+    def flatten_file(path, opts, ctx = {})
       ctx[path] = true
 
       dir = File.dirname(path)
       src = IO.read(path)
 
       src.gsub(R::DEP_RE) do
-        inc_path = File.expand_path($2, dir)
         case $1
         when R::INCLUDE, R::PINCLUDE
-          "\n%%% #{inc_path}\n#{flatten(inc_path, ctx)}\n"
+          inc_path = find_include_file($2, dir, opts, path)
+          "\n%%% #{inc_path}\n#{flatten_file(inc_path, opts, ctx)}\n"
         when R::PINCLUDE_ONCE
+          inc_path = find_include_file($2, dir, opts, path)
           if ctx[inc_path]
             ""
           else
-            "\n%%% #{inc_path}\n#{flatten(inc_path, ctx)}\n"
+            "\n%%% #{inc_path}\n#{flatten_file(inc_path, opts, ctx)}\n"
           end
         else
           $~
         end
       end
     end
+
+    def find_include_file(ref, dir, opts, source_path)
+      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
+
+      raise "Missing include file #{ref} specified in #{source_path}"
+    end
   end
 end

data/lib/lyp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lyp-win
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Sharon Rosner
@@ -84,7 +84,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.1
-description: Lyp is a tool for managing lilypond versions and lilypond packages
+description: Lyp is a tool for installing lilypond and managing lilypond packages
 email: ciconia@gmail.com
 executables:
 - lyp
@@ -138,5 +138,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Lyp is a package manager for lilypond
+summary: Lyp - the Lilypond swiss army knife
 test_files: []