kapost-bootstrapper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48e8b54eec082d2fa5143727675462ce8892f18f
-  data.tar.gz: 8da354bc5d20bf8f6f64df870a4bc0723c3b300f
+  metadata.gz: 6304d8fd0b5d48b0aaa51f59d1486eaf6223ea75
+  data.tar.gz: 7968ffd2f955f975c0267bc88d85d3510fa0b3fe
 SHA512:
-  metadata.gz: 20d387ab90761ce8008e2798ffe412e5a8cc2be2a10bc23abedef5fb3c4cbe251f14a7e2de443c16e03b3c7c232e2f542ae01914720f82a10785b740fb374b9a
-  data.tar.gz: f8b88d86e2a17a31ce7962ac54cfccf6456c9757e7fc4a7792e3b13c7f1e8c1f8aa751d2dd780dc7ab225ae3e2c359682223a5023f27dd91605952e2ef3d308d
+  metadata.gz: 7a2068b5336aeb916b2099e84cce868c9a2a02dab73af0c4316f841f81afd04f76fa3d4e4b6c1d679a8ade2626d7298bc19bcb163e2cce1d54a77d819c009dff
+  data.tar.gz: 9a3085a9ab5b28058fb2be4058c2be08fe830d3768b82a0adbdfd91edd00d640ff74e0b6fd3c75e68649b35b5b5e0801d6c1401143f91851047115b2c25d1a5a

data/lib/kapost/bootstrapper/version.rb

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

data/lib/kapost/bootstrapper.rb

@@ -4,14 +4,42 @@ module Kapost
   # Application dependency installer for this Rails application.
   class Bootstrapper
 
-    class CommandFailedError < StandardError
-      attr_reader :command, :status
+    class CommandError < StandardError
+      attr_reader :command
+
+      def initialize(command)
+        @command = command
+      end
+    end
+
+    class CommandNotFoundError < CommandError
+      def message
+        "command `%s` not found" % command
+      end
+    end
+
+    class CommandVersionMismatchError < CommandError
+      attr_reader :expected_version, :actual_version
+
+      def initialize(command, expected_version, actual_version)
+        super(command)
+        @expected_version, @actual_version = expected_version, actual_version
+      end
+
+      def message
+        "command `%s` has incorrect version. I expected %s, but you have %s" % [command, expected_version, actual_version]
+      end
+    end
+
+    class CommandFailedError < CommandError
+      attr_reader :status
       def initialize(command, status)
-        @command, @status = command, status
+        super(command)
+        @status = status
       end
 
       def message
-        "Command `#{cmd}` failed with status #{status}"
+        "Command `#{command}` failed with status #{status}"
       end
     end
 
@@ -21,7 +49,7 @@ module Kapost
       @platform = platform
       @shell    = shell
 
-      run(&block) if block_given?
+      instance_eval(&block) if block_given?
     end
 
     def default_check(command, version)
@@ -32,10 +60,12 @@ module Kapost
       say(label(command, version)) do
         begin
           block_given? ? yield : default_check(command, version)
-        rescue CommandFailedError => ex
+          true
+        rescue CommandError => ex
           die help, exception: ex
         end
-      end or die(help)
+      end
+      true
     end
 
     def check_bundler
@@ -52,12 +82,16 @@ module Kapost
 
     def installed?(command)
       _, status = cli.capture2e "bash -c 'type #{command}'"
-      status.success?
+      raise CommandNotFoundError, command unless status.success?
+      true
     end
 
     def right_version?(command, expected_version)
       version, status = cli.capture2e "#{command} --version"
-      status.success? && version.include?(expected_version)
+      unless status.success? && version.include?(expected_version)
+        raise CommandVersionMismatchError, command, expected_version, version
+      end
+      true
     end
 
     def say(message)
@@ -76,9 +110,9 @@ module Kapost
     def sh(*cmd)
       options = (Hash === cmd.last) ? cmd.pop : {}
       say(cmd.join(" ")) if options[:verbose]
-      result = system(*cmd)
+      result = cli.system(*cmd)
       status = $?
-      raise CommandFailedError, cmd.join(" "), status.exitstatus unless result
+      raise CommandFailedError.new(cmd.join(" "), status.exitstatus) unless result
       result
     end
 
@@ -101,7 +135,7 @@ module Kapost
     end
 
     def run(&code)
-      instance_eval(&code)
+      instance_eval(&code) or raise CommandError, code
     end
 
     private

metadata

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