kapost-bootstrapper 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4384c1374a0925ec426e81e7cb8d4d1afef06c99
-  data.tar.gz: 7f0f93d73a2d7add9fea9c65e102293829a458d1
+  metadata.gz: 48e8b54eec082d2fa5143727675462ce8892f18f
+  data.tar.gz: 8da354bc5d20bf8f6f64df870a4bc0723c3b300f
 SHA512:
-  metadata.gz: 9fc89d09ef1df3f23950ccaba5292a4b331f7b16a6615a0bc527ceac74ece617671648341a5193b685f5bab1aed9bf1d9906215f7473a0aa1295d9a4ba18c031
-  data.tar.gz: c0ccc02adc2e9f5947dbc2dba251b67bc39ea07aa4f447bc26e92e7c0ac8e3bea04ad98fcea12771fe73b37c7d74d9f45b526a1efdeb8e10f364eb04aa195aec
+  metadata.gz: 20d387ab90761ce8008e2798ffe412e5a8cc2be2a10bc23abedef5fb3c4cbe251f14a7e2de443c16e03b3c7c232e2f542ae01914720f82a10785b740fb374b9a
+  data.tar.gz: f8b88d86e2a17a31ce7962ac54cfccf6456c9757e7fc4a7792e3b13c7f1e8c1f8aa751d2dd780dc7ab225ae3e2c359682223a5023f27dd91605952e2ef3d308d

data/lib/kapost/bootstrapper.rb

@@ -3,6 +3,18 @@ require "open3"
 module Kapost
   # Application dependency installer for this Rails application.
   class Bootstrapper
+
+    class CommandFailedError < StandardError
+      attr_reader :command, :status
+      def initialize(command, status)
+        @command, @status = command, status
+      end
+
+      def message
+        "Command `#{cmd}` failed with status #{status}"
+      end
+    end
+
     def initialize(cli: Open3, printer: $stdout, platform: RUBY_PLATFORM, shell: Kernel, &block)
       @cli      = cli
       @printer  = printer
@@ -12,20 +24,18 @@ module Kapost
       run(&block) if block_given?
     end
 
-    def check(command, help = nil, version: nil, &block)
-      success = say(label(command, version)) do
-        if block_given?
-          yield
-        else
-          installed?(command) and (!version or right_version?(command, version))
-        end
-      end
+    def default_check(command, version)
+      installed?(command) and (!version or right_version?(command, version))
+    end
 
-      unless success
-        say(help) if help
-        shell.exit 1
-      end
-      success
+    def check(command, help = nil, version: nil)
+      say(label(command, version)) do
+        begin
+          block_given? ? yield : default_check(command, version)
+        rescue CommandFailedError => ex
+          die help, exception: ex
+        end
+      end or die(help)
     end
 
     def check_bundler
@@ -68,10 +78,16 @@ module Kapost
       say(cmd.join(" ")) if options[:verbose]
       result = system(*cmd)
       status = $?
-      fail "Command `#{cmd.join(' ')}` failed with status #{status.exitstatus}" unless result
+      raise CommandFailedError, cmd.join(" "), status.exitstatus unless result
       result
     end
 
+    def die(help, exception: nil)
+      say(exception.message) if exception
+      say(help) if help
+      shell.exit 1
+    end
+
     def osx(&block)
       run(&block) if os == :macosx
     end

data/lib/kapost/bootstrapper/version.rb

@@ -1,5 +1,5 @@
 module Kapost
   class Bootstrapper
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

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