markdown_exec 2.0.4 → 2.0.6

data/lib/input_sequencer.rb

@@ -19,7 +19,12 @@ class InputSequencer
     @document_filename = document_filename
     @current_block = nil
     @block_queue = initial_blocks
-    @debug = Env::env_bool('INPUT_SEQUENCER_DEBUG', default: false) ### false e
+    @debug = Env.env_bool('INPUT_SEQUENCER_DEBUG', default: false)
+  # rubocop:disable Style/RescueStandardError
+  rescue
+    pp $!, $@
+    exit 1
+    # rubocop:enable Style/RescueStandardError
   end
 
   # Merges the current menu state with the next, prioritizing the next state's values.
@@ -33,9 +38,11 @@ class InputSequencer
       inherited_lines: next_state.inherited_lines,
       prior_block_was_link: next_state.prior_block_was_link.nil? ? current.prior_block_was_link : next_state.prior_block_was_link
     )
+  # rubocop:disable Style/RescueStandardError
   rescue
     pp $!, $@
     exit 1
+    # rubocop:enable Style/RescueStandardError
   end
 
   # Generates the next menu state based on provided attributes.
@@ -52,6 +59,11 @@ class InputSequencer
   # Orchestrates the flow of menu states and user interactions.
   def run_yield(sym, *args, &block)
     block.call sym, *args
+  # rubocop:disable Style/RescueStandardError
+  rescue
+    pp $!, $@
+    exit 1
+    # rubocop:enable Style/RescueStandardError
   end
 
   def bq_is_empty?
@@ -69,7 +81,6 @@ class InputSequencer
     loop do
       break if run_yield(:parse_document, now_menu.document_filename, &block) == :break
 
-      pp [__LINE__, 'exit_when_bq_empty', exit_when_bq_empty, '@block_queue', @block_queue, 'now_menu', now_menu] if @debug
       # self.imw_ins now_menu, 'now_menu'
 
       break if exit_when_bq_empty && bq_is_empty? && !now_menu.prior_block_was_link
@@ -80,15 +91,11 @@ class InputSequencer
 
         choice = run_yield :user_choice, &block
 
-        if choice.nil?
-          raise "Block not recognized."
-          break
-        end
+        raise 'Block not recognized.' if choice.nil?
         break if run_yield(:exit?, choice&.downcase, &block) # Exit loop and method to terminate the app
 
         next_state = run_yield :execute_block, choice, &block
         # imw_ins next_state, 'next_state'
-        pp [__LINE__, 'next_state', next_state] if @debug
         return :break if next_state == :break
 
         next_menu = next_state
@@ -102,7 +109,6 @@ class InputSequencer
           block_name = @block_queue.shift
         end
         # self.imw_ins block_name, 'block_name'
-        pp [__LINE__, 'block_name', block_name] if @debug
 
         next_menu = if block_name == '.'
                       exit_when_bq_empty = false
@@ -112,15 +118,16 @@ class InputSequencer
                       state.display_menu = bq_is_empty?
                       state
                     end
-        pp [__LINE__, 'next_menu', next_menu] if @debug
         next_menu
         # imw_ins next_menu, 'next_menu'
       end
       now_menu = InputSequencer.merge_link_state(now_menu, next_menu)
     end
+  # rubocop:disable Style/RescueStandardError
   rescue
     pp $!, $@
     exit 1
+    # rubocop:enable Style/RescueStandardError
   end
 end
 

data/lib/markdown_exec/version.rb

@@ -7,5 +7,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '2.0.4'
+  VERSION = '2.0.6'
 end

data/lib/markdown_exec.rb

@@ -9,6 +9,7 @@ require 'fileutils'
 require 'open3'
 require 'optparse'
 require 'shellwords'
+require 'time'
 require 'tmpdir'
 require 'tty-prompt'
 require 'yaml'
@@ -17,6 +18,7 @@ require_relative 'ansi_formatter'
 require_relative 'block_label'
 require_relative 'cached_nested_file_reader'
 require_relative 'cli'
