markdown_exec 2.0.5 → 2.0.7

data/lib/input_sequencer.rb

@@ -20,6 +20,11 @@ class InputSequencer
     @current_block = nil
     @block_queue = initial_blocks
     @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.
@@ -54,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?
@@ -81,10 +91,7 @@ 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

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.5'
+  VERSION = '2.0.7'
 end

data/lib/markdown_exec.rb

@@ -18,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'
@@ -110,6 +111,7 @@ module MarkdownExec
     # @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
@@ -117,7 +119,8 @@ module MarkdownExec
     # 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(filename_with_age)
+    def self.from_menu(dname)
+      filename_with_age = dname.gsub(/\033\[[\d;]+m|\033\[0m/, '')
       filename_with_age.split(': ', 2).last
     end
   end
@@ -341,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
@@ -506,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|
@@ -553,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'
@@ -710,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
@@ -776,7 +786,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/mdoc.rb

@@ -72,11 +72,10 @@ module MarkdownExec
     #
     def collect_block_dependencies(anyname:)
       name_block = get_block_by_anyname(anyname)
-      if name_block.nil? || name_block.keys.empty?
-        raise "Named code block `#{anyname}` not found. (@#{__LINE__})"
-      end
+      raise "Named code block `#{anyname}` not found. (@#{__LINE__})" if name_block.nil? || name_block.keys.empty?
+
+      nickname = name_block.pub_name
 
-      nickname = name_block[:nickname] || name_block[:oname]
       dependencies = collect_dependencies(nickname)
       # &bc 'dependencies.count:',dependencies.count
       all_dependency_names = collect_unique_names(dependencies).push(nickname).uniq
@@ -85,9 +84,7 @@ module MarkdownExec
       # select non-chrome blocks in order of appearance in source documents
       #
       blocks = @table.select do |fcb|
-        !fcb.fetch(:chrome,
-                   false) && all_dependency_names.include?(fcb.fetch(:nickname,
-                                                                     nil) || fcb.fetch(:oname))
+        !fcb.fetch(:chrome, false) && all_dependency_names.include?(fcb.pub_name)
       end
       # &bc 'blocks.count:',blocks.count
 
@@ -95,7 +92,7 @@ module MarkdownExec
       #
       unmet_dependencies = all_dependency_names.dup
       blocks = blocks.map do |fcb|
-        unmet_dependencies.delete(fcb[:nickname] || fcb[:oname]) # may not exist if block name is duplicated
+        unmet_dependencies.delete(fcb.pub_name) # may not exist if block name is duplicated
         if (call = fcb[:call])
           [get_block_by_anyname("[#{call.match(/^%\((\S+) |\)/)[1]}]")
             .merge({ cann: call })]
@@ -124,7 +121,7 @@ module MarkdownExec
         # &bc 'blocks.count:',blocks.count
 
         block_search.merge(
-          { block_names: blocks.map { |block| block[:nickname] || block[:oname] },
+          { block_names: blocks.map(&:pub_name),
             code: blocks.map do |fcb|
               if fcb[:cann]
                 collect_block_code_cann(fcb)
@@ -136,7 +133,7 @@ module MarkdownExec
               elsif fcb[:shell] == BlockType::PORT
                 collect_block_code_shell(fcb)
               elsif label_body
-                block_name_for_bash_comment = (fcb[:nickname] || fcb[:oname]).gsub(/\s+/, '_')
+                block_name_for_bash_comment = fcb.pub_name.gsub(/\s+/, '_')
                 [label_format_above && format(label_format_above,
                                               block_source.merge({ block_name: block_name_for_bash_comment }))] +
                  fcb[:body] +
@@ -198,7 +195,7 @@ module MarkdownExec
 
       ### hide rows correctly
 
-      if !options[:menu_include_imported_blocks]
+      unless options[:menu_include_imported_blocks]
         selrows = selrows.reject do |block|
           block.fetch(:depth, 0).positive?
         end
@@ -287,9 +284,7 @@ module MarkdownExec
       return memo if memo.keys.include? source
 
       block = get_block_by_anyname(source)
-      if block.nil? || block.keys.empty?
-        raise "Named code block `#{source}` not found. (@#{__LINE__})"
-      end
+      raise "Named code block `#{source}` not found. (@#{__LINE__})" if block.nil? || block.keys.empty?
 
       memo[source] = block[:reqs]
       return memo unless memo[source]&.count&.positive?

data/lib/menu.src.yml

@@ -118,16 +118,32 @@
   :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 +151,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 +183,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
@@ -285,7 +306,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
@@ -315,17 +336,17 @@
   :opt_name: find_path
   :procname: val_as_str
 
-- :default: "^# *(?<line>[^#]*?) *$"
+- :default: "^#(?<line>(?!#)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :env_var: MDE_HEADING1_MATCH
   :opt_name: heading1_match
   :procname: val_as_str
 
-- :default: "^## *(?<line>[^#]*?) *$"
+- :default: "^##(?<line>(?!#)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :env_var: MDE_HEADING2_MATCH
   :opt_name: heading2_match
   :procname: val_as_str
 
-- :default: "^### *(?<line>.+?) *$"
+- :default: "^###(?<line>(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :env_var: MDE_HEADING3_MATCH
   :opt_name: heading3_match
   :procname: val_as_str
@@ -407,6 +428,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
@@ -475,7 +504,7 @@
   :opt_name: menu_divider_format
   :procname: val_as_str
 
-- :default: "^::: +(?<line>.+?)$"
+- :default: "^:::(?<line>(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :description: Pattern for topics/dividers in block selection menu
   :env_var: MDE_MENU_DIVIDER_MATCH
   :opt_name: menu_divider_match
@@ -494,6 +523,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
@@ -501,37 +537,40 @@
   :opt_name: menu_final_divider
   :procname: val_as_str
 
-- :default: fg_rgbh_80_80_c0
+- :default: fg_bg_rgbh_80_80_c0_10_10_20
   :description: Color for heading 1 in menu
   :env_var: MDE_MENU_HEADING1_COLOR
   :opt_name: menu_heading1_color
   :procname: val_as_str
 
-- :default: "# %{line}"
+# strip heading tag
+- :default: "%{line}"
   :description: format for menu heading1 in menu
   :env_var: MDE_MENU_HEADING1_FORMAT
   :opt_name: menu_heading1_format
   :procname: val_as_str
 
-- :default: fg_rgbh_60_60_c0
+- :default: fg_bg_rgbh_60_60_c0_10_10_20
   :description: Color for heading 2 in menu
   :env_var: MDE_MENU_HEADING2_COLOR
   :opt_name: menu_heading2_color
   :procname: val_as_str
 
-- :default: "## %{line}"
+# strip heading tag
+- :default: "%{line}"
   :description: format for menu heading2 in menu
   :env_var: MDE_MENU_HEADING2_FORMAT
   :opt_name: menu_heading2_format
   :procname: val_as_str
 
-- :default: fg_rgbh_40_40_c0
+- :default: fg_bg_rgbh_40_40_c0_10_10_20
   :description: Color for heading 3 in menu
   :env_var: MDE_MENU_HEADING3_COLOR
   :opt_name: menu_heading3_color
   :procname: val_as_str
 
-- :default: "### %{line}"
+# strip heading tag
+- :default: "%{line}"
   :description: format for menu heading3 in menu
   :env_var: MDE_MENU_HEADING3_FORMAT
   :opt_name: menu_heading3_format
@@ -596,7 +635,7 @@
   :opt_name: menu_link_format
   :procname: val_as_str
 
-- :default: fg_rgbh_b0_b0_b0
+- :default: fg_rgbh_c0_c0_c0
   :description: Color of menu note
   :env_var: MDE_MENU_NOTE_COLOR
   :opt_name: menu_note_color
@@ -609,7 +648,7 @@
   :procname: val_as_str
 
 ## all lines that do not start with "/ " are notes
-- :default: "^(?<line>(?!/ ).*)?$"
+- :default: "^(?<line>(?!/ )(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :description: Pattern for notes in block selection menu
   :env_var: MDE_MENU_NOTE_MATCH
   :opt_name: menu_note_match
@@ -622,6 +661,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 +675,34 @@
   :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: "! Shell"
+  :description: Text for Shell option
+  :env_var: MDE_MENU_OPTION_SHELL_NAME
+  :opt_name: menu_option_shell_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,12 +784,19 @@
   :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
   :procname: val_as_bool
 
+- :arg_name: BOOL
+  :default: true
+  :description: Display Shell option in menu
+  :env_var: MDE_MENU_WITH_SHELL
+  :opt_name: menu_with_shell
+  :procname: val_as_bool
+
 - :arg_name: BOOL
   :default: false
   :description: Hide decorative menu entries
@@ -758,7 +839,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
 
@@ -819,7 +899,7 @@
 
 - :arg_name: BOOL
   :default: false
-  :description: Wheter to pause after manually executing a block and the next menu
+  :description: Whether to pause after manually executing a block and the next menu
   :env_var: MDE_PAUSE_AFTER_SCRIPT_EXECUTION
   :opt_name: pause_after_script_execution
   :procname: val_as_bool
@@ -860,6 +940,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 +1032,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 +1039,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 +1072,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 +1086,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