markdown_exec 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1cce75f6ae919ebb237862e74ade141e6300426e514331b4410cf7cfa0b27e
-  data.tar.gz: 2ea6f8f6fa47f01b324b6663c6c1dcd0f69a0c2a164d7591f5c714d9618b90a4
+  metadata.gz: c35f2f729da73920db53053340bbe0ced75bfbb16ad59697fa6ba4016b62ae74
+  data.tar.gz: c20943723250feaa3e1b7218710cede9ebf4da4dd6eebf68584a805b9647b7d4
 SHA512:
-  metadata.gz: 87b6c3f35b0fd85b06dc1d94afc6c145fd27989def6972dcaf66e85a8c899e3550376efa9b0e70efe2327e403a46615b6c51a5210653bf5bdd0e1c6946d477f7
-  data.tar.gz: 78fd6cb33feabb7a94c0df274528cf2ffd0d4b60e1bf37328304a125b71edc44c6fd884c003af7088b0953923cee3e3a2b3f39b139b1559bf0b2b4337792ecc9
+  metadata.gz: 185f571fd39b4bdce955a455695413390b83c3635236871a83098bd595b184b5a79a2cd2b2778fb1fa795d658566237ed251e751fe1981a71aff192ce22da376
+  data.tar.gz: 19248dd05c973d9657362145826312fd2a07a7f6b4ad6834e623a19f289b35dc4d32c9c16401fc73a7e6309f4fc7ba9a5f63cc82a7db78299b623ea0d3b471f0

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [2.7.3] - 2025-01-29
+
+### Added
+
+- Automatic loading of multiple Opts and Vars blocks when opening a document.
+
+### Changed
+
+- Fix text displayed when text is wrapped to the next line.
+- Handle and report failure of single tests.
+
+## [2.7.2] - 2025-01-03
+
+### Added
+
+- Block name comparison in FCB class.
+- Option for automatic shell block per document.
+
+### Changed
+
+- Disable command substitution in comments.
+- Fix the source reported by debug function ww0.
+- Inverse the entire line to highlight the active menu line.
+- Return single file if no globs in load block.
+- Update the calculation and use of IDs for blocks used to retrieve the block selected from the menu.
+
+## [2.7.1] - 2024-12-10
+
+### Changed
+
+- Register console dimensions prior to arguments.
+
 ## [2.7.0] - 2024-12-09
 
 ### Added
@@ -399,7 +431,7 @@ Rename options to match use.
   These blocks can be hidden blocks and required in a script.
 
 - Add a "wrap" fenced code block type to facilitate script generation.
-  See document `examples/wrap.md`.
+  See document `examples/wrapped-blocks.md`.
   These blocks are hidden and can be required by one or more blocks.
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (2.7.2)
+    markdown_exec (2.7.3)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)

data/Rakefile

@@ -74,14 +74,38 @@ task :clean do
   system 'rm *.gem'
 end
 
+def execute_with_error_handling(iterator)
+  all_error_level = 0
+  all_failed_files = []
+  
+  iterator.each do |item|
+    command = yield(item)
+    next unless command # Skip if command is nil
+    
+    result = system(command)
+    error_level = $?.exitstatus
+
+    if error_level != 0
+      puts "Error: Command '#{command}' failed with exit status #{error_level}."
+      all_error_level = error_level
+      all_failed_files << command
+    end
+  end
+
+  if all_error_level != 0
+    puts "Error: #{all_failed_files.join(', ')} failed."
+    exit all_error_level
+  end
+end
+
 desc 'bats'
 task :bats do
-  FileList['bats/**/*.bats'].each do |file|
-    next if %w[bats/bats.bats bats/fail.bats].include?(file)
+  execute_with_error_handling(FileList['bats/**/*.bats']) do |file|
+    next nil if %w[bats/bats.bats bats/fail.bats].include?(file)
 
     # temporary clear WW to disable debugging
     # WW pollutes output expected by BATS tests
-    system "unset WW; bats #{file}"
+    "unset WW; bats #{file}"
   end
 end
 
@@ -118,14 +142,8 @@ task :minitest do
     './lib/dev/process_template.rb --test'
   ]
 