+require_relative 'color_scheme'
 require_relative 'colorize'
 require_relative 'directory_searcher'
 require_relative 'env'
@@ -103,6 +105,81 @@ end
 module MarkdownExec
   include Exceptions
 
+  class FileInMenu
+    # Prepends the age of the file in days to the file name for display in a menu.
+    # @param filename [String] the name of the file
+    # @return [String] modified file name with age prepended
+    def self.for_menu(filename)
+      file_age = (Time.now - File.mtime(filename)) / (60 * 60 * 24 * 30)
+      filename = ColorScheme.colorize_path(filename)
+
+      "  #{Histogram.display(file_age, 0, 11, 12, inverse: false)}: #{filename}"
+    end
+
+    # Removes the age from the string to retrieve the original file name.
+    # @param filename_with_age [String] the modified file name with age
+    # @return [String] the original file name
+    def self.from_menu(dname)
+      filename_with_age = dname.gsub(/\033\[[\d;]+m|\033\[0m/, '')
+      filename_with_age.split(': ', 2).last
+    end
+  end
+
+  # A class that generates a histogram bar in terminal using xterm-256 color codes.
+  class Histogram
+    # Generates and prints a histogram bar for a given value within a specified range and width, with an option for inverse display.
+    # @param integer_value [Integer] the value to represent in the histogram
+    # @param min [Integer] the minimum value of the range
+    # @param max [Integer] the maximum value of the range
+    # @param width [Integer] the total width of the histogram in characters
+    # @param inverse [Boolean] whether the histogram is displayed in inverse order (right to left)
+    def self.display(integer_value, min, max, width, inverse: false)
+      return if max <= min # Ensure the range is valid
+
+      # Normalize the value within the range 0 to 1
+      normalized_value = [0, [(integer_value - min).to_f / (max - min), 1].min].max
+
+      # Calculate how many characters should be filled
+      filled_length = (normalized_value * width).round
+
+      # # Generate the histogram bar using xterm-256 colors (color code 42 is green)
+      # filled_bar = "\e[48;5;42m" + ' ' * filled_length + "\e[0m"
+      filled_bar = ('¤' * filled_length).fg_rgbh_AF_AF_00
+      empty_bar = ' ' * (width - filled_length)
+
+      # Determine the order of filled and empty parts based on the inverse flag
+      inverse ? (empty_bar + filled_bar) : (filled_bar + empty_bar)
+    end
+  end
+
+  class MenuBuilder
+    def initialize
+      @chrome_color = :cyan
+      @o_color = :red
+    end
+
+    def build_menu(file_names, directory_names, found_in_block_names, files_in_directories, vbn)
+      choices = []
+
+      # Adding section title and data for file names
+      choices << { disabled: '', name: "in #{file_names[:section_title]}".send(@chrome_color) }
+      choices += file_names[:data].map { |str| FileInMenu.for_menu(str) }
+
+      # Conditionally add directory names if data is present
+      unless directory_names[:data].count.zero?
+        choices << { disabled: '', name: "in #{directory_names[:section_title]}".send(@chrome_color) }
+        choices += files_in_directories
+      end
+
+      # Adding found in block names
+      choices << { disabled: '', name: "in #{found_in_block_names[:section_title]}".send(@chrome_color) }
+
+      choices += vbn
+
+      choices
+    end
+  end
+
   class SearchResultsReport < DirectorySearcher
     def directory_names(search_options, highlight_value)
       matched_directories = find_directory_names
@@ -113,20 +190,24 @@ module MarkdownExec
       }
     end
 
-    def file_contents(search_options, highlight_value)
-      matched_contents = find_file_contents.map.with_index do |(file, contents), index|
-        [file, contents.map { |detail| format('=%4.d: %s', detail.index, detail.line) }, index]
+    def found_in_block_names(search_options, highlight_value, formspec: '=%<index>4.d: %<line>s')
+      matched_contents = (find_file_contents do |line|
+                            read_block_name(line, search_options[:fenced_start_and_end_regex], search_options[:block_name_match], search_options[:block_name_nick_match])
+                          end).map.with_index do |(file, contents), index|
+        # [file, contents.map { |detail| format(formspec, detail.index, detail.line) }, index]
+        [file, contents.map { |detail| format(formspec, { index: detail.index, line: detail.line }) }, index]
       end
       {
-        section_title: 'file contents',
+        section_title: 'block names',
         data: matched_contents.map(&:first),
         formatted_text: matched_contents.map do |(file, details, index)|
-                { header: format('- %3.d: %s', index + 1, file),
-                  content: AnsiFormatter.new(search_options).format_and_highlight_array(
-                    details,
-                    highlight: [highlight_value]
-                  ) }
-              end
+                          { header: format('- %3.d: %s', index + 1, file),
+                            content: AnsiFormatter.new(search_options).format_and_highlight_array(
+                              details,
+                              highlight: [highlight_value]
+                            ) }
+                        end,
+        matched_contents: matched_contents
       }
     end
 
@@ -140,6 +221,21 @@ module MarkdownExec
         ).join("\n") }]
       }
     end
