bindeps 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09a22034ecfb472bbf143443a4241f92e1bcd9a9
-  data.tar.gz: e867e4eaec47e2c02c26916191daef168ef2c55d
+  metadata.gz: ba2bd3ec00323dc75661e16bc266e0b1d202b0f4
+  data.tar.gz: e37fc32f751c0c180b2268fc211ef7e62db980f4
 SHA512:
-  metadata.gz: 7de37d58bb9a9b14f6767a7d34ad025ecad3077269d85bd832c988345b6672e3030f6fd70219d4b411604d1ba2b27db40bc9b907c2b49668891522e9766deafb
-  data.tar.gz: a9f18935a0be780f5df054e5a5570a21bfe5594f724cb52ec46af27ba557f6eb17e7c241f2bf32e76f89e86542bceb8a3027eebb06a52f009a70f84789dd0ed3
+  metadata.gz: bae6e6b44f6b00bd1969179b0def3926ef8759b0dad9482ec856d18337fce9d48c3b53ce4f9b30a8fb50e11504a5d8666a30946620325f6b19606ebf2ddcfe2b
+  data.tar.gz: 5ccf3296ea9243c62477354271bb9cf3311cce11d6f06f2a85e3a231079020a34fbe66c23148942abcb7db3a12b96899db976bd8329b97eb777f1a0621a54618

data/lib/bindeps/version.rb

@@ -1,3 +1,3 @@
 module Bindeps
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/bindeps.rb

@@ -19,7 +19,8 @@ module Bindeps
         d = Dependency.new(name,
                            config['binaries'],
                            config['version'],
-                           config['url'])
+                           config['url'],
+                           config['unpack'])
         d.install_missing
       end
     end
@@ -38,7 +39,8 @@ module Bindeps
         d = Dependency.new(name,
                            config['binaries'],
                            config['version'],
-                           config['url'])
+                           config['url'],
+                           config['unpack'])
         missing << name unless d.all_installed?
       end
     end
@@ -47,7 +49,7 @@ module Bindeps
 
   class Dependency
 
-    def initialize(name, binaries, versionconfig, urlconfig)
+    def initialize(name, binaries, versionconfig, urlconfig, unpack)
       @name = name
       unless binaries.is_a? Array
         raise ArgumentError,
@@ -57,6 +59,7 @@ module Bindeps
       @version = versionconfig['number']
       @version_cmd = versionconfig['command']
       @url = choose_url urlconfig
+      @unpack = unpack
     end
 
     def install_missing
@@ -93,14 +96,18 @@ module Bindeps
 
     def unpack
       archive = File.basename(@url)
-      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)
+      if @unpack
+        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)
+              end
             end
           end
         end
+      else
+        install(@binaries.first)
       end
     end
 
@@ -126,7 +133,8 @@ module Bindeps
 
     def install bin
       bindir = File.join(ENV['GEM_HOME'], 'bin')
-      FileUtils.cp(bin, File.join(bindir, File.basename(bin)))
+      install_location = File.join(bindir, File.basename(bin))
+      FileUtils.install(bin, install_location, :mode => 0775)
     end
 
   end

data/lib/unpacker.rb

@@ -23,6 +23,7 @@
 
 require 'fileutils'
 require 'tmpdir'
+require 'open3'
 
 module Unpacker
 
@@ -44,8 +45,10 @@ module Unpacker
             else
               raise UnrecognizedArchiveError
             end
-      puts cmd
-      puts `#{cmd}`
+      stdout, stderr, status = Open3.capture3 cmd
+      if !status.success?
+        raise RuntimeError.new("There was a problem unpacking #{file}\n#{stderr}")
+      end
       block.call Dir.new(dir)
     end
   end

data/test/data/fakebin.yaml

@@ -13,3 +13,4 @@ fakebin:
       macosx: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin.tgz
       linux: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin.tgz
       unix: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin.tgz
+  unpack: true

data/test/data/fakebin2.yaml

@@ -13,3 +13,4 @@ fakebin:
       macosx: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin2.tgz
       linux: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin2.tgz
       unix: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin2.tgz
+  unpack: true

data/test/data/fakebin3.yaml

@@ -13,3 +13,4 @@ fakebin:
       macosx: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin3.tgz
       linux: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin3.tgz
       unix: https://github.com/Blahah/bindeps/raw/master/test/data/fakebin3.tgz
+  unpack: true

data/test/data/fakebin4

@@ -0,0 +1,5 @@
+#! /bin/sh
+# all output to stderr (some programs show version this way)
+echo 'this is a non-matching line' 1>&2
+echo 'fakebin v4.0.1' 1>&2
+echo 'more non-matching stuff' 1>&2

data/test/data/fakebin4.yaml

@@ -0,0 +1,16 @@
+fakebin:
+  binaries:
+    - fakebin4
+  version:
+    number: 4.0.1
+    command: fakebin4
+  url:
+    64bit:
+      macosx: https://github.com/cboursnell/bindeps/raw/master/test/data/fakebin4
+      linux: https://github.com/cboursnell/bindeps/raw/master/test/data/fakebin4
+      unix: https://github.com/cboursnell/bindeps/raw/master/test/data/fakebin4
+    32bit:
+      macosx: https://github.com/cboursnell/bindeps/raw/master/test/data/fakebin4
+      linux: https://github.com/cboursnell/bindeps/raw/master/test/data/fakebin4
+      unix: https://github.com/cboursnell/bindeps/raw/master/test/data/fakebin4
+  unpack: false

data/test/test_bindeps.rb

@@ -9,6 +9,15 @@ class TestBinDeps < Test::Unit::TestCase
       @data_dir = File.join(test_dir, 'data')
     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")
+    end
+
     should "identify and install missing dependencies" do
       test_yaml = File.join(@data_dir, 'fakebin.yaml')
       Bindeps.require test_yaml
@@ -32,7 +41,8 @@ class TestBinDeps < Test::Unit::TestCase
         d = Bindeps::Dependency.new(name,
                                     config['binaries'],
                                     config['version'],
-                                    config['url'])
+                                    config['url'],
+                                    config['unpack'])
         assert d.installed?('fakebin2')
       end
     end
@@ -47,11 +57,26 @@ class TestBinDeps < Test::Unit::TestCase
         d = Bindeps::Dependency.new(name,
                                     config['binaries'],
                                     config['version'],
-                                    config['url'])
+                                    config['url'],
+                                    config['unpack'])
         assert d.installed?('fakebin3')
       end
     end
 
+    should "handle binaries that don't need to be unpacked" do
+      test_yaml = File.join(@data_dir, 'fakebin4.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'])
+        assert d.installed?('fakebin4'), "fakebin4 installed"
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindeps
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Richard Smith-Unna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: which_works
@@ -149,6 +149,8 @@ files:
 - test/data/fakebin3
 - test/data/fakebin3.tgz
 - test/data/fakebin3.yaml
+- test/data/fakebin4
+- test/data/fakebin4.yaml
 - test/data/neverinstalled.yaml
 - test/helper.rb
 - test/test_bindeps.rb
@@ -172,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: binary dependency management for ruby gems
@@ -187,6 +189,8 @@ test_files:
 - test/data/fakebin3
 - test/data/fakebin3.tgz
 - test/data/fakebin3.yaml
+- test/data/fakebin4
+- test/data/fakebin4.yaml
 - test/data/neverinstalled.yaml
 - test/helper.rb
 - test/test_bindeps.rb