bindeps 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ce60e8a556a5d2d0ca0d4e562c72ed1139d5c23
-  data.tar.gz: 4a6aa254fbf74d7b2ac4d725c5f05fe431d418eb
+  metadata.gz: 6b3ffdc990f2ecff30e081c0a569c8a940a77479
+  data.tar.gz: 041feed4e988c6b939ae895b3628ea6db5893018
 SHA512:
-  metadata.gz: 7dcbc0dafccf0c71371fcd886a3832d9910831d5660a94c4917ad818792f97ca772dc3c95d6409dbb1d629e32ed50470ce3f8e54508a9e7e8f6452fca10779c2
-  data.tar.gz: a0c9e3988109d6c359289f267f5eb7f2f4e312ec6112dfbb58c8df61c97d3e882d2ca3b65e36080b6fbaaa56d131d89b96fea437e5bc12268696d05c6267a5d8
+  metadata.gz: b1ff2005808a9af7e46a22c46b01a87e6aed112ccf26b3516748f5a56f746543f0a0b6af73448d4e5d689c9c6b62539c10bef9ba3d2778db1658bca7b4c2ec2d
+  data.tar.gz: 5de0ad5c19d453e8a3a2614440f15a6e196d4115b4f3e90684200618ef9d825745f89d7a18fa7ee94ea241390e9fcd6ffc34f29235d055639722860909890ff8

data/lib/bindeps.rb

@@ -3,6 +3,7 @@ require "unpacker"
 require "fixwhich"
 require "tmpdir"
 require "yaml"
+require "fileutils"
 
 module Bindeps
 
@@ -13,16 +14,19 @@ module Bindeps
     if dependencies.is_a? String
       dependencies = YAML.load_file dependencies
     end
-    tmpdir = Dir.mktmpdir
-    Dir.chdir(tmpdir) do
-      dependencies.each_pair do |name, config|
-        unpack = config.key?('unpack') ? config['unpack'] : true;
-        d = Dependency.new(name,
-                           config['binaries'],
-                           config['version'],
-                           config['url'],
-                           unpack)
-        d.install_missing
+    Dir.mktmpdir do |tmpdir|
+      Dir.chdir(tmpdir) do
+        dependencies.each_pair do |name, config|
+          unpack = config.key?('unpack') ? config['unpack'] : true;
+          libraries = config.key?('libraries') ? config['libraries'] : []
+          d = Dependency.new(name,
+                             config['binaries'],
+                             config['version'],
+                             config['url'],
+                             unpack,
+                             libraries)
+          d.install_missing
+        end
       end
     end
   end
@@ -33,17 +37,20 @@ module Bindeps
     if dependencies.is_a? String
       dependencies = YAML.load_file dependencies
     end
-    tmpdir = Dir.mktmpdir
     missing = []
-    Dir.chdir(tmpdir) do
-      dependencies.each_pair do |name, config|
-        unpack = config.key?('unpack') ? config['unpack'] : true;
-        d = Dependency.new(name,
-                           config['binaries'],
-                           config['version'],
-                           config['url'],
-                           unpack)
-        missing << d unless d.all_installed?
+    Dir.mktmpdir do |tmpdir|
+      Dir.chdir(tmpdir) do
+        dependencies.each_pair do |name, config|
+          unpack = config.key?('unpack') ? config['unpack'] : true;
+          libraries = config.key?('libraries') ? config['libraries'] : []
+          d = Dependency.new(name,
+                             config['binaries'],
+                             config['version'],
+                             config['url'],
+                             unpack,
+                             libraries)
+          missing << d unless d.all_installed?
+        end
       end
     end
     missing
@@ -51,17 +58,19 @@ module Bindeps
 
   class Dependency
 
-    attr_reader :name, :version, :binaries
+    attr_reader :name, :version, :binaries, :libraries
 
     include Which
 
-    def initialize(name, binaries, versionconfig, urlconfig, unpack)
+    def initialize(name, binaries, versionconfig, urlconfig,
+                   unpack, libraries=[])
       @name = name
       unless binaries.is_a? Array
         raise ArgumentError,
               "binaries must be an array"
       end
       @binaries = binaries
+      @libraries = libraries
       @version = versionconfig['number']
       @version_cmd = versionconfig['command']
       @url = choose_url urlconfig
@@ -70,7 +79,7 @@ module Bindeps
 
     def install_missing
       unless all_installed?
-        puts "Installing #{@name}..."
+        puts "Installing #{@name} (#{@version})..."
         download
         unpack
       end
@@ -85,11 +94,13 @@ module Bindeps
           return sys[os]
         else
           raise UnsupportedSystemError,
-                "bindeps config for #{@name} #{arch} doesn't contain an entry for #{os}"
+                "bindeps config for #{@name} #{arch} doesn't " +
+                "contain an entry for #{os}"
         end
       else
         raise UnsupportedSystemError,
-              "bindeps config for #{@name} doesn't contain an entry for #{arch}"
+              "bindeps config for #{@name} doesn't contain an " +
+              "entry for #{arch}"
       end
     end
 
