lyp-win 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d7c8b45c2774b839d4e20d3726c5532879a05b
-  data.tar.gz: 6cb8087783571a956f952e0f81a922d25397af83
+  metadata.gz: f7c493ee28fc66a7d21ed89d3cae1e75d77b7620
+  data.tar.gz: 5aa416050909fc3b7c628e799390f94a977609d0
 SHA512:
-  metadata.gz: 0e6d13810fba7603cfc1640d1c752ad926f3e8ef4c679e252c6e4d8a1cb1a27d5a533f475e06df83f1d0825dead5e765ca941bb804f4ef4f444236551f5c881a
-  data.tar.gz: 8a53bebf7bcbfbc40b8106a42614a8b756c7bd1504301eef54bc3ac202ac84adfb045f68c136a100987fcc75346307177f529b9baae273811870f1a38869fa45
+  metadata.gz: 4fead81c0513f4a8a5fdbaca6e3e240c5e56ea9d4e3a0ffcae556b91d52305fecdf2159133df4e7359dd08ee6422f6281bacdd318dc7250b3ee184843e487cb8
+  data.tar.gz: 5c7632c1626e763ac4463b0c3ad66cc78386eba95933511a213b8f3e7267924201514a3fcca2467656e47b53857f7e3e8652eacb0e294402d894bd0b9f364a7c

data/bin/install_release.sh

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

data/bin/lyp

@@ -3,4 +3,7 @@
 $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 
 require 'lyp'
-require 'lyp/cli'
+require 'lyp/cli'
+
+Lyp::Package.load_all_extensions
+Lyp::CLI.run

data/lib/lyp/base.rb

@@ -17,6 +17,7 @@ module Lyp
   LYP_DIRECTORY = File.expand_path('~/.lyp')
   LYP_BIN_DIRECTORY = File.join(LYP_DIRECTORY, 'bin')
   LYP_LIB_DIRECTORY = File.join(LYP_DIRECTORY, 'lib')
+  LYP_EXT_DIRECTORY = File.join(LYP_DIRECTORY, 'ext')
   DEFAULT_PACKAGE_DIRECTORY = File.join(LYP_DIRECTORY, 'packages')
   DEFAULT_LILYPONDS_DIRECTORY = File.join(LYP_DIRECTORY, 'lilyponds')
   
@@ -42,6 +43,10 @@ module Lyp
   def self.lilyponds_dir
     ensure_dir(DEFAULT_LILYPONDS_DIRECTORY)
   end
+  
+  def self.ext_dir
+    ensure_dir(LYP_EXT_DIRECTORY)
+  end
 
   def self.settings_file
     ensure_dir(LYP_DIRECTORY)

data/lib/lyp/cli.rb

@@ -64,7 +64,7 @@ class Lyp::CLI < Thor
     else
       search_package(pattern)
     end
-  end  
+  end
   
   no_commands do
     def search_lilypond(version)
@@ -303,12 +303,13 @@ class Lyp::CLI < Thor
       end
     end
   end
+  
+  def self.run
+    start(ARGV)
+  rescue => e
+    puts e.message
+    puts e.backtrace.join("\n") if $cmd_options[:verbose]
+    exit(1)
+  end
 end
 
-begin
-  Lyp::CLI.start(ARGV)
-rescue => e
-  puts e.message
-  puts e.backtrace.join("\n") if $cmd_options[:verbose]
-  exit(1)
-end

data/lib/lyp/etc/lyp.ly

@@ -1,6 +1,4 @@
 #(begin
-  (display "\nlyp.ly\n")
-
   ; file/path procedures based on code from oll-core:
   ;   https://github.com/openlilylib/oll-core/
 
@@ -103,51 +101,71 @@
     (set! lyp:last-this-file current-file)
   ))
 