-  commands.each do |command|
-    result = system("bundle exec ruby #{command}")
-    error_level = $?.exitstatus
-
-    if error_level != 0
-      puts "Error: Command '#{command}' failed with exit status #{error_level}."
-      exit error_level
-    end
+  execute_with_error_handling(commands) do |command|
+    "bundle exec ruby #{command}"
   end
 end
 task mini: %i[minitest]

data/bats/block-type-opts.bats

@@ -0,0 +1,23 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+# Type: Opts
+
+@test 'Opts block - before' {
+  skip 'Fails because command executes after the block is processed'
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-opts.md \
+   'BEFORE Species_menu_note_format: "AFTER %{line}" '
+}
+
+@test 'Opts block - after' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-opts.md \
+   '[decorate-note]' \
+   'AFTER Species_menu_note_format: "AFTER %{line}"'
+}
+
+@test 'Opts block - show that menu has changed' {
+  skip 'Unable to show that menu has changed'
+  spec_mde_args_expect docs/dev/block-type-opts.md '[decorate-note]' \
+   'AFTER Species'
+}

data/bats/block-type-vars.bats

@@ -0,0 +1,26 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+# Type: Vars
+
+# includes output from automatic vars blocks
+@test 'Vars block - auto load' {
+  BATS_OUTPUT_FILTER=A
+  spec_mde_args_expect docs/dev/block-type-vars.md show \
+   'Species = Not specified Genus = Not specified  Species: Not specified VAULT:'
+}
+
+# includes output from assignment and from shell block
+@test 'Vars block - set variable' {
+  BATS_OUTPUT_FILTER=A
+  spec_mde_args_expect docs/dev/block-type-vars.md '[set_vault_1]' show \
+   'Species = Not specified Genus = Not specified VAULT = 1  Species: Not specified VAULT: 1'
+}
+
+# handles invalid YAML in block
+@test 'Vars block - invalid YAML' {
+  BATS_OUTPUT_FILTER=A
+  spec_mde_args_expect docs/dev/block-type-vars.md '[invalid_yaml]' show \
+   'Species = Not specified Genus = Not specified  Species: Not specified VAULT:'
+}

data/bats/block-types.bats

@@ -47,26 +47,6 @@ load 'test_helper'
   run_mde_specs_md_args_expect_xansi '[VARIABLE1]' '(echo-VARIABLE1)' ' VARIABLE1: 1   VARIABLE1: 1'
 }
 
-# Type: Opts
-
-@test 'Opts block - before' {
-  skip 'Fails because command executes after the block is processed'
-  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-opts.md \
-   'BEFORE Species_menu_note_format: "AFTER %{line}" '
-}
-
-@test 'Opts block - after' {
-  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-opts.md \
-   '[decorate-note]' \
-   'AFTER Species_menu_note_format: "AFTER %{line}"'
-}
-
-@test 'Opts block - show that menu has changed' {
-  skip 'Unable to show that menu has changed'
-  spec_mde_args_expect docs/dev/block-type-opts.md '[decorate-note]' \
-   'AFTER Species'
-}
-
 # Type: Port
 
 # includes output from assignment and from shell block
@@ -81,19 +61,3 @@ load 'test_helper'
   spec_mde_args_expect docs/dev/block-type-port.md VAULT-is-export show \
    '   VAULT: This variable has not been set.'
 }
-
-# Type: Vars
-
-# includes output from automatic vars block
-@test 'Vars block - auto load' {
-  BATS_OUTPUT_FILTER=A
-  spec_mde_args_expect docs/dev/block-type-vars.md show \
-   'Species = Not specified  Species: Not specified VAULT:'
-}
-
-# includes output from assignment and from shell block
-@test 'Vars block - set variable' {
-  BATS_OUTPUT_FILTER=A
-  spec_mde_args_expect docs/dev/block-type-vars.md '[set_vault_1]' show \
-   'Species = Not specified VAULT = 1  Species: Not specified VAULT: 1'
-}

