markdown_exec 2.8.1 → 2.8.3

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.8.1'
+  VERSION = '2.8.3'
 end

data/lib/markdown_exec.rb

@@ -656,32 +656,6 @@ module MarkdownExec
       @options.merge(@options.run_state.to_h)
     end
 
-    def iter_source_blocks(source, &block)
-      case source
-      when 1
-        HashDelegator.new(@options).blocks_from_nested_files.each(&block)
-      when 2
-        blocks_in_file, menu_blocks, mdoc =
-          HashDelegator.new(@options)
-                       .mdoc_menu_and_blocks_from_nested_files(LinkState.new)
-        blocks_in_file.each(&block)
-      when 3
-        blocks_in_file, menu_blocks, mdoc =
-          HashDelegator.new(@options)
-                       .mdoc_menu_and_blocks_from_nested_files(LinkState.new)
-        menu_blocks.each(&block)
-      else
-        @options.iter_blocks_from_nested_files do |btype, fcb|
-          case btype
-          when :blocks
-            yield fcb
-          when :filter
-            %i[blocks]
-          end
-        end
-      end
-    end
-
     ##
     # Returns a lambda expression based on the given procname.
     # @param procname [String] The name of the process to generate a lambda for.
@@ -916,7 +890,7 @@ module MarkdownExec
         # save value to options hash if option is named
         #
         lambda { |value|
-          name = item[:long_name]&.present? ? '--' + item[:long_name].to_s : '-' + item[:short_name].to_s
+          name = item[:long_name]&.present? ? "--#{item[:long_name]}" : "-#{item[:short_name]}"
           options_parsed << item.merge(name: name, value: value)
           (item[:proccode] ? item[:proccode].call(value) : value).tap do |converted|
             options[item[:opt_name]] = converted if item[:opt_name]
@@ -1013,7 +987,16 @@ module MarkdownExec
     # Presents a TTY prompt to select an option or exit, returns selected option or nil
     def select_option_or_exit(prompt_text, strings, opts = {})
       @options.select_option_with_metadata(
-        prompt_text, strings, opts
+        prompt_text,
+        strings,
+        opts,
+        menu_blocks: strings.map do |string|
+          FCB.new(
+            chrome: true,
+            dname: string,
+            id: string
+          )
+        end
       )&.fetch(:selected)
     end
 

data/lib/mdoc.rb

@@ -355,13 +355,12 @@ module MarkdownExec
       else
         opts[:hide_blocks_by_name] &&
           ((opts[:block_name_hidden_match]&.present? &&
-            block.oname&.match(Regexp.new(opts[:block_name_hidden_match]))) ||
+            block.s2title&.match(Regexp.new(opts[:block_name_hidden_match]))) ||
            (opts[:block_name_include_match]&.present? &&
-            block.oname&.match(Regexp.new(opts[:block_name_include_match]))) ||
+            block.s2title&.match(Regexp.new(opts[:block_name_include_match]))) ||
            (opts[:block_name_wrapper_match]&.present? &&
-            block.oname&.match(Regexp.new(opts[:block_name_wrapper_match])))) &&
-          (block.oname&.present? || block[:label]&.present?)
-
+            block.s2title&.match(Regexp.new(opts[:block_name_wrapper_match])))) &&
+          (block.s2title&.present? || block[:label]&.present?)
       end
     end
 
@@ -555,7 +554,7 @@ if $PROGRAM_NAME == __FILE__
       def test_hide_menu_block_on_name
         opts = { hide_blocks_by_name: true,
                  block_name_hidden_match: 'block1' }
-        block = FCB.new(oname: 'block1')
+        block = FCB.new(s2title: 'block1')
         result = @doc.hide_menu_block_on_name(opts, block)
         assert result # this should be true based on the given logic
       end

data/lib/menu.src.yml

@@ -54,6 +54,7 @@
 
 - :opt_name: block_name_match
   :env_var: MDE_BLOCK_NAME_MATCH
+  :description: Pattern for the block name in the line defining the block
   :default: ":(?<title>\\S+)( |$)"
   :procname: val_as_str
 

data/lib/menu.yml

@@ -44,6 +44,7 @@
   :procname: val_as_str
 - :opt_name: block_name_match
   :env_var: MDE_BLOCK_NAME_MATCH
+  :description: Pattern for the block name in the line defining the block
   :default: ":(?<title>\\S+)( |$)"
   :procname: val_as_str
 - :opt_name: block_name_nick_match

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.3
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -107,9 +107,14 @@ files:
 - assets/select_a_block.png
 - assets/select_a_file.png
 - bats/bats.bats
+- bats/block-hide.bats
 - bats/block-type-opts.bats
 - bats/block-type-ux-auto.bats
+- bats/block-type-ux-echo.bats
 - bats/block-type-ux-exec.bats
+- bats/block-type-ux-preconditions.bats
+- bats/block-type-ux-readonly.bats
+- bats/block-type-ux-require.bats
 - bats/block-type-ux-row-format.bats
 - bats/block-type-ux-transform.bats
 - bats/block-type-vars.bats
@@ -121,6 +126,8 @@ files:
 - bats/fail.bats
 - bats/history.bats
 - bats/import.bats
+- bats/indented-multi-line-output.bats
+- bats/line-decor-dynamic.bats
 - bats/line-wrapping.bats
 - bats/markup.bats
 - bats/mde.bats
@@ -140,11 +147,16 @@ files:
 - bin/tab_completion.sh
 - bin/tab_completion.sh.erb
 - docs/dev/bats-document-configuration.md
+- docs/dev/block-hide.md
 - docs/dev/block-type-bash.md
 - docs/dev/block-type-opts.md
 - docs/dev/block-type-port.md
 - docs/dev/block-type-ux-auto.md
+- docs/dev/block-type-ux-echo.md
 - docs/dev/block-type-ux-exec.md
+- docs/dev/block-type-ux-preconditions.md
+- docs/dev/block-type-ux-readonly.md
+- docs/dev/block-type-ux-require.md
 - docs/dev/block-type-ux-row-format.md
 - docs/dev/block-type-ux-transform.md
 - docs/dev/block-type-vars.md
@@ -155,6 +167,8 @@ files:
 - docs/dev/document-shell.md
 - docs/dev/import-missing.md
 - docs/dev/import.md
+- docs/dev/indented-multi-line-output.md
+- docs/dev/line-decor-dynamic.md
 - docs/dev/line-wrapping.md
 - docs/dev/linked-file.md
 - docs/dev/load1.sh