-  (define (lyp:include-ly-file path once-only?) (let* (
-      (current-file (lyp:this-file))
-      (current-dir  (dirname current-file))
-      (abs-path     (if (lyp:absolute-path? path)
-                        path
-                        (lyp:expand-path (lyp:join-path current-dir path))))
-      (included?    (and once-only? (hash-ref lyp:file-included? abs-path)))
-    )
-    (ly:debug (format "lyp:include ~a\n" abs-path))
-    (if (not (file-exists? abs-path))
-      (throw 'lyp:failure "lyp:include-ly-file"
-        (format "File not found ~a" abs-path) #f)
-    )
-    (if (not included?) (begin
-      (hash-set! lyp:file-included? abs-path #t)
-      (set! lyp:last-this-file abs-path)
-      #{ \include #abs-path #}
-      (set! lyp:last-this-file current-file)
-    ))))
-
-  (define (lyp:include      path) (lyp:include-ly-file path #f))
-  (define (lyp:include-once path) (lyp:include-ly-file path #t))
-
-  (define (lyp:require ref) (let* (
-      (name (lyp:ref->name ref))
-      (package-dir (lyp:name->dir name))
-      (entry-point-path (lyp:join-path package-dir "package.ly"))
-      (loaded? (hash-ref lyp:package-loaded? name))
-      (prev-package-dir lyp:current-package-dir)
-    )
-    (if (not loaded?) (begin
-      (ly:debug "Loading package ~a at ~a" name package-dir)
-      (set! lyp:current-package-dir package-dir)
-      (hash-set! lyp:package-loaded? name #t)
-      (lyp:include entry-point-path)
-      (set! lyp:current-package-dir prev-package-dir)
-    ))))
+  (define (lyp:do-include parser path)
+    (if (defined? '*parser*)
+      (ly:parser-parse-string (ly:parser-clone)
+        (format "\\include \"~a\"" path))
+      (ly:parser-parse-string (ly:parser-clone parser)
+        (format "\\include \"~a\"" path))))
 )
 
 % command form
-require = #(define-void-function (parser location ref)(string?)
-  (lyp:require ref))
-
-pinclude = #(define-void-function (parser location ref)(string?)
-  (lyp:include ref))
+require = #(define-void-function (parser location ref)(string?) (let* (
+    (current-file (lyp:this-file))
+    (name (lyp:ref->name ref))
+    (package-dir (lyp:name->dir name))
+    (entry-point-path (lyp:join-path package-dir "package.ly"))
+    (loaded? (hash-ref lyp:package-loaded? name))
+    (prev-package-dir lyp:current-package-dir)
+  )
+  (if (not loaded?) (begin
+    (ly:debug "Loading package ~a at ~a" name package-dir)
+    (set! lyp:current-package-dir package-dir)
+    (hash-set! lyp:package-loaded? name #t)
+    
+    (set! lyp:last-this-file entry-point-path)
+    (lyp:do-include parser entry-point-path)
+    (set! lyp:last-this-file current-file)
+    
+    (set! lyp:current-package-dir prev-package-dir)
+  ))
+))
+    
+pinclude = #(define-void-function (parser location path)(string?) (let* (
+    (current-file (lyp:this-file))
+    (current-dir  (dirname current-file))
+    (abs-path     (if (lyp:absolute-path? path)
+                      path
+                      (lyp:expand-path (lyp:join-path current-dir path))))
+  )
+  (ly:debug (format "\\pinclude ~a\n" abs-path))
+  (if (not (file-exists? abs-path))
+    (throw 'lyp:failure "\\pinclude"
+      (format "File not found ~a" abs-path) #f))
+
+  (hash-set! lyp:file-included? abs-path #t)
+  (set! lyp:last-this-file abs-path)
+  (lyp:do-include parser abs-path)
+  (set! lyp:last-this-file current-file)
+))
+
+pincludeOnce = #(define-void-function (parser location path)(string?) (let* (
+    (current-file (lyp:this-file))
+    (current-dir  (dirname current-file))
+    (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 ref)(string?)
-  (lyp:include-once ref))
+    (hash-set! lyp:file-included? abs-path #t)
+    (set! lyp:last-this-file abs-path)
+    (lyp:do-include parser abs-path)
+    (set! lyp:last-this-file current-file)
+  )
+)))

