make_menu 0.1.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e6fc0d7ef57702a6b3921de109c4107cbfd91ae82ad2c3b6c4bb4d965336ce
-  data.tar.gz: ac58b2cbc0b2b6e01451598194494a924e707ee8c0e29b6462961f8f1a51b3eb
+  metadata.gz: 220d243f1715ae665a12f8ed497f109209ba10fc5282298b7d9fec956ff99856
+  data.tar.gz: dd1adb0c2bed5934598a72e2b3d5ffc4c48477b438b2a1c6206351d742868e9e
 SHA512:
-  metadata.gz: 9a41d2f31a4f67d4dae2b62252fa4a4ac81b60561d72f780f5b2718fa1ba98ba6c3b716323e4e3e25ed7e2ad93b755f3f4403fa86265b0c9c849bf93f52f1fe1
-  data.tar.gz: 1a0cabf2eefb7b9d9c8f03dc11c6dc730a4db17ade1e4e20c2e0937c91139b6e37846bec0058f994b6b1053047d22ecbf7ef466859daf674330cc074e5912f7f
+  metadata.gz: e0f933ee0f3af0635c97dfc166e1c416784e0a5b24fac03cadab830179ed36fdce07711fc32e03ba353615de72128534b52d2cbf7b2e6009765043cb8bfb5d7e
+  data.tar.gz: 87c98103a07b39f4d54e4278042b5f110754ccad21b299b073928945b142c507636e1685ef811f2f93f9f52309b710876d052f0c23c1e7b6ceddbd918f1b9df5

data/Gemfile.lock

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

data/lib/make_menu/badge_set.rb

@@ -0,0 +1,34 @@
+module MakeMenu
+  class BadgeSet
+    def initialize
+      @badges = []
+    end
+
+    def display
+      rows = []
+      row = ''
+      @badges.each do |badge|
+        label = badge[:label]
+        value = badge[:handler].call ? badge[:on] : badge[:off]
+        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 = '', on: ' ON '.green_bg.bold, off: ' OFF '.red_bg.dark, &block)
+      @badges << {
+        label: label,
+        on: on,
+        off: off,
+        handler: block
+      }
+    end
+  end
+end

