lyp-win 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d825136da4c3e2bd0a2210a15d72ef1fe52550fe
-  data.tar.gz: 76479742a263932ee35c1189a9322c1eba6228fe
+  metadata.gz: c46b9613b42c79a59f83c26808a0027d7e384503
+  data.tar.gz: 4e47b76bf8c56b7493b19f26e1ccad8d0ffce5ac
 SHA512:
-  metadata.gz: 18f12a5af72114378c619b5b52fe323c3b698751421bc857887b0fe40d1d1b0f98317f1beee3eb7b91e869ff9a99df8342504e55d109809002ad8a8e66e98d95
-  data.tar.gz: 867f9110f70f15b6d0417344401425a8f4f6b018224649de4b1f39aa2c5ef1d49022456b174c46c451183fc9790b39edd514b20002fad62b7a82662c194dfda5
+  metadata.gz: caab1ccb0de4c9c399ddc856df9b70c661b567f610f81278245750c27854a0878d98726b3bde0f83b5a391ef406efe074484d0038fde5168e0ae3e3dbfcd728a
+  data.tar.gz: d74d7f3e4a9d15a11ed6abc21872c2f2b598fe3e271738023d818b01607f2033dec19aeb284738e5a9cf3150ada00a6f0bdca34c7cad8558d4979d59132eb01d

data/bin/install_release.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-LYP_VERSION="0.3.7"
+LYP_VERSION="0.3.9"
 WORKDIR="/tmp/lyp-release-installer"
 URL_BASE="https://github.com/noteflakes/lyp/releases/download/v$LYP_VERSION"
 
@@ -20,7 +20,7 @@ download() {
     fail "Could not find curl or wget"
   fi
 }
-    
+
 PLATFORM=`uname -sp`
 case $PLATFORM in
   "Linux x86_64")

data/bin/lilypond

@@ -24,12 +24,15 @@ LILYPOND_HELP_SWITCHES = %w{
 
 LYP_LY_HELP = <<EOF
 Lyp-provided options:
+  -A, --auto-install-deps             install any missing dependencies
   -c, --cropped                       crop output (requires setting 0 margins)
   -E, --env                           use version specified in $LILYPOND_VERSION
   -n, --install                       install the specified version if not found
   -O, --open                          open the target file after compilation
   -R, --raw                           run raw lilypond (no pre-processing)
   -r, --require=PACKAGE               preload the specified package
+  -S, --snippet                       produce png cropped images at 600dpi
+                                      (--cropped --png -dresolution=600)
   -u, --use=VERSION                   use the given version of lilypond
 EOF
 
@@ -43,7 +46,19 @@ when *LILYPOND_HELP_SWITCHES
   puts `#{$lilypond_path} #{$argv.join(' ')}`
   puts LYP_LY_HELP unless $argv.first == '-dhelp'
 else
+  Lyp::Lilypond.check_update
   begin
+    if $options[:resolve] && $argv.last != '-'
+      resolver = Lyp::DependencyResolver.new($argv.last)
+      tree = resolver.compile_dependency_tree(ignore_missing: true)
+      tree.dependencies.each do |package, spec|
+        Lyp::Package.install(spec.clause) if spec.versions.empty?
+      end
+    end
+
     Lyp::Lilypond.compile($argv, $options)
+  rescue => e
+    puts e.message
+    puts e.backtrace.join("\n")
   end
 end

data/lib/lyp/cli.rb

@@ -147,9 +147,18 @@ class Lyp::CLI < Thor
   desc "install <PACKAGE|lilypond|self>...", "Install a package or a version of lilypond. When 'install self' is invoked, lyp installs itself in ~/.lyp."
   method_option :default, aliases: '-d', type: :boolean, desc: 'Set default lilypond version'
   method_option :test, aliases: '-t', type: :boolean, desc: 'Run package tests after installation'
+  method_option :dev, type: :boolean, desc: 'Install local development package'
   def install(*args)
     $cmd_options = options
 
+    if options[:dev]
+      if args.empty?
+        args = ["#{File.basename(FileUtils.pwd)}@dev:."]
+      else
+        args = args.map {|a| "#{File.basename(File.expand_path(a))}@dev:#{a}"}
+      end
+    end
+
     raise "No package specified" if args.empty?
 
     args.each do |package|

data/lib/lyp/lilypond.rb

@@ -34,6 +34,10 @@ module Lyp::Lilypond
           options[:open] = true
         when '-c', '--cropped'
           argv_clean += ['-dbackend=eps', '-daux-files=#f']
+        when '-S', '--snippet'
+          argv_clean += ['-dbackend=eps', '-daux-files=#f', '--png', '-dresolution=600']
+        when '-A', '--auto-install-deps'
+          options[:resolve] = true
         else
           argv_clean << arg
         end
@@ -316,6 +320,11 @@ module Lyp::Lilypond
       search.reverse.find {|l| Gem::Version.new(l[:version]).segments[1].odd?}[:version]
     end
 
+    def latest_installed_unstable_version
+      latest = list.reverse.find {|l| Gem::Version.new(l[:version]).segments[1].odd?}
+      latest ? latest[:version] : nil
+    end
+
     def latest_version
       search.last[:version]
     end
@@ -570,19 +579,17 @@ module Lyp::Lilypond
       ly_fonts_dir = File.join(lyp_lilypond_share_dir(version), 'lilypond/current/fonts')
 
       Dir["#{Lyp.packages_dir}/**/fonts"].each do |package_fonts_dir|
+        Dir["#{package_fonts_dir}/**/*"].each do |fn|
+          next unless File.file?(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))
+          else
+            next
+          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)
-        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)
         end
       end