data/lib/lyp/package.rb

@@ -72,7 +72,13 @@ module Lyp::Package
         install_package_fonts(info[:path], opts)
       end
       
-      puts "\nInstalled #{package}@#{info[:version]}\n\n" unless opts[:silent]
+      unless opts[:silent]
+        if info[:local_path]
+          puts "\nInstalled #{package}@#{info[:version]} => #{info[:local_path]}\n\n"
+        else
+          puts "\nInstalled #{package}@#{info[:version]}\n\n"
+        end
+      end
       
       if opts[:test]
         FileUtils.cd(info[:path]) do
@@ -85,7 +91,7 @@ module Lyp::Package
     end
     
     LOCAL_PACKAGE_WRAPPER = 
-      "#(set! lyp:current-package-dir \"%s\")\n\\include \"%s\"\n"
+      "#(set! lyp:current-package-dir \"%s\")\n\\pinclude \"%s\"\n"
     
     def install_from_local_files(package, version, opts)
       version =~ /^([^\:]+)\:(.+)$/
@@ -118,7 +124,9 @@ module Lyp::Package
 
       prepare_local_package_fonts(local_path, package_path)
       
-      {version: version, path: package_path}
+      load_package_ext_file("#{package}@#{version}", local_path)
+      
+      {version: version, path: package_path, local_path: local_path}
     end
     
     def prepare_local_package_fonts(local_path, package_path)
@@ -145,9 +153,20 @@ module Lyp::Package
       FileUtils.rm_rf(package_path)
       FileUtils.cp_r(tmp_path, package_path)
       
+      load_package_ext_file("#{package}@#{version}", package_path)
+      
       {version: version, path: package_path}
     end
     
+    def load_package_ext_file(package, path)
+      ext_path = File.join(path, 'ext.rb')
+      if File.file?(ext_path)
+        $installed_package = package
+        $installed_package_path = path
+        load_extension(ext_path)
+      end
+    end
+    
     def uninstall(package, opts = {})
       unless package =~ Lyp::PACKAGE_RE
         raise "Invalid package specifier #{package}"
@@ -163,6 +182,10 @@ module Lyp::Package
           puts "Uninstalling #{name}" unless opts[:silent]
           FileUtils.rm_rf(path)
         end
+        
+        Dir["#{Lyp.ext_dir}/#{File.basename(package_path)}*.rb"].each do |path|
+          FileUtils.rm_f(path)
+        end
       else
         if version
           package_path += "@#{version}"
@@ -187,6 +210,10 @@ module Lyp::Package
           name = package_path.gsub("#{Lyp.packages_dir}/", '')
           puts "Uninstalling #{name}" unless opts[:silent]
           FileUtils.rm_rf(package_path)
+          
+          Dir["#{Lyp.ext_dir}/#{File.basename(package_path)}.rb"].each do |path|
+            FileUtils.rm_f(path)
+          end
         else
           raise "Could not find package #{package}"
         end
@@ -453,5 +480,25 @@ module Lyp::Package
         end
       end        
     end
+    
+    def load_all_extensions
+      Dir["#{Lyp.ext_dir}/*.rb"].each {|f| load_extension(f)}
+    end
+    
+    def load_extension(path)
+      load(path)
+    rescue => e
+      STDERR.puts "Error while loading extension #{path}"
+      STDERR.puts "  #{e.message}"
+    end
+  end
+end
+
+module Lyp
+  def self.install_extension(path)
+    # install extension only when installing the package
+    return unless $installed_package
+
+    FileUtils.cp(path, "#{Lyp.ext_dir}/#{$installed_package}.rb")
   end
 end

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp-win
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient