lyp 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be14f9ec309c846d05866736f78ba82458ba4f5b
-  data.tar.gz: b5ffae67c9ef47ec416ec61d763913cdc89b9459
+  metadata.gz: b8b10bc684d3755cd63fde5175e4769e7ee8d1ae
+  data.tar.gz: dc4c7568047ba01915131cba0125e717f6c9f107
 SHA512:
-  metadata.gz: d5899a965576c65a6d07bd07ff716889e85042044d2efdbf8d16d47adfe09e57965479b75873a0ef0b5ae1c0b293529268fbe28472e97c7a360695df5b5b3e04
-  data.tar.gz: a075ab18c0270b3c057db6ae9c3f365f9c8b4c26c7cf1df4c89fd79c6e896f495cfcc5356cf8c301c93aaa8833df16e5a40bf795112899fd88b344ea7b87bf10
+  metadata.gz: 1f3845fec6418ec6221659d9f04a8e5d6919fd77fe714ee0d91a02f3664cc66ffc1c3e1189c1d8f903ad96bbeffce7e28e361c7ca098d780e76c2afbb80b80ca
+  data.tar.gz: 97ecbadebd13b96c51861c160c62b7e14f2546882d2cad65d9578c9488f2bed997abfb7678b8b43f8c04ee6bf5a4ddbb5f37b03b1c18a07d3947b1c8c8e72e91

data/bin/lilypond

@@ -5,6 +5,7 @@ require 'lyp'
 
 STDERR.puts "Lyp version #{Lyp::VERSION}"
 
+Lyp::Lilypond.check_lilypond!
 lilypond_path = Lyp::Lilypond.current_lilypond
 unless lilypond_path && File.file?(lilypond_path)
   STDERR.puts "No version of lilypond found. To install lilypond run 'lyp install lilypond'."

data/lib/lyp/cli.rb

@@ -1,11 +1,182 @@
-require 'commander/import'
+require 'thor'
 require "lyp/version"
 
-program :name,            'lyp'
-program :version,         Lyp::VERSION
-program :description,     'Lyp is a package manager for lilypond.'
-program :help_formatter,  :compact
+def lilypond_prefix(info)
+  if info[:current] && info[:default]
+    "=* "
+  elsif info[:current]
+    "=> "
+  elsif info[:default]
+    " * "
+  else
+    "   "
+  end
+end
 
-require 'lyp/cli/commands'
+def lilypond_postfix(info)
+  if info[:system]
+    " (system)"
+  else
+    ""
+  end
+end
 