+
+    def read_block_name(line, fenced_start_and_end_regex, block_name_match, block_name_nick_match)
+      return unless line.match(fenced_start_and_end_regex)
+
+      bm = extract_named_captures_from_option(line, block_name_match)
+      return if bm.nil?
+
+      name = bm[:title]
+
+      if block_name_nick_match.present? && line =~ Regexp.new(block_name_nick_match)
+        $~[0]
+      else
+        bm && bm[1] ? bm[:title] : name
+      end
+    end
   end
 
   ##
@@ -248,7 +344,14 @@ module MarkdownExec
     # Reports and executes block logic
     def execute_block_logic(files)
       @options[:filename] = select_document_if_multiple(files)
-      @options.document_menu_loop
+      @options.document_inpseq
+    rescue StandardError
+      error_handler('execute_block_logic')
+    # rubocop:disable Style/RescueStandardError
+    rescue
+      pp $!, $@
+      exit 1
+      # rubocop:enable Style/RescueStandardError
     end
 
     ## Executes the block specified in the options
@@ -353,16 +456,17 @@ module MarkdownExec
                                                                   :menu_chrome_color)}"
       searcher = SearchResultsReport.new(value, [find_path])
       file_names = searcher.file_names(options, value)
-      file_contents = searcher.file_contents(options, value)
+      found_in_block_names = searcher.found_in_block_names(options, value, formspec: '%<line>s')
       directory_names = searcher.directory_names(options, value)
 
       ### search in file contents (block names, chrome, or text)
