lyp 0.3.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b18fe5f2da98662c879adc93a9c83cf84a76660
-  data.tar.gz: 45e1e3f90e79c8d8a21cb7ced32048f56fa2150e
+  metadata.gz: 54f90b19cc9702e07d9ea91f39cbb731b4160eca
+  data.tar.gz: ad54101546c7cfe1dbb9e5557d37a0cf39406b1c
 SHA512:
-  metadata.gz: 5ea695bc459d7dfcebb201ec22b2de16710077092c18561f4682938ef9d5bfb9234c92a0a93ab87320635261117e1848edf25470c54ea75cbbc5c63d856baaf4
-  data.tar.gz: e1db9b949090fa70a3e927e45d3d59a6808d1f5fd07f093b1ed9e022aa324f759a7e788cbc4b51d708ac62aded70176397b62e0586ed5c297922fe3a1422ae49
+  metadata.gz: 579e5add9981c4fd1ad281e030e3b5fdffd2a3f51f4d0f81886ea1ab95a49bd92550619fa31a73f6d4987c4c3cf2d5e1ea7b2952363b6ca20440b5db977819c2
+  data.tar.gz: b3dd8a3af50d2120d5803fe33faacb90f9f7703fa38864d3cbc2ab0a296c0c141a3cd95bb7e3f8ccd288cd39a1284575f1a3472a40a5bce640bf6658078f419f

data/bin/install_release.sh

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

data/lib/lyp.rb

@@ -9,5 +9,6 @@ req 'resolver'
 req 'wrapper'
 req 'package'
 req 'lilypond'
+req 'transform'
 
 req 'windows' if Lyp::WINDOWS

data/lib/lyp/cli.rb

@@ -306,6 +306,19 @@ class Lyp::CLI < Thor
     end
   end
 
+  desc "flatten FILE", "Flatten a file and included files into a single output file"
+  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)
+    if output_path
+      File.open(output_path, 'w+') {|f| f << flat}
+    else
+      puts flat
+    end
+  end
+
+
   def self.run
     start(ARGV)
   rescue => e

data/lib/lyp/etc/lyp.ly

@@ -77,8 +77,8 @@
       (format "Invalid package name ~a" ref) #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 
+  ; 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)
@@ -105,17 +105,17 @@
   (define (lyp:fmt-include path)
     (format "#(set! lyp:last-this-file \"~A\")\n\\include \"~A\"\n#(set! lyp:last-this-file \"~A\")\n"
       path path (lyp:this-file)))
-      
+
   (define (lyp:fmt-require entry-point-path package-dir)
     (format "#(set! lyp:current-package-dir \"~A\")\n~A#(set! lyp:current-package-dir \"~A\")\n"
       package-dir (lyp:fmt-include entry-point-path) lyp:current-package-dir))
-  
+
   ; helper function to cover API changes from 2.18 to 2.19
   (define (lyp:include-string str)
     (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)
@@ -123,7 +123,7 @@
                         (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))
@@ -146,20 +146,19 @@ require = #(define-void-function (parser location ref)(string?) (let* (
   (if (not loaded?) (begin
     (ly:debug "Loading package ~a at ~a" name package-dir)
     (hash-set! lyp:package-loaded? name #t)
-    
+
     (lyp:include-string (lyp:fmt-require entry-point-path package-dir))
   ))
 ))
-    
-pinclude = #(define-void-function (parser location path)(string?) 
+
+pinclude = #(define-void-function (parser location path)(string?)
   (lyp:include parser location path #f))
 
 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?) 
+pincludeOnce = #(define-void-function (parser location path)(string?)
   (lyp:include parser location path #t))
 
-pcondIncludeOnce = #(define-void-function (parser location path)(string?) 
+pcondIncludeOnce = #(define-void-function (parser location expr path)(scheme? string?) 
   (if expr (lyp:include parser location path #t)))
-

data/lib/lyp/transform.rb

@@ -0,0 +1,30 @@
+require 'fileutils'
+
+module Lyp::Transform
+  class << self
+    R = Lyp::DependencyResolver
+
+    def flatten(path, 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"
+        when R::PINCLUDE_ONCE
+          if ctx[inc_path]
+            ""
+          else
+            "\n%%% #{inc_path}\n#{flatten(inc_path, ctx)}\n"
+          end
+        else
+          $~
+        end
+      end
+    end
+  end
+end

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.3.9"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -111,6 +111,7 @@ files:
 - lib/lyp/system.rb
 - lib/lyp/template.rb
 - lib/lyp/templates/deps_wrapper.rb
+- lib/lyp/transform.rb
 - lib/lyp/version.rb
 - lib/lyp/windows.rb
 - lib/lyp/wrapper.rb