howzit 2.0.27 → 2.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135c2149bfce9fb01705564408ded6052edef780b415d1b305e292c6d3701f57
-  data.tar.gz: c4cfbbd4a6517aa33078c69600f88656ec4c07547c5ff6dcc65cae1151feb47a
+  metadata.gz: c2a724cc90c349de14afa896512a32d69bcf2fa44575f69e74b0a6f96d615ebb
+  data.tar.gz: 73c54a8893fa66784575235d329ad698da6e7a34a2741e09d2d93149b118f68a
 SHA512:
-  metadata.gz: 3981a7b2eba17397a7e7723105a7f80f7387b04d3a2fabc442fe63a7c27fa79d954801c4527f2168cb557c16e7da865228d8ffb5f7bff55c754c5623010390f6
-  data.tar.gz: 8cee197d4b84557bddcc5d2584c4784af88ade9424c06cf73d2efdd8735e7675db711d20cfcb98efc91fcb722d91b464aa8a45fa85e0c5c1dd8e8509100460e2
+  metadata.gz: 4d4c9e0c7e5c78f10479cea93dffa09fdf768d335210897feb127f849040bced7a05924a60f6621173ececb1fde116fe5a3ecc79270767c12718b1a1f9742281
+  data.tar.gz: ff2c18f91883cf4f3b6035b8b304a23575381fd1b9a74333781db8ac000b13d03eb43969bb80d964e3dafeec3556a2152392b2eb074a34561981753233e1fc9e

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 2.0.28
+
+2022-08-29 18:42
+
+#### IMPROVED
+
+- If a topic runs multiple directives, stop processing them if one returns a non-zero exit status
+
 ### 2.0.27
 
 2022-08-23 12:25

data/lib/howzit/task.rb

@@ -56,11 +56,13 @@ module Howzit
         script.write(block)
         script.close
         File.chmod(0o777, script.path)
-        system(%(/bin/sh -c "#{script.path}"))
+        res = system(%(/bin/sh -c "#{script.path}"))
       ensure
         script.close
         script.unlink
       end
+
+      res
     end
 
     ##
@@ -85,7 +87,7 @@ module Howzit
     def run_run
       title = Howzit.options[:show_all_code] ? @action : @title
       Howzit.console.info("{bg}Running {bw}#{title}{x}".c)
-      system(@action)
+      return system(@action)
     end
 
     ##
@@ -95,6 +97,7 @@ module Howzit
       title = Howzit.options[:show_all_code] ? @action : @title
       Howzit.console.info("{bg}Copied {bw}#{title}{bg} to clipboard{x}".c)
       Util.os_copy(@action)
+      return true
     end
 
     ##
@@ -103,22 +106,22 @@ module Howzit
     def run
       output = []
       tasks = 1
-      if @type == :block
-        run_block
-      else
-        case @type
-        when :include
-          output, tasks = run_include
-        when :run
-          run_run
-        when :copy
-          run_copy
-        when :open
-          Util.os_open(@action)
-        end
-      end
+      res = if @type == :block
+              run_block
+            else
+              case @type
+              when :include
+                output, tasks = run_include
+              when :run
+                run_run
+              when :copy
+                run_copy
+              when :open
+                Util.os_open(@action)
+              end
+            end
 
-      [output, tasks]
+      [output, tasks, res]
     end
 
     ##

data/lib/howzit/topic.rb

@@ -63,9 +63,15 @@ module Howzit
             next unless res
 
           end
-          run_output, total = task.run
+          run_output, total, success = task.run
+
           output.concat(run_output)
           tasks += total
+
+          unless success
+            Howzit.console.warn '{br}Error running task{bw} - non-zero exit, ending processing{x}'.c
+            break
+          end
         end
       else
         Howzit.console.warn "{r}--run: No {br}@directive{xr} found in {bw}#{@title}{x}".c

data/lib/howzit/version.rb

@@ -3,5 +3,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '2.0.27'
+  VERSION = '2.0.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.0.27
+  version: 2.0.28
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler