lyp-win 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979d491adba337cb2ee7c67181ebdfb23a64ace4
-  data.tar.gz: 97da159cbed5589c1c5049581dabf8c829f8301c
+  metadata.gz: 4e38dff76bd4d1a439152bfa2feae4ba5af4ad16
+  data.tar.gz: 9b411863056ece14eeead97aa5966e17e24d432e
 SHA512:
-  metadata.gz: 86ea03b988790093556d2ea5303aabf0e56f1b097f3e0afd99163a0a4ded8e8e7cc48e610dfe0fce1708d1edb6f695e015b1b6bd7cf30051f9f043b23500d0c5
-  data.tar.gz: 62c0296ad688312460f8a097c3feff5abb827aafa00fef673501b7cb71b4c73ebae01aa55213e7f3a43129800716521b6c2ee27fdfc865386ae00c0022fc72f8
+  metadata.gz: 226b0270fe3e1ad54851bd872d8af0c16ca2ee1270fe1f24df065b0f4b6eee2028bcd521c08dc03463223ae8ad1dbf88e85fb5e2d012182468eb253f6a5180cf
+  data.tar.gz: eb02d6b9696ea5ba3bf6d1309dd20bb43e1543e14f32337886bc1e57af2e7b7c8b033d1b2d7476c26d3176f755b6484f880eb2ff64893d4b6f528d0bc6f97cfa

data/bin/install_release.sh

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

data/lib/lyp/cli.rb

@@ -111,7 +111,7 @@ class Lyp::CLI < Thor
   end
 
   desc "test [<option>...] [.|PATTERN]", "Runs 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 :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'
   def test(*args)
@@ -144,10 +144,11 @@ class Lyp::CLI < Thor
     end
   end
 
-  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'
+  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'
+  method_option :update, aliases: '-u', type: :boolean, desc: 'Remove any old versions of the package'
   def install(*args)
     $cmd_options = options
 
@@ -175,7 +176,14 @@ class Lyp::CLI < Thor
     end
   end
 
-  desc "uninstall <PACKAGE|lilypond|self>...", "Uninstall a package or a version of lilypond. When 'uninstall self' is invoked, lyp uninstalls itself from ~/.lyp."
+  desc "update <PACKAGE>...", "Install a package after removing all previous versions"
+  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'
+  def update(*args)
+    invoke 'install', args, options.merge(update: true)
+  end
+
+  desc "uninstall <PACKAGE|lilypond|self>...", "Uninstall a package or a version of Lilypond. When 'uninstall self' is invoked, lyp uninstalls itself from ~/.lyp."
   method_option :all, aliases: '-a', type: :boolean, desc: 'Uninstall all versions'
   def uninstall(*args)
     $cmd_options = options
@@ -197,8 +205,8 @@ class Lyp::CLI < Thor
     end
   end
 
-  desc "use [lilypond@]<VERSION>", "Switch version of lilypond"
-  method_option :default, aliases: '-d', type: :boolean, desc: 'Set default lilypond version'
+  desc "use [lilypond@]<VERSION>", "Switch version of Lilypond"
+  method_option :default, aliases: '-d', type: :boolean, desc: 'Set default Lilypond version'
   def use(version)
     $cmd_options = options
 
@@ -209,10 +217,10 @@ class Lyp::CLI < Thor
     end
 
     lilypond = Lyp::Lilypond.use(version, options)
-    puts "Using lilypond version #{lilypond[:version]}"
+    puts "Using Lilypond version #{lilypond[:version]}"
   end
 
-  desc "list [PATTERN|lilypond]", "List installed packages matching PATTERN or versions of lilypond"
+  desc "list [PATTERN|lilypond]", "List installed packages matching PATTERN or versions of Lilypond"
   def list(pattern = nil)
     $cmd_options = options
 
@@ -249,7 +257,7 @@ class Lyp::CLI < Thor
     end
   end
 
-  desc "which [PATTERN|lilypond]", "List locations of installed packages matching PATTERN or versions of lilypond"
+  desc "which [PATTERN|lilypond]", "List locations of installed packages matching PATTERN or versions of Lilypond"
   def which(pattern = nil)
     $cmd_options = options
 

data/lib/lyp/lilypond.rb