-      [file_contents,
+      [found_in_block_names,
        directory_names,
        file_names].each do |data|
-        @fout.fout "In #{data[:section_title]}" if data[:section_title]
+        next if data[:data].count.zero?
         next unless data[:formatted_text]
 
+        @fout.fout "In #{data[:section_title]}" if data[:section_title]
         data[:formatted_text].each do |fi|
           @fout.fout fi[:header] if fi[:header]
           @fout.fout fi[:content] if fi[:content]
@@ -372,17 +476,29 @@ module MarkdownExec
 
       ## pick a document to open
       #
-      files = directory_names[:data].map do |dn|
+      files_in_directories = directory_names[:data].map do |dn|
         find_files('*', [dn], exclude_dirs: true)
-      end.flatten(1)
-      choices = \
-       [{ disabled: '', name: "in #{file_names[:section_title]}".cyan }] \
-       + file_names[:data] \
-       + [{ disabled: '', name: "in #{directory_names[:section_title]}".cyan }] \
-       + files \
-       + [{ disabled: '', name: "in #{file_contents[:section_title]}".cyan }] \
-       + file_contents[:data]
-      @options[:filename] = select_document_if_multiple(choices)
+      end.flatten(1).map { |str| FileInMenu.for_menu(str) }
+
+      return { exit: true } unless file_names[:data]&.count.positive? || files_in_directories&.count.positive? || found_in_block_names[:data]&.count.positive?
+
+      vbn = found_in_block_names[:matched_contents].map do |matched_contents|
+        filename, details, = matched_contents
+        nexo = AnsiFormatter.new(@options).format_and_highlight_array(
+          details,
+          highlight: [value]
+        )
+        [FileInMenu.for_menu(filename)] + nexo.map { |str| { disabled: '', name: (' ' * 20) + str } }
+      end.flatten
+
+      choices = MenuBuilder.new.build_menu(file_names, directory_names, found_in_block_names, files_in_directories, vbn)
+
+      @options[:filename] = FileInMenu.from_menu(
+        select_document_if_multiple(
+          choices,
+          prompt: options[:prompt_select_md].to_s + ' ¤ Age in months'.fg_rgbh_AF_AF_00
+        )
+      )
       { exit: false }
     end
 
@@ -400,7 +516,7 @@ module MarkdownExec
         opts.banner = [
           "#{MarkdownExec::APP_NAME}" \
           " - #{MarkdownExec::APP_DESC} (#{MarkdownExec::VERSION})",
-          "Usage: #{executable_name} [(path | filename [block_name])] [options]"
+          "Usage: #{executable_name} [(directory | file [block_name] | search_keyword)] [options]"
         ].join("\n")
 
         menu_iter do |item|
@@ -447,7 +563,7 @@ module MarkdownExec
         }
       when 'show_config'
         ->(_) {
-          finalize_cli_argument_processing(options)
+          finalize_cli_argument_processing([])
           @fout.fout options.sort_by_key.to_yaml
         }
       when 'val_as_bool'
@@ -604,7 +720,7 @@ module MarkdownExec
 
       saved_name_split filename
       @options[:save_executed_script] = false
-      @options.document_menu_loop
+      @options.document_inpseq
     rescue StandardError
       error_handler('run_last_script')
     end
@@ -618,13 +734,13 @@ module MarkdownExec
                                            @options[:saved_filename_replacement])
     end
 
-    def select_document_if_multiple(files = list_markdown_files_in_path)
+    def select_document_if_multiple(files = list_markdown_files_in_path, prompt: options[:prompt_select_md].to_s)
       return files[0] if (count = files.count) == 1
 
       return unless count >= 2
 
       opts = options.dup