data/lib/make_menu/builder.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module MakeMenu
+  module Builder
+    def self.build(makefile, menu)
+      File.open(makefile, 'r') do |file|
+        option_number = 1
+        current_group = nil
+
+        file.each_line do |line|
+          if line.start_with? '###'
+            # Group header
+            group_title = line.gsub(/###\s+/, '').strip
+            current_group = menu.add_group MenuItemGroup.new(group_title.color(menu.group_title_color))
+
+          elsif line.match(/^[a-zA-Z_-]+:.*?## .*$$/)
+            # Menu item
+            target = line.split(':').first.strip
+            description = line.split('##').last.strip
+
+            # Target 'menu' should not appear
+            next if target == 'menu'
+
+            current_group ||= menu.add_group MenuItemGroup.new('Commands'.color(menu.group_title_color))
+
+            menu.add_item current_group.add_item(MenuItem.new(option_number, target, description))
+
+            option_number += 1
+          end
+        end
+
+        if option_number == 1
+          puts
+          puts 'No annotated targets found!'.red.bold
+          puts
+          puts 'Expecting something like this....'
+          puts "    #{'my_target:'.cyan} #{'## Do some things'.yellow}"
+          puts
+          exit 1
+        end
+      end
+    rescue Errno::ENOENT => _e
+      puts
+      puts 'No Makefile!'.red.bold
+      puts
+      puts "File '#{makefile}' could not be found.".yellow
+      puts
+      exit 1
+    end
+  end
+end

data/lib/make_menu/console/color_string.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+module MakeMenu
+  module Console
+    # Monkeypatch for `String`, adds methods to change console text colo(u)r
+    module ColorString
+      COLORS = {
+        white: 0,
+        normal: 0,
+        bold: 1,
+        dark: 2,
+        underline: 4,
+        blink: 5,
+        invert: 7,
+
+        black: 30,
+        red: 31,
+        green: 32,
+        yellow: 33,
+        blue: 34,
+        magenta: 35,
+        cyan: 36,
+        grey: 37,
+
+        black_bg: 40,
+        red_bg: 41,
+        green_bg: 42,
+        yellow_bg: 43,
+        blue_bg: 44,
+        magenta_bg: 45,
+        cyan_bg: 46,
+        grey_bg: 47,
+
+        dark_grey: 90,
+        light_red: 91,
+        light_green: 92,
+        light_yellow: 93,
+        light_blue: 94,
+        light_magenta: 95,
+        light_cyan: 96,
+        light_grey: 97,
+
+        dark_grey_bg: 100,
+        light_red_bg: 101,
+        light_green_bg: 102,
+        light_yellow_bg: 103,
+        light_blue_bg: 104,
+        light_magenta_bg: 105,
+        light_cyan_bg: 106,
+        light_grey_bg: 107
+      }.freeze
+
+      COLORS.each do |name, code|
+        define_method name do
+          color(code)
+        end
+      end
+
+      # Apply specified color code to the String
+      # @param [Array, Symbol, Integer] color_code Can be a key in the COLORS array,
+      #     an integer ANSI code for text color, or an array of either to be applied in order
+      # @return [String] String enclosed by formatting characters
+      def color(color_code)
+        case color_code
+        when Array
+          color_code.inject(self) { |string, code| string.color(code) }
+        when Symbol
+          color(COLORS[color_code])
+        else
+          "\e[#{color_code}m#{self}\e[0m"
+        end
+      end
+
+      # Changes all occurrences of `char` to `fore_color`
+      # and all other characters to `back_color`
+      def highlight(char, fore_color, back_color)
+        inside_highlight = false
+        output = ''
+        buffer = ''
+        each_char do |c|
+          if c == char
+            unless inside_highlight
+              output += buffer.color(COLORS[back_color.to_sym])
+              buffer = ''
+              inside_highlight = true
+            end
+          elsif inside_highlight
+            output += buffer.color(COLORS[fore_color.to_sym]).bold
+            buffer = ''
+            inside_highlight = false
+          end
+          buffer += c
+        end
+
+        output += if inside_highlight
+                    buffer.color(COLORS[fore_color.to_sym]).bold
+                  else
+                    buffer.color(COLORS[back_color.to_sym])
+                  end
+
+        output
+      end
+
+      # Remove color codes from the string
+      def decolor
+        gsub(/\e\[\d+m/, '')
+      end
+
+      # Align the string, ignoring color code characters which would otherwise mess up String#center, etc.
+      def align(alignment = :left, width: nil, char: ' ', pad_right: false)
+        width ||= ::TTY::Screen.cols
+
+        case alignment
+        when :left
+          right_pad = width - decolor.length
+          "#{self}#{char * right_pad}"
+        when :center
+          left_pad = [(width - decolor.length) / 2, 0].max
+          right_pad = width - left_pad - decolor.length
+          "#{char * left_pad}#{self}#{pad_right ? char * right_pad : ''}"
+        when :right
+          left_pad = width - decolor.length
+          "#{char * left_pad}#{self}"
+        end
+      end
+
+      # Align each line of a string
+      def align_block(alignment = :left)
+        split("\n")
+          .map { |line| line.align(alignment) }
+          .join("\n")
+      end
+    end
+  end
+end

data/lib/make_menu/console/prompter.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'io/console'
+
+module MakeMenu
+  module Console
+    module Prompter
+      PressedEscape = Class.new(StandardError)
+
+      def self.prompt(text = '', obscure: false)
+        print text
+
+        input = ''
+        char = ''
+
+        until !char.empty? && char.ord == 13
+          char = $stdin.getch
+
+          case char.ord
+          when 127
+            # BACKSPACE
+            input = input[0..-2]
+            print "\r#{text}#{' ' * input.size} "
+            print "\r#{text}#{obscure ? '*' * input.size : input}"
+
+          when 27
+            # ESC
+            raise PressedEscape
+
+          when 13
+            # ENTER
+
+          else
+            input += char
+            if obscure
+              print '*'
+            else
+              print char
+            end
+          end
+        end
+
+        input
+      end
+    end
+  end
+end

data/lib/make_menu/field_set.rb

@@ -0,0 +1,52 @@
+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]
+                       ).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
+      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 = nil, label_color: :normal, value_color: :normal, &block)
+      @fields << {
+        label: label || '',
+        label_color: label_color,
+        value_color: value_color,
+        handler: block
+      }
+    end
+  end
+end

