make_menu 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c28ded8e47d7c6efaf2f84003d55f829e0c6d3c0cfdf869b2715d7391c78dad
-  data.tar.gz: 6fa3d05c94ed8f9f4de3b867477abf4df9970fe01b8e7edd76f6df65bd3dc2e1
+  metadata.gz: b2d84b31eeff4e7646254d1ad56a798eba7bbdc7022273cac49166c1a9fd25f4
+  data.tar.gz: c11ee1cc88e3ef8ee9b51fb2d0e1c3b7b2ef6da7f9194e00ee9ec4a3abf5a55c
 SHA512:
-  metadata.gz: 1aa18122b85d3ee30b910b0db5f92ea126b69cb962885020ab63bc915e37ac5702ecc078010c78157e9407dee587d6dadcc1461a00dd3d50e65f63d7c95ab5a4
-  data.tar.gz: 5610e7ed9c56ee84b6d54a0a618ea96a16b73c2ba63bd8b63bd2c1bb3112f887def6a90d8c434272d705cad7b898b3913c17e9e9cd7a1d78898dec16f6efb9f0
+  metadata.gz: f0d3393504b31d23d6c788a300d646488e5d99ce8943d0afb69cf57a9a8b9ae594f6e7f199d869cd6d65399ca2d31c6ebffc94e2c568259fd9cc725cbe0f388c
+  data.tar.gz: 0d3d990803202ba5523bfc311ff6acf000eeb7df582670752e311a70e9b3920e88e28f0d47ed6c50d366494a203eec8f67a502315cecea4f6923acef9b988725

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    make_menu (1.0.0)
+    make_menu (2.0.0)
       tty-screen (~> 0.8.2)
 
 GEM

data/lib/make_menu/badge_set.rb

@@ -0,0 +1,32 @@
+module MakeMenu
+  class BadgeSet
+    def initialize
+      @badges = []
+    end
+
+    def display
+      rows = []
+      row = ''
+      @badges.each do |badge|
+        label = badge[:label]
+        value = badge[:handler].call
+        if row.decolor.size + label.decolor.size + value.decolor.size >= (0.7 * ::TTY::Screen.cols)
+          rows << row
+          row = ''
+        end
+        row += " #{label}#{value} "
+      end
+      rows << row
+
+      puts rows.join("\n\n").align_block(:center)
+      puts
+    end
+
+    def add(label = '', &block)
+      @badges << {
+        label: label,
+        handler: block
+      }
+    end
+  end
+end

data/lib/make_menu/field_set.rb

@@ -0,0 +1,60 @@
+module MakeMenu
+  class FieldSet
+    def initialize
+      @fields = []
+      @max_widths = {}
+    end
+
+    def display
+      build
+      @fields.each do |field|
+        label_cell = field[:label]
+                       .align(
+                         :right,
+                         width: @max_widths[:label]
+                       )
+
+        value_cel = field[:value]
+                      .align(
+                        :left,
+                        width: @max_widths[:value],
+                        pad_right: true
+                      )
+
+        puts "#{label_cell}#{value_cel}".align(:center)
+      end
+      puts
+    end
+
+    def build
+      @max_widths[:label] = 0
+      @max_widths[:value] = 0
+
+      @fields.each do |field|
+        label = field[:label]
+        value = field[:value] = field[:handler].call
+        label_width = label.decolor.size
+        value_width = value.decolor.size
+        @max_widths[:label] = label_width if label_width > @max_widths[:label]
+        @max_widths[:value] = value_width if value_width > @max_widths[:value]
+      end
+    end
+
+    def add(label = '', value_from_file: nil, color: :normal, none: '[none]'.dark, &block)
+      if value_from_file
+        block = lambda do
+          if File.exists? value_from_file
+            return File.read(value_from_file).strip.color(color)
+          else
+            return none
+          end
+        end
+      end
+
+      @fields << {
+        label: label,
+        handler: block
+      }
+    end
+  end
+end

data/lib/make_menu/menu.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'builder'
+require_relative 'badge_set'
+require_relative 'field_set'
 require_relative 'menu_item_group'
 require_relative 'text/table'
 require_relative 'console/prompter'
@@ -18,10 +20,14 @@ module MakeMenu
       @options = {
         group_title_color: :underline,
         clear_screen: true,
-        pause_on_success: false
+        pause_on_success: false,
+        badges_first: true
       }
       @highlights = {}
+
       @header = nil
+      @field_set = nil
+      @badge_set = nil
     end
 
     attr_reader :makefile, :groups, :items, :options, :highlights
@@ -36,6 +42,14 @@ module MakeMenu
 
         display_header
 
+        if badges_first?
+          display_badges
+          display_fields
+        else
+          display_fields
+          display_badges
+        end
+
         puts colorize(MakeMenu::Text::Table.new(groups).to_s)
         puts
         puts 'Press ESC to quit'.align(:center).bold
@@ -73,6 +87,10 @@ module MakeMenu
       end
     end
 
+    def header(&block)
+      @header = block
+    end
+
     def display_header
       if @header
         @header.call
@@ -82,6 +100,30 @@ module MakeMenu
       end
     end
 
+    def add_field(label = '', value_from_file: nil, color: :normal, none: '[none]'.dark, &block)
+      fields.add label, value_from_file: value_from_file, color: color, none: none, &block
+    end
+
+    def fields
+      @field_set ||= FieldSet.new
+    end
+
+    def display_fields
+      @field_set.display if @field_set
+    end
+
+    def add_badge(label = '', &block)
+      badges.add label, &block
+    end
+
+    def badges
+      @badge_set ||= BadgeSet.new
+    end
+
+    def display_badges
+      @badge_set.display if @badge_set
+    end
+
     def options
       @options.merge!(yield) if block_given?
       @options
@@ -92,10 +134,6 @@ module MakeMenu
       @highlights
     end
 
-    def header(&block)
-      @header = block
-    end
-
     def add_group(group)
       groups << group
       group
@@ -118,6 +156,10 @@ module MakeMenu
       options[:pause_on_success]
     end
 
+    def badges_first?
+      options[:badges_first]
+    end
+
     def colorize(text)
       highlights.each do |word, color|
         case color

data/lib/make_menu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MakeMenu
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_menu
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Barri Mason
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-07 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-screen
@@ -33,9 +33,11 @@ files:
 - Gemfile
 - Gemfile.lock
 - lib/make_menu.rb
+- lib/make_menu/badge_set.rb
 - lib/make_menu/builder.rb
 - lib/make_menu/console/color_string.rb
 - lib/make_menu/console/prompter.rb
+- lib/make_menu/field_set.rb
 - lib/make_menu/menu.rb
 - lib/make_menu/menu_item.rb
 - lib/make_menu/menu_item_group.rb