data/bats/line-wrapping.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Text and Headings' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/line-wrapping.md \
+   "          DEMO WRAPPING LONG LINES__MDE detects the screen's dimensions:_height (lines) and width (characters)__Normal document text is displayed as_disabled menu lines. The width of these_lines is limited according to the screen's_width.__Test Indented Lines__  Indented with two spaces, this line_  should wrap in an aesthetically pleasing_  way.__    Indented with a tab, this line should_    wrap in an aesthetically pleasing way.__  SPECIES GENUS FAMILY ORDER CLASS PHYLUM_               KINGDOM DOMAIN_species genus family order class phylum_kingdom domain"
+}

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "2.7.2"
+  echo "2.7.3"
 }
 
 _mde() {

data/docs/dev/block-type-opts.md

@@ -6,6 +6,9 @@ menu_note_format: "AFTER %{line}"
 ```opts :(document_opts)
 menu_final_divider:
 menu_for_saved_lines: false
+```
+/ Demonstrate multiple (document_opts) in a single file
+```opts :(document_opts)
 menu_initial_divider:
 menu_note_format: "BEFORE %{line}"
-```
+```

data/docs/dev/block-type-vars.md

@@ -1,6 +1,15 @@
+```vars :(document_vars)
+Species: Not specified
+```
+```vars :(document_vars)
+Genus: Not specified
+```
 ```vars :[set_vault_1]
 VAULT: 1
 ```
+```vars :[invalid_yaml]
+this is not yaml
+```
 ```bash :show
 echo "Species: $Species"
 echo "VAULT: $VAULT"
@@ -8,8 +17,6 @@ echo "VAULT: $VAULT"
 | Variable| Value
 | -| -
 | Species| ${Species}
+| Genus| ${Genus}
 | VAULT| ${VAULT}
-@import bats-document-configuration.md
-```vars :(document_vars)
-Species: Not specified
-```
+@import bats-document-configuration.md

data/docs/dev/line-wrapping.md

@@ -0,0 +1,24 @@
+# Demo wrapping long lines
+
+MDE detects the screen's dimensions: height (lines) and width (characters)
+
+Normal document text is displayed as disabled menu lines. The width of these lines is limited according to the screen's width.
+
+::: Test Indented Lines
+
+  Indented with two spaces, this line should wrap in an aesthetically pleasing way.
+
+	Indented with a tab, this line should wrap in an aesthetically pleasing way.
+
+# species genus family order class phylum kingdom domain
+## species genus family order class phylum kingdom domain
+@import bats-document-configuration.md
+```opts :(document_opts)
+divider4_center: false
+heading1_center: true
+heading2_center: false
+screen_width: 48
+
+menu_note_match: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
+
+```

data/examples/link-blocks-vars.md

@@ -1,59 +1,87 @@
-# Demonstrate link blocks set variables
-@import example-document-opts.md
-```opts :(document_opts)
-execute_in_own_window: false
-menu_with_inherited_lines: true
-output_execution_report: false
-output_execution_summary: false
-pause_after_script_execution: true
+# Demonstrate Setting Variables in the Inherited Lines
+
+```link :select-a-folder +(select-a-folder)
+eval: true
+```
+```bash :(select-a-folder)
+echo "PT=$(osascript -e 'do shell script "echo " & quoted form of POSIX path of (choose folder with prompt "Please select a folder:")' 2>/dev/null)"
 ```
 
-## Demonstrate a link block that sets a variable
-::: Select below to trigger. If it prints "VARIABLE1: 1", the Link block was processed.
+This table displays the value of variables in the context of the current inherited lines. At first, the variable is empty unless it exists in the current shell environment.
 
 | Variable| Value
 | -| -
-| VARIABLE1| ${VARIABLE1}
+| SPECIES| ${SPECIES}
+
+## Current Inherited Lines
+
+```view
+View the current inherited lines.
+```
+
+The inherited lines can also be displayed automatically within the menu by enabling this option:
+
+```opts
+menu_with_inherited_lines: true
+```
+
+## Setting Variables in the Inherited Lines
+
+You can set environment variables in the inherited lines by adding shell expressions. For example, a line such as `SPECIES=Unknown` in the inherited lines defines a variable that can be used in the rest of the executed script.
+
+Below are several ways to add such expressions to the inherited lines:
+
+### Vars Block
+
+This block (YAML) adds a variable and its value to the inherited lines:
+
+```vars
+SPECIES: Tapanuli Orangutan
+```
+
+### Link Block
+
+This block (YAML) also adds a variable and its value to the inherited lines:
 
-The block sets VARIABLE1.
-For each environment variable in `vars`, append an inherited line that assigns the variable the specified value.
     ```link
     vars:
-      VARIABLE1: 1
+      SPECIES: Psychedelic Frogfish
     ```
 
-## Demonstrate a link block that requires a shell block that sets a variable
-This block "[bash_set_to_3]" is required below. It sets the variable "ALPHA".
-    ```bash :[bash_set_to_3]
-    ALPHA=3
-    ```
-::: Select below to trigger. If it prints "ALPHA: 3", the Link block was processed.
-These blocks require the *code* of the named shell block.
-    ```link +[bash_set_to_3]
-    block: "(display_variable_ALPHA)"
-    ```
-    ```link +[bash_set_to_3]
-    next_block: "(display_variable_ALPHA)"
-    ```
+### Link+Bash Blocks
 
-This block "[bash_set_to_4]" is required below. It prints a command that sets the variable "ALPHA".
-    ```bash :[bash_set_to_4]
-    echo "ALPHA=4"
-    ```
-::: Select below to trigger. If it prints "ALPHA: 4", the Link block was processed.
-These blocks require the *output* of the execution of the code in the named shell block.
-    ```link +[bash_set_to_4]
-    eval: true
-    block: "(display_variable_ALPHA)"
+::: Adding Code to the Inherited Lines
+
+This Link block (YAML) appends the Bash code defined in the referenced block to the inherited lines:
+
+    ```link :add-bash-code +[bash_species]
     ```
-    ```link +[bash_set_to_4]
+        ```bash :[bash_species] @disable
+        SPECIES='Ruby Seadragon'
+        ```
+
+If necessary to extract environment variable values displayed in the menu, inherited lines are executed every time the menu displayed. Therefore, do add code that has unwanted side effects when executed multiple times.
+
+::: Adding Evaluated Code Output to the Inherited Lines
+
+This Link block (YAML) appends the output of the Bash code to the inherited lines. The Bash code is executed first to generate the output:
+
+    ```link :add-evaluated-bash-code +[bash_species_code]
     eval: true
-    next_block: "(display_variable_ALPHA)"
     ```
+        ```bash :[bash_species_code] @disable
+        echo "SPECIES='Illacme tobini (Millipede)'"
+        ```
 
 | Variable| Value
 | -| -
-| ALPHA| ${ALPHA}
+| SPECIES| ${SPECIES}
 
-```bash :(display_variable_ALPHA)
-```
+@import example-document-opts.md
+```opts :(document_opts)
+execute_in_own_window: false
+menu_with_inherited_lines: false
+output_execution_report: false
+output_execution_summary: false
+pause_after_script_execution: true
+```

data/lib/colorize.rb

@@ -13,23 +13,15 @@ class String
   # @return [String] The formatted string.
   def method_missing(method_name, *args, &block)
     case method_name.to_s
-    # when /^bg_rgb_/
-    #   bytes = $'.split('_')
-    #   bg_rgb_color(bytes[0..2].join(';'))
     when /^fg_bg_rgb_/
-      pp [__LINE__, caller[0]]; binding.irb
       bytes = $'.split('_')
       fg_bg_rgb_color(bytes[0..2].join(';'), bytes[3..5].join(';'))
     when /^fg_bg_rgbh_/
-      pp [__LINE__, caller[0]]; binding.irb
       hex_to_fg_bg_rgb($')
     when /^fg_rgb_/
-      pp [__LINE__, caller[0]]; binding.irb
       fg_rgb_color($'.gsub('_', ';'))
     when /^fg_rgbh_/
-      pp [__LINE__, caller[0]]; binding.irb
       hex_to_rgb($')
-
     when 'to_a', 'to_ary', 'to_hash', 'to_int', 'to_io', 'to_regexp'
       nil
     else
@@ -41,24 +33,14 @@ class String
   #
   # @return [String] The string wrapped in an ANSI control sequence.
   def ansi_control_sequence
-    pp [__LINE__, caller[0]]; binding.irb
     "\033[#{self}\033[0m"
   end
 
-  # # Applies a 24-bit RGB background color to the string.
-  # #
-  # # @param rgb [String] The RGB color, expressed as a string like "1;2;3".
-  # # @return [String] The string with the applied RGB foreground color.
-  # def bg_rgb_color(rgb)
-  #   "48;2;#{rgb}m#{self}".ansi_control_sequence
-  # end
-
   # Applies a 24-bit RGB foreground color to the string.
   #
   # @param rgb [String] The RGB color, expressed as a string like "1;2;3".
   # @return [String] The string with the applied RGB foreground color.
   def fg_bg_rgb_color(fg_rgb, bg_rgb)
-    pp [__LINE__, caller[0]]; binding.irb
     "38;2;#{fg_rgb}m\033[48;2;#{bg_rgb}m#{self}".ansi_control_sequence
   end
 
@@ -67,7 +49,6 @@ class String
   # @param rgb [String] The RGB color, expressed as a string like "1;2;3".
   # @return [String] The string with the applied RGB foreground color.
   def fg_rgb_color(rgb)
-    pp [__LINE__, caller[0]]; binding.irb
     "38;2;#{rgb}m#{self}".ansi_control_sequence
   end
 
@@ -76,7 +57,6 @@ class String
   # @param hex_str [String] The RGB color, expressed as a hex string like "FF00FF".
   # @return [String] The string with the applied RGB foreground color.
   def hex_to_fg_bg_rgb(hex_str)
-    pp [__LINE__, caller[0]]; binding.irb
     values = hex_str.split('_').map { |hex| hex.to_i(16).to_s }
     fg_bg_rgb_color(
       values[0..2].join(';'),
@@ -89,7 +69,6 @@ class String
   # @param hex_str [String] The RGB color, expressed as a hex string like "FF00FF".
   # @return [String] The string with the applied RGB foreground color.
   def hex_to_rgb(hex_str)
-    pp [__LINE__, caller[0]]; binding.irb
     fg_rgb_color(
       hex_str.split('_').map { |hex| hex.to_i(16).to_s }.join(';')
     )
@@ -99,7 +78,6 @@ class String
   #
   # @return [String] The original string.
   def plain
-    pp [__LINE__, caller[0]]; binding.irb
     self
   end
 
@@ -126,20 +104,16 @@ class String
   def violet;  fg_rgbh_94_00_D3; end
   def yellow;  fg_rgbh_FF_FF_00; end
 
-  def x
-    pp [__LINE__, caller[1]]; binding.irb
-  end
-
   # graphics modes
-  def bold;             x; "\033[1m#{self}\033[22m"; end
-  def bold_italic;      x; "\033[1m\033[3m#{self}\033[22m\033[23m"; end
-  def bold_underline;   x; "\033[1m\033[4m#{self}\033[22m\033[24m"; end
-  def dim;              x; "\033[2m#{self}\033[22m"; end
-  def italic;           x; "\033[3m#{self}\033[23m"; end
-  def underline;        x; "\033[4m#{self}\033[24m"; end
-  def underline_italic; x; "\033[4m\033[3m#{self}\033[23m\033[24m"; end
-  def blinking;         x; "\033[5m#{self}\033[25m"; end
-  def inverse;          x; "\033[7m#{self}\033[27m"; end
-  def hidden;           x; "\033[8m#{self}\033[28m"; end
-  def strikethrough;    x; "\033[9m#{self}\033[29m"; end
+  def bold;             "\033[1m#{self}\033[22m"; end
+  def bold_italic;      "\033[1m\033[3m#{self}\033[22m\033[23m"; end
+  def bold_underline;   "\033[1m\033[4m#{self}\033[22m\033[24m"; end
+  def dim;              "\033[2m#{self}\033[22m"; end
+  def italic;           "\033[3m#{self}\033[23m"; end
+  def underline;        "\033[4m#{self}\033[24m"; end
+  def underline_italic; "\033[4m\033[3m#{self}\033[23m\033[24m"; end
+  def blinking;         "\033[5m#{self}\033[25m"; end
+  def inverse;          "\033[7m#{self}\033[27m"; end
+  def hidden;           "\033[8m#{self}\033[28m"; end
+  def strikethrough;    "\033[9m#{self}\033[29m"; end
 end

data/lib/format_table.rb

@@ -188,7 +188,6 @@ end
 return if $PROGRAM_NAME != __FILE__
 
 require 'minitest/autorun'
-require_relative 'colorize'
 
 class TestMarkdownTableFormatter < Minitest::Test
   def setup

data/lib/hash_delegator.rb

@@ -91,6 +91,10 @@ module HashDelegatorSelf
     blocks.find { |item| item.send(msg) == value } || default
   end
 
+  def block_select(blocks, msg, value, default = nil)
+    blocks.select { |item| item.send(msg) == value }
+  end
+
   def code_merge(*bodies)
     merge_lists(*bodies)
   end
@@ -979,16 +983,19 @@ module MarkdownExec
 
     # sets ENV
     def code_from_vars_block_to_set_environment_variables(selected)
-      code_lines = []
-      YAML.load(selected.body.join("\n"))&.each do |key, value|
-        ENV[key] = value.to_s
-        code_lines.push "#{key}=#{Shellwords.escape(value)}"
+      code_lines = []      
+      case data = YAML.load(selected.body.join("\n"))
+      when Hash
+        data.each do |key, value|
+          ENV[key] = value.to_s
+          code_lines.push "#{key}=#{Shellwords.escape(value)}"
 
-        next unless @delegate_object[:menu_vars_set_format].present?
+          next unless @delegate_object[:menu_vars_set_format].present?
 
-        formatted_string = format(@delegate_object[:menu_vars_set_format],
-                                  { key: key, value: value })
-        print string_send_color(formatted_string, :menu_vars_set_color)
+          formatted_string = format(@delegate_object[:menu_vars_set_format],
+                                    { key: key, value: value })
+          print string_send_color(formatted_string, :menu_vars_set_color)
+        end
       end
       code_lines
     end
@@ -1232,11 +1239,12 @@ module MarkdownExec
       wrap: nil,
       fcb: nil
     )
-      line_cap = NamedCaptureExtractor.extract_named_group2(match_data)
+      ww 'match_data', match_data
+      line_cap = NamedCaptureExtractor.extract_named_group_match_data(match_data)
       # replace tabs in indent
       line_cap[:indent] ||= ''
       line_cap[:indent] = line_cap[:indent].dup if line_cap[:indent].frozen?
-      line_cap[:indent].gsub!("\t", '    ')
+      line_cap[:indent].gsub!("\t", '    ') # TAB_SIZE = 4
       # replace tabs in text
       line_cap[:text] ||= ''
       line_cap[:text] = line_cap[:text].dup if line_cap[:text].frozen?
@@ -1264,6 +1272,7 @@ module MarkdownExec
         end
       end
 
+      use_fcb = !fcb.nil? # fcb only for the first record if any
       line_caps.each_with_index do |line_obj, index|
         next if line_obj[:text].nil?
 
@@ -1287,7 +1296,7 @@ module MarkdownExec
 
         line_obj[:line] = line_obj[:indent] + line_obj[:text]
 
-        if fcb.nil?
+        if !use_fcb
           fcb = FCB.new(
             center: center,
             chrome: true,
@@ -1321,6 +1330,7 @@ module MarkdownExec
           fcb.oname = line_obj[:text]
           fcb.text = line_obj[:text]
           fcb.type = type
+          use_fcb = false # next line is new record
         end
 
         blocks.push fcb
@@ -1956,7 +1966,7 @@ module MarkdownExec
         [exit_prompt] + dirs.sort.map do |file|
           { name: format(
             block_data['view'] || view,
-            NamedCaptureExtractor.extract_named_group2(
+            NamedCaptureExtractor.extract_named_group_match_data(
               file.match(
                 Regexp.new(block_data['filename_pattern'] ||
                            filename_pattern)
@@ -2240,7 +2250,6 @@ module MarkdownExec
       key_format: '${%s}',
       pattern: nil
     )
-      # defined($x) ? '' : ($x = 1; pp [__LINE__, caller.deref])
       pattern ||= options_variable_expression_regexp
       return if pattern.nil?
 
@@ -2553,20 +2562,29 @@ module MarkdownExec
       label_format_above = @delegate_object[:shell_code_label_format_above]
       label_format_below = @delegate_object[:shell_code_label_format_below]
 
-      [label_format_above.present? &&
-        format(label_format_above,
-               block_source.merge({ block_name: selected.pub_name }))] +
-        output_lines.map do |line|
-          re = Regexp.new(link_block_data.fetch('pattern', '(?<line>.*)'))
-          next unless re =~ line
-
-          re.gsub_format(line,
-                         link_block_data.fetch('format',
-                                               '%{line}'))
-        end.compact +
-        [label_format_below.present? &&
-         format(label_format_below,
-                block_source.merge({ block_name: selected.pub_name }))]
+      ([
+        label_format_above.present? ?
+          format(
+            label_format_above,
+            block_source.merge({ block_name: selected.pub_name })
+          ) : nil
+      ] +
+      output_lines.map do |line|
+        re = Regexp.new(link_block_data.fetch('pattern', '(?<line>.*)'))
+        next unless re =~ line
+
+        re.gsub_format(
+          line,
+          link_block_data.fetch('format', '%{line}')
+        )
+      end +
+      [
+        label_format_below.present? ?
+          format(
+            label_format_below,
+            block_source.merge({ block_name: selected.pub_name })
+          ) : nil
+      ]).compact
     end
 
     def link_history_push_and_next(
@@ -2641,43 +2659,23 @@ module MarkdownExec
         return
       end
 
-      block = HashDelegator.block_find(all_blocks, :oname, block_name)
-      return unless block
+      blocks = HashDelegator.block_select(all_blocks, :oname, block_name)
+      return if blocks.empty?
 
-      options_state = read_show_options_and_trigger_reuse(
-        mdoc: mdoc,
-        selected: block
+      update_menu_base(
+        blocks.each.with_object({}) do |block, merged_options|
+          options_state = read_show_options_and_trigger_reuse(
+            mdoc: mdoc,
+            selected: block
+          )
+          merged_options.merge!(options_state.options)
+        end
       )
-      update_menu_base(options_state.options)
 
       @opts_most_recent_filename = @delegate_object[:filename]
       true
     end
 
-    def load_document_shell_block(all_blocks, mdoc: nil)
-      block_name = @delegate_object[:document_load_shell_block_name]
-      unless block_name.present? &&
-             @shell_most_recent_filename != @delegate_object[:filename]
-        return
-      end
-
-      fcb = HashDelegator.block_find(all_blocks, :oname, block_name)
-      return unless fcb
-
-      @shell_most_recent_filename = @delegate_object[:filename]
-
-      if mdoc
-        mdoc.collect_recursively_required_code(
-          anyname: fcb.pub_name,
-          label_format_above: @delegate_object[:shell_code_label_format_above],
-          label_format_below: @delegate_object[:shell_code_label_format_below],
-          block_source: block_source
-        )[:code]
-      else
-        fcb.body
-      end
-    end
-
     def load_auto_vars_block(all_blocks,
                              block_name: @delegate_object[:document_load_vars_block_name])
       unless block_name.present? &&
@@ -2685,11 +2683,16 @@ module MarkdownExec
         return
       end
 
-      block = HashDelegator.block_find(all_blocks, :oname, block_name)
-      return unless block
+      blocks = HashDelegator.block_select(all_blocks, :oname, block_name)
+      return if blocks.empty?
 
       @vars_most_recent_filename = @delegate_object[:filename]
-      code_from_vars_block_to_set_environment_variables(block)
+
+      (blocks.each.with_object([]) do |block, merged_options|
+        merged_options.push(
+          code_from_vars_block_to_set_environment_variables(block)
+        )
+      end).to_a
     end
 
     def load_cli_or_user_selected_block(all_blocks: [], menu_blocks: [],
@@ -2712,6 +2715,30 @@ module MarkdownExec
       SelectedBlockMenuState.new(block, source, state)
     end
 
+    def load_document_shell_block(all_blocks, mdoc: nil)
+      block_name = @delegate_object[:document_load_shell_block_name]
+      unless block_name.present? &&
+             @shell_most_recent_filename != @delegate_object[:filename]
+        return
+      end
+
+      fcb = HashDelegator.block_find(all_blocks, :oname, block_name)
+      return unless fcb
+
+      @shell_most_recent_filename = @delegate_object[:filename]
+
+      if mdoc
+        mdoc.collect_recursively_required_code(
+          anyname: fcb.pub_name,
+          label_format_above: @delegate_object[:shell_code_label_format_above],
+          label_format_below: @delegate_object[:shell_code_label_format_below],
+          block_source: block_source
+        )[:code]
+      else
+        fcb.body
+      end
+    end
+
     # format + glob + select for file in load block
     # name has references to ENV vars and doc and batch vars
     #  incl. timestamp
@@ -3839,10 +3866,10 @@ module MarkdownExec
         shell: fcb_title_groups.fetch(:shell, ''),
         start_line: line,
         stdin: if (tn = rest.match(/<(?<type>\$)?(?<name>[A-Za-z_-]\S+)/))
-                 NamedCaptureExtractor.extract_named_group2(tn)
+                 NamedCaptureExtractor.extract_named_group_match_data(tn)
                end,
         stdout: if (tn = rest.match(/>(?<type>\$)?(?<name>[\w.\-]+)/))
-                  NamedCaptureExtractor.extract_named_group2(tn)
+                  NamedCaptureExtractor.extract_named_group_match_data(tn)
                 end,
         title: title,
         type: fcb_title_groups.fetch(:type, ''),

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.7.2'
+  VERSION = '2.7.3'
 end

data/lib/markdown_exec.rb

@@ -19,7 +19,6 @@ require_relative 'ansi_formatter'
 require_relative 'cached_nested_file_reader'
 require_relative 'cli'
 require_relative 'color_scheme'
-require_relative 'colorize'
 require_relative 'directory_searcher'
 require_relative 'env'
 require_relative 'exceptions'
@@ -95,7 +94,7 @@ class NamedCaptureExtractor
     str&.match(regexp)&.named_captures&.transform_keys(&:to_sym)
   end
 
-  def self.extract_named_group2(match_data)
+  def self.extract_named_group_match_data(match_data)
     match_data&.named_captures&.transform_keys(&:to_sym)
   end
 end

data/lib/menu.src.yml

@@ -904,11 +904,10 @@
   :procname: val_as_str
 
 ## lines that start with "/" are comments (hidden), not notes (visible)
-# - :default: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
 - :opt_name: menu_note_match
   :env_var: MDE_MENU_NOTE_MATCH
   :description: Pattern for notes in block selection menu
-  :default: "^(?<line>(?![ \t]*/)(?<text>.*?)(?<trailing>[ \t]*))$"
+  :default: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :procname: val_as_str
 
 - :opt_name: menu_option_back_name

data/lib/menu.yml

@@ -766,7 +766,7 @@
 - :opt_name: menu_note_match
   :env_var: MDE_MENU_NOTE_MATCH
   :description: Pattern for notes in block selection menu
-  :default: "^(?<line>(?![ \t]*/)(?<text>.*?)(?<trailing>[ \t]*))$"
+  :default: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
   :procname: val_as_str
 - :opt_name: menu_option_back_name
   :env_var: MDE_MENU_OPTION_BACK_NAME

data/lib/ww.rb

@@ -15,7 +15,7 @@ if $debug && ENV['WW_MINIMUM'].nil?
 end
 
 def ww(*objs, **kwargs)
-  return unless $debug
+  return objs.size == 1 ? objs.first : objs unless $debug
 
   ww0(*objs, **kwargs.merge(locations: caller_locations))
 end
@@ -24,7 +24,7 @@ def ww0(*objs,
         category: nil,
         full_backtrace: false,
         level: :debug,
-        locations: caller_locations[1..-1],
+        locations: caller_locations,
         log_file: nil,
         output: $stderr,
         single_line: false,
@@ -70,11 +70,13 @@ def ww0(*objs,
   output.flush
 
   # Optionally log to a file
-  return unless log_file
+  return objs.size == 1 ? objs.first : objs unless log_file
 
   File.open(log_file, 'a') do |file|
     file.puts(formatted_message)
   end
+
+  objs.size == 1 ? objs.first : objs
 end
 
 class Array

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-10 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -107,6 +107,8 @@ files:
 - assets/select_a_block.png
 - assets/select_a_file.png
 - bats/bats.bats
+- bats/block-type-opts.bats
+- bats/block-type-vars.bats
 - bats/block-types.bats
 - bats/border.bats
 - bats/cli.bats
@@ -115,6 +117,7 @@ files:
 - bats/fail.bats
 - bats/history.bats
 - bats/import.bats
+- bats/line-wrapping.bats
 - bats/markup.bats
 - bats/mde.bats
 - bats/options-collapse.bats
@@ -143,6 +146,7 @@ files:
 - docs/dev/document-shell.md
 - docs/dev/import-missing.md
 - docs/dev/import.md
+- docs/dev/line-wrapping.md
 - docs/dev/linked-file.md
 - docs/dev/load1.sh
 - docs/dev/load_code.md
@@ -201,7 +205,7 @@ files:
 - examples/variable-expansion-save-block.md
 - examples/variable-expansion.md
 - examples/vars-blocks.md
-- examples/wrap.md
+- examples/wrapped-blocks.md
 - lib/ansi_formatter.rb
 - lib/ansi_string.rb
 - lib/argument_processor.rb