natty-ui 0.27.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f1afe6be5864d4895c974783fbfcff1f4b5a23f963eb24f6a964fe09b1174c
-  data.tar.gz: e3a4c8e1981f0299f9927c4a3f53fa0c4eca95f792f9590c9ea191e7018adcb5
+  metadata.gz: 3d1b81e5e7afebe8166a6532c00df911d53b189f6eb4b282e828492b0d4a123f
+  data.tar.gz: ef24f92d9c696f966e6dbe3fdcb7eba55c649099551b50dcb83922f1702a1d2a
 SHA512:
-  metadata.gz: d9c75d24c0363076c3e0d41ac458d4f13a6552811d166028d5d758ba408d20aa63907a471ee56c4fe4b0638db1cb03e915d0b6c606e8770a9753d59eafb7c951
-  data.tar.gz: 77a95400ba528d57f3e1b559ac1ffa584c68a60bcc45d212341bc803031f204abac44e269db1d81903a4629b7c9c466c27acae66d84c2f802a3486bab37a929b
+  metadata.gz: 610d16c334a76042430e2cf9ff0ae876347ecb24417134adbda55dae569871b7e1e91408bab79770ba3da8ed9379dcf3834bc54aa6673d5081c376cc3c58778d
+  data.tar.gz: 024bc0a945ca27ec2379b7170343e40e23d555c65780b766c30751bc8c4e093766e79081bb6a5aae93cc3be8c9f8c474ca03b84fe1b5e4fa6307858d816a13bd

data/examples/8bit-colors.rb

@@ -6,13 +6,13 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]8bit Color Support[/]' do
   color = ->(i) { "[bg#{i = i.to_s(16).rjust(2, '0')}] #{i} " }
 
   ui.space
