howzit 2.0.26 → 2.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ef20bf69eaecc6f2d2df7ac9621dfbd227af13148ce2e0465d466b6206d8a59
-  data.tar.gz: 5923dbabfc6ec5d6bc1783ebb21b1a231fbfdaaa2ecd3887582b014a9642d8ab
+  metadata.gz: 135c2149bfce9fb01705564408ded6052edef780b415d1b305e292c6d3701f57
+  data.tar.gz: c4cfbbd4a6517aa33078c69600f88656ec4c07547c5ff6dcc65cae1151feb47a
 SHA512:
-  metadata.gz: b5e8c29926fa85e6b52e4d8463504a474f4d0e35765a8bf85294ab46f84e11c10d9f77f002d85ed2ea0db4657edd23a9faabe03f5c7ba0796aa38407d00e1180
-  data.tar.gz: 9340eff4ab693b1e82e11b201d63da704a4dc4d647bd5443b7b2bdfa8b5f1af98dc61cf4b42f76247c2ba4adbf2651ab82ea082136f68bdf0c5ebc0c904898d5
+  metadata.gz: 3981a7b2eba17397a7e7723105a7f80f7387b04d3a2fabc442fe63a7c27fa79d954801c4527f2168cb557c16e7da865228d8ffb5f7bff55c754c5623010390f6
+  data.tar.gz: 8cee197d4b84557bddcc5d2584c4784af88ade9424c06cf73d2efdd8735e7675db711d20cfcb98efc91fcb722d91b464aa8a45fa85e0c5c1dd8e8509100460e2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 2.0.27
+
+2022-08-23 12:25
+
+#### IMPROVED
+
+- Code cleanup
+
 ### 2.0.26
 
 2022-08-23 11:36

data/lib/howzit/prompt.rb

@@ -87,60 +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="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 {}")
-          ]
+          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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.0.26
+  version: 2.0.27
 platform: ruby
 authors:
 - Brett Terpstra