data/lib/make_menu/menu.rb

@@ -1,39 +1,61 @@
 # frozen_string_literal: true
 
+require_relative 'builder'
+require_relative 'badge_set'
+require_relative 'field_set'
 require_relative 'menu_item_group'
-require_relative 'color_string'
-require_relative 'text_table'
+require_relative 'text/table'
+require_relative 'console/prompter'
 
 module MakeMenu
   # This class builds and displays a number-selection menu from a Makefile
   # then prompts for a number and executes the target.
   class Menu
-    # @param [String] makefile Makefile name
     def initialize(makefile)
+      @makefile = makefile
+
       @groups = []
       @items = []
-      build makefile
+
+      @options = {
+        group_title_color: :underline,
+        clear_screen: true,
+        pause_on_success: false
+      }
+      @highlights = {}
+
+      @header = nil
+      @field_set = nil
+      @badge_set = nil
     end
 
-    attr_reader :groups, :items
+    attr_reader :makefile, :groups, :items, :options, :highlights
 
-    # Display menu and prompt for command
-    # rubocop:disable Metrics/MethodLength
     def run
-      running = true
+      yield self if block_given?
+
+      Builder.build(makefile, self)
 
-      while running
+      loop do
         system 'clear' if clear_screen?
 
         display_header
+        display_badges
+        display_fields
 
-        puts colorize(TextTable.new(groups).to_s)
+        puts colorize(MakeMenu::Text::Table.new(groups).to_s)
         puts
-        puts 'Press ENTER to quit'.align(:center).bold
+        puts 'Press ESC to quit'.align(:center).bold
         puts
-        print 'Select option: '.align(:center)
 
-        running = false unless execute_option(gets.strip)
+        prompt = 'Select option: '.align(:center)
+
+        begin
+          execute_option(MakeMenu::Console::Prompter.prompt(prompt).strip)
+          puts
+        rescue MakeMenu::Console::Prompter::PressedEscape
+          break
+        end
       end
 
       puts
@@ -41,133 +63,102 @@ module MakeMenu
       system 'clear' if clear_screen?
     end
 
