lyp-win 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 617e2359eb0c4377a53959641786eb18c211527a
-  data.tar.gz: cf364e9fa0ab5744da270cb696dfdacf25ef67a4
+  metadata.gz: afd48348c59bf85030e6ff6503c45d5a677a541b
+  data.tar.gz: 24379cc9ee854d468587469286a6c5e306e39f7e
 SHA512:
-  metadata.gz: cf4dc31307e943657636619204531c262cc2c7a7e1d04f33d4f231c2fbb50635f123dc84b0cbaf7cc09d164512c3303e1d0d692dde6f04831d69f0766238ba99
-  data.tar.gz: 8774a353b9fee6b96eb552b4eeaa0680d9097d82be0850bf9b1bb80c4f22358fcd2b0c1773a78b5acc32a6e71adf7fc607d20de3cf4c97106edc069a3dbcd89d
+  metadata.gz: 3f2e34ffb30279e65d66e9b8ec18861a9f06fdf2d88b190a285901b451e064782ffdb70be1d1f455864266bfbe95e74a38cf7d0183f3c62268915e37375b30f2
+  data.tar.gz: 74f2e49025ce8b1049e348c28666fc7d0181fc0a603066fcc994d49b47298b3b357c65576f8c43a8ebea3542d5c1bf34b48a890179451dfbfb44eaab41bda642

data/bin/install_release.sh

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

data/lib/lyp/base.rb

@@ -25,12 +25,17 @@ module Lyp
   FONT_COPY_REQ = Gem::Requirement.new('>=2.18.2')
   FONT_PATCH_REQ = Gem::Requirement.new('>=2.18.2', '<2.19.12')
   
+  ETC_DIRECTORY = File.join(File.dirname(__FILE__), 'etc')
+  
   # Font patch filename (required for 2.18.2 <= lilypond < 2.19.12)
-  FONT_PATCH_FILENAME = File.expand_path('etc/font.scm', File.dirname(__FILE__))
+  FONT_PATCH_FILENAME = File.join(ETC_DIRECTORY, 'font.scm')
+
+  # File for detecting version and data dir of system-installed lilypond
+  DETECT_SYSTEM_LILYPOND_FILENAME = File.join(ETC_DIRECTORY, 'detect_system_lilypond.ly')
 
   # etc/lyp.ly contains lyp:* procedure definitions for loading packages and
   # other support code.
-  LYP_LY_LIB_PATH = File.expand_path('etc/lyp.ly', File.dirname(__FILE__))
+  LYP_LY_LIB_PATH = File.join(ETC_DIRECTORY, 'lyp.ly')
   
   LILYPOND_NOT_FOUND_MSG = "No version of lilypond found.\nTo install lilypond run 'lyp install lilypond'"
 
@@ -57,5 +62,18 @@ module Lyp
     FileUtils.mkdir_p(dir) unless File.directory?(dir)
     dir
   end
+  
+  def self.sudo_cp(src, dest)
+    cmd = "sudo cp #{src} #{dest}"
+    msg = `#{cmd}`
+    raise msg unless $?.success?
+  end
+  
+  def self.confirm_action(prompt)
+    require 'readline'
+    
+    response = Readline.readline(prompt)
+    ["y", "yes"].include?(response)
+  end
 end
 

data/lib/lyp/cli.rb

@@ -219,7 +219,7 @@ class Lyp::CLI < Thor
     end
   
     lilypond = Lyp::Lilypond.use(version, options)
-    puts "Using version #{lilypond[:version]}"
+    puts "Using lilypond version #{lilypond[:version]}"
   end
 
   desc "list [PATTERN|lilypond]", "List installed packages matching PATTERN or versions of lilypond"

data/lib/lyp/etc/detect_system_lilypond.ly

