markdown_exec 2.0.5 → 2.0.6

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.6'
 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
@@ -739,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]
@@ -776,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
 

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (2.0.5)
+# MDE - Markdown Executor (2.0.6)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -94,45 +94,64 @@
   :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
 - :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
 - :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
@@ -239,7 +258,7 @@
   :env_var: MDE_FENCED_START_AND_END_REGEX
   :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
@@ -341,6 +360,13 @@
   :long_name: list-recent-scripts
   :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
@@ -415,6 +441,12 @@
   :env_var: MDE_MENU_EXIT_AT_TOP
   :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
@@ -521,12 +553,36 @@
   :env_var: MDE_MENU_OPTION_BACK_NAME
   :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
   :env_var: MDE_MENU_OPTION_EXIT_NAME
   :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
@@ -595,7 +651,7 @@
   :opt_name: menu_with_exit
   :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
@@ -636,7 +692,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
 - :default: "%{name}: %{value}"
@@ -728,6 +783,11 @@
   :env_var: MDE_PROMPT_EXIT
   :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
@@ -809,14 +869,12 @@
   :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
 - :arg_name: BOOL
   :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
 - :default: "/"
@@ -845,7 +903,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
 - :arg_name: GLOB
@@ -858,7 +915,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
 - :arg_name: GLOB

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -113,6 +113,7 @@ files:
 - bin/setup
 - bin/tab_completion.sh
 - bin/tab_completion.sh.erb
+- examples/block_names.md
 - examples/colors.md
 - examples/document_options.md
 - examples/duplicate_block.md
@@ -125,9 +126,11 @@ files:
 - examples/linked1.md
 - examples/linked2.md
 - examples/linked3.md
+- examples/linked_show.md
 - examples/llm.md
 - examples/load1.sh
 - examples/load2.sh
+- examples/load_code.md
 - examples/nickname.md
 - examples/opts.md
 - examples/pass-through.md
@@ -144,6 +147,7 @@ files:
 - lib/cached_nested_file_reader.rb
 - lib/ce_get_cost_and_usage.rb
 - lib/cli.rb
+- lib/color_scheme.rb
 - lib/colorize.rb
 - lib/constants.rb
 - lib/directory_searcher.rb