lyp 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0526bbb1656a6c6908733533c3bba2328fe7ae6e
-  data.tar.gz: c3bb37df62281ff3dcb02d06dffa6fbb9ad0bd93
+  metadata.gz: f42faeca80592cbc261208384e53d7205bcfa058
+  data.tar.gz: d4e7574bda07418c782076aad5c01c8b7f0f6008
 SHA512:
-  metadata.gz: c276e9128136b033690feca8346fc5012ef6d2a8a4f3394eb59a67d75f141b8a0ac00ee9224c9386669bfa63395221fd6bb24b5e1466045101dbefb142508c29
-  data.tar.gz: 1e613e28b8b5c03e5fcf22dff77e51d82f90b03d227f570bf7e76ffd089e30ff843a0a2b72ebc7de7e1f9602a06197271da5f47ca09d246fabef7b22942e57d4
+  metadata.gz: 9cc74befb159bc7d74d0059137c506bdc7fb5720b8ac74f113b5e8ae7cdc1a3e40218d45b5ebb841d0ee59dd78aa9a51ba9b00aacadaa5600484606bc963dcc3
+  data.tar.gz: b7eaf8be84f505f8dc242d91b45f3bc6a1d8b74fec5756f0f67a2d79c2dfefbf77401fed49e923d6e9059c02053c4ffab5b01d413ca108bca555e239625c4079

data/README.md

@@ -14,6 +14,7 @@ __No hassle Lilypond installation__: With lyp you can also install any version o
   - [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)
