bindeps 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc4c9b6b12aa39eeca92f3ed58fbf8740d4f132
-  data.tar.gz: 99b87a1e44f339a21077da11ec44c2bee9c9185b
+  metadata.gz: 74eff957e81c9566dfc40705887561816cc26905
+  data.tar.gz: 4e00ae4f42c5d9af3e910a32a4e17e7d811f0d3c
 SHA512:
-  metadata.gz: e92b9af3e4a8f712ca2a3f5ba5707cf236b6512e72431387c5952b4ec582788cf00c7d8feaf84f153ee9c4a9219c92aac1f84a4db590525459fb4a182b02bb05
-  data.tar.gz: 8ccb82c363feffe8938688aeb97ae457637c3a80090c2a72776f4566a54321520fc458918c355416b86e88e20f2c44ce7c4b51d7fd73b822a0a06ad07a1b25af
+  metadata.gz: 75ecdcde7c39fee9581ac6db23f76221f7f167efa318367672fbe456a97c44df0e407bcc97cf195b207e2cd9ad8b32c87f5edf8ec92fdfc69dd8ace71b5fca65
+  data.tar.gz: 716dabef22b28961c101eaab322efc503c9fac190df05a815e3f6d2cb07f133842457488d01c886487c06d4acfc26c48dc9dffc6149ece3b5d32663787627221

data/README.md

@@ -15,26 +15,6 @@ Simple binary dependency management for Ruby gems
 $ gem install bindeps
 ```
 
-### Using Bundler
-
-Add this line to your application's Gemfile:
-
-```
-gem 'bindeps'
-```
-
-And then execute:
-
-```bash
-$ bundle
-```
-
-Or install it yourself as:
-
-```bash
-$ gem install bindeps
-```
-
 ## Usage
 
 Create a YAML file describing your dependencies as a dictionary. Read the [bindeps YAML format specifications](wiki/bindeps_YAML_format_specifications).
@@ -71,6 +51,15 @@ Bindeps.require 'binary_dependencies.yaml'
 
 `bindeps` will check run the `version:command` for each dependency. If the return value of the command doesn't match a regular expression test against the `version:number` field, `bindeps` will download the file that matches your system architecture, unpack it unless `unpack` is set to false, and place the binary in your path. Specifically, it is added to the `bin` directory of your RubyGems installation. This means the binary will be in the PATH as long as this version of RubyGems is in use (which is ideal for gem dependencies). If the return value does match, `bindeps` will do nothing.
 
+### Specifying an install directory
+
+Simply pass the destination directory as the second argument to `Bindeps::require()`:
+
+```ruby
+Bindeps.require('deps.yaml', '/some/install/directory')
+
+```
+
 ## Contributing
 
 1. Fork it

data/lib/bindeps.rb

@@ -10,7 +10,7 @@ module Bindeps
   class DownloadFailedError < StandardError; end
   class UnsupportedSystemError < StandardError; end
 
-  def self.require dependencies
+  def self.require(dependencies, destdir = '')
     if dependencies.is_a? String
       dependencies = YAML.load_file dependencies
     end
@@ -25,7 +25,7 @@ module Bindeps
                              config['url'],
                              unpack,
                              libraries)
-          d.install_missing
+          d.install_missing destdir
         end
       end
     end
@@ -77,11 +77,11 @@ module Bindeps
       @unpack = unpack
     end
 
-    def install_missing
+    def install_missing destdir=''
       unless all_installed?
         puts "Installing #{@name} (#{@version})..."
         download
-        unpack
+        unpack destdir
       end
     end
 
@@ -124,7 +124,7 @@ module Bindeps
       end
     end
 
-    def unpack
+    def unpack destdir = ''
       archive = File.basename(@url)
       Unpacker.archive? archive
       if @unpack
@@ -135,13 +135,15 @@ module Bindeps
               if @binaries.include?(file) || @libraries.include?(file)
                 dir = File.dirname(extracted).split(File::PATH_SEPARATOR).last
                 dir = %w[bin lib].include?(dir) ? dir : '.'
-                install(extracted, dir) unless File.directory?(extracted)
+                unless File.directory?(extracted)
+                  install(extracted, dir, destdir)
+                end
               end
             end
           end
         end
       else
-        install(@binaries.first, 'bin')
+        install(@binaries.first, 'bin', destdir)
       end
     end
 
@@ -173,11 +175,13 @@ module Bindeps
       false
     end
 
-    def install(src, destprefix)
+    def install(src, destprefix, destdir = '')
       gem_home = ENV['GEM_HOME']
       home = ENV['HOME']
       basedir = File.join(home, '.local')
-      if gem_home.nil?
+      if destdir.length > 0
+        basedir = destdir
+      elsif gem_home.nil?
         ENV['PATH'] = ENV['PATH'] + ":#{File.join(basedir, 'bin')}"
       else
         basedir = ENV['GEM_HOME']

data/lib/bindeps/version.rb

@@ -1,3 +1,3 @@
 module Bindeps
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/test/test_bindeps.rb

@@ -165,6 +165,16 @@ class TestBindeps < Test::Unit::TestCase
       assert_equal msg, `fakebin2`.strip
     end
 
+    should "install to a custom directory if specified" do
+      Dir.mktmpdir do |dir|
+        test_yaml = File.join(@data_dir, 'fakebin.yaml')
+        Bindeps.require(test_yaml, dir)
+        bindest = File.join(dir, 'bin', 'fakebin')
+        assert File.exist?(bindest)
+        assert_equal `#{bindest}`.chomp, 'success'
+      end
+    end
+
     should "handle lib dependencies" do
       test_yaml = File.join(@data_dir, 'fakelibbin.yaml')
       Bindeps.require test_yaml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bindeps
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Richard Smith-Unna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fixwhich