lyp 0.0.5 → 0.1.1

data/lib/lyp.rb

@@ -1,5 +1,23 @@
+# test for existence of 
+$rugged_available = begin
+  gem 'rugged', '>=0.23.0'
+  require 'rugged'
+rescue Exception
+  nil
+end
+
+$git_available = `git --version` rescue nil
+
+unless $rugged_available || $git_available
+  raise "Lyp needs git in order to be able to install packages. Please install git and then try again."
+end
+
+unless $rugged_available
+  require 'lyp/git_based_rugged'
+end
+
 %w{
-  directories
+  base
   system
   settings
   
@@ -12,3 +30,4 @@
 }.each do |f|
   require File.expand_path("lyp/#{f}", File.dirname(__FILE__))
 end
+

data/lib/lyp/{directories.rb → base.rb}

@@ -3,8 +3,11 @@ require 'fileutils'
 module Lyp
   # A package specifier is of the form <package>@<version specifier>, where
   # the version specifier can be simply a version number, or include an operator
-  # before the version number. Accepted operators: >=, ~>
-  PACKAGE_RE = /^([^@]+)(?:@(.+))?$/
+  # before the version number.
+  # 
+  # Accepted operators: >=, ~>
+  PACKAGE_RE = /^([^@\>~]+)(?:@?((?:\>=|~\>)?.+))?/ #/^([^@]+)(?:@(.+))?$/
+  LILYPOND_RE = /^lilypond(?:@?((?:\>=|~\>)?.+))?/
 
   LYP_DIRECTORY = File.expand_path('~/.lyp')
   LYP_BIN_DIRECTORY = File.join(LYP_DIRECTORY, 'bin')

data/lib/lyp/cli.rb

@@ -51,7 +51,7 @@ class Lyp::CLI < Thor
   end
   
   desc "search [PATTERN|lilypond]", "List available packages matching PATTERN or versions of lilypond"
-  def search(pattern)
+  def search(pattern = '')
     # Lyp::System.test_installed_status!
 
     pattern =~ Lyp::PACKAGE_RE
@@ -85,7 +85,7 @@ class Lyp::CLI < Thor
       if packages.empty?
         puts "\nNo matching package found in lyp-index\n\n"
       else
-        puts "\nAvailable packages:\n\n"
+        puts "\nAvailable packages on lyp-index:\n\n"
         packages.each do |p|
           puts "   #{p[:name]}"
         end
@@ -111,7 +111,7 @@ class Lyp::CLI < Thor
       case package
       when 'self'
         Lyp::System.install!
-      when /^lilypond(?:@(.+))?$/
+      when Lyp::LILYPOND_RE
         Lyp::System.test_installed_status!
         Lyp::Lilypond.install($1, options)
       else
@@ -130,7 +130,7 @@ class Lyp::CLI < Thor
       case package
       when 'self'
         Lyp::System.uninstall!
-      when /^lilypond(?:@(.+))?$/
+      when Lyp::LILYPOND_RE
         Lyp::System.test_installed_status!
         Lyp::Lilypond.uninstall($1)
       else
@@ -145,7 +145,7 @@ class Lyp::CLI < Thor
   def use(version)
     Lyp::System.test_installed_status!
 
-    if version =~ /^lilypond@(.+)$/
+    if version =~ Lyp::LILYPOND_RE
       version = $1
     end
   
@@ -162,7 +162,24 @@ class Lyp::CLI < Thor
       Lyp::Lilypond.list.each {|info| puts format_lilypond_entry(info)}
       STDOUT.puts LILYPOND_LEGEND
     else