@@ -0,0 +1,14 @@
+% original code: 
+%   https://github.com/openlilylib/oll-core/blob/master/internal/predicates.scm
+
+#(begin
+  (define (lilypond-version-string)
+    (string-join
+      (map (lambda (elt) (if (integer? elt) (number->string elt) elt))
+        (ly:version))
+     "."))
+
+  (display (format "~a\n~a\n" (lilypond-version-string) (ly:get-option 'datadir)))
+)
+
+

data/lib/lyp/lilypond.rb

@@ -184,10 +184,10 @@ module Lyp::Lilypond
       
       list.inject([]) do |m, path|
         begin
-          resp = `#{path} -v`
-          if resp.lines.first =~ /LilyPond ([0-9\.]+)/i
-            data_path = `#{path} -e"(display (ly:get-option 'datadir))" /dev/null 2>/dev/null`
-            
+          resp = `#{path} #{Lyp::DETECT_SYSTEM_LILYPOND_FILENAME} 2>/dev/null`
+
+          if resp =~ /(.+)\n(.+)/
+            version, data_path = $1, $2
             m << {
               root_path: File.expand_path(File.join(File.dirname(path), '..')),
               data_path: data_path,
@@ -197,7 +197,7 @@ module Lyp::Lilypond
             }
           end
         rescue
-          # ignore error
+          # ignore error, don't include this version in the list of lilyponds
         end
         m
       end
@@ -475,15 +475,38 @@ module Lyp::Lilypond
       target_fn = File.join(lyp_lilypond_share_dir(version), 'lilypond/current/scm/font.scm')
       FileUtils.cp(Lyp::FONT_PATCH_FILENAME, target_fn)
     end
+
+    SYSTEM_LILYPOND_PATCH_WARNING = <<-EOF.gsub(/^\s{6}/, '').chomp
+      The system-installed lilypond version %s needs to be patched in 
+      order to support custom music fonts. This operation will replace the file
+      
+        %s
+      
+      Would you like to overwrite this file? (y/n): 
+    EOF
     
-    def patch_system_lilypond_font_scm(lilypond)
-      return unless Lyp::FONT_PATCH_REQ =~ Gem::Version.new(lilypond[:version])
+    def patch_system_lilypond_font_scm(lilypond, opts)
+      return false unless Lyp::FONT_PATCH_REQ =~ Gem::Version.new(lilypond[:version])
       
       target_fn = File.join(lilypond[:data_path], '/scm/font.scm')
-      puts "patch #{target_fn}"
-      FileUtils.cp(Lyp::FONT_PATCH_FILENAME, target_fn)
-    end
+      # do nothing if alredy patched
+      if IO.read(target_fn) == IO.read(Lyp::FONT_PATCH_FILENAME)
+        return true
+      end
 
+      prompt = SYSTEM_LILYPOND_PATCH_WARNING % [lilypond[:version], target_fn]
+      return unless Lyp.confirm_action(prompt)
+      
+      puts "Patching #{target_fn}:" unless opts[:silent]
+      if File.writeable?(target_fn)
+        FileUtils.cp(target_fn, "#{target_fn}.old")
+        FileUtils.cp(Lyp::FONT_PATCH_FILENAME, target_fn)
+      else
+        Lyp.sudo_cp(target_fn, "#{target_fn}.old")
+        Lyp.sudo_cp(Lyp::FONT_PATCH_FILENAME, target_fn)
+      end
+    end
+    
     def copy_fonts_from_all_packages(version, opts)
       return unless Lyp::FONT_COPY_REQ =~ Gem::Version.new(version)
       

data/lib/lyp/package.rb

@@ -68,7 +68,6 @@ module Lyp::Package
       install_package_dependencies(info[:path], opts)
       
       if File.directory?(File.join(info[:path], 'fonts'))
-        puts "Installing package fonts..." unless opts[:silent]
         install_package_fonts(info[:path], opts)
       end
       
@@ -269,35 +268,56 @@ module Lyp::Package
       end
       sub_deps.each {|d| install(d, opts)}
     end
+
+    SYSTEM_LILYPOND_PROMPT = <<-EOF.gsub(/^\s{6}/, '').chomp
+      Do you wish to install the package fonts on the system-installed lilypond 
+      version %s (this might require sudo password)? (y/n): 
+    EOF
     
     def install_package_fonts(package_path, opts = {})
+      puts "Installing package fonts..." unless opts[:silent]
+      available_on_versions = []
+      
       req = Lyp::FONT_COPY_REQ
       
       Lyp::Lilypond.list.each do |lilypond|
         next unless req =~ Gem::Version.new(lilypond[:version])
-        
+
+        if lilypond[:system]
+          next unless Lyp.confirm_action(SYSTEM_LILYPOND_PROMPT % lilypond[:version])
+        end
+
         ly_fonts_dir = File.join(lilypond[:data_path], 'fonts')
         package_fonts_dir = File.join(package_path, 'fonts')
         
         if lilypond[:system]
-          Lyp::Lilypond.patch_system_lilypond_font_scm(lilypond)
-        end
-        
-        Dir["#{package_fonts_dir}/*.otf"].each do |fn|
-          target_fn = File.join(ly_fonts_dir, 'otf', File.basename(fn))
-          FileUtils.cp(fn, target_fn)
-        end
-        
-        Dir["#{package_fonts_dir}/*.svg"].each do |fn|
-          target_fn = File.join(ly_fonts_dir, 'svg', File.basename(fn))
-          FileUtils.cp(fn, target_fn)
+          if Lyp::Lilypond.patch_system_lilypond_font_scm(lilypond, opts)
+            available_on_versions << lilypond[:version]
+          end
+        else
+          available_on_versions << lilypond[:version]
         end
         
-        Dir["#{package_fonts_dir}/*.woff"].each do |fn|
-          target_fn = File.join(ly_fonts_dir, 'svg', File.basename(fn))
-          FileUtils.cp(fn, target_fn)
+        Dir["#{package_fonts_dir}/*"].each do |fn|
+          target_fn = case File.extname(fn)
+          when '.otf'
+            File.join(ly_fonts_dir, 'otf', File.basename(fn))
+          when '.svg', '.woff'
+            File.join(ly_fonts_dir, 'svg', File.basename(fn))
+          end
+          
+          if File.writable?(File.dirname(target_fn))
+            FileUtils.cp(fn, target_fn)
+          else
+            Lyp.sudo_cp(fn, target_fn)
+          end
         end
       end
+
+      unless opts[:silent]
+        puts "\nFonts available on lilypond #{available_on_versions.join(', ')}"
+      end
+
     end
     
     def package_git_url(package, search_index = true)

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp-win
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -86,6 +86,7 @@ files:
 - lib/lyp.rb
 - lib/lyp/base.rb
 - lib/lyp/cli.rb
+- lib/lyp/etc/detect_system_lilypond.ly
 - lib/lyp/etc/font.scm
 - lib/lyp/etc/lyp.ly
 - lib/lyp/git_based_rugged.rb