@@ -1,7 +1,3 @@
-require 'uri'
-require 'open3'
-require 'ruby-progressbar'
-
 module Lyp::Lilypond
   class << self
     NO_ARGUMENT_OPTIONS_REGEXP = /^\-([REnFOcSA]+)(.+)/
@@ -208,10 +204,14 @@ module Lyp::Lilypond
     end
 
     def get_session_settings
-      YAML.load(IO.read(session_settings_filename)) rescue {}
+      req_ext('yaml')
+      settings = YAML.load(IO.read(session_settings_filename)) rescue {}
+      settings = {} unless settings.is_a?(Hash)
+      settings
     end
 
     def set_session_settings(settings)
+      req_ext('yaml')
       File.open(session_settings_filename, 'w+') do |f|
         f << YAML.dump(settings)
       end
@@ -314,7 +314,7 @@ module Lyp::Lilypond
 
     # Returns a list of versions of lilyponds available for download
     def search(version_specifier = nil)
-      require 'open-uri'
+      req_ext 'open-uri'
 
       platform = detect_lilypond_platform
       url = "#{BASE_URL}/#{platform}/"
@@ -452,12 +452,14 @@ module Lyp::Lilypond
     end
 
     def temp_install_filename(url)
+      req_ext('uri')
       u = URI(url)
       "#{Lyp::TMP_ROOT}/#{File.basename(u.path)}"
     end
 
     def download_lilypond(url, fn, opts)
-      require 'httpclient'
+      req_ext 'ruby-progressbar'
+      req_ext 'httpclient'
 
       STDERR.puts "Downloading #{url}" unless opts[:silent]
 
@@ -700,6 +702,7 @@ module Lyp::Lilypond
     end
 
     def exec(cmd, raise_on_failure = true)
+      req_ext('open3')
       $_out = ""
       $_err = ""
       success = nil

data/lib/lyp/package.rb

@@ -1,7 +1,3 @@
-require 'fileutils'
-require 'open-uri'
-require 'yaml'
-
 module Lyp::Package
   class << self
 
@@ -10,29 +6,7 @@ module Lyp::Package
         File.dirname(path).gsub("#{Lyp.packages_dir}/", '')
       end
 
-      if pattern
-        if (pattern =~ /[@\>\<\=\~]/) && (pattern =~ Lyp::PACKAGE_RE)
-          package, version = $1, $2
-          req = Lyp.version_req(version) rescue nil
-          packages.select! do |p|
-            p =~ Lyp::PACKAGE_RE
-            p_pack, p_ver = $1, $2
-
-            next false unless p_pack == package
-
-            if req && (p_gemver = Lyp.version(p_ver) rescue nil)
-              req =~ p_gemver
-            else
-              p_ver == version
-            end
-          end
-        else
-          packages.select! do |p|
-            p =~ Lyp::PACKAGE_RE
-            $1 =~ /#{pattern}/
-          end
-        end
-      end
+      packages = filter_packages(packages, pattern) if pattern
 
       packages.sort do |x, y|
         x =~ Lyp::PACKAGE_RE; x_package, x_version = $1, $2
@@ -49,6 +23,33 @@ module Lyp::Package
       end
     end
 
+    def filter_packages(packages, pattern)
+      if (pattern =~ /[@\>\<\=\~]/) && (pattern =~ Lyp::PACKAGE_RE)
+        package, version = $1, $2
+        req = Lyp.version_req(version) rescue nil
+        packages.select do |p|
+          p =~ Lyp::PACKAGE_RE
+          p_name, p_ver = $1, $2
+
+          next false unless p_name == package
+
+          if req && (p_gemver = Lyp.version(p_ver) rescue nil)
+            req =~ p_gemver
+          else
+            p_ver == version
+          end
+        end
+      else
+        if pattern =~ /^"(.+)"$/
+          pattern = $1
+        end
+        packages.select do |p|
+          p =~ Lyp::PACKAGE_RE
+          $1 =~ /#{pattern}/
+        end
+      end
+    end
+
     def which(pattern = nil)
       list(pattern).map {|p| "#{Lyp.packages_dir}/#{p}" }
     end
@@ -59,6 +60,10 @@ module Lyp::Package
       end
       package, version = $1, $2
 
