bindeps 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eefc4b0d6a9dd94e3c31c67291affeb55384da4f
-  data.tar.gz: 189932cf2ea2d1d46219be9323aa679378b60f6a
+  metadata.gz: 34d7ec015d12ca506a57940e13e144ce06803d64
+  data.tar.gz: c6872d2030aae9d49149dbf43e72212125f7bdb9
 SHA512:
-  metadata.gz: 333fc976974665a29e85728a5c53eb3729709bf8e68401481b7e36b965f475a8ec8d83649d06e81d6ebf9aa69e413f44fa6223c47bfcb8cd417f88257655b462
-  data.tar.gz: 4e0eba4b5b947c57cf105e662e8a7e32b246d325941bc13c475da888657413e9c80119f93c296ad8a2eef881f5307c5e2f0162a3678f0ead7a01ddd055374246
+  metadata.gz: cdc0b071ce6677c9702a7b96cea5bf16f406fdd5141604e4fb41f2c0f811f5783c7b7cba9c8a3e267dcc9f5ff7ab29e8515c4717bb85eefe512c890f4a1b0ca3
+  data.tar.gz: 3de04bfe9067f95d0daf62139d693abc161fdf05af7f01dadf93a34d81d30a8a640cc485973dec7ccfbce394b376955c56e89b31f83ad425f19b952fa1e80cde

data/README.md

@@ -11,21 +11,29 @@ Simple binary dependency management for Ruby gems
 
 ## Installation
 
-`gem install bindeps`
+```bash
+$ gem install bindeps
+```
 
 ### Using Bundler
 
 Add this line to your application's Gemfile:
 
-    gem 'bindeps'
+```
+gem 'bindeps'
+```
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install bindeps
+```bash
+$ gem install bindeps
+```
 
 ## Usage
 

data/bindeps.gemspec

@@ -18,13 +18,14 @@ 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_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency 'turn'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'shoulda-context'
-  spec.add_development_dependency 'coveralls', '>= 0.6.7'
+  spec.add_development_dependency 'rake', '~> 10.3', '>= 10.3.2'
+  spec.add_development_dependency 'turn', '~> 0.9', '>= 0.9.7'
+  spec.add_development_dependency 'minitest', '~> 4', '>= 4.7.5'
+  spec.add_development_dependency 'simplecov', '~> 0.8', '>= 0.8.2'
+  spec.add_development_dependency 'shoulda-context', '~> 1.2', '>= 1.2.1'
+  spec.add_development_dependency 'coveralls', '~> 0.7'
 end

data/lib/bindeps.rb

@@ -89,8 +89,20 @@ module Bindeps
     end
 
     def download
-      `curl -O -J -L #{@url}`
-      unless $?.to_i == 0
+      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"
       end
@@ -98,6 +110,7 @@ module Bindeps
 
     def unpack
       archive = File.basename(@url)
+      Unpacker.archive? archive
       if @unpack
         Unpacker.unpack(archive) do |dir|
           Dir.chdir dir do

data/lib/bindeps/version.rb

@@ -1,3 +1,3 @@
 module Bindeps
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/unpacker.rb

@@ -23,14 +23,14 @@
 
 require 'fileutils'
 require 'tmpdir'
+require 'which'
+include Which
 require 'open3'
 
 module Unpacker
 
   class UnrecognizedArchiveError < StandardError; end
 
-  SUPPORTED_FILEEXTS = %w[tar rar zip gz bz tgz bgz tar]
-
   def self.unpack(file, tmpdir = "/tmp", &block)
     Dir.mktmpdir 'unpacker' do |dir|
       cmd = case file
@@ -53,8 +53,43 @@ module Unpacker
     end
   end
 
+  # %w[tar rar zip gz bz tgz bgz tar]
   def self.archive?(file_name)
