markdown_exec 2.7.1 → 2.7.3

data/lib/input_sequencer.rb

@@ -94,13 +94,18 @@ class InputSequencer
       break if exit_when_bq_empty && bq_is_empty? && !now_menu.prior_block_was_link
 
       if now_menu.display_menu
+        # !!b
         break if run_yield(:end_of_cli, &block) == :exit
+        # !!b
 
         exit_when_bq_empty = false
         run_yield :display_menu, &block
+        # !!b
 
         choice = run_yield :user_choice, &block
+        # !!b
         break if choice == :break
+        # !!b
 
         raise BlockMissing, 'Block not recognized.' if choice.nil?
         # Exit loop and method to terminate the app
@@ -115,7 +120,9 @@ class InputSequencer
         if now_menu.block_name && !now_menu.block_name.empty?
           block_name = now_menu.block_name
         else
+          # break if bq_is_empty? # Exit loop if no more blocks to process
           if bq_is_empty? # Exit loop if no more blocks to process
+            # !!b
             run_yield :end_of_cli, &block
             break
           end

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.1'
+  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/mdoc.rb

@@ -177,12 +177,12 @@ module MarkdownExec
       blocks.map do |block|
         (block[:wraps] || []).map do |wrap|
           wrap_before = wrap.sub('}', '-before}') ### hardcoded wrap name
-          @table.select { |fcb| [wrap_before, wrap].include? fcb.oname }
+          @table.select { |fcb| fcb.code_name_included?(wrap_before, wrap) }
         end.flatten(1) +
           [block] +
           (block[:wraps] || []).reverse.map do |wrap|
             wrap_after = wrap.sub('}', '-after}') ### hardcoded wrap name
-            @table.select { |fcb| fcb.oname == wrap_after }
+            @table.select { |fcb| fcb.code_name_included?(wrap_after) }
           end.flatten(1)
       end.flatten(1).compact
     end
@@ -623,25 +623,22 @@ if $PROGRAM_NAME == __FILE__
       # Mocking the @table object for testing
       def setup
         @table = [
-          OpenStruct.new(oname: '{wrap1}'),
-          OpenStruct.new(oname: '{wrap2-before}'),
-          OpenStruct.new(oname: '{wrap2}'),
-          OpenStruct.new(oname: '{wrap2-after}'),
-          OpenStruct.new(oname: '{wrap3-before}'),
-          OpenStruct.new(oname: '{wrap3}'),
-          OpenStruct.new(oname: '{wrap3-after}')
+          FCB.new(oname: '{wrap1}'),
+          FCB.new(oname: '{wrap2-before}'),
+          FCB.new(oname: '{wrap2}'),
+          FCB.new(oname: '{wrap2-after}'),
+          FCB.new(oname: '{wrap3-before}'),
+          FCB.new(oname: '{wrap3}'),
+          FCB.new(oname: '{wrap3-after}')
         ]
         @mdoc = MDoc.new(@table)
       end
 
       def test_collect_wrapped_blocks
         # Test case 1: blocks with wraps
-        OpenStruct.new(oname: 'block1')
-
         assert_equal(%w[{wrap2-before} {wrap2} b {wrap2-after}],
                      @mdoc.collect_wrapped_blocks(
-                       [OpenStruct.new(oname: 'b',
-                                       wraps: ['{wrap2}'])]
+                       [FCB.new(oname: 'b', wraps: ['{wrap2}'])]
                      ).map(&:oname))
 
         assert_equal(%w[{wrap2-before} {wrap2} {wrap3-before} {wrap3} c {wrap3-after} {wrap2-after}],

data/lib/menu.src.yml

@@ -200,6 +200,12 @@
   :default: "(document_opts)"
   :procname: val_as_str
 
+- :opt_name: document_load_shell_block_name
+  :env_var: MDE_DOCUMENT_LOAD_SHELL_BLOCK_NAME
+  :description: Name of shell block to load with the document
+  :default: "(document_shell)"
+  :procname: val_as_str
+
 - :opt_name: document_load_vars_block_name
   :env_var: MDE_DOCUMENT_LOAD_VARS_BLOCK_NAME
   :description: Name of Vars block to load with the document
@@ -676,8 +682,7 @@
   :env_var: MDE_MENU_ACTIVE_COLOR_PASTEL_MESSAGES
   :description: menu_active_color_pastel_messages
   :default:
-  - bright_magenta
-  - on_black
+  - inverse
 
 - :opt_name: menu_back_at_top
   :env_var: MDE_MENU_BACK_AT_TOP
@@ -899,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

@@ -166,6 +166,11 @@
   :description: Name of Opts block to load with the document
   :default: "(document_opts)"
   :procname: val_as_str
+- :opt_name: document_load_shell_block_name
+  :env_var: MDE_DOCUMENT_LOAD_SHELL_BLOCK_NAME
+  :description: Name of shell block to load with the document
+  :default: "(document_shell)"
+  :procname: val_as_str
 - :opt_name: document_load_vars_block_name
   :env_var: MDE_DOCUMENT_LOAD_VARS_BLOCK_NAME
   :description: Name of Vars block to load with the document
@@ -572,8 +577,7 @@
   :env_var: MDE_MENU_ACTIVE_COLOR_PASTEL_MESSAGES
   :description: menu_active_color_pastel_messages
   :default:
-  - bright_magenta
-  - on_black
+  - inverse
 - :opt_name: menu_back_at_top
   :env_var: MDE_MENU_BACK_AT_TOP
   :description: Display Back option at top of menu (vs bottom)
@@ -762,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
@@ -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.1
+  version: 2.7.3
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -107,12 +107,17 @@ 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
 - bats/command-substitution.bats
+- bats/document-shell.bats
 - bats/fail.bats
 - bats/history.bats
 - bats/import.bats
+- bats/line-wrapping.bats
 - bats/markup.bats
 - bats/mde.bats
 - bats/options-collapse.bats
@@ -134,11 +139,14 @@ files:
 - docs/dev/block-type-opts.md
 - docs/dev/block-type-port.md
 - docs/dev/block-type-vars.md
+- docs/dev/border.md
 - docs/dev/command-substitution.md
 - docs/dev/data-blocks.md
 - docs/dev/disable.md
+- 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
@@ -197,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