-default_command(:list)
+def format_lilypond_entry(info)
+  "#{lilypond_prefix(info)}#{info[:version]}#{lilypond_postfix(info)}"
+end
+
+LILYPOND_PREAMBLE = <<EOF
+
+Lilypond versions:
+
+EOF
+
+LILYPOND_LEGEND = <<EOF
+
+# => - current
+# =* - current && default
+#  * - default
+
+EOF
+
+class Lyp::CLI < Thor
+  package_name "lyp"
+  map "-v" => :version
+  check_unknown_options! :except => :compile
+  
+  desc "version", "show Lyp version"
+  def version
+    require 'lyp/version'
+    $stderr.puts "Lyp #{Lyp::VERSION}"
+  end
+  
+  desc "search [PATTERN|lilypond]", "List available packages matching PATTERN or versions of lilypond"
+  def search(pattern)
+    # Lyp::System.test_installed_status!
+
+    pattern =~ Lyp::PACKAGE_RE
+    package, version = $1, $2
+    
+    if package == 'lilypond'
+      search_lilypond(version)
+    else
+      search_package(pattern)
+    end
+  end  
+  
+  no_commands do
+    def search_lilypond(version)
+      versions = Lyp::Lilypond.search(version)
+  
+      if versions.empty?
+        puts "\nNo versions of lilypond are available for download\n\n"
+      else
+        puts "\nAvailable versions of lilypond:\n\n"
+        versions.each do |v|
+          prefix = v[:installed] ? " * " : "   "
+          puts "#{prefix}#{v[:version]}"
+        end
+        puts "\n * Currently installed\n\n"
+      end
+    end
+  
+    def search_package(pattern)
+      packages = Lyp::Package.list_lyp_index(pattern)
+      if packages.empty?
+        puts "\nNo matching package found in lyp-index\n\n"
+      else
+        puts "\nAvailable packages:\n\n"
+        packages.each do |p|
+          puts "   #{p[:name]}"
+        end
+        puts "\n\n"
+      end
+    end
+  end
+
+  desc "compile [<option>...] <FILE>", "Invokes lilypond with given file"
+  def compile(*args)
+    Lyp::System.test_installed_status!
+    Lyp::Lilypond.check_lilypond!
+
+    Lyp::Lilypond.compile(*args)
+  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'
+  def install(*args)
+    raise "No package specified" if args.empty?
+    
+    args.each do |package|
+      case package
+      when 'self'
+        Lyp::System.install!
+      when /^lilypond(?:@(.+))?$/
+        Lyp::System.test_installed_status!
+        Lyp::Lilypond.install($1, options)
+      else
+        Lyp::System.test_installed_status!
+        Lyp::Package.install(package)
+      end
+    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."
+  def uninstall(*args)
+    Lyp::System.test_installed_status!
+
+    raise "No package specified" if args.empty?
+    args.each do |package|
+      case package
+      when 'self'
+        Lyp::System.uninstall!
+      when /^lilypond(?:@(.+))?$/
+        Lyp::System.test_installed_status!
+        Lyp::Lilypond.uninstall($1)
+      else
+        Lyp::System.test_installed_status!
+        Lyp::Package.uninstall(package)
+      end
+    end
+  end
+  
+  desc "use [lilypond@]<VERSION>", "Switch version of lilypond"
+  method_option :default, aliases: '-d', type: :boolean, desc: 'Set default lilypond version'
+  def use(version)
+    Lyp::System.test_installed_status!
+
+    if version =~ /^lilypond@(.+)$/
+      version = $1
+    end
+  
+    lilypond = Lyp::Lilypond.use(version, options)
+    puts "Using version #{lilypond[:version]}"
+  end
+
+  desc "list [PATTERN|lilypond]", "List installed packages matching PATTERN or versions of lilypond"
+  def list(pattern = nil)
+    Lyp::System.test_installed_status!
+
+    if pattern == 'lilypond'
+      STDOUT.puts LILYPOND_PREAMBLE
+      Lyp::Lilypond.list.each {|info| puts format_lilypond_entry(info)}
+      STDOUT.puts LILYPOND_LEGEND
+    else
+      Lyp::Package.list(args.first).each {|p| puts p}
+    end
+  end
+  
+  desc "which [PATTERN|lilypond]", "List locations of installed packages matching PATTERN or versions of lilypond"
+  def which(pattern = nil)
+    Lyp::System.test_installed_status!
+
+    if pattern == 'lilypond'
+      puts Lyp::Lilypond.current_lilypond
+    else
+      Lyp::Package.which(args.first).each {|p| puts p}
+    end
+  end
+  
+end
+
+Lyp::CLI.start(ARGV)

data/lib/lyp/lilypond.rb

@@ -1,5 +1,6 @@
 require 'httpclient'
 require 'uri'
+require 'open3'
 
 module Lyp::Lilypond
   class << self
@@ -13,7 +14,7 @@ module Lyp::Lilypond
     def invoke(argv)
       lilypond = detect_use_version_argument(argv) || current_lilypond
       
-      exec("#{lilypond} #{argv.join(' ')}")
+      Kernel.exec(lilypond, *argv)
     end
     
     def detect_use_version_argument(argv)
@@ -47,6 +48,25 @@ module Lyp::Lilypond
       set_session_settings(settings)
     end
     
+    def check_lilypond!
+      # check default
+      select_default_lilypond! unless valid_lilypond?(default_lilypond)
+      
+      set_current_lilypond(default_lilypond) unless valid_lilypond?(current_lilypond)
+    end
+    
+    def valid_lilypond?(path)
+      File.file?(path) && (`#{path} -v` =~ /^GNU LilyPond/)
+    end
+    
+    def select_default_lilypond!
+      latest = system_lilyponds.sort(&CMP_VERSION).last || lyp_lilyponds.sort(&CMP_VERSION).last
+      if latest
+        default = latest[:path]
+        set_default_lilypond(default)
+      end
+    end
+    
     def get_session_settings
       YAML.load(IO.read(session_settings_filename)) rescue {}
     end
@@ -406,8 +426,10 @@ module Lyp::Lilypond
     def exec(cmd)
       Open3.popen3(cmd) do |_in, _out, _err, wait_thr|
         exit_value = wait_thr.value
+        $_out = _out.read
+        $_err = _err.read
         if exit_value != 0
-          raise "Error executing cmd #{cmd}: #{_err.read}"
+          raise "Error executing cmd #{cmd}: #{$_err.read}"
         end
       end
       

data/lib/lyp/package.rb

@@ -12,7 +12,27 @@ module Lyp::Package
       end
       
       if pattern
