lux-hammer 0.3.21 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84a9d6339d8a34112c31a210823398ea9122959fff9d3522562f840147e8a130
-  data.tar.gz: f7483553452c4e33d18dad6d9d4e2b764cb13a49a4080ea90f4227689f9fc211
+  metadata.gz: 74dd44bca6cf689dcfe0396d90e05e51b0605821314fb6d5b742502662f4e8e8
+  data.tar.gz: a84eaa4fcce83f951905bab3419d18adfcce409cd0f9d2f23db910569443a2ce
 SHA512:
-  metadata.gz: e5158a762b7cb292535f58e33b0a8ae84c2f9affe473501cce701784d5a690bebf5c187e3c588df66821a5cd3f3177f83d655149e84426ea8e9a12c578e7e5c8
-  data.tar.gz: 5711d908d489770a4ede0507224f0a6cf3dbe761edddaed0f6c4591b0e1a1e070e4727f8000829c861cc215be8baf238933b6591d996bb8ee500742d70d22aa5
+  metadata.gz: 044a31c525aba212012888f39d938fa37dc2e69e59097fa10f1dda53723b0a267dae2dad0e77887c19ad801a64fcb47e03b8aa95d916b04474d5239628a9b8f0
+  data.tar.gz: 3ec9940429c06e4bfb00669184fe3d4f78fff0ed693f857fcd37c682bf89b70a214f3a7e92e24826a1ab5889c62de26f05e0f9b78fe22c1c65b12227d4a18681

data/.version

@@ -1 +1 @@
-0.3.21
+0.3.23

data/lib/hammer/shell.rb

@@ -88,26 +88,43 @@ class Hammer
     #
     #   idx = choose 'Pick env', %w[dev staging prod]
     #   say.green "chose #{ %w[dev staging prod][idx] }" if idx
-    def choose(prompt, items)
+    #
+    # `skip` marks rows that are shown but never landed on, so a list can
+    # carry its own headings and rules. They are drawn in gray, the cursor
+    # steps over them, and the returned index still counts every row:
+    #
+    #   choose 'Pick', ['-- fast --', 'dev', '-- slow --', 'prod'],
+    #          skip: ->(item) { item.start_with?('--') }
+    def choose(prompt, items, skip: nil)
       items = items.to_a
       error 'choose needs at least one item' if items.empty?
 
+      live = items.each_index.reject { |i| skip&.call(items[i]) }
+      error 'choose needs at least one selectable item' if live.empty?
+
       say.cyan prompt
 
-      return choose_numbered(items) unless $stdin.tty? && $stdin.respond_to?(:raw)
+      return choose_numbered(items, live) unless $stdin.tty? && $stdin.respond_to?(:raw)
 
-      selected = 0
+      selected = live.first
       # In raw mode \n is not translated to \r\n, so the picker uses \r\n
       # explicitly. The initial draw happens in cooked mode but \r\n is
       # harmless there.
       redraw = lambda do |highlight = :cyan|
         items.each_with_index do |item, i|
-          line = i == selected ? paint("> #{item}", highlight) : "  #{item}"
+          line = if !live.include?(i) then paint("  #{item}", :gray)
+                 elsif i == selected  then paint("> #{item}", highlight)
+                 else                      "  #{item}"
+                 end
           $stdout.print "#{line}\r\n"
         end
       end
       redraw.call
 
+      # Move by position among the selectable rows, so skipped ones are
+      # stepped over in both directions and the wrap-around still works.
+      step = ->(dir) { live[(live.index(selected) + dir) % live.size] }
+
       $stdout.print "\e[?25l" # hide cursor
       begin
         $stdin.raw do |io|
@@ -126,15 +143,15 @@ class Hammer
               # ESC may stand alone or start an arrow sequence \e[A / \e[B.
               if IO.select([io], nil, nil, 0.01) && io.getch == '['
                 case io.getch
-                when 'A' then selected = (selected - 1) % items.size
-                when 'B' then selected = (selected + 1) % items.size
+                when 'A' then selected = step.call(-1)
+                when 'B' then selected = step.call(1)
                 end
               else
                 $stdout.print "\e[#{items.size}A\r\e[J"
                 return nil
               end
-            when 'k' then selected = (selected - 1) % items.size
-            when 'j' then selected = (selected + 1) % items.size
+            when 'k' then selected = step.call(-1)
+            when 'j' then selected = step.call(1)
             end
             $stdout.print "\e[#{items.size}A\r\e[J"
             redraw.call
@@ -146,13 +163,17 @@ class Hammer
     end
 
     # Fallback for non-TTY stdin (pipes, tests). Returns the index or nil.
-    def choose_numbered(items)
-      items.each_with_index { |item, i| puts "  #{i + 1}) #{item}" }
-      print paint("select [1-#{items.size}]: ", :cyan)
+    # Skipped rows are still printed, just without a number to type.
+    def choose_numbered(items, live = items.each_index.to_a)
+      items.each_with_index do |item, i|
+        n = live.index(i)
+        puts n ? "  #{n + 1}) #{item}" : "     #{item}"
+      end
+      print paint("select [1-#{live.size}]: ", :cyan)
       line = $stdin.gets
       return nil if line.nil?
       idx = line.strip.to_i - 1
-      idx.between?(0, items.size - 1) ? idx : nil
+      idx.between?(0, live.size - 1) ? live[idx] : nil
     end
 
     # Run a shell command. Echoes the command in gray, raises