+  - [Manually installing releases](manually-installing-releases)
   - [Uninstalling lyp](#uninstalling-lyp)
 - [How lyp works](#how-lyp-works)
 - [Working with packages](#working-with-packages)
@@ -41,30 +42,20 @@ __No hassle Lilypond installation__: With lyp you can also install any version o
 
 ### System requirements
 
-Lyp is tested to work on Linux, Mac OSX and Windows 7+.
-
-**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.
+Lyp is tested to work on Linux, Mac OS X and Windows 7+.
 
 ### 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
+# Linux/Mac OS X:
 $ 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.
-
-Windows users should install the lyp-win gem:
 
-```bash
+# Windows:
 > 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)):
@@ -79,6 +70,17 @@ or with Wget:
 $ wget -qO- https://git.io/getlyp | bash
 ```
 
+Windows users can simply download the latest Windows [release](https://github.com/noteflakes/lyp/releases), unzip it and run `lyp install self`:
+
+```bash
+> unzip lyp-0.2.3-win32.zip
+> lyp-0.2.3-win32/bin/lyp install self
+```
+
+### Manually installing releases
+
+(This section is for Linux / Mac OS X 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`:
 
 ```bash
@@ -88,8 +90,6 @@ $ tar -xzf lyp-0.2.1-linux-x86_64.tar.gz
 $ lyp-0.2.1-linux-x86_64/lyp install self
 ```
 
-https://github.com/noteflakes/lyp/releases/download/v0.2.1/lyp-0.2.1-linux-x86_64.tar.gz
-
 **Note**: using the standalone release of lyp requires having git on your machine.
 
 ### Uninstalling lyp

data/bin/install_release.sh

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

data/bin/lilypond

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
+
 require 'lyp/version'
 require 'lyp'
 

data/bin/lyp

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
-require "lyp"
-require "lyp/cli"
+$LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 
+require 'lyp'
+require 'lyp/cli'

data/lib/lyp/system.rb

@@ -46,7 +46,7 @@ You can uninstall lyp at any time by running 'lyp uninstall self'.
 EOF
 
     def test_installed_status!
-      unless installed?
+      unless !is_gem? && installed?
         STDERR.puts INSTALL_MSG
       end
     end
@@ -95,36 +95,34 @@ EOF
     end
     
     def setup_files
-      bin_dir = File.expand_path(File.dirname($0))
-      
-      if is_gem?(bin_dir)
-        setup_gem_files(bin_dir)
+      if is_gem?
+        setup_gem_files
       else
-        setup_release_files(bin_dir)
+        setup_release_files
       end
     end
     
     RELEASE_BIN_PATH = "lib/app/bin"
+    SELF_DIR = File.expand_path(File.dirname($0))
     
-    def is_gem?(bin_dir)
-      bin_dir !~ /#{RELEASE_BIN_PATH}$/
+    def is_gem?
+      SELF_DIR !~ /#{RELEASE_BIN_PATH}$/
     end
     
-    def setup_gem_files(bin_dir)
-
+    def setup_gem_files
       FileUtils.rm_rf(Lyp::LYP_BIN_DIRECTORY)
       FileUtils.mkdir_p(Lyp::LYP_BIN_DIRECTORY)
 
       %w{lyp lilypond}.each do |fn|
-        FileUtils.ln_sf("#{bin_dir}/#{fn}", "#{Lyp::LYP_BIN_DIRECTORY}/#{fn}")
+        FileUtils.ln_sf("#{SELF_DIR}/#{fn}", "#{Lyp::LYP_BIN_DIRECTORY}/#{fn}")
       end
     end
     
-    def setup_release_files(bin_dir)
+    def setup_release_files
       FileUtils.rm_rf(Lyp::LYP_BIN_DIRECTORY)
       FileUtils.mkdir_p(Lyp::LYP_BIN_DIRECTORY)
       
-      release_dir = File.expand_path(File.join(bin_dir, '../../../'))
+      release_dir = File.expand_path(File.join(SELF_DIR, '../../../'))
       
       puts "Copying Ruby runtime & gems..."
       lib_dir = File.join(release_dir, 'lib')

data/lib/lyp/version.rb

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

data/lib/lyp/windows.rb

@@ -99,10 +99,35 @@ module Lyp::System
       true
     end
     
+    # - Copy the entire directory to ~/.lyp
+    # - Create wrappers in Windows/System32 that call ~/.lyp/bin
     def install!
-      puts "\ninstall self curently not supported on Windows.\n\n"
+      return if is_gem?
+      
+      puts "\nInstalling lyp...\n\n"
+      copy_package_files
+      create_wrapper_batch_files
+    end
+    
+    def copy_package_files
+      package_root = File.expand_path('../../../..', File.dirname(__FILE__))
+      FileUtils.rm_rf("#{Lyp::LYP_DIRECTORY}/lib")
+      FileUtils.rm_rf("#{Lyp::LYP_DIRECTORY}/bin")
+      FileUtils.cp_r("#{package_root}/lib", "#{Lyp::LYP_DIRECTORY}/lib")
+      FileUtils.cp_r("#{package_root}/bin", "#{Lyp::LYP_DIRECTORY}/bin")
     end
     
+    def create_wrapper_batch_files
+      system32_dir = File.join(ENV["SystemRoot"], "System32")
+      bin_dir = "#{Lyp::LYP_DIRECTORY}/bin"
+      
+      %w{lyp lilypond}.each do |name|
+        File.open("#{system32_dir}/#{name}.bat", "w+") do |f|
+          f << "@#{bin_dir}\\#{name}.bat %*"
+        end
+      end
+    end
+
     def uninstall!
       puts "\nuninstall self curently not supported on Windows.\n\n"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -97,8 +97,6 @@ files:
 - bin/install_release.sh
 - bin/lilypond
 - bin/lyp
-- bin/release_wrapper_lilypond.sh
-- bin/release_wrapper_lyp.sh
 - lib/lyp.rb
 - lib/lyp/base.rb
 - lib/lyp/cli.rb

data/bin/release_wrapper_lilypond.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# Figure out where this script is located.
-SELFDIR="`dirname \"$0\"`"
-ROOTDIR="`cd \"$SELFDIR/..\" && pwd`"
-
-# Tell Bundler where the Gemfile and gems are.
-export BUNDLE_GEMFILE="$ROOTDIR/lib/vendor/Gemfile"
-unset BUNDLE_IGNORE_CONFIG
-
-# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
-exec "$ROOTDIR/lib/ruby/bin/ruby" -rbundler/setup  -rreadline -I$ROOTDIR/lib/app/lib "$ROOTDIR/lib/app/bin/lilypond" "$@"

data/bin/release_wrapper_lyp.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-# Figure out where this script is located.
-SELFDIR="`dirname \"$0\"`"
-ROOTDIR="`cd \"$SELFDIR/..\" && pwd`"
-
-# Tell Bundler where the Gemfile and gems are.
-export BUNDLE_GEMFILE="$ROOTDIR/lib/vendor/Gemfile"
-unset BUNDLE_IGNORE_CONFIG
-
-# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
-exec "$ROOTDIR/lib/ruby/bin/ruby" -rbundler/setup  -rreadline -I$ROOTDIR/lib/app/lib "$ROOTDIR/lib/app/bin/lyp" "$@"