lyp-win 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeeb07e71da27f2b64f82ed5857c27595ecce50c
-  data.tar.gz: 8cdf9309856d240e99a172171c33f25d8938f86c
+  metadata.gz: e98a618ed6bc2fd2168aa288e5ab0f0228b04de9
+  data.tar.gz: ce18add67cbbe485000918a16f97ab843d3aa46c
 SHA512:
-  metadata.gz: f58acdac29428959fd4e4585ceeabc2bf884f73691d965e104058de218a5fcd94f676f66cc33f7e0396b5a21889a7d006d63889a7d5d5fbe1889fc53a2b83ba8
-  data.tar.gz: 813b94150f002c21118331f3d70bff586471c3d4c78a67323cb0a07a404427b52a7fda4fd2a06df1eab2184424c03743c8c32c6c42a9087b95dc11ccc81c58f2
+  metadata.gz: a9b35eb5a49c493c8b198b1f1bcf202dd037b1ef4ae0c41c10d8d61bb7c1bb911b7a737e50211bdcdac034251360b4bfc5252b2c8e5ec38cf086d0de156b249d
+  data.tar.gz: 5a490c2c2234b969f38a55206560a2c6283ca31070e03b8dbf052efa3f6603ecfefe30772b61d7105d278bf8022ac8cdc9957e914440429b7deda7dfd9ac7781

data/README.md