-      Lyp::Package.list(args.first).each {|p| puts p}
+      list = Lyp::Package.list(args.first)
+      if list.empty?
+        if args.first
+          return puts "\nNo installed packages found matching '#{args.first}'\n\n"
+        else
+          return puts "\nNo packages are currently installed\n\n"
+        end
+      end
+      
+      by_package = list.inject({}) do |m, p|
+        p =~ Lyp::PACKAGE_RE; (m[$1] ||= []) << $2; m
+      end
+      
+      puts "\nInstalled packages:\n\n"
+      by_package.keys.sort.each do |p|
+        puts "   #{p} => (#{by_package[p].sort.join(', ')})"
+      end
+      puts "\n\n"
     end
   end
   
@@ -177,6 +194,35 @@ class Lyp::CLI < Thor
     end
   end
   
+  desc "deps FILE", "Lists dependencies found in user's files"
+  def deps(fn)
+    resolver = Lyp::Resolver.new(fn)
+    tree = resolver.get_dependency_tree(ignore_missing: true)
+    tree[:dependencies].each do |package, leaf|
+      versions = leaf[:versions].keys.map {|k| k =~ Lyp::PACKAGE_RE; $2 }.sort
+      if versions.empty?
+        puts "   #{leaf[:clause]} => (no local version found)"
+      else
+        puts "   #{leaf[:clause]} => #{versions.join(', ')}"
+      end
+    end
+  end
+  
+  desc "resolve FILE", "Resolves and installs missing dependencies found in user's files"
+  method_option :all, aliases: '-a', type: :boolean, desc: 'Install all found dependencies'
+  def resolve(fn)
+    resolver = Lyp::Resolver.new(fn)
+    tree = resolver.get_dependency_tree(ignore_missing: true)
+    tree[:dependencies].each do |package, leaf|
+      if options[:all] || leaf[:versions].empty?
+        Lyp::Package.install(leaf[:clause])
+      end
+    end
+  end
 end
 
-Lyp::CLI.start(ARGV)
+begin
+  Lyp::CLI.start(ARGV)
+rescue => e
+  puts e.message
+end

data/lib/lyp/git_based_rugged.rb

@@ -0,0 +1,38 @@
+# A quick-n-dirty rugged swap-in
+
+puts "git_based_rugged"
+
+module Rugged
+  class Repository
+    def self.clone_at(url, path)
+      `git clone -q \"#{url}\" \"#{path}\"`
+      new(path)
+    end
+    
+    def initialize(path)
+      @path = path
+      exec('status')
+    end
+    
+    Ref  = Struct.new(:name)
+
+    def head
+      h = exec("show-ref --head").lines.map {|r| r =~ /^(\S+)\sHEAD$/ && $1}[0]
+      Ref.new(h)
+    end
+    
+     
+    def checkout(ref, opts)
+      # strategy: :force
+      exec("checkout -qf #{ref}")
+    end
+    
+    def tags
+      exec("tag").lines.map {|l| Ref.new(l.chomp)}
+    end 
+
+    def exec(cmd)
+      `cd #{@path} && git #{cmd}`
+    end
+  end
+end

data/lib/lyp/package.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'rugged'
 require 'open-uri'
 require 'yaml'
 
@@ -7,12 +6,12 @@ module Lyp::Package
   class << self
     
     def list(pattern = nil)
-      packages = Dir["#{Lyp.packages_dir}/*"].map do |p|
-        File.basename(p)
+      packages = Dir["#{Lyp.packages_dir}/**/package.ly"].map do |path|
+        File.dirname(path).gsub("#{Lyp.packages_dir}/", '')
       end
       
       if pattern
-        if (pattern =~ /@/) && (pattern =~ Lyp::PACKAGE_RE)
+        if (pattern =~ /[@\>\<\=\~]/) && (pattern =~ Lyp::PACKAGE_RE)
           package, version = $1, $2
           req = Gem::Requirement.new(version) rescue nil
           packages.select! do |p|
@@ -60,6 +59,51 @@ module Lyp::Package
       end
       package, version = $1, $2
       
