kapost-bootstrapper 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6304d8fd0b5d48b0aaa51f59d1486eaf6223ea75
-  data.tar.gz: 7968ffd2f955f975c0267bc88d85d3510fa0b3fe
+  metadata.gz: 7bbdfc50dfe2de74b812a50bb6258856d68116d5
+  data.tar.gz: 5bc52349f47dbb10611ed3783076130938119d86
 SHA512:
-  metadata.gz: 7a2068b5336aeb916b2099e84cce868c9a2a02dab73af0c4316f841f81afd04f76fa3d4e4b6c1d679a8ade2626d7298bc19bcb163e2cce1d54a77d819c009dff
-  data.tar.gz: 9a3085a9ab5b28058fb2be4058c2be08fe830d3768b82a0adbdfd91edd00d640ff74e0b6fd3c75e68649b35b5b5e0801d6c1401143f91851047115b2c25d1a5a
+  metadata.gz: 57280b925aea7f4e276c1ac2621efd6715e8a8bc1e4589900a7b90bb3a54352c706435a689e097e54dd781869d4445c78628b0323d402d86f2345da741b448c2
+  data.tar.gz: 5f198e76bf08abfafb25f13840cc5878dfa3c37d3b189ed9210be4a517c07fac346f7ad3336ff7b0ce67f82b8ef0d6e40ce5b653dd249bfe9ddd8982aba6b1e5

data/lib/kapost/bootstrapper/version.rb

@@ -1,5 +1,5 @@
 module Kapost
   class Bootstrapper
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/kapost/bootstrapper.rb

@@ -53,7 +53,11 @@ module Kapost
     end
 
     def default_check(command, version)
-      installed?(command) and (!version or right_version?(command, version))
+      installed?(command) or raise CommandNotFoundError, command
+      if version
+        actual_version = right_version?(command, version) or raise CommandVersionMismatchError, command, version, actual_version
+      end
+      true
     end
 
     def check(command, help = nil, version: nil)
@@ -82,16 +86,12 @@ module Kapost
 
     def installed?(command)
       _, status = cli.capture2e "bash -c 'type #{command}'"
-      raise CommandNotFoundError, command unless status.success?
-      true
+      status.success?
     end
 
     def right_version?(command, expected_version)
       version, status = cli.capture2e "#{command} --version"
-      unless status.success? && version.include?(expected_version)
-        raise CommandVersionMismatchError, command, expected_version, version
-      end
-      true
+      status.success? && version.include?(expected_version) && version
     end
 
     def say(message)
@@ -110,7 +110,7 @@ module Kapost
     def sh(*cmd)
       options = (Hash === cmd.last) ? cmd.pop : {}
       say(cmd.join(" ")) if options[:verbose]
-      result = cli.system(*cmd)
+      result = shell.system(*cmd)
       status = $?
       raise CommandFailedError.new(cmd.join(" "), status.exitstatus) unless result
       result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapost-bootstrapper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Paul Sadauskas