-      select_option_or_exit(HashDelegator.new(@options).string_send_color(opts[:prompt_select_md].to_s, :prompt_color_after_script_execution),
+      select_option_or_exit(HashDelegator.new(@options).string_send_color(prompt, :prompt_color_after_script_execution),
                             files,
                             opts.merge(per_page: opts[:select_page_height]))
     end
@@ -633,7 +749,6 @@ module MarkdownExec
     def select_option_or_exit(prompt_text, strings, opts = {})
       result = @options.select_option_with_metadata(prompt_text, strings,
                                                     opts)
-      ### 2024-04-20 what for?
       # return unless result.fetch(:option, nil)
 
       result[:selected]
@@ -670,7 +785,7 @@ module MarkdownExec
 
       saved_name_split(filename)
 
-      @options.document_menu_loop ### ({ save_executed_script: false })
+      @options.document_inpseq ### ({ save_executed_script: false })
     end
 
     public

data/lib/menu.src.yml

@@ -106,28 +106,38 @@
   :opt_name: display_level_xbase_prefix
   :procname: val_as_str
 
-# - :default: "(document_link)"
-#   :description: Name of Link block to load with the document
-#   :env_var: MDE_DOCUMENT_LOAD_LINK_BLOCK_NAME
-#   :opt_name: document_load_link_block_name
-#   :procname: val_as_str
-
 - :default: "(document_options)"
   :description: Name of Opts block to load with the document
   :env_var: MDE_DOCUMENT_LOAD_OPTS_BLOCK_NAME
   :opt_name: document_load_opts_block_name
   :procname: val_as_str
 
+- :arg_name: GLOB
+  :default: "document_configurations/%{document_filename}_*.sh"
+  :description: Glob for saved lines for a document
+  :env_var: MDE_DOCUMENT_SAVED_LINES_GLOB
+  :opt_name: document_saved_lines_glob
+  :procname: val_as_str
+
+- :arg_name: BOOL
+  :default: true
+  :description: Add menu options for saved lines
+  :env_var: MDE_MENU_FOR_SAVED_LINES
+  :opt_name: menu_for_saved_lines
+  :procname: val_as_bool
+
 - :arg_name: BOOL
   :default: false
   :description: Dump @delegate_object
-  :long_name: dump-dump-delegate-object
+  :env_var: MDE_DUMP_DELEGATE_OBJECT
+  :long_name: dump-delegate-object
   :opt_name: dump_delegate_object
   :procname: val_as_bool
 
 - :arg_name: BOOL
   :default: false
   :description: Dump BlocksInFile (stage 1)
+  :env_var: MDE_DUMP_BLOCKS_IN_FILE
   :long_name: dump-blocks-in-file
   :opt_name: dump_blocks_in_file
   :procname: val_as_bool
@@ -135,27 +145,31 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited block_names
-  :long_name: dump-dump-inherited-block_names
+  :env_var: MDE_DUMP_INHERITED_BLOCK_NAMES
+  :long_name: dump-inherited-block_names
   :opt_name: dump_inherited_block_names
   :procname: val_as_bool
 
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited dependencies
-  :long_name: dump-dump-inherited-dependencies
+  :env_var: MDE_DUMP_INHERITED_DEPENDENCIES
+  :long_name: dump-inherited-dependencies
   :opt_name: dump_inherited_dependencies
   :procname: val_as_bool
 
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited lines
-  :long_name: dump-dump-inherited-lines
+  :env_var: MDE_DUMP_INHERITED_LINES
+  :long_name: dump-inherited-lines
   :opt_name: dump_inherited_lines
   :procname: val_as_bool
 
 - :arg_name: BOOL
   :default: false
   :description: Dump MenuBlocks (stage 2)
+  :env_var: MDE_DUMP_MENU_BLOCKS
   :long_name: dump-menu-blocks
   :opt_name: dump_menu_blocks
   :procname: val_as_bool
@@ -163,6 +177,7 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump selected block
+  :env_var: MDE_DUMP_SELECTED_BLOCK
   :long_name: dump-selected-block
   :opt_name: dump_selected_block
   :procname: val_as_bool
@@ -212,8 +227,6 @@
   :opt_name: exclude_expect_blocks
   :procname: val_as_bool
 
-# - :default: >
-#   osascript scripts/applescript/mde.applescript "%{batch_index}" "%{home}" " %{started_at} - %{document_filename} - %{block_name} " "%{script_filespec}" "%{output_filespec}"
 - :default: >
     osascript -e '
       on run argv
@@ -285,7 +298,7 @@
   :opt_name: fenced_start_and_end_regex
   :procname: val_as_str
 
-- :default: "^(?<indent> *)`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*) *$"
+- :default: "^(?<indent> *)`{3,}(?<shell>[^`\\s]*) *(:(?<name>[^\\s]*))? *(?<rest>.*) *$"
   :description: Match the start of a fenced block
   :env_var: MDE_FENCED_START_EXTENDED_REGEX
   :opt_name: fenced_start_extended_regex
@@ -407,6 +420,14 @@
   :opt_name: list_recent_scripts
   :procname: val_as_bool
 
+- :arg_name: PATH
+  :default: ''
+  :description: Load code
+  :env_var: MDE_LOAD_CODE
+  :long_name: load-code
+  :opt_name: load_code
+  :procname: val_as_str
+
 - :arg_name: PREFIX
   :default: mde
   :description: Name prefix for stdout files
@@ -494,6 +515,13 @@
   :opt_name: menu_exit_at_top
   :procname: val_as_bool
 
+- :arg_name: BOOL
+  :default: false
+  :description: Display Load option at top of menu (vs bottom)
+  :env_var: MDE_MENU_LOAD_AT_TOP
+  :opt_name: menu_load_at_top
+  :procname: val_as_bool
+
 - :default:
     :line: "~~~"
   :description: closing demarcations for menu
@@ -622,6 +650,13 @@
   :opt_name: menu_option_back_name
   :procname: val_as_str
 
+- :default:
+    :line: "* Edit"
+  :description: Text for Edit option
+  :env_var: MDE_MENU_OPTION_EDIT_NAME
+  :opt_name: menu_option_edit_name
+  :procname: val_as_str
+
 - :default:
     :line: "* Exit"
   :description: Text for Exit option
@@ -629,6 +664,27 @@
   :opt_name: menu_option_exit_name
   :procname: val_as_str
 
+- :default:
+    :line: "* Load"
+  :description: Text for Load option
+  :env_var: MDE_MENU_OPTION_LOAD_NAME
+  :opt_name: menu_option_load_name
+  :procname: val_as_str
+
+- :default:
+    :line: "* Save"
+  :description: Text for Save option
+  :env_var: MDE_MENU_OPTION_SAVE_NAME
+  :opt_name: menu_option_save_name
+  :procname: val_as_str
+
+- :default:
+    :line: "* View"
+  :description: Text for View option
+  :env_var: MDE_MENU_OPTION_VIEW_NAME
+  :opt_name: menu_option_view_name
+  :procname: val_as_str
+
 - :default: fg_rgbh_ff_00_ff
   :description: Color of menu opts
   :env_var: MDE_MENU_OPTS_COLOR
@@ -710,7 +766,7 @@
   :procname: val_as_bool
 
 - :arg_name: BOOL
-  :default: true
+  :default: false
   :description: Display inherited lines in menu
   :env_var: MDE_MENU_WITH_INHERITED_LINES
   :opt_name: menu_with_inherited_lines
@@ -758,7 +814,6 @@
   :default: false
   :description: Display summary for execution
   :env_var: MDE_OUTPUT_EXECUTION_SUMMARY
-  :long_name: output-execution-summary
   :opt_name: output_execution_summary
   :procname: val_as_bool
 
@@ -860,6 +915,12 @@
   :opt_name: prompt_exit
   :procname: val_as_str
 
+- :default: Back
+  :description: Quit prompt
+  :env_var: MDE_PROMPT_FILESPEC_OTHER
+  :opt_name: prompt_filespec_back
+  :procname: val_as_str
+
 - :default: Other
   :description: Prompt for a custom file name
   :env_var: MDE_PROMPT_FILESPEC_OTHER
@@ -946,7 +1007,6 @@
   :default: false
   :description: Wheter to save an executed script`
   :env_var: MDE_SAVE_EXECUTED_SCRIPT
-  :long_name: save-executed-script
   :opt_name: save_executed_script
   :procname: val_as_bool
 
@@ -954,7 +1014,6 @@
   :default: false
   :description: Save standard output of the executed script
   :env_var: MDE_SAVE_EXECUTION_OUTPUT
-  :long_name: save-execution-output
   :opt_name: save_execution_output
   :procname: val_as_bool
 
@@ -988,7 +1047,6 @@
   :default: logs
   :description: Folder where saved scripts are stored
   :env_var: MDE_SAVED_SCRIPT_FOLDER
-  :long_name: saved-script-folder
   :opt_name: saved_script_folder
   :procname: val_as_str
 
@@ -1003,7 +1061,6 @@
   :default: logs
   :description: Saved stdout folder
   :env_var: MDE_SAVED_STDOUT_FOLDER
-  :long_name: saved-stdout-folder
   :opt_name: saved_stdout_folder
   :procname: val_as_str