+      if version =~ /\:/
+        info = install_from_local_files(package, version, opts)
+      else
+        info = install_from_repository(package, version, opts)
+      end
+      
+      install_package_dependencies(info[:path], opts)
+      
+      puts "\nInstalled #{package}@#{info[:version]}\n\n" unless opts[:silent]
+      
+      # important: return the installed version
+      info[:version]
+    end
+    
+    def install_from_local_files(package, version, opts)
+      version =~ /^([^\:]+)\:(.+)$/
+      version, local_path = $1, $2
+      
+      entry_point_path = nil
+      if File.directory?(local_path)
+        ly_path = File.join(local_path, "package.ly")
+        if File.file?(ly_path)
+          entry_point_path = ly_path
+        else
+          raise "Could not find #{ly_path}. Please specify a valid lilypond file."
+        end
+      elsif File.file?(local_path)
+        entry_point_path = local_path
+      else
+        raise "Could not find #{local_path}"
+      end
+      
+      package_path = "#{Lyp.packages_dir}/#{package}@#{version}"
+      package_ly_path = "#{package_path}/package.ly"
+      
+      FileUtils.rm_rf(package_path)
+      FileUtils.mkdir_p(package_path)
+      File.open(package_ly_path, 'w+') do |f|
+        f << "\\include \"#{entry_point_path}\"\n"
+      end
+      
+      {version: version, path: package_path}
+    end
+    
+    def install_from_repository(package, version, opts)
       url = package_git_url(package)
       tmp_path = git_url_to_temp_path(url)
       
@@ -75,25 +119,30 @@ module Lyp::Package
       FileUtils.rm_rf(package_path)
       FileUtils.cp_r(tmp_path, package_path)
       
-      install_package_dependencies(package_path, opts)
-      
-      puts "\nInstalled #{package}@#{version}\n\n" unless opts[:silent]
-      
-      # return the installed version
-      version
+      {version: version, path: package_path}
     end
     
     def uninstall(package, opts = {})
+      unless package =~ Lyp::PACKAGE_RE
+        raise "Invalid package specifier #{package}"
+      end
+      package, version = $1, $2
+      package_path = git_url_to_package_path(
+        package !~ /\// ? package : package_git_url(package), nil
+      )
+      
       if opts[:all_versions]
-        Dir["#{Lyp.packages_dir}/#{package}@*"].each do |path|
-          puts "Uninstalling #{File.basename(path)}" unless opts[:silent]
+        Dir["#{package_path}@*"].each do |path|
+          name = path.gsub("#{Lyp.packages_dir}/", '')
+          puts "Uninstalling #{name}" 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)
+        package_path += "@#{version}"
+        if File.directory?(package_path)
+          name = package_path.gsub("#{Lyp.packages_dir}/", '')
+          puts "Uninstalling #{name}" unless opts[:silent]
+          FileUtils.rm_rf(package_path)
         else
           raise "Could not find #{package}"
         end
@@ -103,14 +152,21 @@ module Lyp::Package
     def package_repository(url, tmp_path, opts = {})
       # Create repository
       if File.directory?(tmp_path)
-        repo = Rugged::Repository.new(tmp_path)
-        repo.fetch('origin', [repo.head.name])
-      else
-        FileUtils.mkdir_p(File.dirname(tmp_path))
-        puts "Cloning #{url}..." unless opts[:silent]
-        repo = Rugged::Repository.clone_at(url, tmp_path)
+        begin
+          repo = Rugged::Repository.new(tmp_path)
+          repo.fetch('origin', [repo.head.name])
+          return repo
+        rescue
+          # ignore and try to clone
+        end
       end
-      repo
+      
+      FileUtils.rm_rf(File.dirname(tmp_path))
+      FileUtils.mkdir_p(File.dirname(tmp_path))
+      puts "Cloning #{url}..." unless opts[:silent]
+      Rugged::Repository.clone_at(url, tmp_path)
+    rescue => e
+      raise "Could not clone repository (please check that the package URL is correct.)"
     end
     
     def checkout_package_version(repo, version, opts = {})
