bindeps 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d4b195eec3ac740185d58b64202495c16c1002
-  data.tar.gz: e555f6766653523b2891e6f3de661f063db5fa92
+  metadata.gz: 4e76a60c0afc4c11a9970385125f0ee4fe203321
+  data.tar.gz: ade512a542e417f59eb6d22bf6bc190bf4119332
 SHA512:
-  metadata.gz: 35fc32f868bf4ef51ea93400737252bcbab8d17fddc04bc9f4d99ae936a26a2a6eef5e174388250e8feada9699cf154efacd54966f61bbe97b07af3919502e86
-  data.tar.gz: cce17d30c4e01a02f1fb32784c5798498dfdfe1142e391283e227bae31e67882d9c612126d02b8dd7845929290042596f801de7f42c9a8b8ed33da44e0fa521f
+  metadata.gz: 34dabe4eb5ff1b564123da329e4df203dc3de6ddd282accfa485bef4f24ff0b0ba451c4523c07a37bb801acacb121e4362d3a7e146125236b82068c29487d8f0
+  data.tar.gz: 1ea12308cf81a47e09ea165bcc9e84761ae62b7cc1abc48446f4d9a3e959e3c1db0a08efbc354eb1a4fa24902e53ef73e4e43adbacdc43095e00ab865cb69f8d

data/lib/bindeps.rb

@@ -99,7 +99,7 @@ module Bindeps
     def installed? bin
       path = Which.which(bin)
       if path
-        ret = `#{@version_cmd}`.strip
+        ret = `#{@version_cmd} 2>&1`.split("\n").map{ |l| l.strip }.join('|')
         if ret && (/#{@version}/ =~ ret)
           return path
         else

data/lib/bindeps/version.rb

@@ -1,3 +1,3 @@
 module Bindeps
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/data/fakebin2

@@ -0,0 +1,4 @@
+#! /bin/sh
+echo 'this is a non-matching line'
+echo 'fakebin v2.0.1'
+echo 'more non-matching stuff'

data/test/data/fakebin2.yaml

@@ -0,0 +1,15 @@
+fakebin:
+  binaries:
+    - fakebin2
+  version:
+    number: 2.0.1
+    command: fakebin2
+  url:
+    64bit:
+      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
+    32bit:
+      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

data/test/data/fakebin3

@@ -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 v2.0.1.ERR' 1>&2
+echo 'more non-matching stuff' 1>&2

data/test/data/fakebin3.yaml

@@ -0,0 +1,15 @@
+fakebin:
+  binaries:
+    - fakebin3
+  version:
+    number: 2.0.1.ERR
+    command: fakebin3
+  url:
+    64bit:
+      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
+    32bit:
+      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

data/test/test_bindeps.rb

@@ -6,8 +6,7 @@ class TestBinDeps < Test::Unit::TestCase
 
     setup do
       test_dir = File.dirname(__FILE__)
-      data_dir = File.join(test_dir, 'data')
-      @test_yaml = File.join(data_dir, 'fakebin.yaml')
+      @data_dir = File.join(test_dir, 'data')
     end
 
     # teardown do
@@ -22,10 +21,41 @@ class TestBinDeps < Test::Unit::TestCase
     # end
 
     should "identify and install missing dependencies" do
-      Bindeps.require @test_yaml
+      test_yaml = File.join(@data_dir, 'fakebin.yaml')
+      Bindeps.require test_yaml
       assert_equal 'success', `fakebin`.strip
     end
 
+    should "handle case where version is not on first line" do
+      test_yaml = File.join(@data_dir, 'fakebin2.yaml')
+      # install fakebin2
+      Bindeps.require test_yaml
+      # now Dependency should detect it as installed
+      deps = YAML.load_file test_yaml
+      deps.each_pair do |name, config|
+        d = Bindeps::Dependency.new(name,
+                                    config['binaries'],
+                                    config['version'],
+                                    config['url'])
+        assert d.installed?('fakebin2')
+      end
+    end
+
+    should "handle version output to stderr" do
+      test_yaml = File.join(@data_dir, 'fakebin3.yaml')
+      # install fakebin3
+      Bindeps.require test_yaml
+      # now Dependency should detect it as installed
+      deps = YAML.load_file test_yaml
+      deps.each_pair do |name, config|
+        d = Bindeps::Dependency.new(name,
+                                    config['binaries'],
+                                    config['version'],
+                                    config['url'])
+        assert d.installed?('fakebin3')
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindeps
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Richard Smith-Unna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: which_works
@@ -143,6 +143,12 @@ files:
 - test/data/fakebin
 - test/data/fakebin.tgz
 - test/data/fakebin.yaml
+- test/data/fakebin2
+- test/data/fakebin2.tgz
+- test/data/fakebin2.yaml
+- test/data/fakebin3
+- test/data/fakebin3.tgz
+- test/data/fakebin3.yaml
 - test/helper.rb
 - test/test_bindeps.rb
 homepage: https://github.com/Blahah/bindeps
@@ -174,6 +180,12 @@ test_files:
 - test/data/fakebin
 - test/data/fakebin.tgz
 - test/data/fakebin.yaml
+- test/data/fakebin2
+- test/data/fakebin2.tgz
+- test/data/fakebin2.yaml
+- test/data/fakebin3
+- test/data/fakebin3.tgz
+- test/data/fakebin3.yaml
 - test/helper.rb
 - test/test_bindeps.rb
 has_rdoc: