make_menu 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2d84b31eeff4e7646254d1ad56a798eba7bbdc7022273cac49166c1a9fd25f4
-  data.tar.gz: c11ee1cc88e3ef8ee9b51fb2d0e1c3b7b2ef6da7f9194e00ee9ec4a3abf5a55c
+  metadata.gz: d77eaca0e51f7d0a83a9dfee76c802001897c54ea3de35bd01dbee07e36e4f04
+  data.tar.gz: 4b508767ebcdd7c6de85fc90e7d596a5b0f11293c1a108c83abd819f01cda9fa
 SHA512:
-  metadata.gz: f0d3393504b31d23d6c788a300d646488e5d99ce8943d0afb69cf57a9a8b9ae594f6e7f199d869cd6d65399ca2d31c6ebffc94e2c568259fd9cc725cbe0f388c
-  data.tar.gz: 0d3d990803202ba5523bfc311ff6acf000eeb7df582670752e311a70e9b3920e88e28f0d47ed6c50d366494a203eec8f67a502315cecea4f6923acef9b988725
+  metadata.gz: 6e0182748c51ea9417c65d14223ab0b558204877f2dd25cb78b9787310e8794ce972a6c04f1a4fb1aad4099fab6ca7a8dec0e4dbf8658c6113ceca972d122f9b
+  data.tar.gz: 8f0157fa975c994df129d9d55446c78331527d9aca1bfa3f543e99990c92186b909651f95334270ce2328585e2700d28da1988f8d41446073ce03599db17ab7b

data/Gemfile.lock

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

data/lib/make_menu/badge_set.rb

@@ -1,9 +1,23 @@
+# frozen_string_literal: true
+
 module MakeMenu
+  # A set of BADGES to display above the menu
   class BadgeSet
     def initialize
       @badges = []
     end
 
+    # Add a new badge to the set
+    # @param [String] label Optional label to print to the left of the badge value
+    # @param [Proc] block Block to run each time the menu is re-drawn
+    def add(label = '', &block)
+      @badges << {
+        label: label,
+        handler: block
+      }
+    end
+
+    # Print badges in a wrapping horizontal row
     def display
       rows = []
       row = ''
@@ -21,12 +35,5 @@ module MakeMenu
       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/builder.rb

@@ -2,6 +2,7 @@
 
 module MakeMenu
   module Builder
+    # Parse `makefile` and add all annotated targets to `menu`
     def self.build(makefile, menu)
       File.open(makefile, 'r') do |file|
         option_number = 1

data/lib/make_menu/console/prompter.rb

@@ -7,10 +7,29 @@ module MakeMenu
     module Prompter
       PressedEscape = Class.new(StandardError)
 
-      def self.prompt(text = '', obscure: false)
-        print text
+      def self.prompt_and_save(text, file:, obscure: false)
+        if file.is_a? Symbol
+          file = ".#{file}"
+        end
+
+        current = File.exists?(file) ? File.read(file).strip : ''
+
+        response = prompt(text, input: current, obscure: obscure)
+
+        if response.empty?
+          File.delete(file) if File.exists?(file)
+        else
+          File.write(file, response)
+        end
+
+        return response
+      end
+
+      def self.prompt(text = '', input: '', obscure: false, value_color: :light_yellow)
+        text = text.bold
+
+        print "\r#{text}#{input.color(value_color)}"
 
-        input = ''
         char = ''
 
         until !char.empty? && char.ord == 13
@@ -21,11 +40,17 @@ module MakeMenu
             # BACKSPACE
             input = input[0..-2]
             print "\r#{text}#{' ' * input.size} "
-            print "\r#{text}#{obscure ? '*' * input.size : input}"
+            print "\r#{text}#{obscure ? '*'.color(value_color) * input.size : input.color(value_color)}"
 
           when 27
             # ESC
-            raise PressedEscape
+            raise PressedEscape if input.empty?
+
+            print "\r#{text}#{' ' * input.size} "
+            print "\r#{text}"
+
+            input = ''
+            char = ''
 
           when 13
             # ENTER
@@ -33,13 +58,16 @@ module MakeMenu
           else
             input += char
             if obscure
-              print '*'
+              print '*'.color(value_color)
             else
-              print char
+              print char.color(value_color)
             end
           end
         end
 
+        print "\r#{text}#{' ' * input.size} "
+        print "\r#{text}"
+
         input
       end
     end

data/lib/make_menu/field_set.rb

@@ -1,10 +1,46 @@
+# frozen_string_literal: true
+
 module MakeMenu