@@ -155,7 +211,7 @@ module Lyp::Package
         if search_index && (url = search_lyp_index(package))
           package_git_url(url, false) # make sure url is qualified
         else
-          raise "Invalid package specified"
+          raise "Could not find package '#{package}' in lyp-index"
         end
       end
     end
@@ -199,22 +255,25 @@ module Lyp::Package
     end
     
     def git_url_to_package_path(url, version)
-      version = 'head' if version.nil? || (version == '')
+      # version = 'head' if version.nil? || (version == '')
       
-      case url
+      package_path = case url
       when /^(?:http|https)\:(?:\/\/)?(.+)$/
         path = $1.gsub(/\.git$/, '')
-        "#{Lyp::packages_dir}/#{path}@#{version}"
+        "#{Lyp::packages_dir}/#{path}"
       when /^(?:.+@)([^\:]+)\:(?:\/\/)?(.+)$/
         domain, path = $1, $2.gsub(/\.git$/, '')
-        "#{Lyp::packages_dir}/#{domain}/#{path}@#{version}"
+        "#{Lyp::packages_dir}/#{domain}/#{path}"
       else
         if url !~ /\//
-          "#{Lyp::packages_dir}/#{url}@#{version}"
+          "#{Lyp::packages_dir}/#{url}"
         else
           raise "Invalid URL #{url}"
         end
       end
+      
+      package_path += "@#{version}" if version
+      package_path
     end
     
     TAG_VERSION_RE = /^v?(\d.*)$/
@@ -249,7 +308,7 @@ module Lyp::Package
       repo.tags.each {|t| tags << t}
       
       tags.sort do |x, y|
-        x_version, y_version = tag_version(x), tag_version(y)
+        x_version, y_version = tag_version(x.name), tag_version(y.name)
         if x_version && y_version
           Gem::Version.new(x_version) <=> Gem::Version.new(y_version)
         else

data/lib/lyp/resolver.rb

@@ -385,6 +385,7 @@ class Lyp::Resolver
 
   # Sort permutations by version numbers
   def sort_permutations(permutations, user_deps)
+    # Cache for versions converted to Gem::Version instances
     versions = {}
     
     map = lambda do |m, p|
@@ -398,7 +399,8 @@ class Lyp::Resolver
       x_versions = x.inject({}, &map)
       y_versions = y.inject({}, &map)
       
-      # Naive implementation - add up the comparison scores for each package
+      # If the dependency is direct (not transitive), just compare its versions.
+      # Otherwise, add the result of comparison to score.
       x_versions.inject(0) do |score, kv|
         package = kv[0]
         cmp = kv[1] <=> y_versions[package]

data/lib/lyp/system.rb

@@ -4,21 +4,20 @@ module Lyp::System
   class << self
     INSTALL_MSG = <<EOF
 
-lyp is not yet properly installed in your home directory. 
+Warning! Lyp is not yet properly installed in your home directory. 
 
 To install lyp run 'lyp install self'. lyp will then:
   1. Setup ~/.lyp as its base directory.
-  2. Add ~/.lyp/bin to $PATH.
+  2. Add the lyp and lilypond scripts to ~/.lyp/bin.
+  3. Add ~/.lyp/bin to front of $PATH.
   
 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
       end
     end
     

data/lib/lyp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -71,65 +71,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 1.6.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 1.6.6.2
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.23'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.23'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.23.0
 description: Lyp is a tool for managing lilypond versions and lilypond packages
 email: ciconia@gmail.com
 executables:
@@ -140,11 +128,13 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/get.sh
 - bin/lilypond
 - bin/lyp
 - lib/lyp.rb
+- lib/lyp/base.rb
 - lib/lyp/cli.rb
-- lib/lyp/directories.rb
+- lib/lyp/git_based_rugged.rb
 - lib/lyp/lilypond.rb
 - lib/lyp/package.rb
 - lib/lyp/resolver.rb