@@ -120,14 +131,16 @@ module Bindeps
         Unpacker.unpack(archive) do |dir|
           Dir.chdir dir do
             Dir['**/*'].each do |extracted|
-              if @binaries.include? File.basename(extracted)
-                install(extracted) unless File.directory?(extracted)
+              file = File.basename(extracted)
+              if @binaries.include?(file) || @libraries.include?(file)
+                dir = File.dirname extracted
+                install(extracted, dir) unless File.directory?(extracted)
               end
             end
           end
         end
       else
-        install(@binaries.first)
+        install(@binaries.first, 'bin')
       end
     end
 
@@ -142,19 +155,37 @@ module Bindeps
 
     def installed? bin
       path = which(bin)
-      if path
+      if path.length > 0
         ret = `#{@version_cmd} 2>&1`.split("\n").map{ |l| l.strip }.join('|')
         if ret && (/#{@version}/ =~ ret)
           return path
         end
+      else
+        if Dir.exist?("#{ENV['HOME']}/.local/bin")
+          ENV['PATH'] = ENV['PATH'] + ":#{ENV['HOME']}/.local/bin"
+          path = which(bin)
+          if path.length > 0
+            return path
+          end
+        end
       end
       false
     end
 
-    def install bin
-      bindir = File.join(ENV['GEM_HOME'], 'bin')
-      install_location = File.join(bindir, File.basename(bin))
-      FileUtils.install(bin, install_location, :mode => 0775)
+    def install(src, destprefix)
+      gem_home = ENV['GEM_HOME']
+      home = ENV['HOME']
+      basedir = File.join(home, '.local')
+      if gem_home.nil?
+        ENV['PATH'] = ENV['PATH'] + ":#{File.join(basedir, 'bin')}"
+      else
+        basedir = ENV['GEM_HOME']
+      end
+      FileUtils.mkdir_p File.join(basedir, 'bin')
+      FileUtils.mkdir_p File.join(basedir, 'lib')
+      destprefix = 'bin' if destprefix == '.'
+      install_location = File.join(basedir, destprefix, File.basename(src))
+      FileUtils.install(src, install_location, :mode => 0775)
     end
 
   end

data/lib/bindeps/version.rb

@@ -1,3 +1,3 @@
 module Bindeps
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/unpacker.rb

@@ -34,8 +34,6 @@ module Unpacker
   def self.unpack(file, tmpdir = "/tmp", &block)
     Dir.mktmpdir 'unpacker' do |dir|
       cmd = case file
-            when /rar$/
-              "unrar x -y #{file} #{dir}"
             when /(tar|tgz|tar\.gz)$/
               "tar xzf #{file} --directory #{dir}"
             when /(tar\.bz|tbz|tar\.bz2)$/
@@ -58,31 +56,12 @@ module Unpacker
   end
 
   def self.archive?(file_name)
-    supported = []
+    supported = Unpacker.supported_archives
     ext = File.extname(file_name).sub('.', '')
     return true if ext==""
-    if !which('unrar').empty?
-      supported << "rar"
-    end
-    if !which('tar').empty?
-      %w[tar tgz tgz tar.gz tar.bz tar.bz2 tbz].each do |ext|
-        supported << ext
-      end
-    end
-    if !which('unzip').empty?
-      supported << "zip"
-    end
-    if !which('gunzip').empty?
-      supported << "gz"
-    end
-    if !which('bunzip2').empty?
-      supported << "bz2"
-    end
     support = supported.include? ext
     if !support
       help = case file_name
-      when /rar$/
-        "Please install unrar"
       when /(tar|tgz|tar\.gz|tar\.bz|tbz|tar\.bz2)$/
         "Please install tar"
       when /zip$/
@@ -102,8 +81,6 @@ module Unpacker
 
   def self.valid?(file_path, file_name = file_path)
     cmd = case file_name
-          when /rar$/
-            "unrar t #{file_path}"
           when /(tar|tar\.bz|tbz)$/
             "tar tf #{file_path}"
           when /zip$/
@@ -123,4 +100,26 @@ module Unpacker
     end
   end
 
+  def self.supported_archives
+    supported = []
+    if !which('unrar').empty?
+      supported << "rar"
+    end
+    if !which('tar').empty?
+      %w[tar tgz tgz tar.gz tar.bz tar.bz2 tbz].each do |ext|
+        supported << ext
+      end
+    end
+    if !which('unzip').empty?
+      supported << "zip"
+    end
+    if !which('gunzip').empty?
+      supported << "gz"
+    end
+    if !which('bunzip2').empty?
+      supported << "bz2"
+    end
+    supported
+  end
+
 end # module Unpacker

data/test/data/bin/fakelibbin

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+# Figure out where this script is located.
+SELFDIR="`dirname \"$0\"`"
+SELFDIR="`cd \"$SELFDIR\" && pwd`"
+
+# Use the lib
+cat "$SELFDIR/../lib/fakelib"

data/test/data/fakelibbin.yaml

@@ -0,0 +1,18 @@
+fakelibbin:
+  binaries:
+    - fakelibbin
+  libraries:
+    - fakelib
+  version:
+    number: success
+    command: fakelibbin
+  url:
+    64bit:
+      macosx: https://github.com/Blahah/bindeps/raw/master/test/data/fakelibbin.tgz
+      linux: https://github.com/Blahah/bindeps/raw/master/test/data/fakelibbin.tgz
+      unix: https://github.com/Blahah/bindeps/raw/master/test/data/fakelibbin.tgz
+    32bit:
+      macosx: https://github.com/Blahah/bindeps/raw/master/test/data/fakelibbin.tgz
+      linux: https://github.com/Blahah/bindeps/raw/master/test/data/fakelibbin.tgz
+      unix: https://github.com/Blahah/bindeps/raw/master/test/data/fakelibbin.tgz
+  unpack: true

data/test/data/lib/fakelib

@@ -0,0 +1 @@
+success

data/test/helper.rb

@@ -13,6 +13,7 @@ require 'shoulda-context'
 require 'bindeps'
 
 Turn.config.format = :pretty
-Turn.config.trace = 5
+Turn.config.trace = 15
 
 require 'yaml'
+require 'fileutils'

data/test/test_bindeps.rb

@@ -10,12 +10,20 @@ class TestBindeps < Test::Unit::TestCase
     end
 
     teardown do
-      # delete fake binaries from
-      bindir = File.join(ENV['GEM_HOME'], 'bin')
-      `rm #{bindir}/fakebin` if File.exist?("#{bindir}/fakebin")
-      `rm #{bindir}/fakebin2` if File.exist?("#{bindir}/fakebin2")
-      `rm #{bindir}/fakebin3` if File.exist?("#{bindir}/fakebin3")
-      `rm #{bindir}/fakebin4` if File.exist?("#{bindir}/fakebin4")
+      # delete fake binaries
+      bindirs = [File.join(ENV['HOME'], '.local', 'bin')]
+      if !ENV['GEM_HOME'].nil?
+        bindirs << File.join(ENV['GEM_HOME'], 'bin')
+      end
+      bindirs.each do |bindir|
+        %w[fakebin fakebin2 fakebin3 fakebin4 fakelibbin].each do |bin|
+          path = File.join(bindir, bin)
+          FileUtils.rm(path) if File.exist?(path)
+        end
+        # delete fake lib
+        libpath = File.expand_path File.join(bindir, '../lib/fakelib')
+        FileUtils.rm(libpath) if File.exist?(libpath)
+      end
     end
 
     should "identify and install missing dependencies" do
@@ -141,7 +149,34 @@ class TestBindeps < Test::Unit::TestCase
                                     config['version'],
                                     config['url'],
                                     config['unpack'])