-    # rubocop:enable Metrics/MethodLength
-
-    # Display the company logo and the status bar (if set)
-    def display_header
-      puts formatted_logo if logo
-    end
-
-    private
-
-    # Build a menu from the specified Makefile
-    # @param [String] makefile Filename
-    # rubocop:disable Metrics/MethodLength
-    def build(makefile)
-      File.open(makefile, 'r') do |file|
-        option_number = 1
-        current_group = nil
-
-        file.each_line do |line|
-          if line.start_with? '###'
-            # Group header
-            group_title = line.gsub(/###\s+/, '').strip
-            current_group = MenuItemGroup.new(group_title.color(group_title_color))
-            groups << current_group
-
-          elsif line.match(/^[a-zA-Z_-]+:.*?## .*$$/)
-            # Menu item
-            target = line.split(':').first.strip
-            description = line.split('##').last.strip
-
-            # Target 'menu' should not appear
-            next if target == 'menu'
+    def execute_option(selected)
+      selected = selected.to_i
 
-            unless current_group
-              current_group = MenuItemGroup.new('Commands'.color(group_title_color))
-              groups << current_group
-            end
+      items.each do |item|
+        next unless item.option_number == selected
 
-            items << current_group.add_item(
-              MenuItem.new(option_number, target, description)
-            )
+        system 'clear' if clear_screen?
 
-            option_number += 1
-          end
-        end
+        item.execute
 
-        if option_number == 1
-          puts
-          puts 'No annotated targets found!'.red.bold
-          puts
-          puts 'Expecting something like this....'
-          puts "    #{'my_target:'.cyan} #{'## Do some things'.yellow}"
-          puts
-          exit 1
+        if pause_on_success?
+          puts "\nPress ENTER to continue....".dark
+          gets
         end
       end
-
-    rescue Errno::ENOENT => _e
-      puts
-      puts 'No Makefile!'.red.bold
-      puts
-      puts "File '#{makefile}' could not be found.".yellow
-      puts
-      exit 1
     end
 
-    # rubocop:enable Metrics/MethodLength
+    def header(&block)
+      @header = block
+    end
 
-    # Execute the selected menu item
-    # @param [String] selected Value entered by user
-    # @return [Boolean] False to signify that menu should exit
-    def execute_option(selected)
-      return false if selected.empty?
+    def display_header
+      if @header
+        @header.call
+      else
+        logo = "  #{Dir.pwd.split('/').last.upcase}  ".invert.bold.to_s
+        puts "\n#{logo.align(:center)}\n \n"
+      end
+    end
 
-      selected = selected.to_i
+    def add_field(field, &block)
+      fields.add field, &block
+    end
 
-      items.each do |item|
-        next unless item.option_number == selected
+    def fields
+      @field_set ||= FieldSet.new
+    end
 
-        system 'clear' if clear_screen?
-        item.execute
-        return true
-      end
+    def display_fields
+      @field_set.display if @field_set
+    end
 
-      true
+    def add_badge(label = '', on: ' ON '.green_bg.bold, off: ' OFF '.red_bg.dark, &block)
+      badges.add label, on: on, off: off, &block
     end
 
-    # Apply word colorings
-    # @param [String] string
-    # @return [String]
-    def colorize(string)
-      return string unless Object.const_defined?("#{self.class.name}::HIGHLIGHTS")
+    def badges
+      @badge_set ||= BadgeSet.new
+    end
 
-      Object.const_get("#{self.class.name}::HIGHLIGHTS").each do |word, color|
-        case color
-        when Array
-          color.each { |c| string.gsub!(word, word.send(c)) }
-        else
-          string.gsub!(word, word.send(color))
-        end
-      end
-      string
+    def display_badges
+      @badge_set.display if @badge_set
     end
 
-    # Center each line of the logo across the screen
-    def formatted_logo
-      logo.split("\n")
-          .map { |line| line.align(:center) }
-          .join("\n")
+    def options
+      @options.merge!(yield) if block_given?
+      @options
     end
 
-    # Get the menu logo from the LOGO constant
-    def logo
-      return "\n#{"  #{Dir.pwd.split('/').last}  ".light_yellow_bg.black.bold}\n \n" unless Object.const_defined?("#{self.class.name}::LOGO")
+    def highlights
+      @highlights.merge!(yield) if block_given?
+      @highlights
+    end
 
-      Object.const_get("#{self.class.name}::LOGO")
+    def add_group(group)
+      groups << group
+      group
     end
 
-    protected
+    def add_item(item)
+      items << item
+      item
+    end
 
-    # @return [Symbol,Array[Symbol]] Color for group title
     def group_title_color
-      %i[yellow bold]
+      options[:group_title_color]
     end
 
-    # Clear screen before and after each command
     def clear_screen?
-      true
+      options[:clear_screen]
+    end
+
+    def pause_on_success?
+      options[:pause_on_success]
+    end
+
+    def colorize(text)
+      highlights.each do |word, color|
+        case color
+        when Array
+          color.each { |c| text.gsub!(word, word.send(c)) }
+        else
+          text.gsub!(word, word.send(color))
+        end
+      end
+      text
     end
   end
 end

data/lib/make_menu/menu_item.rb

@@ -5,9 +5,6 @@ module MakeMenu
   class MenuItem
     INDENT = 6
 
-    # @param [Integer] option_number Number user enters for this command
-    # @param [String] target Name of target defined in Makefile
-    # @param [String] description Text to display for this command, taken from Makefile comment
     def initialize(option_number = nil, target = nil, description = nil)
       @option_number = option_number
       @target = target
@@ -16,17 +13,16 @@ module MakeMenu
 
     attr_reader :option_number, :target, :description
 
-    # Run the make target
     def execute
       cmd = ['make', target]
       puts "> #{cmd.join(' ').cyan}\n"
       unless system(*cmd)
         # Indicates the command failed, so we pause to allow user to see error message
-        puts "\nPress ENTER key to continue....\n"
+        puts "\nPress ENTER to continue....".dark
         gets
       end
     rescue StandardError => _e
-      # ignore CTRL+C from within Make target
+      # Sink keyboard interrupt from within Make target
     end
 
     # @return [Integer] Number of characters required to display the item

data/lib/make_menu/text/column.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module MakeMenu
+  module Text
+    # A column of text with a fixed with
+    class Column
+      def initialize(width)
+        @width = width
+        @rows = []
+        @row_index = 0
+      end
+
+      attr_reader :width
+
+      attr_accessor :rows, :row_index
+
+      # 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|
+          row.gsub("\r", '')
+        end
+        self.row_index += text.lines.size
+      end
+
+      # @return [String] The row at the specified index
+      def row(index)
+        (rows[index] || '').align(width: width)
+      end
+
+      # @return [Integer] The number of rows in the column
+      def height
+        row_index
+      end
+
+      # @return [Boolean] True if the column is empty
+      def empty?
+        row_index.zero?
+      end
+    end
+  end
+end

data/lib/make_menu/text/table.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require_relative 'column'
+
+module MakeMenu
+  module Text
+    # This class displays the menu groups in columns across the screen.
+    # Each group is kept together in a column, and once a column has exceeded the
+    # calculated height, a new column is added.
+    class Table
+      MAX_COLUMNS = 4
+
+      # @param [Array<MenuItemGroup>] groups
+      def initialize(groups)
+        @groups = groups
+        @columns = []
+        calculate_table_dimensions
+        build_table
+      end
+
+      # @return [String] The entire table, centered on the screen
+      def to_s
+        buffer = ''
+
+        max_height.times do |i|
+          row = ''
+          columns.each do |column|
+            row += column.row(i) unless column.empty?
+          end
+          buffer += "#{row.align(:center)}\n"
+        end
+
+        buffer
+      end
+
+      private
+
+      attr_reader :groups, :columns, :column_width, :column_height
+
+      attr_accessor :current_column
+
+      # Calculate width and minimum height of columns
+      def calculate_table_dimensions
+        @column_width = groups.map(&:width).max + 5
+        total_rows = groups.map(&:height).sum
+        column_count = (::TTY::Screen.cols / column_width).clamp(1, MAX_COLUMNS)
+        @column_height = total_rows / column_count
+      end
+
+      # Build columns from groups
+      def build_table
+        column_break
+        groups.each do |group|
+          add_text_block group.to_s
+        end
+      end
+
+      # Add a block of text to the current column. If the column is now larger than
+      # the minimum height, a new column is added
+      def add_text_block(text)
+        current_column.add(text)
+        column_break if current_column.height >= column_height
+      end
+
+      # Add a new column to the table
+      def column_break
+        self.current_column = Column.new(column_width)
+        columns << current_column
+      end
+
+      # @return [Integer] Maximum column height (rows)
+      def max_height
+        columns.map(&:height).max
+      end
+    end
+  end
+end

data/lib/make_menu/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MakeMenu
-  VERSION = '0.1.1'
-end
+  VERSION = '1.1.0'
+end

data/lib/make_menu.rb

@@ -1,34 +1,16 @@
-require_relative 'make_menu/color_string'
+# frozen_string_literal: true
+
+require_relative 'make_menu/console/color_string'
 require_relative 'make_menu/menu'
 
 require 'tty-screen'
 
 module MakeMenu
-  String.include MakeMenu::ColorString
-
-  def self.run
-    # Allows CTRL+C to return to the menu instead of exiting the script
-    trap('SIGINT') { throw StandardError }
-
-    makefile = ENV.fetch('MAKEFILE', './Makefile')
+  String.include MakeMenu::Console::ColorString
 
-    if (menu_name = ENV.fetch('MENU', nil))
-      require "./#{menu_name.downcase}_menu.rb"
-      Object.const_get("#{menu_name.capitalize}Menu").new(makefile).run
-    else
-      MakeMenu::Menu.new(makefile).run
-    end
+  trap('SIGINT') { throw StandardError }
 
-  rescue LoadError, NameError => _e
-    puts
-    puts 'No customisation class found!'.red.bold
-    puts
-    puts 'Expected file:'
-    puts "    ./#{menu_name.downcase}_menu.rb".cyan
-    puts
-    puts 'To define class:'
-    puts "    #{menu_name.capitalize}Menu < MakeMenu::Menu".yellow
-    puts
-    exit 1
+  def self.run(makefile = './Makefile', &block)
+    MakeMenu::Menu.new(makefile).run(&block)
   end
-end
+end

data/make_menu.gemspec

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require File.expand_path('lib/make_menu/version', __dir__)
 
 Gem::Specification.new do |s|
-  s.name = "make_menu"
+  s.name = 'make_menu'
   s.version = MakeMenu::VERSION
-  s.summary = "Generates an interactive menu from a Makefile"
-  s.authors = ["Barri Mason"]
-  s.email = "loki@amarantha.net"
+  s.summary = 'Generates an interactive menu from a Makefile'
+  s.authors = ['Barri Mason']
+  s.email = 'loki@amarantha.net'
   s.files = Dir[
     'lib/**/*.rb',
     'make_menu.gemspec',
@@ -13,8 +15,8 @@ Gem::Specification.new do |s|
     'Gemfile.lock'
   ]
   s.homepage =
-    "https://github.com/MisterGrimalkin/make_menu"
-  s.license = "MIT"
+    'https://github.com/MisterGrimalkin/make_menu'
+  s.license = 'MIT'
   s.add_dependency 'tty-screen', '~> 0.8.2'
-  s.description = ""
-end
+  s.description = ''
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_menu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Barri Mason
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-screen
@@ -33,12 +33,16 @@ files:
 - Gemfile
 - Gemfile.lock
 - lib/make_menu.rb
-- lib/make_menu/color_string.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
-- lib/make_menu/text_column.rb
-- lib/make_menu/text_table.rb
+- lib/make_menu/text/column.rb
+- lib/make_menu/text/table.rb
 - lib/make_menu/version.rb
 - make_menu.gemspec
 homepage: https://github.com/MisterGrimalkin/make_menu

data/lib/make_menu/color_string.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-module MakeMenu
-  # Monkeypatch for `String`, adds methods to change console text colo(u)r
-  module ColorString
-    COLORS = {
-      white: 0,
-      normal: 0,
-      bold: 1,
-      dark: 2,
-      underline: 4,
-      blink: 5,
-      invert: 7,
-
-      black: 30,
-      red: 31,
-      green: 32,
-      yellow: 33,
-      blue: 34,
-      magenta: 35,
-      cyan: 36,
-      grey: 37,
-
-      black_bg: 40,
-      red_bg: 41,
-      green_bg: 42,
-      yellow_bg: 43,
-      blue_bg: 44,
-      magenta_bg: 45,
-      cyan_bg: 46,
-      grey_bg: 47,
-
-      dark_grey: 90,
-      light_red: 91,
-      light_green: 92,
-      light_yellow: 93,
-      light_blue: 94,
-      light_magenta: 95,
-      light_cyan: 96,
-      light_grey: 97,
-
-      dark_grey_bg: 100,
-      light_red_bg: 101,
-      light_green_bg: 102,
-      light_yellow_bg: 103,
-      light_blue_bg: 104,
-      light_magenta_bg: 105,
-      light_cyan_bg: 106,
-      light_grey_bg: 107
-    }.freeze
-
-    COLORS.each do |name, code|
-      define_method name do
-        color(code)
-      end
-    end
-
-    # Apply specified color code to the String
-    # @param [Array, Symbol, Integer] color_code Can be a key in the COLORS array,
-    #     an integer ANSI code for text color, or an array of either to be applied in order
-    # @return [String] String enclosed by formatting characters
-    def color(color_code)
-      case color_code
-      when Array
-        color_code.inject(self) { |string, code| string.color(code) }
-      when Symbol
-        color(COLORS[color_code])
-      else
-        "\e[#{color_code}m#{self}\e[0m"
-      end
-    end
-
-    # Changes all occurrences of a specified character to one color,
-    # and all other characters to another
-    # @param [String] char Character to highlight
-    # @param [Symbol] fore_color Key of color to use for highlighted character
-    # @param [Symbol] back_color Key of color to use for other characters
-    # @return [String] Highlighted text
-    # @example "==$$==".highlight('$', :light_yellow, :red)
-    # rubocop:disable Metrics/MethodLength
-    def highlight(char, fore_color, back_color)
-      inside_highlight = false
-      output = ''
-      buffer = ''
-      each_char do |c|
-        if c == char
-          unless inside_highlight
-            output += buffer.color(COLORS[back_color.to_sym])
-            buffer = ''
-            inside_highlight = true
-          end
-        elsif inside_highlight
-          output += buffer.color(COLORS[fore_color.to_sym]).bold
-          buffer = ''
-          inside_highlight = false
-        end
-        buffer += c
-      end
-
-      output += if inside_highlight
-                  buffer.color(COLORS[fore_color.to_sym]).bold
-                else
-                  buffer.color(COLORS[back_color.to_sym])
-                end
-
-      output
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    # Remove color codes from the string
-    # @return [String] The modified string
-    def decolor
-      gsub(/\e\[\d+m/, '')
-    end
-
-    # Align the string, ignoring color code characters which would otherwise mess up String#center, etc.
-    # @param [Symbol] alignment :left, :center, or :right
-    # @param [Integer] width The number of characters to spread the string over (default to terminal width)
-    # @param [String] char The character to use for padding
-    # @param [Boolean] pad_right Set true to include trailing spaces when aligning to :center
-    # @return [String] The padded string
-    # rubocop:disable Metrics/MethodLength
-    def align(alignment = :left, width: nil, char: ' ', pad_right: false)
-      width = ::TTY::Screen.cols unless width
-
-      case alignment
-      when :left
-        right_pad = width - decolor.length
-        "#{self}#{char * right_pad}"
-      when :center
-        left_pad = [(width - decolor.length) / 2, 0].max
-        right_pad = width - left_pad - decolor.length
-        "#{char * left_pad}#{self}#{pad_right ? char * right_pad : ''}"
-      when :right
-        left_pad = width - decolor.length
-        "#{char * left_pad}#{self}"
-      end
-    end
-    # rubocop:enable Metrics/MethodLength
-  end
-end

data/lib/make_menu/text_column.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module MakeMenu
-  # A column of text with a fixed with
-  class TextColumn
-    # @param [Integer] width Width of the column, in characters
-    def initialize(width)
-      @width = width
-      @rows = []
-      @row_index = 0
-    end
-
-    attr_reader :width
-
-    attr_accessor :rows, :row_index
-
-    # Add a block of text to the column. Each row will be padded to the column width
-    # @param [String] text The text to add, may be multi-line
-    def add(text)
-      self.rows += text.split("\n").map do |row|
-        row.gsub("\r", '')
-      end
-      self.row_index += text.lines.size
-    end
-
-    # Return the specified row of text
-    # @param [Integer] index The index of the row
-    # @return [String] The row at the specified index
-    def row(index)
-      (rows[index] || '').align(width: width)
-    end
-
-    # @return [Integer] The number of rows in the column
-    def height
-      row_index
-    end
-
-    # @return [Boolean] True if the column is empty
-    def empty?
-      row_index.zero?
-    end
-  end
-end

data/lib/make_menu/text_table.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'text_column'
-
-module MakeMenu
-  # This class displays the menu groups in columns across the screen.
-  # Each group is kept together in a column, and once a column has exceeded the
-  # calculated height a new column is added.
-  class TextTable
-    MAX_COLUMNS = 4
-
-    # @param [Array<MenuItemGroup>] groups
-    def initialize(groups)
-      @groups = groups
-      @columns = []
-      calculate_table_dimensions
-      build_table
-    end
-
-    # @return [String] The entire table, centered on the screen
-    def to_s
-      buffer = ''
-
-      max_height.times do |i|
-        row = ''
-        columns.each do |column|
-          row += column.row(i) unless column.empty?
-        end
-        buffer += "#{row.align(:center)}\n"
-      end
-
-      buffer
-    end
-
-    private
-
-    attr_reader :groups, :columns, :column_width, :column_height
-
-    attr_accessor :current_column
-
-    # Calculate width and minimum height of columns
-    def calculate_table_dimensions
-      @column_width = groups.map(&:width).max + 5
-      total_rows = groups.map(&:height).sum
-      column_count = (::TTY::Screen.cols / column_width).clamp(1, MAX_COLUMNS)
-      @column_height = total_rows / column_count
-    end
-
-    # Build columns from groups
-    def build_table
-      column_break
-      groups.each do |group|
-        add_text_block group.to_s
-      end
-    end
-
-    # Add a block of text to the current column. If the column is now larger than
-    # the minimum height, a new column is added
-    def add_text_block(text)
-      current_column.add(text)
-      column_break if current_column.height >= column_height
-    end
-
-    # Add a new column to the table
-    def column_break
-      self.current_column = TextColumn.new(column_width)
-      columns << current_column
-    end
-
-    # @return [Integer] Maximum column height (rows)
-    def max_height
-      columns.map(&:height).max
-    end
-  end
-end