lyp 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec8334dffcd62c410ebf9f6630d95b9d980e0ad9
-  data.tar.gz: 5aa416050909fc3b7c628e799390f94a977609d0
+  metadata.gz: 330317c1be8c18c423a9ab6e7efc8819c6f07b8b
+  data.tar.gz: cf364e9fa0ab5744da270cb696dfdacf25ef67a4
 SHA512:
-  metadata.gz: 2e400ff952e684c0e8ba9da536e80ee015eebe742858a83c9ff9fbf4706c14b2b233881166f22fd7f63a3e17c03b6062c141942267edd8a3d0cdbf318c76375b
-  data.tar.gz: 5c7632c1626e763ac4463b0c3ad66cc78386eba95933511a213b8f3e7267924201514a3fcca2467656e47b53857f7e3e8652eacb0e294402d894bd0b9f364a7c
+  metadata.gz: f9d7aa3b3ab28314f151cf845cf1bf8e8a7a94699dbe86b16cc6e1a363900575e666706ecb83cf3d7bea9b3d262a859f33813f3288d7c5a3198707aeea59dadf
+  data.tar.gz: 8774a353b9fee6b96eb552b4eeaa0680d9097d82be0850bf9b1bb80c4f22358fcd2b0c1773a78b5acc32a6e71adf7fc607d20de3cf4c97106edc069a3dbcd89d

data/bin/install_release.sh

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

data/lib/lyp.rb

@@ -1,11 +1,9 @@
-def req(f); require File.expand_path("lyp/#{f}", File.dirname(__FILE__)); end
+def req(f); require File.expand_path("lyp/#{f}", File.dirname(__FILE__)) end
 
 req 'base'
 req 'system'
 req 'settings'
 
-Lyp::System.test_rugged_gem!
-
 req 'template'
 req 'resolver'
 req 'wrapper'

data/lib/lyp/cli.rb

@@ -81,6 +81,8 @@ class Lyp::CLI < Thor
         puts "\n * Currently installed\n\n"
       end
     end
+    
+    PACKAGE_FMT = "%-16s => %s"
   
     def search_package(pattern)
       packages = Lyp::Package.list_lyp_index(pattern)
@@ -89,7 +91,8 @@ class Lyp::CLI < Thor
       else
         puts "\nAvailable packages on lyp-index:\n\n"
         packages.each do |p|
-          puts "   #{p[:name]}"
+          puts PACKAGE_FMT % [p['name'], p['description']]
+          # puts "   #{p['name']}"
         end
         puts "\n\n"
       end

data/lib/lyp/lilypond.rb

@@ -1,5 +1,4 @@
 require 'uri'
-require 'httpclient'
 require 'open3'
 require 'ruby-progressbar'
 
@@ -90,10 +89,11 @@ module Lyp::Lilypond
     attr_reader :forced_version
     
     def check_lilypond!
-      # check default
-      select_default_lilypond! unless valid_lilypond?(default_lilypond)
+      path = default_lilypond
+      select_default_lilypond! unless path && path =~ /lilypond$/
       
-      set_current_lilypond(default_lilypond) unless valid_lilypond?(current_lilypond)
+      path = current_lilypond
+      set_current_lilypond(default_lilypond) unless path && path =~ /lilypond$/
     end
     
     def valid_lilypond?(path)
@@ -169,6 +169,7 @@ module Lyp::Lilypond
         path = File.join(path, "bin/lilypond")
         list << {
           root_path: root_path,
+          data_path: File.join(root_path, 'share/lilypond/current'),
           path: path,
           version: version
         }
@@ -185,8 +186,11 @@ module Lyp::Lilypond
         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`
+            
             m << {
               root_path: File.expand_path(File.join(File.dirname(path), '..')),
+              data_path: data_path,
               path: path,
               version: $1,
               system: true
@@ -203,7 +207,7 @@ module Lyp::Lilypond
       self_bin_dir = File.dirname(File.expand_path($0))
       
       list = `which -a lilypond`
-      list = list.lines.map {|f| f.chomp}.reject do |l|
+      list = list.lines.map {|f| f.chomp}.uniq.reject do |l|
         dir = File.dirname(l)
         (dir == Gem.bindir) || (dir == Lyp::LYP_BIN_DIRECTORY) || (dir == self_bin_dir)
       end
@@ -351,6 +355,8 @@ module Lyp::Lilypond
     end
   
     def download_lilypond(url, fn, opts)
+      require 'httpclient'
+      
       STDERR.puts "Downloading #{url}" unless opts[:silent]
       
       download_count = 0
@@ -469,6 +475,14 @@ 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
+    
+    def patch_system_lilypond_font_scm(lilypond)
+      return 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
 
     def copy_fonts_from_all_packages(version, opts)
       return unless Lyp::FONT_COPY_REQ =~ Gem::Version.new(version)

data/lib/lyp/package.rb

@@ -221,6 +221,8 @@ module Lyp::Package
     end
     
     def package_repository(url, tmp_path, opts = {})
+      Lyp::System.test_rugged_gem!
+      
       # Create repository
       if File.directory?(tmp_path)
         begin
@@ -274,9 +276,13 @@ module Lyp::Package
       Lyp::Lilypond.list.each do |lilypond|
         next unless req =~ Gem::Version.new(lilypond[:version])
         
-        ly_fonts_dir = File.join(lilypond[:root_path], lilypond_fonts_path)
+        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)
@@ -294,10 +300,6 @@ module Lyp::Package
       end
     end
     
-    def lilypond_fonts_path
-      'share/lilypond/current/fonts'
-    end
-    
     def package_git_url(package, search_index = true)
       case package
       when /^(?:(?:[^\:]+)|http|https)\:/
@@ -326,14 +328,14 @@ module Lyp::Package
     
     def list_lyp_index(pattern = nil)
       list = lyp_index['packages'].inject([]) do |m, kv|
-        m << kv[1].merge(name: kv[0])
+        m << kv[1].merge('name' => kv[0])
       end
       
       if pattern
-        list.select! {|p| p[:name] =~ /#{pattern}/}
+        list.select! {|p| p['name'] =~ /#{pattern}/}
       end
       
-      list.sort_by {|p| p[:name]}
+      list.sort_by {|p| p['name']}
     end
     
     def lyp_index

data/lib/lyp/system.rb

@@ -5,10 +5,14 @@ module Lyp::System
     RUGGED_REQ = Gem::Requirement.new('>=0.23.0')
     
     def test_rugged_gem!
+      return if @already_tested
+      
       return if find_rugged_gem || use_git_based_rugged_gem
       
       STDERR.puts "Lyp needs git in order to be able to install packages. Please install git and then try again."
       exit 1
+    ensure
+      @already_tested = true
     end
     
     def find_rugged_gem

data/lib/lyp/version.rb

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

data/lib/lyp/windows.rb

@@ -82,10 +82,6 @@ module Lyp::Package
       end
     end
     
-    def lilypond_fonts_path
-      'usr/share/lilypond/current/fonts'
-    end
-  
     def lyp_index
       @lyp_index ||= YAML.load(`curl -s #{LYP_INDEX_URL}`)
     end

metadata

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