lyp 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff21ca7ba2c6d2c94dcb6c07dd2574323653376
-  data.tar.gz: 9b411863056ece14eeead97aa5966e17e24d432e
+  metadata.gz: 4d9fed1dd1f3c460de5891f6cfc0bdb7a6603db3
+  data.tar.gz: c253c781c07613a9a6523920077700d7e5c24584
 SHA512:
-  metadata.gz: 1fc1bd8f3de79b99d4f46669fc6f82542eacd463a08962876af8b6fb804562b3b653217a2288630f7657be661cd8abb5d819be2fed123683b89888503376a8d2
-  data.tar.gz: eb02d6b9696ea5ba3bf6d1309dd20bb43e1543e14f32337886bc1e57af2e7b7c8b033d1b2d7476c26d3176f755b6484f880eb2ff64893d4b6f528d0bc6f97cfa
+  metadata.gz: ffc6ec1b50ffd05b9032ac30a00ab05ec608ba8210e26b911cac1132721fd6674f0bacf9245efec42bd624aa08272e9b054f436080e9f0a840f44871acdff64f
+  data.tar.gz: 37948d1ec09e6e3558719acf6c4f47254c41bbb39b50e44c204f6046b40820b252c37c0c2eac3b3106bc09c3bc7e3d77460a9f8c56d02a6e810509fc1a0abb59

data/README.md

@@ -49,14 +49,16 @@ __No hassle Lilypond installation__: With lyp you can also install any version o
 
 ### System requirements
 
-Lyp is tested to work on Linux, Mac OS X and Windows 7+.
+Lyp is tested to work on Linux, MacOS and Windows 7+.
 
 ### Installing lyp as a Ruby gem
 