-        packages.select! {|p| p =~ /#{pattern}/}
+        if (pattern =~ /@/) && (pattern =~ Lyp::PACKAGE_RE)
+          package, version = $1, $2
+          req = Gem::Requirement.new(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 = Gem::Version.new(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.sort do |x, y|
@@ -30,6 +50,10 @@ module Lyp::Package
       end
     end
     
+    def which(pattern = nil)
+      list(pattern).map {|p| "#{Lyp.packages_dir}/#{p}" }
+    end
+    
     def install(package_specifier, opts = {})
       unless package_specifier =~ Lyp::PACKAGE_RE
         raise "Invalid package specifier #{package_specifier}"
@@ -59,6 +83,23 @@ module Lyp::Package
       version
     end
     
+    def uninstall(package, opts = {})
+      if opts[:all_versions]
+        Dir["#{Lyp.packages_dir}/#{package}@*"].each do |path|
+          puts "Uninstalling #{File.basename(path)}" unless opts[:silent]
+          FileUtils.rm_rf(path)
+        end
+      else
+        path = "#{Lyp.packages_dir}/#{package}"
+        if File.directory?(path)
+          puts "Uninstalling #{package}" unless opts[:silent]
+          FileUtils.rm_rf(path)
+        else
+          raise "Could not find #{package}"
+        end
+      end
+    end
+    
     def package_repository(url, tmp_path, opts = {})
       # Create repository
       if File.directory?(tmp_path)
@@ -74,20 +115,18 @@ module Lyp::Package
     
     def checkout_package_version(repo, version, opts = {})
       # Select commit to checkout
-      if version.nil? || (version == '')
-        puts "Checkout master branch..." unless opts[:silent]
-        repo.checkout('master', strategy: :force)
-        version = 'head'
-      else
-        tag = select_git_tag(repo, version)
-        unless tag
-          raise "Could not find tag matching #{version_specifier}"
-        end
-        puts "Checkout #{tag.name} tag" unless opts[:silent]
-        repo.checkout(tag.name, strategy: :force)
-        version = tag_version(tag)
+      checkout_ref = select_checkout_ref(repo, version)
+      unless checkout_ref
+        raise "Could not find tag matching #{version}"
       end
-      version
+      
+      begin
+        repo.checkout(checkout_ref, strategy: :force)
+      rescue
+        raise "Invalid version specified (#{version})"
+      end
+      
+      tag_version(checkout_ref) || version
     end
     
     def install_package_dependencies(package_path, opts = {})
@@ -180,20 +219,30 @@ module Lyp::Package
     
     TAG_VERSION_RE = /^v?(\d.*)$/
     
-    def select_git_tag(repo, version_specifier)
-      return if version_specifier.nil? || (version_specifier == '')
-      
-      req = Gem::Requirement.new(version_specifier) rescue nil
-      
-      repo_tags(repo).reverse.find do |t|
-        if req && (v = tag_version(t))
-          req =~ Gem::Version.new(v)
+    def select_checkout_ref(repo, version_specifier)
+      case version_specifier
+      when nil, '', 'latest'
+        highest_versioned_tag(repo) || 'master'
+      when /^(\>=|~\>|\d)/
+        req = Gem::Requirement.new(version_specifier)
+        tag = repo_tags(repo).reverse.find do |t|
+          (v = tag_version(t.name)) && (req =~ Gem::Version.new(v))
+        end
+        unless tag
+          raise "Could not find a version matching #{version_specifier}"
         else
-          t.name == version_specifier
+          tag.name
         end
+      else
+        version_specifier
       end
     end
     
+    def highest_versioned_tag(repo)
+      tag = repo_tags(repo).select {|t| Gem::Version.new(tag_version(t.name)) rescue nil}.last
+      tag && tag.name
+    end
+    
     # Returns a list of tags sorted by version
     def repo_tags(repo)
       tags = []
@@ -210,7 +259,7 @@ module Lyp::Package
     end
     
     def tag_version(tag)
-      (tag.name =~ TAG_VERSION_RE) ? $1 : nil
+      (tag =~ TAG_VERSION_RE) ? $1 : nil
     end
   end
 end

data/lib/lyp/system.rb

@@ -15,6 +15,7 @@ You can uninstall lyp at any time by running 'lyp uninstall self'.
 EOF
 
     def test_installed_status!
+      return
       unless installed?
         puts INSTALL_MSG
         exit 1

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -51,25 +51,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.5
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,6 @@ files:
 - bin/lyp
 - lib/lyp.rb
 - lib/lyp/cli.rb
-- lib/lyp/cli/commands.rb
 - lib/lyp/directories.rb
 - lib/lyp/lilypond.rb
 - lib/lyp/package.rb

data/lib/lyp/cli/commands.rb

@@ -1,178 +0,0 @@
-# package commands
-
-def lilypond_prefix(info)
-  if info[:current] && info[:default]
-    "=* "
-  elsif info[:current]
-    "=> "
-  elsif info[:default]
-    " * "
-  else
-    "   "
-  end
-end
-
-def lilypond_postfix(info)
-  if info[:system]
-    " (system)"
-  else
-    ""
-  end
-end
-
-def format_lilypond_entry(info)
-  "#{lilypond_prefix(info)}#{info[:version]}#{lilypond_postfix(info)}"
-end
-
-LILYPOND_PREAMBLE = <<EOF
-
-Lilypond versions:
-
-EOF
-
-LILYPOND_LEGEND = <<EOF
-
-# => - current
-# =* - current && default
-#  * - default
-
-EOF
-
-command :list do |c|
-  c.syntax =      "list [PATTERN]"
-  c.description = "Lists installed versions of packages whose name matches PATTERN"
-  c.action do |args, opts|
-    Lyp::System.test_installed_status!
-
-    pattern = args.first
-    if pattern == 'lilypond'
-      STDOUT.puts LILYPOND_PREAMBLE
-      Lyp::Lilypond.list.each {|info| puts format_lilypond_entry(info)}
-      STDOUT.puts LILYPOND_LEGEND
-    else
-      Lyp::Package.list(args.first).each {|p| puts p}
-    end
-  end
-end
-
-command :compile do |c|
-  c.syntax = "compile <FILE>"
-  c.description = "Resolves package dependencies and invokes lilypond"
-  c.action do |args, opts|
-    Lyp::System.test_installed_status!
-    
-    begin
-      raise "File not specified" if args.empty?
-      Lyp::Lilypond.compile(ARGV[1..-1])
-    end
-  end
-end
-
-command :search do |c|
-  c.syntax = "search <PATTERN>"
-  c.description = "Search for a package or a version of lilypond"
-  c.action do |args, opts|
-    Lyp::System.test_installed_status!
-
-    pattern = args.first
-    pattern =~ Lyp::PACKAGE_RE
-    package, version = $1, $2
-    req = (version && Gem::Requirement.new(version)) rescue nil
-    
-    if package == 'lilypond'
-      begin
-        versions = Lyp::Lilypond.search(version)
-        
-        if versions.empty?
-          puts "\nNo versions of lilypond are available for download\n\n"
-        else
-          puts "\nAvailable versions of lilypond:\n\n"
-          versions.each do |v|
-            prefix = v[:installed] ? " * " : "   "
-            puts "#{prefix}#{v[:version]}"
-          end
-          puts "\n * Currently installed\n\n"
-        end
-      end
-    else
-      packages = Lyp::Package.list_lyp_index(pattern)
-      if packages.empty?
-        puts "\nNo matching package found in lyp-index\n\n"
-      else
-        puts "\nAvailable packages:\n\n"
-        packages.each do |p|
-          puts "   #{p[:name]}"
-        end
-        puts "\n\n"
-      end
-    end
-  end
-end
-
-command :install do |c|
-  c.syntax = "install <PACKAGE...>"
-  c.description = "Install a package or a version of lilypond"
-  c.option "-d", "--default", "Set default version"
-  c.action do |args, opts|
-    
-    begin
-      raise "No package specified" if args.empty?
-      
-      args.each do |package|
-        case package
-        when 'self'
-          Lyp::System.install!
-        when /^lilypond(?:@(.+))?$/
-          Lyp::System.test_installed_status!
-          Lyp::Lilypond.install($1, opts.__hash__)
-        else
-          Lyp::System.test_installed_status!
-          Lyp::Package.install(package)
-        end
-      end
-    end
-  end
-end
-
-command :use do |c|
-  c.syntax = "use [lilypond@]<VERSION>"
-  c.description = "Switch version of lilypond"
-  c.option "-d", "--default", "Set default version"
-
-  c.action do |args, opts|
-    Lyp::System.test_installed_status!
-
-    begin
-      version = args.first
-      if version =~ /^lilypond@(.+)$/
-        version = $1
-      end
-      
-      lilypond = Lyp::Lilypond.use(version, opts.__hash__)
-      puts "Using version #{lilypond[:version]}"
-    end
-  end
-end
-
-command :uninstall do |c|
-  c.syntax = "uninstall <PACKAGE>"
-  c.description = "Uninstall a package or version of lilypond"
-
-  c.action do |args, opts|
-    Lyp::System.test_installed_status!
-
-    begin
-      raise "No package specified" if args.empty?
-      
-      args.each do |package|
-        case package
-        when 'self'
-          Lyp::System.uninstall!
-        when /^lilypond(?:@(.+))?$/
-          Lyp::System.test_installed_status!
-          Lyp::Lilypond.uninstall($1)
-        end
-      end
-    end
-  end
-end