-  ui.message('System Colors', <<~COLORS.chomp)
+  ui.message 'System Colors', <<~COLORS.chomp
     [#ff]#{0.upto(7).map(&color).join}
     [#00]#{8.upto(15).map(&color).join}
   COLORS
 
   ui.space
-  ui.message('Grayscale', <<~GRAYSCALE.chomp)
+  ui.message 'Grayscale', <<~GRAYSCALE.chomp
     [#ff]#{0xe8.upto(0xf3).map(&color).join}
     [#ff]#{0xf4.upto(0xff).map(&color).join}
   GRAYSCALE

data/examples/elements.rb

@@ -4,16 +4,16 @@ require_relative '../lib/natty-ui'
 
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Simple Elements[/]' do
   ui.space
-  ui.h1('This is a [b]H1[/b] heading element')
+  ui.h1 'This is a [b]H1[/b] heading element'
 
   ui.space
-  ui.h2('This is a [b]H2[/b] heading element')
+  ui.h2 'This is a [b]H2[/b] heading element'
 
   ui.space
   ui.quote "This is a\nmulti-line quotation"
 
   ui.space
-  ui.h3('This is a [b]H3[/b] heading element')
+  ui.h3 'This is a [b]H3[/b] heading element'
   ui.mark(
     'This is a multi-line message',
     'with a leading checkmark.',
@@ -21,11 +21,11 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Simple Elements[/]' do
   )
 
   ui.space
-  ui.h4('This is a [b]H4[/b] heading element')
+  ui.h4 'This is a [b]H4[/b] heading element'
 
   ui.space
-  ui.h5('This is a [b]H5[/b] heading element')
+  ui.h5 'This is a [b]H5[/b] heading element'
 
   ui.space
-  ui.h6('This is a [b]H6[/b] heading element')
+  ui.h6 'This is a [b]H6[/b] heading element'
 end

data/examples/examples.rb

@@ -13,17 +13,18 @@ EXAMPLES = {
   'ls' => 'Print Lists',
   'tables' => 'Print Tables',
   'cols' => 'Print Columns',
+  'vbars' => 'Print Vertical Bars',
+  'hbars' => 'Print Horizontal Bars',
   'sections' => 'Sections',
-  'tasks' => 'Tasks'
+  'tasks' => 'Tasks',
+  'options' => 'Options and Selections'
 }.freeze
 
-DEFAULT_MODE = NattyUI.input_mode == :default
-
 ui.space
 
 while true
   selected =
-    ui.choice(**EXAMPLES, abortable: true) do
+    ui.choice(**EXAMPLES, abortable: true, selected: selected) do
       ui.cols(
         "[red] /\\_/\\\n( o.o )\n > ^ <",
         '[bright_green b]Select a natty example:',
@@ -32,12 +33,12 @@ while true
       ui.div('[faint](Abort with [\\ESC])', padding: [1, 0, 1])
     end
 
-  ui.space unless DEFAULT_MODE
+  ui.space unless Terminal.ansi?
   break unless selected
 
   ui.temporary do
     load("#{__dir__}/#{selected}.rb")
-    if DEFAULT_MODE
+    if Terminal.ansi?
       ui.await { ui.puts '[faint][\\Press ENTER to continue...]' }
     else
       ui.space

data/examples/hbars.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Print Horizontal Bars[/]' do
+  values = [11.97, 14.35, 15.51, 12.39, 14.3, 10.6, 17.7].freeze
+
+  ui.space
+  ui.hbars values, style: :blue
+  ui.puts 'NattyUI can quick dump values as horizontal bars.'
+
+  ui.space
+  ui.hbars values, style: :green, normalize: true, width: 0.5
+  ui.puts(
+    'These are the same values but [i]normalized[/i] ' \
+      'and printed in half width.'
+  )
+end

data/examples/illustration.rb

@@ -39,7 +39,7 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b]' do
     table.add do |row|
       row.add 'Layout'
       row.add <<~TEXT.chomp
-        🎩 heading elements     📝 messages
+        🎩 heading elements     📝 messages    📊 bar graphs
         📏 horizontal rulers    [blue]┼┼[/] tables
         📋 lists                [b green]✓✓[/] tasks
       TEXT

data/examples/info.rb

@@ -2,29 +2,30 @@
 
 require_relative '../lib/natty-ui'
 
+def colors
+  return Terminal.colors.to_s if Terminal.colors < 8
+  colors = [
+    Terminal.true_color? ? 'true color' : Terminal.colors,
+    "#{(0..15).map { "[#{_1.to_s(16).rjust(2, '0')}]██" }.join}[/]"
+  ]
+  if Terminal.true_color?
+    colors << Terminal::Ansi.rainbow('████████████████████████████████')
+  end
+  colors.join("\n")
+end
+
 ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Terminal Information[/]' do
   ui.space
   ui.table do |table|
-    table.add('Identifier', Terminal.application || 'unidentified')
-    table.add('ANSI support', Terminal.ansi? ? 'yes' : 'no')
-    table.add('Input mode', Terminal.input_mode)
-    table.add(
-      'Colors',
-      "#{Terminal.true_color? ? 'true color' : Terminal.colors}
-      [black]██[red]██[green]██[yellow]██[blue]██[magenta]██[cyan]██[white]██" \
-        '[bright_black]██[bright_red]██[bright_green]██[bright_yellow]██' \
-        '[bright_blue]██[bright_magenta]██[bright_cyan]██[bright_white]██[/]' \
-        "#{
-          if Terminal.true_color?
-            Terminal::Ansi.rainbow("\n████████████████████████████████")
-          end
-        }"
-    )
-    table.add('Screen size', Terminal.size.join(' x '))
+    table.add 'Identifier', Terminal.application || 'unidentified'
+    table.add 'ANSI support', Terminal.ansi? ? 'yes' : 'no'
+    table.add 'Input mode', Terminal.input_mode
+    table.add 'Colors', colors
+    table.add 'Screen size', Terminal.size.join(' x ')
     fc = table.columns[0]
-    fc.width = 13
-    fc.padding_right = 1
+    fc.width = 14
+    fc.padding_right = 2
     fc.align = :right
-    table.columns[1].style = :bold
+    table.columns[1].style = %i[bold bright_yellow]
   end
 end

data/examples/key-codes.rb

@@ -2,27 +2,29 @@
 
 require_relative '../lib/natty-ui'
 
-raw = name = :start
-while name != 'Esc'
+event = nil
+while true
   ui.temporary do
     ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Keyboard Key Codes[/]' do
       ui.puts(
-        "\n#{
-          case name
-          when :start
-            "Your terminal uses [i]#{
-              Terminal.input_mode
-            }[/i] mode. Press a key!"
-          when nil
-            "[green]#{raw.inspect}[/fg] → [bold bright_green][\\#{raw}]"
+        "
+        #{
+          if event
+            "#{event.to_a.size < 2 ? ' Key' : 'Keys'}: [bold bright_green]#{
+              event.to_a.map { "[\\#{_1}]" }.join(' ')
+            }[/]
+            Code: [bright_blue]#{event.raw.inspect}[/]"
           else
-            "[green]#{raw.inspect}[/fg] → [bold bright_green]#{
-              name.split('+').map! { "[\\#{_1}]" }.join(' ')
-            }"
+            "Your terminal uses [bright_blue]#{
+              Terminal.input_mode
+            }[/] mode. Press a key!"
           end
-        }\n\n[bright_black](Exit with ESC)"
+        }
+
+        [faint](Exit with ESC)"
       )
     end