+  # A set of FIELDS to display above the menu
   class FieldSet
     def initialize
       @fields = []
       @max_widths = {}
     end
 
+    # Add a new field to the set
+    # @param [String] label Optional label to print to the left of the field value
+    # @param [String,Symbol] value_from_file If set, read the field value from a file
+    #   in the current directory. A String is used literally, a Symbol is assumed
+    #   to be a hidden file (i.e. starts with `.`)
+    # @param [String,Symbol,Integer] color Formatting to apply to the value
+    # @param [String] none Text to display if the file does not exist, or is empty
+    # @param [Proc] block Block to return the value to display
+    def add(label = '', value_from_file: nil, color: :normal, none: '[none]'.dark, &block)
+      if value_from_file
+        if value_from_file.is_a? Symbol
+          value_from_file = ".#{value_from_file}"
+        end
+        block = lambda do
+          if File.exists? value_from_file
+            value = File.read(value_from_file).strip
+
+            return none if value.empty?
+
+            return value.color(color)
+          else
+            return none
+          end
+        end
+      end
+
+      @fields << {
+        label: label,
+        handler: block
+      }
+    end
+
+    # Print fields in an aligned vertical stack
     def display
       build
       @fields.each do |field|
@@ -26,6 +62,9 @@ module MakeMenu
       puts
     end
 
+    private
+
+    # Calculate maximum sizes of labels and rendered values
     def build
       @max_widths[:label] = 0
       @max_widths[:value] = 0
@@ -39,22 +78,5 @@ module MakeMenu
         @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/text/column.rb

@@ -2,21 +2,23 @@
 
 module MakeMenu
   module Text
+    SPACING = 2
+
     # A column of text with a fixed with
     class Column
-      def initialize(width)
-        @width = width
+      def initialize
+        @width = nil
         @rows = []
         @row_index = 0
       end
 
-      attr_reader :width
-
-      attr_accessor :rows, :row_index
+      attr_accessor :rows, :row_index, :width
 
       # Add a block of text to the column. Each row will be padded to the column width
       def add(text)
         self.rows += text.split("\n").map do |row|
+          self.width = row.decolor.size + SPACING unless width
+          self.width = [width, row.decolor.size + SPACING].max
           row.gsub("\r", '')
         end
         self.row_index += text.lines.size

data/lib/make_menu/text/table.rb

@@ -64,7 +64,7 @@ module MakeMenu
 
       # Add a new column to the table
       def column_break
-        self.current_column = Column.new(column_width)
+        self.current_column = Column.new
         columns << current_column
       end
 

data/lib/make_menu/version.rb

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

data/lib/make_menu.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'make_menu/console/prompter'
 require_relative 'make_menu/console/color_string'
 require_relative 'make_menu/menu'
 
@@ -13,4 +14,39 @@ module MakeMenu
   def self.run(makefile = './Makefile', &block)
     MakeMenu::Menu.new(makefile).run(&block)
   end
+
+  def self.prompt(text = nil, obscure: false, value_from_file: nil)
+    if (preamble = ARGV[0])
+      if text.nil?
+        if preamble.include?("\n")
+          parts = preamble.split("\n")
+          preamble = parts[0..-2].join("\n")
+          text = parts[-1]
+          puts preamble
+        else
+          text = preamble
+        end
+      end
+    end
+
+    if value_from_file
+      begin
+        input = Console::Prompter.prompt_and_save text, file: value_from_file, obscure: obscure
+        puts (obscure ? ('*' * input.decolor.size) : input).green.underline
+
+      rescue Console::Prompter::PressedEscape
+        puts '(not updated)'.red
+      end
+    else
+      begin
+        input = Console::Prompter.prompt text, obscure: obscure
+        puts (obscure ? ('*' * input.decolor.size) : input).green.underline
+        $stderr.puts input
+      rescue Console::Prompter::PressedEscape
+        puts '(not updated)'.red
+      end
+    end
+
+    input
+  end
 end

data/make_menu.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
     'Gemfile.lock'
   ]
   s.homepage =
-    'https://github.com/MisterGrimalkin/make_menu'
+    'https://github.com/MixterGrimalkin/make_menu'
   s.license = 'MIT'
   s.add_dependency 'tty-screen', '~> 0.8.2'
   s.description = ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_menu
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Barri Mason
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-screen
@@ -45,7 +45,7 @@ files:
 - lib/make_menu/text/table.rb
 - lib/make_menu/version.rb
 - make_menu.gemspec
-homepage: https://github.com/MisterGrimalkin/make_menu
+homepage: https://github.com/MixterGrimalkin/make_menu
 licenses:
 - MIT
 metadata: {}