@@ -11,8 +11,11 @@ __No hassle Lilypond installation__: With lyp you can also install any version o
 ## Table of contents
 
 - [Installation](#installation)
-  - [How lyp works](#how-lyp-works)
-  - [Uninstalling](#uninstalling)
+  - [System requirements](#system-requirements)
+  - [Installing lyp as a Ruby gem](#installing-lyp-as-a-ruby-gem)
+  - [Installing lyp as a standalone release](#installing-lyp-as-a-standalone-release)
+  - [Uninstalling lyp](#uninstalling-lyp)
+- [How lyp works](#how-lyp-works)
 - [Working with packages](#working-with-packages)
   - [What constitutes a package?](#what-constitutes-a-package)
   - [Installing packages](#installing-packages)
@@ -36,20 +39,33 @@ __No hassle Lilypond installation__: With lyp you can also install any version o
 
 ## Installation
 
-**Note**: lyp is tested to work on Linux and Mac OSX. Installing and using it on Windows would probably be problematic.
+### System requirements
 
-#### Installing lyp as a Ruby gem
+Lyp is tested to work on Linux, Mac OSX and Windows 7+.
 
-If you have a recent (>=1.9.3) version of Ruby on your machine, you can install lyp as a gem:
+**Note**: Windows users will currently need to install lyp as a Ruby gem, and will also need to have git installed in order to be able to install packages.
+
+### Installing lyp as a Ruby gem
+
+If you have a recent (>=1.9.3) version of Ruby on your machine, you can install lyp as a gem.
 
 ```bash
+# Linux/OSX only
 $ gem install lyp
 $ lyp install self
 ```
 
 The `lyp install self` command is needed in order to setup the `~/.lyp` working directory and add the lyp binaries directory to your `PATH` (see below), by adding a line of code to your shell profile file.
 
-#### Installing lyp without Ruby
+Windows users should install the lyp-win gem:
+
+```bash
+> gem install lyp-win
+```
+
+On Windows, there's no need to run the `lyp install self` command.
+
+### Installing lyp as a standalone release
 
 If you don't have Ruby on your machine you can install lyp as a stand alone package using the install script ([view source](https://git.io/getlyp)):
 
@@ -76,19 +92,7 @@ https://github.com/noteflakes/lyp/releases/download/v0.2.1/lyp-0.2.1-linux-x86_6
 
 **Note**: using the standalone release of lyp requires having git on your machine.
 
-### How lyp works
-
-Lyp sets up a working directory in `~/.lyp` where it keeps its binaries,  installed packages, and installed versions of lilypond. Lyp provides a wrapper script for lilypond, which does the following:
-
-- Select the correct version of lilypond to use (see below).
-- Scan the given lilypond file for any dependencies (specified using `\require`), and also recursively scan any include files for dependencies
-- Resolve the dependency tree and calculate the correct versions to use for each required package.
-- Create a wrapper lilypond file that loads the packages.
-- Invoke the selected version of lilypond.
-
-For more information on running lilypond see the section on [Running lilypond](#running-lilypond).
-
-### Uninstalling
+### Uninstalling lyp
 
 In order to remove lyp from your system use the `uninstall self` command:
 
@@ -104,6 +108,18 @@ In order to completely remove all files in `~/.lyp` you can simply delete the di
 $ rm -rf ~/.lyp
 ```
 
+## How lyp works
+
+Lyp sets up a working directory in `~/.lyp` where it keeps its binaries,  installed packages, and installed versions of lilypond. Lyp provides a wrapper script for lilypond, which does the following:
+
+- Select the correct version of lilypond to use (see below).
+- Scan the given lilypond file for any dependencies (specified using `\require`), and also recursively scan any include files for dependencies
+- Resolve the dependency tree and calculate the correct versions to use for each required package.
+- Create a wrapper lilypond file that loads the packages.
+- Invoke the selected version of lilypond.
+
+For more information on running lilypond see the section on [Running lilypond](#running-lilypond).
+
 ## Working with Packages
 
 A package is a library of lilypond code, containing one or more lilypond files, that provide commonly-used functionality for users. A package can be a library of scheme code to extend lilypond, as in openlilylib; or a stylesheet which contains music fonts and additional lilypond code to change the look of the music: font, spacing, line widths, sizes, etc.

data/bin/install_release.sh

@@ -18,7 +18,7 @@ download() {
 }
     
 WORKDIR="/tmp/lyp-release-installer"
-LYP_VERSION="0.2.2"
+LYP_VERSION="0.2.3"
 URL_BASE="https://github.com/noteflakes/lyp/releases/download/v$LYP_VERSION"
 
 PLATFORM=`uname -sp`

data/lib/lyp.rb

@@ -1,42 +1,15 @@
-$WINDOWS = Gem.win_platform?
+def req(f); require File.expand_path("lyp/#{f}", File.dirname(__FILE__)); end
 
-# test for existence of 
-$rugged_available = begin
-  gem 'rugged', '>=0.23.0'
-  require 'rugged'
-rescue Exception
-  nil
-end
+req 'base'
+req 'system'
+req 'settings'
 
-$git_available = `git --version` rescue nil
+Lyp::System.test_rugged_gem!
 
-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
+req 'template'
+req 'resolver'
+req 'wrapper'
+req 'package'
+req 'lilypond'
 
-unless $rugged_available
-  require 'lyp/git_based_rugged'
-end
-
-require 'tmpdir'
-require 'fileutils'
-$TMP_DIR = $WINDOWS ? "#{Dir.home}/AppData/Local/Temp" : "/tmp"
-$TMP_ROOT = "#{$TMP_DIR}/lyp"
-FileUtils.mkdir_p($TMP_ROOT)
-
-%w{
-  base
-  system
-  settings
-  
-  template
-  resolver
-  wrapper
-  
-  package
-  lilypond
-}.each do |f|
-  require File.expand_path("lyp/#{f}", File.dirname(__FILE__))
-end
-
-require File.expand_path("lyp/windows", File.dirname(__FILE__)) if $WINDOWS
+req 'windows' if Lyp::WINDOWS

data/lib/lyp/base.rb

@@ -1,6 +1,11 @@
 require 'fileutils'
 
 module Lyp
+  WINDOWS = Gem.win_platform?
+  TMP_DIR = WINDOWS ? "#{Dir.home}/AppData/Local/Temp" : "/tmp"
+  TMP_ROOT = "#{TMP_DIR}/lyp"
+  FileUtils.mkdir_p(TMP_ROOT)
+
   # 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.

data/lib/lyp/lilypond.rb

@@ -110,7 +110,7 @@ module Lyp::Lilypond
     end
     
     def session_settings_filename
-      "#{$TMP_ROOT}/session.#{Process.getsid}.yml"
+      "#{Lyp::TMP_ROOT}/session.#{Process.getsid}.yml"
     end
     
     CMP_VERSION = proc do |x, y|
@@ -336,7 +336,7 @@ module Lyp::Lilypond
     
     def temp_install_filename(url)
       u = URI(url)
-      "#{$TMP_ROOT}/#{File.basename(u.path)}"
+      "#{Lyp::TMP_ROOT}/#{File.basename(u.path)}"
     end
   
     def download_lilypond(url, fn, opts)
@@ -365,7 +365,7 @@ module Lyp::Lilypond
     end
   
     def install_lilypond_files(fn, platform, version, opts)
-      tmp_target = "#{$TMP_ROOT}/lilypond-#{version}"
+      tmp_target = "#{Lyp::TMP_ROOT}/lilypond-#{version}"
       FileUtils.mkdir_p(tmp_target)
 
       case platform
@@ -394,7 +394,7 @@ module Lyp::Lilypond
       STDERR.puts "Extracting..." unless opts[:silent]
 
       # create temp directory in which to extract .sh file
-      tmp_dir = "#{$TMP_ROOT}/#{Time.now.to_f}"
+      tmp_dir = "#{Lyp::TMP_ROOT}/#{Time.now.to_f}"
       FileUtils.mkdir_p(tmp_dir)
     
       FileUtils.cd(tmp_dir) do

data/lib/lyp/package.rb

@@ -313,7 +313,7 @@ module Lyp::Package
       @lyp_index ||= YAML.load(open(LYP_INDEX_URL))
     end
     
-    TEMP_REPO_ROOT_PATH = "#{$TMP_ROOT}/repos"
+    TEMP_REPO_ROOT_PATH = "#{Lyp::TMP_ROOT}/repos"
 
     def git_url_to_temp_path(url)
       case url

data/lib/lyp/system.rb

@@ -2,6 +2,36 @@ require 'fileutils'
 
 module Lyp::System
   class << self
+    RUGGED_REQ = Gem::Requirement.new('>=0.23.0')
+    
+    def test_rugged_gem!
+      return if find_rugged_gem || use_git_based_rugged_gem
+      
+      STDERR.puts "Lyp needs git in order to be able to install packages. Please install git and then try again."
+      exit 1
+    end
+    
+    def find_rugged_gem
+      found = Gem::Specification.find_all_by_name('rugged').find do |s|
+        RUGGED_REQ =~ s.version
+      end
+      
+      require_rugged_gem if found
+      found
+    end
+    
+    def require_rugged_gem
+      gem 'rugged', RUGGED_REQ.to_s
+      require 'rugged'
+    end
+    
+    def use_git_based_rugged_gem
+      git_available = `git --version` rescue nil
+      return false unless git_available
+      
+      require File.expand_path('git_based_rugged', File.dirname(__FILE__))
+    end
+    
     INSTALL_MSG = <<EOF
 
 Warning! Lyp is not yet properly installed in your home directory. 
@@ -17,7 +47,7 @@ EOF
 
     def test_installed_status!
       unless installed?
-        puts INSTALL_MSG
+        STDERR.puts INSTALL_MSG
       end
     end
     

data/lib/lyp/templates/deps_wrapper.rb

@@ -13,7 +13,7 @@ user_filename = File.expand_path(_[:user_file])
 user_dirname = File.dirname(user_filename)
 
 quote_path = lambda do |path|
-  path = path.gsub("\\", "/") if $WINDOWS
+  path = path.gsub("\\", "/") if Lyp::WINDOWS
   path.inspect
 end
 

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/lyp/wrapper.rb

@@ -12,8 +12,8 @@ module Lyp
     r[:current_package_dir] = opts[:current_package_dir]
 
     if !r[:package_dirs].empty? || opts[:force_wrap]
-      FileUtils.mkdir_p("#{$TMP_ROOT}/wrappers")
-      fn = "#{$TMP_ROOT}/wrappers/#{File.basename(fn)}" 
+      FileUtils.mkdir_p("#{Lyp::TMP_ROOT}/wrappers")
+      fn = "#{Lyp::TMP_ROOT}/wrappers/#{File.basename(fn)}" 
   
       File.open(fn, 'w+') {|f| f << WRAPPER_TEMPLATE.render(r)}
     end

metadata

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