-        assert d.installed?('fakebin4'), "fakebin4 installed"
+        assert d.installed?('fakebin4'), "fakebin4 not installed"
+      end
+    end
+
+    should "install to a local directory if gem_home can't be found" do
+      ENV['GEM_HOME']=nil
+      test_yaml = File.join(@data_dir, 'fakebin.yaml')
+      Bindeps.require test_yaml
+      assert_equal 'success', `fakebin`.strip
+      test_yaml = File.join(@data_dir, 'fakebin2.yaml')
+      # install fakebin2
+      Bindeps.require test_yaml
+      msg = "this is a non-matching line\nfakebin v2.0.1\nmore non-matching stuff"
+      assert_equal msg, `fakebin2`.strip
+    end
+
+    should "handle lib dependencies" do
+      test_yaml = File.join(@data_dir, 'fakelibbin.yaml')
+      Bindeps.require test_yaml
+      deps = YAML.load_file test_yaml
+      deps.each_pair do |name, config|
+        d = Bindeps::Dependency.new(name,
+        config['binaries'],
+        config['version'],
+        config['url'],
+        config['unpack'],
+        config['libraries'])
+        assert d.installed?('fakelibbin'), "fakelibbin not installed"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bindeps
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Richard Smith-Unna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fixwhich
@@ -176,6 +176,7 @@ files:
 - lib/bindeps.rb
 - lib/bindeps/version.rb
 - lib/unpacker.rb
+- test/data/bin/fakelibbin
 - test/data/bowtie2_test.yaml
 - test/data/fakebin
 - test/data/fakebin.tgz
@@ -188,6 +189,9 @@ files:
 - test/data/fakebin3.yaml
 - test/data/fakebin4
 - test/data/fakebin4.yaml
+- test/data/fakelibbin.tgz
+- test/data/fakelibbin.yaml
+- test/data/lib/fakelib
 - test/data/neverinstalled.yaml
 - test/data/wget
 - test/helper.rb
@@ -217,6 +221,7 @@ signing_key:
 specification_version: 4
 summary: binary dependency management for ruby gems
 test_files:
+- test/data/bin/fakelibbin
 - test/data/bowtie2_test.yaml
 - test/data/fakebin
 - test/data/fakebin.tgz
@@ -229,6 +234,9 @@ test_files:
 - test/data/fakebin3.yaml
 - test/data/fakebin4
 - test/data/fakebin4.yaml
+- test/data/fakelibbin.tgz
+- test/data/fakelibbin.yaml
+- test/data/lib/fakelib
 - test/data/neverinstalled.yaml
 - test/data/wget
 - test/helper.rb