+      # The update flag means all installed versions are removed prior to 
+      # proceeding with installation 
+      uninstall(package, {all: true}) if opts[:update]
+
       if version =~ /\:/
         info = install_from_local_files(package, version, opts)
       else
@@ -71,14 +76,6 @@ module Lyp::Package
         install_package_fonts(info[:path], opts)
       end
 
-      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
           run_tests(info[:path])
@@ -96,6 +93,8 @@ module Lyp::Package
       version =~ /^([^\:]+)\:(.+)$/
       version, local_path = $1, $2
 
+      puts "Installing #{package}@#{version} => #{local_path}" unless opts[:silent]      
+
       entry_point_path = nil
       local_path = File.expand_path(local_path)
       if File.directory?(local_path)
@@ -143,6 +142,8 @@ module Lyp::Package
       repo = package_repository(url, tmp_path, opts)
       version = checkout_package_version(repo, version, opts)
 
+      puts "Installing #{package}@#{version}" unless opts[:silent]      
+
       # Copy files
       package_path = git_url_to_package_path(
         package !~ /\// ? package : url, version
@@ -366,6 +367,8 @@ module Lyp::Package
     end
 
     def lyp_index
+      req_ext 'yaml'
+      req_ext 'open-uri'
       @lyp_index ||= YAML.load(open(LYP_INDEX_URL))
     end
 

data/lib/lyp/settings.rb

@@ -1,12 +1,12 @@
-require 'yaml'
-
 module Lyp::Settings
   class << self
     def load
+      req_ext 'yaml'
       @settings = YAML.load(IO.read(Lyp.settings_file)) rescue {}
     end
 
     def save
+      req_ext 'yaml'
       File.open(Lyp.settings_file, 'w+') {|f| f << YAML.dump(@settings)}
     end
 
@@ -33,11 +33,13 @@ module Lyp::Settings
     end
 
     def get_value(path, default = nil)
+      req_ext 'yaml'
       v = self[path]
       v ? YAML.load(v) : default
     end
 
     def set_value(path, value)
+      req_ext 'yaml'
       self[path] = YAML.dump(value)
     end
   end

data/lib/lyp/system.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Lyp::System
   class << self
     RUGGED_REQ = Lyp.version_req('>=0.23.0')
@@ -26,7 +24,7 @@ module Lyp::System
     
     def require_rugged_gem
       gem 'rugged', RUGGED_REQ.to_s
-      require 'rugged'
+      req_ext 'rugged'
     end
     
     def use_git_based_rugged_gem

data/lib/lyp/templates/deps_wrapper.rb

@@ -13,8 +13,6 @@ if _[:opts][:lilypond_version]
 `
 end
 
-require 'fileutils'
-
 user_filename = File.expand_path(_[:user_file])
 user_dirname = File.dirname(user_filename)
 

data/lib/lyp/transform.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Lyp::Transform
   class << self
     R = Lyp::DependencyResolver

data/lib/lyp/version.rb

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

data/lib/lyp/wrapper.rb

@@ -1,5 +1,3 @@
-require 'tempfile'
-
 module Lyp
   WRAPPER_TEMPLATE = Lyp::Template.new(IO.read(
     File.expand_path('templates/deps_wrapper.rb', File.dirname(__FILE__))

data/lib/lyp.rb

@@ -1,14 +1,23 @@
-def req(f); require File.expand_path("lyp/#{f}", File.dirname(__FILE__)) end
+def req_int(f)
+  require File.expand_path("lyp/#{f}", File.dirname(__FILE__))
+end
 
-req 'base'
-req 'system'
-req 'settings'
+module Kernel
+  @@ext_requires = {}
+  def req_ext(l)
+    @@ext_requires[l] ||= require(l)
+  end
+end 
 
-req 'template'
-req 'resolver'
-req 'wrapper'
-req 'package'
-req 'lilypond'
-req 'transform'
+req_int 'base'
+req_int 'system'
+req_int 'settings'
 
-req 'windows' if Lyp::WINDOWS
+req_int 'template'
+req_int 'resolver'
+req_int 'wrapper'
+req_int 'package'
+req_int 'lilypond'
+req_int 'transform'
+
+req_int 'windows' if Lyp::WINDOWS

metadata

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