+_Note_: A recent version of Ruby (2.0.0 or later) is included in MacOS 10.9.0 or later.
+
 If you have a recent (>=1.9.3) version of Ruby on your machine, you can install lyp as a gem.
 
 ```bash
-# Linux/Mac OS X:
+# Linux/MacOS:
 $ gem install lyp
 
 # Windows:
@@ -86,7 +88,7 @@ Windows users can simply download the latest Windows [release](https://github.co
 
 ### Manually installing releases
 
-(This section is for Linux / Mac OS X users.)
+(This section is for Linux / MacOS users.)
 
 If you feel uneasy about piping curl output to bash, you can install lyp yourself by downloading a [release](https://github.com/noteflakes/lyp/releases), untarring it, and running `lyp install self`:
 

data/bin/install_release.sh

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

data/bin/lilypond

@@ -26,7 +26,7 @@ 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
-  -F, --force_version                 use lilypond version specified in user file
+  -F, --force-version                 use lilypond version specified in user file
   -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)

data/lib/lyp/cli.rb

@@ -99,7 +99,7 @@ class Lyp::CLI < Thor
     end
   end
 
-  desc "compile [<option>...] <FILE>", "Invokes lilypond with given file"
+  desc "compile [<option>...] <FILE>", "Invoke lilypond with given file"
   def compile(*argv)
     opts, argv = Lyp::Lilypond.preprocess_argv(argv)
 
@@ -110,7 +110,14 @@ class Lyp::CLI < Thor
     Lyp::Lilypond.compile(argv, opts)
   end
 
-  desc "test [<option>...] [.|PATTERN]", "Runs package tests on installed packages or local directory"
+  desc "exec <CMD> [<options>...]", "Execute a lilypond script"
+  def exec(*argv)
+    $stderr.puts "Lyp #{Lyp::VERSION}"
+    Lyp::System.test_installed_status!
+    Lyp::Lilypond.invoke_script(argv, {})
+  end
+
+  desc "test [<option>...] [.|PATTERN]", "Run package tests on installed packages or local directory"
   method_option :install, aliases: '-n', type: :boolean, desc: 'Install the requested version of Lilypond if not present'
   method_option :env, aliases: '-E', type: :boolean, desc: 'Use version set by LILYPOND_VERSION environment variable'
   method_option :use, aliases: '-u', type: :string, desc: 'Use specified version'
@@ -275,7 +282,7 @@ class Lyp::CLI < Thor
     end
   end
 
-  desc "deps FILE", "Lists dependencies found in user's files"
+  desc "deps FILE", "List dependencies found in user's files"
   def deps(fn)
     $cmd_options = options
 
@@ -291,7 +298,7 @@ class Lyp::CLI < Thor
     end
   end
 
-  desc "resolve FILE", "Resolves and installs missing dependencies found in user's files"
+  desc "resolve FILE", "Resolve and install missing dependencies found in user's files"
   method_option :all, aliases: '-a', type: :boolean, desc: 'Install all found dependencies'
   def resolve(fn)
     $cmd_options = options
@@ -326,6 +333,15 @@ class Lyp::CLI < Thor
     end
   end
 
+  desc "accelerate", "Rewrite gem binaries to make lyp faster"
+  def accelerate
+    unless Lyp::System.is_gem?
+      puts "Lyp is not installed as a gem."
+      exit 1
+    end
+
+    Lyp::System.rewrite_gem_scripts
+  end
 
   def self.run
     start(ARGV)

data/lib/lyp/etc/lyp.ly

@@ -136,16 +136,13 @@
   ))
 
   ; define list of finalizer lambdas to be called after the user's file has been
-  ; \included.
-  (module-define! (current-module) 'lyp:finalProcs '())
-  (define (lyp:getFinalProcs)
-    (module-ref (current-module) 'lyp:finalProcs))
-  (define (lyp:setFinalProcs l) 
-    (module-define! (current-module) 'lyp:finalProcs l))
+  ; processed. packages invoke (lyp:finalize proc) to add their own code.
+  ; Finalizers are called in the order they were added.
+  (define lyp:final-procs '())
   (define (lyp:finalize proc)
-    (lyp:setFinalProcs (append (lyp:getFinalProcs) (list proc))))
-  (define (lyp:callFinalizers)
-    (for-each (lambda (p) (p)) (lyp:getFinalProcs)))
+    (set! lyp:final-procs (append lyp:final-procs (list proc))))
+  (define (lyp:call-finalizers)
+    (for-each (lambda (p) (p)) lyp:final-procs))
 )
 
 % command form

data/lib/lyp/lilypond.rb

@@ -116,6 +116,20 @@ module Lyp::Lilypond
       end
     end
 
+    def invoke_script(argv, opts = {})
+      cmd = File.join(current_lilypond_bin_path, argv.shift)
+
+      case opts[:mode]
+      when :system
+        system("#{cmd} #{argv.join(" ")}")
+      when :spawn
+        pid = spawn(cmd, *argv, opts[:spawn_opts] || {})
+        Process.detach(pid)
+      else
+        Kernel.exec(cmd, *argv)
+      end
+    end
+
     def default_lilypond
       Lyp::Settings['lilypond/default']
     end
@@ -139,6 +153,11 @@ module Lyp::Lilypond
       settings[:current]
     end
 
+    def current_lilypond_bin_path
+      lilypond = current_lilypond
+      lilypond && File.dirname(lilypond)
+    end
+
     def current_lilypond_version
       path = current_lilypond
       version = File.basename(File.expand_path("#{File.dirname(path)}/../.."))
@@ -504,7 +523,7 @@ module Lyp::Lilypond
 
     def install_lilypond_files_osx(fn, target, platform, version, opts)
       STDERR.puts "Extracting..." unless opts[:silent]
-      exec "tar -xjf #{fn} -C #{target}"
+      run_cmd "tar -xjf #{fn} -C #{target}"
 
       copy_lilypond_files("#{target}/LilyPond.app/Contents/Resources", version, opts)
     end
@@ -519,12 +538,12 @@ module Lyp::Lilypond
       FileUtils.mkdir_p(tmp_dir)
 
       FileUtils.cd(tmp_dir) do
-        exec "sh #{fn} --tarball >/dev/null"
+        run_cmd "sh #{fn} --tarball >/dev/null"
       end
 
       tmp_fn = "#{tmp_dir}/lilypond-#{version}-1.#{platform}.tar.bz2"
 
-      exec "tar -xjf #{tmp_fn} -C #{target}"
+      run_cmd "tar -xjf #{tmp_fn} -C #{target}"
 
       copy_lilypond_files("#{target}/usr", version, opts)
     ensure
@@ -701,7 +720,7 @@ module Lyp::Lilypond
       FileUtils.rm_rf(path)
     end
 
-    def exec(cmd, raise_on_failure = true)
+    def run_cmd(cmd, raise_on_failure = true)
       req_ext('open3')
       $_out = ""
       $_err = ""
@@ -713,7 +732,7 @@ module Lyp::Lilypond
         success = exit_value == 0
       end
       if !success && raise_on_failure
-        raise "Error executing cmd #{cmd}:\n#{parse_error_msg($_err)}"
+        raise "Error executing #{cmd}:\n#{parse_error_msg($_err)}"
       end
       success
     end

data/lib/lyp/system.rb

@@ -110,6 +110,15 @@ EOF
     def is_gem?
       SELF_DIR !~ /#{RELEASE_BIN_PATH}$/
     end
+
+    def rewrite_gem_scripts
+      %w{lyp lilypond}.each do |script_name|
+        src_path = Gem.bin_path('lyp', script_name)
+        dest_path = File.join(Gem.bindir, script_name)
+        puts "cp #{src_path} #{dest_path}"
+        FileUtils.cp(src_path, dest_path)
+      end
+    end
     
     def setup_gem_files
       FileUtils.rm_rf(Lyp::LYP_BIN_DIRECTORY)

data/lib/lyp/templates/deps_wrapper.rb

@@ -83,5 +83,5 @@ end
 `
 \include {{quote_path[user_filename]}}
 
-#(lyp:callFinalizers)
+#(lyp:call-finalizers)
 `

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient