howzit 2.0.25 → 2.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29f72dd5e915f1fbec378cc4210902fb6e3b9ce376de4f4e962c08b40dc5bbca
-  data.tar.gz: bdc554ae8533b3a86360c82a41d4ea55677a5a271fab218db5b1057814aac490
+  metadata.gz: c2a724cc90c349de14afa896512a32d69bcf2fa44575f69e74b0a6f96d615ebb
+  data.tar.gz: 73c54a8893fa66784575235d329ad698da6e7a34a2741e09d2d93149b118f68a
 SHA512:
-  metadata.gz: b49e67762ea36e7e792decb239a8d35f100f28be2992f70a2fb9b2d6ed13ba809db11aa4ea075244be6b263c1c464430b0e57db73ecf444a61f79fcdad812a91
-  data.tar.gz: 7d2d9b973f4798dc4ce0082ccdaad308748a4a39fe505f384f928cdf1fe73a23f751928907e2418a602e26f0de46bafb874d9f0917017d39a0c6feedcfb99990
+  metadata.gz: 4d4c9e0c7e5c78f10479cea93dffa09fdf768d335210897feb127f849040bced7a05924a60f6621173ececb1fde116fe5a3ecc79270767c12718b1a1f9742281
+  data.tar.gz: ff2c18f91883cf4f3b6035b8b304a23575381fd1b9a74333781db8ac000b13d03eb43969bb80d964e3dafeec3556a2152392b2eb074a34561981753233e1fc9e

data/.travis.yml

@@ -14,3 +14,4 @@ script: "bundle exec rspec spec --exclude-pattern 'cli*'"
 branches:
   only:
   - main
+  - develop

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 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
+
+#### IMPROVED
+
+- Code cleanup
+
+### 2.0.26
+
+2022-08-23 11:36
+
+#### IMPROVED
+
+- Add ctrl-a/d bindings to fzf menu for select/deselect all
+
 ### 2.0.25
 
 2022-08-09 12:46

data/lib/howzit/prompt.rb

@@ -87,59 +87,86 @@ module Howzit
         return [] if !$stdout.isatty || matches.count.zero?
 
         if Util.command_exist?('fzf')
-          height = if height == :auto
-                     matches.count + 3
-                   else
-                     TTY::Screen.rows
-                   end
-
-          settings = [
-            '-0',
-            '-1',
-            '-m',
-            "--height=#{height}",
-            '--header="Use tab to mark multiple selections, enter to display/run"',
-            '--prompt="Select a section > "',
-            %(--preview="howzit --no-pager --header-format block --no-color --default --multiple first {}")
-          ]
+          height = height == :auto ? matches.count + 3 : TTY::Screen.rows
+
+          settings = fzf_options(height)
           res = `echo #{Shellwords.escape(matches.join("\n"))} | fzf #{settings.join(' ')}`.strip
-          if res.nil? || res.empty?
-            Howzit.console.info 'Cancelled'
-            Process.exit 0
-          end
-          return res.split(/\n/)
+          return fzf_result(res)
+        end
+
+        tty_menu(matches)
+      end
+
+      def fzf_result(res)
+        if res.nil? || res.empty?
+          Howzit.console.info 'Cancelled'
+          Process.exit 0
         end
+        return res.split(/\n/)
+      end
+
+      def fzf_options(height)
+        [
+          '-0',
+          '-1',
+          '-m',
+          "--height=#{height}",
+          '--header="Tab: add selection, ctrl-a/d: (de)select all, return: display/run"',
+          '--bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all',
+          '--prompt="Select a topic > "',
+          %(--preview="howzit --no-pager --header-format block --no-color --default --multiple first {}")
+        ]
+      end
 
+      ##
+      ## Display a numeric menu on the TTY
+      ##
+      ## @param      matches  The matches from which to select
+      ##
+      def tty_menu(matches)
         return matches if matches.count == 1
 
-        res = matches[0..9]
-        stty_save = `stty -g`.chomp
+        @stty_save = `stty -g`.chomp
 
         trap('INT') do
-          system('stty', stty_save)
+          system('stty')
           exit
         end
 
         options_list(matches)
+        read_selection(matches)
+      end
 
-        begin
-          printf("Type 'q' to cancel, enter for first item", res.length)
-          while (line = Readline.readline(': ', true))
-            if line =~ /^[a-z]/i
-              system('stty', stty_save) # Restore
-              exit
-            end
-            line = line == '' ? 1 : line.to_i
+      ##
+      ## Read a single number response from the command line
+      ##
+      ## @param      matches  The matches
+      ##
+      def read_selection(matches)
+        printf "Type 'q' to cancel, enter for first item"
+        while (line = Readline.readline(': ', true))
+          line = read_num(line)
 
-            return [matches[line - 1]] if line.positive? && line <= matches.length
+          return [matches[line - 1]] if line.positive? && line <= matches.length
 
-            puts 'Out of range'
-            options_list(matches)
-          end
-        ensure
-          system('stty', stty_save)
+          puts 'Out of range'
+          read_selection(matches)
+        end
+      ensure
+        system('stty', @stty_save)
+      end
+
+      ##
+      ## Convert a response to an Integer
+      ##
+      ## @param      line  The response to convert
+      ##
+      def read_num(line)
+        if line =~ /^[a-z]/i
+          system('stty', @stty_save) # Restore
           exit
         end
+        line == '' ? 1 : line.to_i
       end
     end
   end

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.25'
+  VERSION = '2.0.28'
 end

metadata

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