-    raw, name = Terminal.read_key(mode: :both)
+    event = Terminal.read_key_event
+    exit if event.nil? || event.name == 'Esc'
   end
 end

data/examples/options.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Options and Selections[/]' do
+  ui.space
+  ui.puts <<~INFO, eol: false
+    [i]Options[/i] and [i]selections[/i] allow the user to select from several
+    options interactively.
+    If ANSI is available the user can use [b][Up][/b] and [b][Down][/b] keys to
+    navigate, switch the state of selected item with [b][Space][/b] and complete
+    the selection with [b][Enter][/b].
+  INFO
+
+  ui.space
+  options =
+    ui.select %w[Kitty iTerm2 Ghostty Tabby Rio] do
+      ui.puts '[i]Which terminal applications did you already tested?[/i]'
+    end
+  case options.size
+  when 0
+    ui.puts 'You selected nothing – test more in future!'
+  when 1
+    ui.puts "#{options.first} is indeed a nice terminal."
+  else
+    ui.puts "#{options.join(', ')} are worth to test!"
+  end
+end

data/examples/tasks.rb

@@ -21,7 +21,7 @@ ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Tasks[/]' do
 
     ui.task('Connect to Library') do
       foo
-      ui.mark('Server Found', mark: :checkmark)
+      ui.mark 'Server Found', mark: :checkmark
       ui.task('Login...') { some }
     end
 

data/examples/vbars.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Print Vertical Bars[/]' do
+  values = [
+    11.97,
+    14.35,
+    15.51,
+    12.39,
+    14.3,
+    10.6,
+    17.7,
+    14.47,
+    14.56,
+    17.31,
+    12.98,
+    16.21,
+    14.9,
+    17.23,
+    13.35,
+    11.62,
+    14.81,
+    19.7,
+    13.42,
+    14.18
+  ].freeze
+
+  ui.space
+  ui.vbars values, style: :blue
+  ui.puts 'NattyUI can quick dump values as vertical bars.'
+
+  ui.space
+  ui.vbars values, style: :green, normalize: true, bar_width: 2
+  ui.puts(
+    'These are the same values but [i]normalized[/i] and printed with ' \
+      'a fixed bar width.'
+  )
+end

data/lib/natty-ui/attributes.rb

@@ -29,7 +29,6 @@ module NattyUI
       def _init = nil
       def _assign(_opt) = self
       def _store(opt) = opt
-
       def as_uint(value) = [0, value.to_i].max
       def as_nint(value) = ([0, value.to_i].max if value)
 
@@ -555,9 +554,7 @@ module NattyUI
 
   module TextWithAttributes
     include WithAttributes
-
     attr_reader :text
-
     def empty? = @text.empty?
     alias _to_s to_s
     private :_to_s

data/lib/natty-ui/choice.rb

@@ -7,22 +7,31 @@ module NattyUI
     def select
       yield(self) if block_given?
       pin_line = NattyUI.lines_written
-      draw(current = 0)
-      while (key = Terminal.read_key)
-        case key
+      draw
+      last = @current
+      while (event = Terminal.read_key_event)
+        case event.name
         when 'Esc', 'Ctrl+c'
           break nil if @abortable
-        when 'Enter', ' '
-          break @ret[current]
-        when 'Up', 'Left', 'Back', 'Shift+Tab'
-          current = @texts.size - 1 if (current -= 1) < 0
-          pin_line = NattyUI.back_to_line(pin_line, erase: false)
-          draw(current)
-        when 'Down', 'Right', 'Tab'
-          current = 0 if (current += 1) == @texts.size
-          pin_line = NattyUI.back_to_line(pin_line, erase: false)
-          draw(current)
+        when 'Enter', 'Space'
+          break @ret[@current]
+        when 'Home'
+          @current = 0
+        when 'End'
+          @current = @texts.size - 1
+        when 'Up', 'Back', 'Shift+Tab', 'i', 'w'
+          @current = @texts.size - 1 if (@current -= 1) < 0
+        when 'Down', 'Tab', 'k', 's'
+          @current = 0 if (@current += 1) == @texts.size
+        else
+          next unless event.simple?
+          c = event.key.ord
+          @current = (c - 48).clamp(0, @texts.size - 1) if c.between?(48, 57)
         end