@@ -675,5 +682,35 @@ module Lyp::Lilypond
     def parse_error_msg(msg)
       (msg =~ /[^\n]+: error.+failed files: ".+"/m) ? $& : msg
     end
+
+    CHECK_UPDATE_INTERVAL = 7 * 86400
+    CHECK_UPDATE_STAMP_KEY = 'lilypond/last_update_stamp'
+
+    UNSTABLE_UPDATE_MESSAGE = <<EOF
+Lilypond version %s is now available. Install it by typing:
+
+  lyp install lilypond@unstable
+
+EOF
+
+    def check_update
+      last_check = Lyp::Settings.get_value(
+        CHECK_UPDATE_STAMP_KEY, Time.now - CHECK_UPDATE_INTERVAL)
+
+      return unless last_check < Time.now - CHECK_UPDATE_INTERVAL
+
+      Lyp::Settings.set_value(CHECK_UPDATE_STAMP_KEY, Time.now)
+
+      # check unstable
+      installed = latest_installed_unstable_version
+      return unless installed
+
+      available = {version: latest_unstable_version}
+      installed = {version: installed}
+
+      if CMP_VERSION[available, installed] > 0
+        puts UNSTABLE_UPDATE_MESSAGE % available[:version]
+      end
+    end
   end
 end

data/lib/lyp/package.rb

@@ -298,7 +298,7 @@ module Lyp::Package
           available_on_versions << lilypond[:version]
         end
 
-        Dir["#{package_fonts_dir}/*/**"].each do |fn|
+        Dir["#{package_fonts_dir}/**/*"].each do |fn|
           next unless File.file?(fn)
           target_fn = case File.extname(fn)
           when '.otf'

data/lib/lyp/resolver.rb

@@ -1,10 +1,11 @@
 module Lyp
   class DependencySpec
-    attr_reader :clause, :versions
+    attr_reader :clause, :versions, :location
 
-    def initialize(clause, versions = {})
+    def initialize(clause, versions, location = nil)
       @clause = clause
       @versions = versions.inject({}) {|m, kv| m[kv[0].to_s] = kv[1]; m}
+      @location = location
     end
 
     def add_version(version, leaf)
@@ -16,7 +17,7 @@ module Lyp
     end
 
     def hash
-      {clase: clause, versions: versions}.hash
+      {clause: clause, versions: versions}.hash
     end
   end
 
@@ -28,6 +29,9 @@ module Lyp
     end
 
     def add_dependency(name, spec)
+      if @dependencies[name.to_s] && !spec.eql?(@dependencies[name.to_s])
+        DependencyResolver.error("Clause mismatch found in %s", spec.location)
+      end
       @dependencies[name.to_s] = spec
     end
 
@@ -110,7 +114,7 @@ module Lyp
       result = select_highest_versioned_permutation(permutations, user_deps).flatten
 
       if result.empty? && !tree.dependencies.empty?
-        raise "Failed to satisfy dependency requirements"
+        error("Failed to satisfy dependency requirements")
       else
         result
       end
@@ -174,29 +178,33 @@ module Lyp
       dir = File.dirname(path)
 
       # Parse lilypond file for \include and \require
-      ly_content.scan(DEP_RE) do |type, ref|
-        case type
-        when INCLUDE, PINCLUDE, PINCLUDE_ONCE
-          process_include_command(ref, dir, leaf, opts)
-        when REQUIRE
-          process_require_command(ref, dir, leaf, opts)
+      location = {path: path, line: 0}
+      ly_content.each_line do |line|
+        location[:line] += 1
+        line.scan(DEP_RE) do |type, ref|
+          case type
+          when INCLUDE, PINCLUDE, PINCLUDE_ONCE
+            process_include_command(ref, dir, leaf, opts, location)
+          when REQUIRE
+            process_require_command(ref, dir, leaf, opts, location)
+          end
         end
       end
 
       # process any external requires (supplied using the -r command line option)
       if @ext_require
         @ext_require.each do |p|
-          process_require_command(p, dir, leaf, opts)
+          process_require_command(p, dir, leaf, opts, {ext_require: true})
         end
         @ext_require = nil
       end
 
       @processed_files[path] = true
     rescue Errno::ENOENT
