bindeps 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b07814f574d3695f940067291571a19c0f11f69c
-  data.tar.gz: 605a2ec27508c8c87b1e7275d9f091333c7aa9ea
+  metadata.gz: 133fb10206978ebdb1caf2c391eea280bcfadead
+  data.tar.gz: 8fe29388274cc23ad9d8511cf6bde24e6f082dc3
 SHA512:
-  metadata.gz: 2e70535f6f0a477b8c43c8868481431cf71dd0f758d7f42047ebdb3a119045bd6131efa1a8668b54c7c38faaa15627e34d145d6ab1ad26c3f4fd91e58cda3c78
-  data.tar.gz: c28a30941eed04bab4bfd078d5eaf3f193e39ffa0794b69563e11a9eff283cfc03b9b3f760061c0b51bb636ea6783193475a8162ab6eca54a9a1f4fc45bb5256
+  metadata.gz: 3bbca5560b97ee4f77906a24e541bb1d71041eb19a8fe4011074c77f1e4758b4c57198c01c742258da704fdfcc509cdb4223bfc73bd703048c47357113926a9b
+  data.tar.gz: 8bce1184e71c3d7b8a60338f18ccc2181ecbb835e46a3ffd738867203ae3bb604160a849be8677f9a0515d891cea30ad6712287df02750f44ecff6248d422a27

data/bindeps.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'which', '~> 0.0', '>= 0.0.2'
-  spec.add_dependency "which_works"
+  spec.add_dependency 'fixwhich', '~> 1.0', '>= 1.0.2'
+  spec.add_dependency 'downloadr', '~> 0.0', '>= 0.0.41'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'rake', '~> 10.3', '>= 10.3.2'

data/lib/bindeps.rb

@@ -1,8 +1,9 @@
 require "bindeps/version"
 require "unpacker"
-require "which_works"
+require "fixwhich"
 require "tmpdir"
 require "yaml"
+require "downloadr"
 
 module Bindeps
 
@@ -53,6 +54,8 @@ module Bindeps
 
     attr_reader :name, :version, :binaries
 
+    include Which
+
     def initialize(name, binaries, versionconfig, urlconfig, unpack)
       @name = name
       unless binaries.is_a? Array
@@ -92,23 +95,7 @@ module Bindeps
     end
 
     def download
-      curl = which('curl').first
-      wget = which('wget').first
-      if curl
-        cmd = "#{curl} -O -J -L #{@url}"
-        stdout, stderr, status = Open3.capture3 cmd
-      elsif wget
-        cmd = "#{wget} #{@url}"
-        stdout, stderr, status = Open3.capture3 cmd
-      else
-        msg = "You don't have curl or wget?! What kind of computer is "
-        msg << "this?! Windows?! BeOS? OS/2?"
-        raise DownloadFailedError.new(msg)
-      end
-      if !status.success?
-        raise DownloadFailedError,
-              "download of #{@url} for #{@name} failed:\n#{stdout}\n#{stderr}"
-      end
+      Downloadr::HTTP.download @url
     end
 
     def unpack
@@ -139,7 +126,7 @@ module Bindeps
     end
 
     def installed? bin
-      path = Which.which(bin)
+      path = which(bin)
       if path
         ret = `#{@version_cmd} 2>&1`.split("\n").map{ |l| l.strip }.join('|')
         if ret && (/#{@version}/ =~ ret)

data/lib/bindeps/version.rb

@@ -1,3 +1,3 @@
 module Bindeps
-  VERSION = "0.1.3"
+  VERSION = "1.0.0"
 end

data/lib/unpacker.rb

@@ -23,9 +23,9 @@
 
 require 'fileutils'
 require 'tmpdir'
-require 'which'
-include Which
+require 'fixwhich'
 require 'open3'
+include Which
 
 module Unpacker
 

data/test/test_bindeps.rb

@@ -90,51 +90,6 @@ class TestBindeps < Test::Unit::TestCase
       Gem::Platform.local.cpu = original_cpu
     end
 
-    should "fallback to wget when curl is not available" do
-      # set up fake OS
-      original_os = RbConfig::CONFIG['host_os']
-      RbConfig::CONFIG['host_os'] = 'solaris'
-      original_cpu = Gem::Platform.local.cpu
-      Gem::Platform.local.cpu = 'x86_64'
-      # create config
-      urlconfig = { '64bit' => { 'unix' => 'url' } }
-      versionconfig = { 'number' => 1, 'command' => 'getversion' }
-
-      # with only wget in the path
-      original_path = ENV['PATH']
-      ENV['PATH'] = File.expand_path(@data_dir)
-      assert_nothing_raised Bindeps::DownloadFailedError do
-        dep = Bindeps::Dependency.new('test', ['binary'],
-                                      versionconfig, urlconfig, false)
-        dep.download
-      end
-
-      # with neither curl nor wget
-      ENV['PATH'] = ""
-      assert_raise Bindeps::DownloadFailedError do
-        dep = Bindeps::Dependency.new('test', ['binary'],
-                                      versionconfig, urlconfig, false)
-        dep.download
-      end
-
-      # restore path
-      ENV['PATH'] = original_path
-      # when download doesn't actually work
-      assert_raise Bindeps::DownloadFailedError do
-        dep = Bindeps::Dependency.new('test', ['binary'],
-                                      versionconfig, urlconfig, false)
-        dep.download
-      end
-
-      # restore real OS
-      RbConfig::CONFIG['host_os'] = original_os
-      Gem::Platform.local.cpu = original_cpu
-    end
-
-    should "fail when no downloader is available" do
-
-    end
-
     should "initialize" do
       assert_nothing_raised do
         Bindeps::Dependency.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bindeps
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Richard Smith-Unna
@@ -9,42 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: which
+  name: fixwhich
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: which_works
+  name: downloadr
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.41
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement