markdown_exec 2.0.5 → 2.0.7

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (2.0.5)
+# MDE - Markdown Executor (2.0.7)
 ---
 - :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
@@ -266,15 +285,15 @@
   :long_name: find-path
   :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
@@ -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
@@ -399,7 +425,7 @@
   :env_var: MDE_MENU_DIVIDER_FORMAT
   :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
@@ -415,38 +441,44 @@
   :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
   :env_var: MDE_MENU_FINAL_DIVIDER
   :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}"
+- :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}"
+- :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}"
+- :default: "%{line}"
   :description: format for menu heading3 in menu
   :env_var: MDE_MENU_HEADING3_FORMAT
   :opt_name: menu_heading3_format
@@ -500,7 +532,7 @@
   :env_var: MDE_MENU_LINK_FORMAT
   :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
@@ -510,7 +542,7 @@
   :env_var: MDE_MENU_NOTE_FORMAT
   :opt_name: menu_note_format
   :procname: val_as_str
-- :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
@@ -521,12 +553,42 @@
   :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: "! 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
@@ -595,11 +657,17 @@
   :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
   :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
@@ -636,7 +704,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}"
@@ -688,7 +755,7 @@
   :short_name: p
 - :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
@@ -728,6 +795,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 +881,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 +915,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 +927,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

data/lib/saved_assets.rb

@@ -12,7 +12,8 @@ module MarkdownExec
   # method derives a name for stdout redirection.
   #
   class SavedAsset
-    FNR11 = %r{/|:}.freeze
+    FNR11 = %r{[^!#$%&()\+,\-0-9=A-Z_a-z~]}.freeze
+    # / !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
     FNR12 = '_'
     DEFAULT_FTIME = '%F-%H-%M-%S'
 
@@ -43,7 +44,7 @@ class SavedAssetTest < Minitest::Test
     time = Time.new(2023, 1, 1, 12, 0, 0)
     blockname = 'block/1:2'
 
-    expected_name = 'test_2023-01-01-12-00-00_sample.txt_,_block_1_2.sh'
+    expected_name = 'test_2023-01-01-12-00-00_sample_txt_,_block_1_2.sh'
     assert_equal expected_name, MarkdownExec::SavedAsset.script_name(
       filename: filename, prefix: prefix, time: time, blockname: blockname
     )
@@ -55,7 +56,7 @@ class SavedAssetTest < Minitest::Test
     time = Time.new(2023, 1, 1, 12, 0, 0)
     blockname = 'block/1:2'
 
-    expected_name = 'test_2023-01-01-12-00-00_sample.txt_,_block_1_2.out.txt'
+    expected_name = 'test_2023-01-01-12-00-00_sample_txt_,_block_1_2.out.txt'
     assert_equal expected_name, MarkdownExec::SavedAsset.stdout_name(
       filename: filename, prefix: prefix, time: time, blockname: blockname
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-06-05 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
@@ -121,16 +122,21 @@ files:
 - examples/include.md
 - examples/indent.md
 - examples/index.md
+- examples/interrupt.md
+- examples/line-wrapping.md
 - examples/linked.md
 - 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
+- examples/pause-after-execution.md
 - examples/plant.md
 - examples/port.md
 - examples/search.md
@@ -144,6 +150,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