-      raise "Cannot find file #{path}"
+      error("Could not find file #{path}")
     end
 
-    def process_include_command(ref, dir, leaf, opts)
+    def process_include_command(ref, dir, leaf, opts, location)
       # a package would normally use a plain \pinclude or \pincludeOnce
       # command to include package files, e.g. \pinclude "inc/init.ly".
       #
@@ -209,10 +217,15 @@ module Lyp
         ref = $2
       end
       qualified_path = File.expand_path(ref, dir)
+
+      unless File.file?(qualified_path)
+        error("Invalid include file specified in %s", location)
+      end
+
       queue_file_for_processing(qualified_path, leaf)
     end
 
-    def process_require_command(ref, dir, leaf, opts)
+    def process_require_command(ref, dir, leaf, opts, location)
       forced_path = nil
       if ref =~ /^([^\:]+)\:(.+)$/
         ref = $1
@@ -228,7 +241,7 @@ module Lyp
         set_forced_package_path(package, forced_path)
       end
 
-      find_package_versions(ref, leaf)
+      find_package_versions(ref, leaf, location)
     end
 
     def queue_file_for_processing(path, leaf)
@@ -430,7 +443,7 @@ module Lyp
 
     # Find available packaging matching the package specifier, and queue them for
     # processing any include files or transitive dependencies.
-    def find_package_versions(ref, leaf)
+    def find_package_versions(ref, leaf, location)
       return {} unless ref =~ Lyp::PACKAGE_RE
       ref_package = $1
       version_clause = $2
@@ -439,7 +452,8 @@ module Lyp
 
       # Raise if no match found and we're at top of the tree
       if matches.empty? && (leaf == tree) && !opts[:ignore_missing]
-        raise "No package found for requirement #{ref}"
+        msg = "Missing package dependency #{ref} in %sYou can install any missing packages by running:\n\n  lyp resolve #{@user_file}"
+        error(msg, location)
       end
 
       matches.each do |p, package_leaf|
@@ -449,7 +463,7 @@ module Lyp
       end
 
       # Setup up dependency leaf
-      leaf.add_dependency(ref_package, DependencySpec.new(ref, matches))
+      leaf.add_dependency(ref_package, DependencySpec.new(ref, matches, location))
     end
 
     # Remove redundant older versions of dependencies by collating package
@@ -525,7 +539,7 @@ module Lyp
           end
         end
         if dependency.versions.empty? && raise_on_missing
-          raise "No valid version found for package #{package}"
+          error("No valid version found for package #{package}")
         end
       end
     end
@@ -537,5 +551,30 @@ module Lyp
       available_packages["#{package}@forced"] = DependencyPackage.new(
         File.join(path, MAIN_PACKAGE_FILE))
     end
+
+    def error(msg, location = nil)
+      DependencyResolver.error(msg, location)
+    end
+
+    def self.error(msg, location = nil)
+      location = location ? format_location(location) : nil
+      raise ResolveError, msg % location
+    end
+
+    def self.format_location(location)
+      return "" unless location
+      return "require flag" if location[:ext_require]
+      source_line = get_source_line(location[:path], location[:line])
+      "#{location[:path]}:#{location[:line]}: \n\n  #{source_line}\n"
+    end
+
+    def self.get_source_line(path, line)
+      IO.read(path).lines[line - 1]
+    rescue => e
+      "???"
+    end
   end
 end
+
+class ResolveError < RuntimeError
+end

data/lib/lyp/settings.rb

@@ -2,36 +2,43 @@ require 'yaml'
 
 module Lyp::Settings
   class << self
-    def get
-      YAML.load(IO.read(Lyp.settings_file)) rescue {}
+    def load
+      @settings = YAML.load(IO.read(Lyp.settings_file)) rescue {}
     end
-    
-    def set(o)
-      File.open(Lyp.settings_file, 'w+') {|f| f << YAML.dump(o)}
+
+    def save
+      File.open(Lyp.settings_file, 'w+') {|f| f << YAML.dump(@settings)}
     end
-    
+
     def [](path)
-      h = get
+      h = load
       while path =~ /^([^\/]+)\/(.+)$/
         h = h[$1.to_sym] ||= {}
         path = $2
       end
-      
+
       h[path.to_sym]
     end
-    
+
     def []=(path, value)
-      h = settings = get
+      h = load
       while path =~ /^([^\/]+)\/(.+)$/
         h = h[$1.to_sym] ||= {}
         path = $2
       end
-      
+
       h[path.to_sym] = value
-      
-      set(settings)
-      
+      save
       value
     end
+
+    def get_value(path, default = nil)
+      v = self[path]
+      v ? YAML.load(v) : default
+    end
+
+    def set_value(path, value)
+      self[path] = YAML.dump(value)
+    end
   end
-end
+end

data/lib/lyp/version.rb

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

metadata

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