markdown_exec 2.0.6 → 2.0.7

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

data/lib/markdown_exec.rb

@@ -749,6 +749,7 @@ 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]

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

@@ -106,6 +106,12 @@
   :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
@@ -227,6 +233,8 @@
   :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
@@ -328,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
@@ -496,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
@@ -529,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
@@ -624,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
@@ -637,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
@@ -678,6 +689,13 @@
   :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
@@ -772,6 +790,13 @@
   :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
@@ -874,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

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (2.0.6)
+# MDE - Markdown Executor (2.0.7)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -285,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
@@ -425,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
@@ -453,32 +453,32 @@
   :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
@@ -532,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
@@ -542,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
@@ -577,6 +577,12 @@
   :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
@@ -656,6 +662,12 @@
   :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
@@ -743,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

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.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -122,6 +122,8 @@ 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
@@ -134,6 +136,7 @@ files:
 - examples/nickname.md
 - examples/opts.md
 - examples/pass-through.md
+- examples/pause-after-execution.md
 - examples/plant.md
 - examples/port.md
 - examples/search.md