make_menu 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 220d243f1715ae665a12f8ed497f109209ba10fc5282298b7d9fec956ff99856
-  data.tar.gz: dd1adb0c2bed5934598a72e2b3d5ffc4c48477b438b2a1c6206351d742868e9e
+  metadata.gz: b2d84b31eeff4e7646254d1ad56a798eba7bbdc7022273cac49166c1a9fd25f4
+  data.tar.gz: c11ee1cc88e3ef8ee9b51fb2d0e1c3b7b2ef6da7f9194e00ee9ec4a3abf5a55c
 SHA512:
-  metadata.gz: e0f933ee0f3af0635c97dfc166e1c416784e0a5b24fac03cadab830179ed36fdce07711fc32e03ba353615de72128534b52d2cbf7b2e6009765043cb8bfb5d7e
-  data.tar.gz: 87c98103a07b39f4d54e4278042b5f110754ccad21b299b073928945b142c507636e1685ef811f2f93f9f52309b710876d052f0c23c1e7b6ceddbd918f1b9df5
+  metadata.gz: f0d3393504b31d23d6c788a300d646488e5d99ce8943d0afb69cf57a9a8b9ae594f6e7f199d869cd6d65399ca2d31c6ebffc94e2c568259fd9cc725cbe0f388c
+  data.tar.gz: 0d3d990803202ba5523bfc311ff6acf000eeb7df582670752e311a70e9b3920e88e28f0d47ed6c50d366494a203eec8f67a502315cecea4f6923acef9b988725

data/Gemfile.lock

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

data/lib/make_menu/badge_set.rb

@@ -9,7 +9,7 @@ module MakeMenu
       row = ''
       @badges.each do |badge|
         label = badge[:label]
-        value = badge[:handler].call ? badge[:on] : badge[:off]
+        value = badge[:handler].call
         if row.decolor.size + label.decolor.size + value.decolor.size >= (0.7 * ::TTY::Screen.cols)
           rows << row
           row = ''
@@ -22,11 +22,9 @@ module MakeMenu
       puts
     end
 
-    def add(label = '', on: ' ON '.green_bg.bold, off: ' OFF '.red_bg.dark, &block)
+    def add(label = '', &block)
       @badges << {
         label: label,
-        on: on,
-        off: off,
         handler: block
       }
     end

data/lib/make_menu/field_set.rb

@@ -12,14 +12,14 @@ module MakeMenu
                        .align(
                          :right,
                          width: @max_widths[:label]
-                       ).color(field[:label_color])
+                       )
 
         value_cel = field[:value]
                       .align(
                         :left,
                         width: @max_widths[:value],
                         pad_right: true
-                      ).color(field[:value_color])
+                      )
 
         puts "#{label_cell}#{value_cel}".align(:center)
       end
@@ -40,11 +40,19 @@ module MakeMenu
       end
     end
 
-    def add(label = nil, label_color: :normal, value_color: :normal, &block)
+    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 || '',
-        label_color: label_color,
-        value_color: value_color,
+        label: label,
         handler: block
       }
     end

data/lib/make_menu/menu.rb

@@ -20,7 +20,8 @@ module MakeMenu
       @options = {
         group_title_color: :underline,
         clear_screen: true,
-        pause_on_success: false
+        pause_on_success: false,
+        badges_first: true
       }
       @highlights = {}
 
@@ -40,8 +41,14 @@ module MakeMenu
         system 'clear' if clear_screen?
 
         display_header
-        display_badges
-        display_fields
+
+        if badges_first?
+          display_badges
+          display_fields
+        else
+          display_fields
+          display_badges
+        end
 
         puts colorize(MakeMenu::Text::Table.new(groups).to_s)
         puts
@@ -93,8 +100,8 @@ module MakeMenu
       end
     end
 
-    def add_field(field, &block)
-      fields.add field, &block
+    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
@@ -105,8 +112,8 @@ module MakeMenu
       @field_set.display if @field_set
     end
 
-    def add_badge(label = '', on: ' ON '.green_bg.bold, off: ' OFF '.red_bg.dark, &block)
-      badges.add label, on: on, off: off, &block
+    def add_badge(label = '', &block)
+      badges.add label, &block
     end
 
     def badges
@@ -149,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.1.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.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Barri Mason
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-screen