+        next if last == @current
+        pin_line = NattyUI.back_to_line(pin_line, erase: false)
+        draw
+        last = @current
       end
     ensure
       NattyUI.back_to_line(@start_line)
@@ -30,22 +39,23 @@ module NattyUI
 
     private
 
-    def initialize(parent, args, kwargs, abortable)
+    def initialize(parent, args, kwargs, abortable, selected)
       super(parent)
       @start_line = NattyUI.lines_written
       @texts = args + kwargs.values
       @ret = Array.new(args.size, &:itself) + kwargs.keys
       @abortable = abortable
+      @current = @ret.index(selected) || 0
       theme = Theme.current
       @mark = [theme.mark(:choice), theme.choice_style]
       @mark_current = [theme.mark(:current_choice), theme.choice_current_style]
     end
 
-    def draw(current)
+    def draw
       @texts.each_with_index do |str, idx|
-        mark, decor = idx == current ? @mark_current : @mark
+        mark, style = idx == @current ? @mark_current : @mark
         @parent.puts(
-          "#{decor}#{str}",
+          "#{style}#{str}",
           first_line_prefix: mark,
           first_line_prefix_width: mark.width
         )

data/lib/natty-ui/dumb_choice.rb

@@ -7,11 +7,12 @@ module NattyUI
     def select
       yield(self) if block_given?
       draw
-      while (code = Terminal.read_key)
-        return if @abortable && (code == 'Esc' || code == 'Ctrl+c')
-        next if code.size > 1
-        code = code[0].upcase
-        if @ret.size <= 9 && ('1'..'9').include?(code)
+      while (event = Terminal.read_key_event)
+        return if @abortable && %w[Esc Ctrl+c].include?(event.name)
+        next unless event.simple?
+        code = event.raw.upcase
+        if @ret.size <= 9
+          next unless ('1'..'9').include?(code)
           code = @ret[code.ord - 49] and break code
         elsif ('A'..'Z').include?(code)
           code = @ret[code.ord - 65] and break code

data/lib/natty-ui/dumb_options.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require_relative 'element'
+
+module NattyUI
+  class DumbOptions < Element
+    def select
+      yield(self) if block_given?
+      draw
+      while (event = Terminal.read_key_event)
+        return if @abortable && %w[Esc Ctrl+c].include?(event.name)
+        return @opts.transform_values(&:last) if event.name == 'Enter'
+        next unless event.simple?
+        code = event.raw.upcase
+        if @opts.size <= 9
+          next unless ('1'..'9').include?(code)
+          offset = 49
+        elsif ('A'..'Z').include?(code)
+          offset = 65
+        else
+          next
+        end
+        key = @opts.keys[code.ord - offset] or next
+        @opts[key][-1] = !@opts[key][-1]
+        @parent.space
+        draw
+      end
+    ensure
+      @parent.space
+    end
+
+    private
+
+    def initialize(parent, opts, abortable, selected)
+      super(parent)
+      @opts =
+        opts.to_h do |k, v|
+          v.is_a?(Enumerable) ? [k, [v[0], !!v[-1]]] : [k, [k, !!v]]
+        end
+      @abortable = abortable
+      @current = @opts.key?(selected) ? selected : @opts.first.first
+      theme = Theme.current
+      @marks = {
+        true => theme.mark(:checkmark),
+        false => theme.mark(:choice)
+      }.compare_by_identity
+    end
+
+    def draw
+      glyph = @opts.size <= 9 ? 1 : 'A'
+      @opts.each_pair do |_, (str, selected)|
+        mark = @marks[selected]
+        @parent.puts(
+          str,
+          first_line_prefix: "[\\#{glyph}] #{mark}",
+          first_line_prefix_width: mark.width + 2
+        )
+        glyph = glyph.succ
+      end
+    end
+  end
+  private_constant :DumbOptions
+end

data/lib/natty-ui/element.rb

@@ -32,12 +32,12 @@ module NattyUI
       self
     end
 
-    alias _to_s to_s
-    private :_to_s
-
     # @!visibility private
     alias to_s inspect
 
+    alias _to_s to_s
+    private :_to_s
+
     private
 
     def initialize(parent)
@@ -48,7 +48,6 @@ module NattyUI
 
   module WithStatus
     attr_reader :status
-
     def active? = @status.nil?
     def closed? = !active?
     def ok? = @state == :ok