-    SUPPORTED_FILEEXTS.include? File.extname(file_name).sub('.', '')
+    supported = []
+    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 tbz].each do |ext|
+        supported << ext
+      end
+    end
+    if !which('unzip').empty?
+      supported << "zip"
+    end
+    if !which('gunzip').empty?
+      supported << "gz"
+    end
+    support = supported.include? ext
+    if !support
+      help = case ext
+      when /rar/
+        "Please install unrar"
+      when /(tar|tgz|tar\.gz|tar\.bz|tbz)$/
+        "Please install tar"
+      when /zip$/
+        "Please install unzip"
+      when /gz$/
+        "Please install gunzip"
+      else
+        raise UnrecognizedArchiveError
+      end
+      msg = "Archive type not supported: #{ext}\n#{help}"
+      raise UnrecognizedArchiveError.new(msg)
+    end
+    support
   end
 
   def self.valid?(file_path, file_name = file_path)
@@ -70,10 +105,12 @@ module Unpacker
           else
             raise UnrecognizedArchiveError
           end
-    `#{cmd}`
-    true
-  rescue
-    false
+    stdout, stderr, status = Open3.capture3 cmd
+    if status.success?
+      true
+    else
+      false
+    end
   end
 
 end # module Unpacker

data/test/test_bindeps.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestBinDeps < Test::Unit::TestCase
+class TestBindeps < Test::Unit::TestCase
 
   context "bindeps" do
 
@@ -60,6 +60,119 @@ class TestBinDeps < Test::Unit::TestCase
                                     config['url'],
                                     config['unpack'])
         assert d.installed?('fakebin3')
+        assert d.all_installed?
+      end
+    end
+
+    should "fail when no download is specified for the local system" do
+      require 'rbconfig'
+      original_os = RbConfig::CONFIG['host_os']
+      RbConfig::CONFIG['host_os'] = 'fail'
+      assert_raise Bindeps::UnsupportedSystemError do
+        Bindeps::System.os
+      end
+      urlconfig = { '64bit' => { 'unix' => 'url' } }
+      versionconfig = { 'number' => 1, 'command' => 'getversion' }
+      RbConfig::CONFIG['host_os'] = 'linux'
+      assert_raise Bindeps::UnsupportedSystemError do
+        Bindeps::Dependency.new('test', ['binary'],
+                                versionconfig, urlconfig, false)
+      end
+      RbConfig::CONFIG['host_os'] = 'solaris'
+      original_cpu = Gem::Platform.local.cpu
+      Gem::Platform.local.cpu = 'fail'
+      assert_raise Bindeps::UnsupportedSystemError do
+        Bindeps::Dependency.new('test', ['binary'],
+                                versionconfig, urlconfig, false)
+      end
+      # set os info back to the truth
+      RbConfig::CONFIG['host_os'] = original_os
+      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(
+          'test',                     # name
+          ['binary'],                 # binaries
+          {                           # versionconfig
+            'number' => 1,
+            'command' => 'getversion'
+          },
+          {                           # urlconfig
+            '64bit' => {
+              'linux' => 'url',
+              'unix' => 'url',
+              'macosx' => 'url',
+              'windows' => 'url',
+            }
+          },
+          false                       # unpack
+        )
+      end
+      assert_raise ArgumentError do
+        Bindeps::Dependency.new(
+          'test',                     # name
+          'binary',                   # binaries is no longer an array
+          {                           # versionconfig
+            'number' => 1,
+            'command' => 'getversion'
+          },
+          {                           # urlconfig
+            '64bit' => {
+              'linux' => 'url',
+              'unix' => 'url',
+              'macosx' => 'url',
+              'windows' => 'url',
+            }
+          },
+          false                       # unpack
+        )
       end
     end
 

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: bindeps
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Richard Smith-Unna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: which
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: which_works
   requirement: !ruby/object:Gem::Requirement
@@ -42,86 +62,116 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.3'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.3'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.5
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0.7'
 description: binary dependency management for ruby gems
 email:
 - rds45@cam.ac.uk
@@ -152,6 +202,7 @@ files:
 - test/data/fakebin4
 - test/data/fakebin4.yaml
 - test/data/neverinstalled.yaml
+- test/data/wget
 - test/helper.rb
 - test/test_bindeps.rb
 homepage: https://github.com/Blahah/bindeps
@@ -174,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: binary dependency management for ruby gems
@@ -192,6 +243,7 @@ test_files:
 - test/data/fakebin4
 - test/data/fakebin4.yaml
 - test/data/neverinstalled.yaml
+- test/data/wget
 - test/helper.rb
 - test/test_bindeps.rb
 has_rdoc: