markdown_exec 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5acb96c20743bda8d745d4dece7997ff6cd5b5474fdeba4b7401474c7500528
-  data.tar.gz: 8e52cb02c35801816c9472c94112b521b110a758f602fdf0b19c4dd851c23243
+  metadata.gz: 4e802d2af4a779aad7091b20ab189a4c324f15f53643880758b7aac76549ba49
+  data.tar.gz: 2d6f910706bd10232f8bb87313364f671d3871e06382d57dd6248f07c4e497f2
 SHA512:
-  metadata.gz: bb66529f2a2766cb1f8cbdd8b071c02eb29ef0c55e29507576a3cb9a0fc4920093fb03af95ddd480a8f6a189d3a86c4b504315f2faadba173a345d07fd16de8e
-  data.tar.gz: 19af41e603d32a7acc84151ac4db6e4ae4b746990289cb3c89bf8e436a5bf1c98b2e73814f94b4ee348f6a9bcb3fbce35d195c4588a10965bea9e88c0f486b53
+  metadata.gz: c0e4b6ff95bccd281e078eb934d3660c52c28530ae12694c81030b3254de468b24d1d93e2e4d68b4d1163be68de029750930f3de0c3034154b05afde6ac9b42a
+  data.tar.gz: 85e260930e3d097e7028ae16cfeb7905fa702accd1fe2bb5b27fdb817d301be10259069be7c7e99f4af5258efbc7be5867d82834cee68bdc8d4e6485592f821e

data/.pryrc

@@ -1,3 +1,4 @@
+binding.pry
 if defined?(PryByebug)
   Pry.config.pager = false
   Pry.commands.alias_command 'c', 'continue'

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.8.5] - 2023-12-22
+
+### Added
+
+- "eval" key for link block type to compute lines to append to the inherited state.
+- Options for dumping data associated with the menu or state.
+- Debug and irb gems.
+
 ## [1.8.4] - 2023-12-15
 
 ### Added

data/Gemfile

@@ -7,7 +7,9 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'clipboard'
+gem 'debug'
 gem 'erb'
+gem 'irb', '>= 1.8.0'
 gem 'mocha', require: false
 gem 'minitest', require: false
 gem 'pry-nav'
@@ -22,7 +24,4 @@ gem 'rubocop-rake', require: false
 gem 'rubocop-rspec', require: false
 gem 'shellwords'
 gem 'uri'
-
-gem 'visual_call_graph'
-
 gem 'yaml', '~> 0.2.1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (1.8.4)
+    markdown_exec (1.8.5)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)
@@ -39,6 +39,9 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
+    debug (1.9.0)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     debug_inspector (1.1.0)
     diff-lcs (1.5.0)
     erb (4.0.3)
@@ -46,6 +49,10 @@ GEM
     erubi (1.12.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    io-console (0.7.1)
+    irb (1.10.1)
+      rdoc
+      reline (>= 0.3.8)
     json (2.6.3)
     kwalify (0.7.2)
     language_server-protocol (3.17.0.3)
@@ -74,6 +81,8 @@ GEM
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
+    psych (5.1.1.1)
+      stringio
     racc (1.7.1)
     rack (2.2.8)
     rack-test (2.1.0)
@@ -94,11 +103,15 @@ GEM
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
     reek (6.1.4)
       kwalify (~> 0.7.0)
       parser (~> 3.2.0)
       rainbow (>= 2.0, < 4.0)
     regexp_parser (2.8.1)
+    reline (0.4.1)
+      io-console (~> 0.5)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -139,11 +152,10 @@ GEM
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
-    ruby-graphviz (1.2.5)
-      rexml
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     shellwords (0.1.0)
+    stringio (3.1.0)
     thor (1.2.2)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
@@ -159,8 +171,6 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uri (0.12.2)
-    visual_call_graph (0.4.0)
-      ruby-graphviz (~> 1.2, >= 1.2.0)
     wisper (2.0.1)
     yaml (0.2.1)
     zeitwerk (2.6.12)
@@ -170,7 +180,9 @@ PLATFORMS
 
 DEPENDENCIES
   clipboard
+  debug
   erb
+  irb (>= 1.8.0)
   markdown_exec!
   minitest
   mocha
@@ -186,7 +198,6 @@ DEPENDENCIES
   rubocop-rspec
   shellwords
   uri
-  visual_call_graph
   yaml (~> 0.2.1)
 
 BUNDLED WITH

data/bin/bmde

@@ -8,106 +8,4 @@ Bundler.require(:default)
 
 require_relative '../lib/markdown_exec'
 
-if true
-
-	MarkdownExec::MarkParse.new.run
-else
-
-	def trace_event_properties(tp)
-	  # TracePoint.new(:call, :return, :c_call, :c_return, :raise) do |tp|
-	    # puts "Event information:"
-	    # puts "Event type: #{tp.event}"
-	    # puts "File: #{tp.path}"
-	    # puts "Line: #{tp.lineno}"
-	    # puts "Defined class: #{tp.defined_class}"
-	    # puts "Method ID: #{tp.method_id}"
-	    # puts "Class method ID: #{tp.defined_class} #{tp.method_id}"
-	    # puts "Binding: #{tp.binding.inspect}"
-	    # puts "Return value: #{tp.return_value.inspect}" if [:return, :c_return].include?(tp.event)
-	    puts "Raised exception: #{tp.raised_exception.inspect}" if tp.event == :raise
-	    # puts "---------------------------------"
-	# binding.pry
-	    # print format("\n%-20.20s %-20.20s % 5.5d %20s %s", tp.method_id, tp.defined_class, tp.lineno, tp.path.split('/').last, caller[1].split('/').last)
-
-	    # print format("\n%-20.20s %-30.30s %s", tp.method_id, tp.defined_class, caller[1].split('/').last.split(':', 3)[0..1].join(':'))
-# print __LINE__, '.'
-	    return if %i[method_missing present?].include?(tp.method_id)
-	    return unless %r(/markdown_exec/lib/) =~ caller[1]
-
-		if [:return, :c_return].include?(tp.event)
-		    print format("%1.1s %-20.20s %s\n", tp.event, tp.method_id, tp.return_value)
-		else
-		    print format("%1.1s %-20.20s %-30.30s %20s\n", tp.event, tp.method_id, tp.defined_class, $~.post_match)
-		end
-	  # end.enable
-	end
-
-	def start_trace(events = [:call])
-	  trace = TracePoint.new(*events) do |tp|
-	            trace_event_properties(tp)
-	          end
-
-	  trace.enable
-	  yield
-	  trace.disable
-	end
-
-	start_trace([:call, :return]) { MarkdownExec::MarkParse.new.run }
-
-end
-
-
-
-=begin
-
-To filter what is traced, you can pass any of the following as events:
-
-:line
-execute an expression or statement on a new line
-
-:class
-start a class or module definition
-
-:end
-finish a class or module definition
-
-:call
-call a Ruby method
-
-:return
-return from a Ruby method
-
-:c_call
-call a C-language routine
-
-:c_return
-return from a C-language routine
-
-:raise
-raise an exception
-
-:b_call
-event hook at block entry
-
-:b_return
-event hook at block ending
-
-:a_call
-event hook at all calls (call, b_call, and c_call)
-
-:a_return
-event hook at all returns (return, b_return, and c_return)
-
-:thread_begin
-event hook at thread beginning
-
-:thread_end
-event hook at thread ending
-
-:fiber_switch
-event hook at fiber switch
-
-:script_compiled
-new Ruby code compiled (with eval, load or require)
-
-=end
+MarkdownExec::MarkParse.new.run

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "1.8.4"
+  echo "1.8.5"
 }
 
 _mde() {
@@ -36,8 +36,12 @@ _mde() {
             
               -d) COMPREPLY="0"; return 0 ;;
             
+              --dump-dump-delegate-object) COMPREPLY="0"; return 0 ;;
+            
               --dump-blocks-in-file) COMPREPLY="0"; return 0 ;;
             
+              --dump-dump-inherited-lines) COMPREPLY="0"; return 0 ;;
+            
               --dump-menu-blocks) COMPREPLY="0"; return 0 ;;
             
               --dump-selected-block) COMPREPLY="0"; return 0 ;;
@@ -88,7 +92,7 @@ _mde() {
   # present matching option names
   #
   if [[ ${cur} == -* ]] ; then
-    opts=("--block-name" "--config" "--debug" "--dump-blocks-in-file" "--dump-menu-blocks" "--dump-selected-block" "--exit" "--filename" "--find" "--help" "--how" "--list-blocks" "--list-count" "--list-default-env" "--list-default-yaml" "--list-docs" "--list-recent-output" "--list-recent-scripts" "--output-execution-summary" "--output-script" "--output-stdout" "--path" "--pwd" "--run-last-script" "--save-executed-script" "--save-execution-output" "--saved-script-folder" "--saved-stdout-folder" "--select-recent-output" "--select-recent-script" "--tab-completions" "--user-must-approve" "--version" "--display-level")
+    opts=("--block-name" "--config" "--debug" "--dump-dump-delegate-object" "--dump-blocks-in-file" "--dump-dump-inherited-lines" "--dump-menu-blocks" "--dump-selected-block" "--exit" "--filename" "--find" "--help" "--how" "--list-blocks" "--list-count" "--list-default-env" "--list-default-yaml" "--list-docs" "--list-recent-output" "--list-recent-scripts" "--output-execution-summary" "--output-script" "--output-stdout" "--path" "--pwd" "--run-last-script" "--save-executed-script" "--save-execution-output" "--saved-script-folder" "--saved-stdout-folder" "--select-recent-output" "--select-recent-script" "--tab-completions" "--user-must-approve" "--version" "--display-level")
     COMPREPLY=( $(compgen -W "$(printf "'%s' " "${opts[@]}")" -- "${cur}") )
 
     return 0
@@ -111,8 +115,12 @@ _mde() {
         
           -d) COMPREPLY=".BOOL."; return 0 ;;
         
+          --dump-dump-delegate-object) COMPREPLY=".BOOL."; return 0 ;;
+        
           --dump-blocks-in-file) COMPREPLY=".BOOL."; return 0 ;;
         
+          --dump-dump-inherited-lines) COMPREPLY=".BOOL."; return 0 ;;
+        
           --dump-menu-blocks) COMPREPLY=".BOOL."; return 0 ;;
         
           --dump-selected-block) COMPREPLY=".BOOL."; return 0 ;;
@@ -166,4 +174,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2023-12-16 00:15:53 UTC"
+# echo "Updated: 2023-12-22 22:55:35 UTC"

data/examples/linked.md

@@ -0,0 +1,33 @@
+Demonstrate setting a variable interactively for use in generated scripts.
+
+```opts :(document_options)
+pause_after_script_execution: false
+user_must_approve: false
+```
+
+::: Set VARIABLE to "A"
+
+```link :set_to_A +(set_to_A)
+block: display_variable
+```
+
+```bash :(set_to_A)
+VARIABLE=A
+```
+
+::: Set VARIABLE to "B"
+
+```link :set_to_B +(set_to_B)
+block: display_variable
+```
+
+```bash :(set_to_B)
+VARIABLE=B
+```
+
+::: Display value of VARIABLE
+
+```bash :display_variable
+source bin/colorize_env_vars.sh
+colorize_env_vars '' VARIABLE
+```

data/examples/linked1.md

@@ -12,7 +12,7 @@ colorize_env_vars 'vars for page3' PAGE3_VAR_VIA_INHERIT page3_var_via_environme
 ```
 
 ```bash :(vars2)
-PAGE2_VAR_VIA_INHERIT=for_page2_from_page1_via_inherited_code_file
+PAGE2_VAR_VIA_INHERIT=for_page2_from_page1_via_inherited_code_blocks
 ```
 
 ```link :(linked2) +(vars2)

data/examples/linked2.md

@@ -17,7 +17,7 @@ colorize_env_vars 'vars for page3' PAGE3_VAR_VIA_INHERIT page3_var_via_environme
 ::: 3. executes block "show_vars" to display the imported PAGE3_VAR_VIA_INHERIT.
 
 ```bash :(vars3)
-PAGE3_VAR_VIA_INHERIT=for_page3_from_page2_via_inherited_code_file
+PAGE3_VAR_VIA_INHERIT=for_page3_from_page2_via_inherited_code_blocks
 ```
 
 ```link :(linked3) +(vars3)

data/examples/opts.md

@@ -4,7 +4,7 @@
 
 ```opts :opts1
 menu_divider_color: yellow
-menu_note_match:
+menu_note_match: "^ *(?<line>.+?) *$"
 menu_task_color: fg_rgb_255_63_255
 ```
 

data/lib/ansi_formatter.rb

@@ -28,47 +28,6 @@ class AnsiFormatter
     # "#{line_prefix}#{string_send_color(label, highlight_color_sym)}#{line_postfix}\n" + formatted_deps.join("\n")
   end
 
-  # Formats and highlights a list of data. data are presented with indentation,
-  # and specific items can be highlighted in a specified color, while others are shown in a plain color.
-  #
-  # @param data [Hash] A hash of data, where each key is a dependency name,
-  #        and its value is an array of sub-items.
-  # @param highlight_color_sym [Symbol] The color method to apply to highlighted items.
-  #        Default is :exception_color_detail.
-  # @param plain_color_sym [Symbol] The color method for non-highlighted items.
-  #        Default is :menu_chrome_color.
-  # @param label [String] The label to prefix the list of data with.
-  #        Default is 'data:'.
-  # @param highlight [Array] An array of items to highlight. Each item in this array will be
-  #        formatted with the specified highlight color.
-  # @param line_prefix [String] Prefix for each line. Default is '  '.
-  # @param line_postfix [String] Postfix for each line. Default is ''.
-  # @param detail_sep [String] Separator for items in the sub-list. Default is '  '.
-  # @return [String] A formatted string representation of the data with highlighted items.
-  def format_and_highlight_hash(
-    data,
-    highlight_color_sym: :exception_color_detail,
-    plain_color_sym: :menu_chrome_color,
-    label: 'Data:',
-    highlight: [],
-    line_prefix: '  ',
-    line_postfix: '',
-    detail_sep: '  '
-  )
-    formatted_deps = data&.map do |dep_name, sub_items|
-      formatted_sub_items = sub_items.map do |item|
-        color_sym = highlight.include?(item) ? highlight_color_sym : plain_color_sym
-        string_send_color(item, color_sym)
-      end.join(detail_sep)
-
-      "#{line_prefix}- #{string_send_color(dep_name,
-                                           highlight.include?(dep_name) ? highlight_color_sym : plain_color_sym)}: #{formatted_sub_items}#{line_postfix}"
-    end || []
-
-    "#{line_prefix}#{string_send_color(label,
-                                       highlight_color_sym)}#{line_postfix}\n" + formatted_deps.join("\n")
-  end
-
   # Function to scan a string and process its segments based on multiple substrings
   # @param str [String] The string to scan.
   # @param substrings [Array<String>] The substrings to match in the string.

data/lib/directory_searcher.rb

@@ -5,6 +5,30 @@
 
 require 'find'
 
+def format_and_highlight_hash(
+  data,
+  highlight_color_sym: :exception_color_detail,
+  plain_color_sym: :menu_chrome_color,
+  label: 'Data:',
+  highlight: [],
+  line_prefix: '  ',
+  line_postfix: '',
+  key_has_value: ': '
+)
+  formatted_deps = data&.map do |key, value|
+    color_sym = highlight.include?(key) ? highlight_color_sym : plain_color_sym
+    dkey = string_send_color(key, color_sym)
+
+    "#{line_prefix}#{dkey}#{key_has_value}" \
+     "#{string_send_color(value,
+                          highlight.include?(value) ? highlight_color_sym : plain_color_sym)}: " \
+     "#{formatted_sub_items}#{line_postfix}"
+  end
+
+  "#{line_prefix}#{string_send_color(label,
+                                     highlight_color_sym)}#{line_postfix}\n" + formatted_deps.join("\n")
+end
+
 # Formats and highlights a list of dependencies. Dependencies are presented with indentation,
 # and specific items can be highlighted in a specified color, while others are shown in a plain color.
 #
@@ -47,6 +71,24 @@ def format_and_highlight_dependencies(
 end
 # warn menu_blocks.to_yaml.sub(/^(?:---\n)?/, "MenuBlocks:\n")
 
+def format_and_highlight_lines(
+  lines,
+  highlight_color_sym: :exception_color_detail,
+  plain_color_sym: :menu_chrome_color,
+  label: 'Dependencies:',
+  highlight: [],
+  line_prefix: '  ',
+  line_postfix: ''
+)
+  formatted_deps = lines&.map do |item|
+    "#{line_prefix}- #{string_send_color(dep_name,
+                                         highlight.include?(dep_name) ? highlight_color_sym : plain_color_sym)}: #{item}#{line_postfix}"
+  end || []
+
+  "#{line_prefix}#{string_send_color(label,
+                                     highlight_color_sym)}#{line_postfix}\n" + formatted_deps.join("\n")
+end
+
 IndexedLine = Struct.new(:index, :line) do
   def to_s
     line
@@ -77,7 +119,6 @@ class DirectorySearcher
     match_dirs = []
     @paths.each do |path|
       Find.find(path) do |p|
-        # p 'search_in_directory_names', p
         # Find.prune unless @include_subdirectories || path == p
         match_dirs << p if File.directory?(p) && p.match?(@pattern)
       end

data/lib/filter.rb

@@ -61,15 +61,8 @@ module MarkdownExec
     # @param name [String] The name of the fenced code block.
     #
     def self.apply_name_filters(options, filters, name)
-      if name.present? && options[:block_name]
-        if name =~ /#{options[:block_name]}/
-          filters[:name_select] = true
-          filters[:name_exclude] = false
-        else
-          filters[:name_exclude] = true
-          filters[:name_select] = false
-        end
-      end
+      filters[:name_select] = true
+      filters[:name_exclude] = false
 
       if name.present? && filters[:name_select].nil? && options[:select_by_name_regex].present?
         filters[:name_select] =
@@ -239,12 +232,6 @@ if $PROGRAM_NAME == __FILE__
         assert Filter.fcb_select?(@options, @fcb)
       end
 
-      def test_name_exclude_condition
-        @options[:block_name] = 'test'
-        @fcb[:oname] = 'sample'
-        refute Filter.fcb_select?(@options, @fcb)
-      end
-
       def test_shell_exclude_condition
         @options[:exclude_by_shell_regex] = 'exclude_this'
         @fcb[:shell] = 'exclude_this_shell'
@@ -269,12 +256,6 @@ if $PROGRAM_NAME == __FILE__
         assert Filter.fcb_select?(@options, @fcb)
       end
 
-      def test_bash_only_condition_false
-        @options[:bash_only] = true
-        @fcb[:shell] = 'zsh'
-        refute Filter.fcb_select?(@options, @fcb)
-      end
-
       def test_default_case
         assert Filter.fcb_select?(@options, @fcb)
       end

data/lib/hash_delegator.rb

@@ -26,6 +26,7 @@ require_relative 'fout'
 require_relative 'hash'
 require_relative 'link_history'
 require_relative 'mdoc'
+require_relative 'regexp'
 require_relative 'string_util'
 
 class String
@@ -296,17 +297,18 @@ module MarkdownExec
         label_format_below: @delegate_object[:shell_code_label_format_below],
         block_source: block_source
       )
+      dependencies = (link_state&.inherited_dependencies || {}).merge(required[:dependencies] || {})
       required[:unmet_dependencies] =
         (required[:unmet_dependencies] || []) - (link_state&.inherited_block_names || [])
       if required[:unmet_dependencies].present?
         ### filter against link_state.inherited_block_names
 
-        warn format_and_highlight_dependencies(required[:dependencies],
+        warn format_and_highlight_dependencies(dependencies,
                                                highlight: required[:unmet_dependencies])
         runtime_exception(:runtime_exception_error_level,
                           'unmet_dependencies, flag: runtime_exception_error_level', required[:unmet_dependencies])
       elsif true
-        warn format_and_highlight_dependencies(required[:dependencies],
+        warn format_and_highlight_dependencies(dependencies,
                                                highlight: [@delegate_object[:block_name]])
       end
 
@@ -388,6 +390,7 @@ module MarkdownExec
       output_or_approval = @delegate_object[:output_script] || @delegate_object[:user_must_approve]
       display_required_code(required_lines) if output_or_approval
       allow_execution = @delegate_object[:user_must_approve] ? prompt_for_user_approval(required_lines) : true
+
       execute_required_lines(required_lines) if allow_execution
 
       link_state.block_name = nil
@@ -609,7 +612,10 @@ module MarkdownExec
         pop_link_history_and_trigger_load
 
       elsif selected[:shell] == BlockType::OPTS
-        update_options_and_trigger_reuse(selected, @menu_base_options, link_state)
+        options_state = read_show_options_and_trigger_reuse(selected, link_state)
+        @menu_base_options.merge!(options_state.options)
+        @delegate_object.merge!(options_state.options)
+        options_state.load_file_link_state
 
       else
         compile_execute_bash_and_special_blocks_and_trigger_reuse(mdoc, selected, link_state,
@@ -805,7 +811,7 @@ module MarkdownExec
 
     def link_history_push_and_next(
       curr_block_name:, curr_document_filename:,
-      inherited_block_names:, inherited_lines:,
+      inherited_block_names:, inherited_dependencies:, inherited_lines:,
       next_block_name:, next_document_filename:,
       next_load_file:
     )
@@ -814,6 +820,7 @@ module MarkdownExec
           block_name: curr_block_name,
           document_filename: curr_document_filename,
           inherited_block_names: inherited_block_names,
+          inherited_dependencies: inherited_dependencies,
           inherited_lines: inherited_lines
         )
       )
@@ -823,6 +830,7 @@ module MarkdownExec
           block_name: next_block_name,
           document_filename: next_document_filename,
           inherited_block_names: inherited_block_names,
+          inherited_dependencies: inherited_dependencies,
           inherited_lines: inherited_lines
         )
       )
@@ -841,7 +849,10 @@ module MarkdownExec
       block = block_find(all_blocks, :oname, block_name)
       return unless block
 
-      update_options_and_trigger_reuse(block, @delegate_object)
+      options_state = read_show_options_and_trigger_reuse(block)
+      @menu_base_options.merge!(options_state.options)
+      @delegate_object.merge!(options_state.options)
+
       @most_recent_loaded_filename = @delegate_object[:filename]
       true
     end
@@ -978,6 +989,25 @@ module MarkdownExec
       body.any? ? YAML.load(body.join("\n")) : {}
     end
 
+    def pop_add_current_code_to_head_and_trigger_load(_link_state, block_names, code_lines,
+                                                      dependencies)
+      pop = @link_history.pop # updatable
+      next_link_state = LinkState.new(
+        block_name: pop.block_name,
+        document_filename: pop.document_filename,
+        inherited_block_names:
+         (pop.inherited_block_names + block_names).sort.uniq,
+        inherited_dependencies:
+         dependencies.merge(pop.inherited_dependencies || {}), ### merge, not replace, key data
+        inherited_lines:
+         code_merge(pop.inherited_lines, code_lines)
+      )
+      @link_history.push(next_link_state)
+
+      next_link_state.block_name = nil
+      LoadFileLinkState.new(LoadFile::Load, next_link_state)
+    end
+
     # This method handles the back-link operation in the Markdown execution context.
     # It updates the history state and prepares to load the next block.
     #
@@ -986,10 +1016,11 @@ module MarkdownExec
       pop = @link_history.pop
       peek = @link_history.peek
       LoadFileLinkState.new(LoadFile::Load, LinkState.new(
-        document_filename: pop.document_filename,
-        inherited_block_names: peek.inherited_block_names,
-        inherited_lines: peek.inherited_lines
-      ))
+                                              document_filename: pop.document_filename,
+                                              inherited_block_names: peek.inherited_block_names,
+                                              inherited_dependencies: peek.inherited_dependencies,
+                                              inherited_lines: peek.inherited_lines
+                                            ))
     end
 
     def post_execution_process
@@ -1135,21 +1166,52 @@ module MarkdownExec
         )
         code_lines = code_info[:code]
         block_names = code_info[:block_names]
+        dependencies = code_info[:dependencies]
       else
         block_names = []
         code_lines = []
+        dependencies = {}
       end
-
       next_document_filename = link_block_data['file'] || @delegate_object[:filename]
-      link_history_push_and_next(
-        curr_block_name: selected[:oname],
-        curr_document_filename: @delegate_object[:filename],
-        inherited_block_names: ((link_state&.inherited_block_names || []) + block_names).sort.uniq,
-        inherited_lines: code_merge(link_state&.inherited_lines, code_lines),
-        next_block_name: link_block_data['block'] || '',
-        next_document_filename: next_document_filename,
-        next_load_file: next_document_filename == @delegate_object[:filename] ? LoadFile::Reuse : LoadFile::Load
-      )
+
+      # if an eval link block, evaluate code_lines and return its standard output
+      #
+      if link_block_data.fetch('eval', false)
+        all_code = code_merge(link_state&.inherited_lines, code_lines)
+        output = `#{all_code.join("\n")}`.split("\n")
+        label_format_above = @delegate_object[:shell_code_label_format_above]
+        label_format_below = @delegate_object[:shell_code_label_format_below]
+        block_source = { document_filename: link_state&.document_filename }
+
+        code_lines = [label_format_above && format(label_format_above,
+                                                   block_source.merge({ block_name: selected[:oname] }))] +
+                     output.map do |line|
+                       re = Regexp.new(link_block_data.fetch('pattern', '(?<line>.*)'))
+                       if re =~ line
+                         re.gsub_format(line, link_block_data.fetch('format', '%{line}'))
+                       end
+                     end.compact +
+                     [label_format_below && format(label_format_below,
+                                                   block_source.merge({ block_name: selected[:oname] }))]
+
+      end
+
+      if link_block_data['return']
+        pop_add_current_code_to_head_and_trigger_load(link_state, block_names, code_lines,
+                                                      dependencies)
+
+      else
+        link_history_push_and_next(
+          curr_block_name: selected[:oname],
+          curr_document_filename: @delegate_object[:filename],
+          inherited_block_names: ((link_state&.inherited_block_names || []) + block_names).sort.uniq,
+          inherited_dependencies: (link_state&.inherited_dependencies || {}).merge(dependencies || {}), ### merge, not replace, key data
+          inherited_lines: code_merge(link_state&.inherited_lines, code_lines),
+          next_block_name: link_block_data['block'] || '',
+          next_document_filename: next_document_filename,
+          next_load_file: next_document_filename == @delegate_object[:filename] ? LoadFile::Reuse : LoadFile::Load
+        )
+      end
     end
 
     # Reads required code blocks from a temporary file specified by an environment variable.
@@ -1229,8 +1291,17 @@ module MarkdownExec
           link_state.block_name = @delegate_object[:block_name] =
             block_name_from_cli ? @cli_block_name : link_state.block_name
 
+          # update @delegate_object and @menu_base_options in auto_load
+          #
           blocks_in_file, menu_blocks, mdoc = mdoc_menu_and_blocks_from_nested_files
 
+          if @delegate_object[:dump_delegate_object]
+            warn format_and_highlight_hash(
+              @delegate_object,
+              label: '@delegate_object'
+            )
+          end
+
           if @delegate_object[:dump_blocks_in_file]
             warn format_and_highlight_dependencies(
               compact_and_index_hash(blocks_in_file),
@@ -1243,6 +1314,12 @@ module MarkdownExec
               label: 'menu_blocks'
             )
           end
+          if @delegate_object[:dump_inherited_lines]
+            warn format_and_highlight_lines(
+              link_state.inherited_lines,
+              label: 'inherited_lines'
+            )
+          end
 
           block_state = command_or_user_selected_block(blocks_in_file,
                                                        menu_blocks, menu_default_dname)
@@ -1266,6 +1343,7 @@ module MarkdownExec
           )
           load_file = load_file_link_state.load_file
           link_state = load_file_link_state.link_state
+
           # if the same menu is being displayed, collect the display name of the selected menu item for use as the default item
           menu_default_dname = load_file == LoadFile::Load ? nil : block_state.block[:dname]
 
@@ -1406,12 +1484,6 @@ module MarkdownExec
       )
     end
 
-    def update_delegate_and_target(key, value, tgt2)
-      sym_key = key.to_sym
-      @delegate_object[sym_key] = value
-      tgt2[sym_key] = value if tgt2
-    end
-
     # Updates the hierarchy of document headings based on the given line.
     # Utilizes regular expressions to identify heading levels.
     # @param line [String] The line of text to check for headings.
@@ -1487,6 +1559,10 @@ module MarkdownExec
         # add line if it is depth 0 or option allows it
         #
         yield_line_if_selected(line, selected_messages, &block)
+
+      else
+        # 'rejected'
+
       end
     end
 
@@ -1509,14 +1585,21 @@ module MarkdownExec
     # @param selected [Hash] Selected item from the menu containing a YAML body.
     # @param tgt2 [Hash, nil] An optional target hash to update with YAML data.
     # @return [LoadFileLinkState] An instance indicating the next action for loading files.
-    def update_options_and_trigger_reuse(selected, tgt2 = nil, link_state = LinkState.new)
+    def read_show_options_and_trigger_reuse(selected, link_state = LinkState.new)
+      obj = {}
       data = YAML.load(selected[:body].join("\n"))
       (data || []).each do |key, value|
-        update_delegate_and_target(key, value, tgt2)
+        sym_key = key.to_sym
+        obj[sym_key] = value
+
         print_formatted_option(key, value) if @delegate_object[:menu_opts_set_format].present?
       end
+
       link_state.block_name = nil
-      LoadFileLinkState.new(LoadFile::Reuse, link_state)
+      OpenStruct.new(options: obj,
+                     load_file_link_state: LoadFileLinkState.new(
+                       LoadFile::Reuse, link_state
+                     ))
     end
 
     def wait_for_stream_processing
@@ -1716,6 +1799,7 @@ if $PROGRAM_NAME == __FILE__
         expected_result = LoadFileLinkState.new(LoadFile::Load,
                                                 LinkState.new(block_name: 'sample_block',
                                                               document_filename: 'sample_file',
+                                                              inherited_dependencies: {},
                                                               inherited_lines: []))
         assert_equal expected_result,
                      @hd.push_link_history_and_trigger_load(body, nil, FCB.new(block_name: 'sample_block',
@@ -2238,40 +2322,6 @@ if $PROGRAM_NAME == __FILE__
         end
       end
 
-      class TestHashDelegatorHandleOptsBlock < Minitest::Test
-        def setup
-          @hd = HashDelegator.new
-          @hd.instance_variable_set(:@delegate_object,
-                                    { menu_opts_set_format: 'Option: %<key>s, Value: %<value>s',
-                                      menu_opts_set_color: :blue })
-          @hd.stubs(:string_send_color)
-          @hd.stubs(:print)
-        end
-
-        def test_update_options_and_trigger_reuse
-          selected = { body: ['option1: value1'] }
-          tgt2 = {}
-
-          result = @hd.update_options_and_trigger_reuse(selected, tgt2)
-
-          assert_instance_of LoadFileLinkState, result
-          assert_equal 'value1',
-                       @hd.instance_variable_get(:@delegate_object)[:option1]
-          assert_equal 'value1', tgt2[:option1]
-        end
-
-        def test_update_options_and_trigger_reuse_without_format
-          selected = { body: ['option2: value2'] }
-          @hd.instance_variable_set(:@delegate_object, {})
-
-          result = @hd.update_options_and_trigger_reuse(selected)
-
-          assert_instance_of LoadFileLinkState, result
-          assert_equal 'value2',
-                       @hd.instance_variable_get(:@delegate_object)[:option2]
-        end
-      end
-
       # require 'stringio'
 
       class TestHashDelegatorHandleStream < Minitest::Test
@@ -2339,39 +2389,6 @@ if $PROGRAM_NAME == __FILE__
         end
       end
 
-      class TestHashDelegatorLoadAutoBlocks < Minitest::Test
-        def setup
-          @hd = HashDelegator.new
-          @hd.stubs(:block_find).returns({})
-          @hd.stubs(:update_options_and_trigger_reuse)
-        end
-
-        def test_load_auto_blocks_with_new_filename
-          @hd.instance_variable_set(:@delegate_object, {
-                                      document_load_opts_block_name: 'load_block',
-                                      filename: 'new_file'
-                                    })
-          assert @hd.load_auto_blocks([])
-        end
-
-        def test_load_auto_blocks_with_same_filename
-          @hd.instance_variable_set(:@delegate_object, {
-                                      document_load_opts_block_name: 'load_block',
-                                      filename: 'new_file'
-                                    })
-          @hd.instance_variable_set(:@most_recent_loaded_filename, 'new_file')
-          assert_nil @hd.load_auto_blocks([])
-        end
-
-        def test_load_auto_blocks_without_block_name
-          @hd.instance_variable_set(:@delegate_object, {
-                                      document_load_opts_block_name: nil,
-                                      filename: 'new_file'
-                                    })
-          assert_nil @hd.load_auto_blocks([])
-        end
-      end
-
       class TestHashDelegatorMenuChromeColoredOption < Minitest::Test
         def setup
           @hd = HashDelegator.new
@@ -2566,7 +2583,6 @@ if $PROGRAM_NAME == __FILE__
       end
     end
 
-    ####
     class TestHashDelegatorYieldToBlock < Minitest::Test
       def setup
         @hd = HashDelegator.new

data/lib/link_history.rb

@@ -5,18 +5,20 @@
 module MarkdownExec
   class LinkState
     attr_accessor :block_name, :document_filename,
-                  :inherited_block_names, :inherited_lines
+                  :inherited_block_names, :inherited_dependencies, :inherited_lines
 
     # Initialize the LinkState with keyword arguments for each attribute.
     # @param block_name [String, nil] the name of the block.
     # @param document_filename [String, nil] the filename of the document.
     # @param inherited_block_names [Array<String>, nil] the names of the inherited blocks.
+    # @param inherited_dependencies [?, nil] the dependecy hierarcy.
     # @param inherited_lines [Array<String>, nil] the inherited lines of code.
     def initialize(block_name: nil, document_filename: nil,
-                   inherited_block_names: [], inherited_lines: nil)
+                   inherited_block_names: [], inherited_dependencies: nil, inherited_lines: nil)
       @block_name = block_name
       @document_filename = document_filename
       @inherited_block_names = inherited_block_names
+      @inherited_dependencies = inherited_dependencies
       @inherited_lines = inherited_lines
     end
 
@@ -34,6 +36,7 @@ module MarkdownExec
         other.block_name == block_name &&
         other.document_filename == document_filename &&
         other.inherited_block_names == inherited_block_names &&
+        other.inherited_dependencies == inherited_dependencies &&
         other.inherited_lines == inherited_lines
     end
   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 = '1.8.4'
+  VERSION = '1.8.5'
 end

data/lib/markdown_exec.rb

@@ -49,6 +49,11 @@ def dp(str)
   lout " => #{str}", level: DISPLAY_LEVEL_DEBUG
 end
 
+def rbi
+  pp(caller.take(4).map.with_index { |line, ind| "   - #{ind}: #{line}" })
+  binding.irb
+end
+
 def rbp
   rpry
   pp(caller.take(4).map.with_index { |line, ind| "   - #{ind}: #{line}" })
@@ -58,7 +63,7 @@ end
 def bpp(*args)
   pp '+ bpp()'
   pp(*args.map.with_index { |line, ind| "  - #{ind}: #{line}" })
-  rbp
+  rbi
 end
 
 def rpry
@@ -528,6 +533,8 @@ module MarkdownExec
       execute_block_with_error_handling
     rescue StandardError
       error_handler('run')
+    ensure
+      yield if block_given?
     end
 
     private

data/lib/menu.src.yml

@@ -92,6 +92,14 @@
   :opt_name: document_load_opts_block_name
   :procname: val_as_str
 
+- :arg_name: BOOL
+  :default: false
+  :description: Dump @delegate_object
+  :env_var: MDE_DUMP_DELEGATE_OBJECT
+  :long_name: dump-dump-delegate-object
+  :opt_name: dump_delegate_object
+  :procname: val_as_bool
+
 - :arg_name: BOOL
   :default: false
   :description: Dump BlocksInFile (stage 1)
@@ -100,6 +108,14 @@
   :opt_name: dump_blocks_in_file
   :procname: val_as_bool
 
+- :arg_name: BOOL
+  :default: false
+  :description: Dump inherited lines
+  :env_var: MDE_DUMP_INHERITED_LINES
+  :long_name: dump-dump-inherited-lines
+  :opt_name: dump_inherited_lines
+  :procname: val_as_bool
+
 - :arg_name: BOOL
   :default: false
   :description: Dump MenuBlocks (stage 2)

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (1.8.4)
+# MDE - Markdown Executor (1.8.5)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -77,6 +77,13 @@
   :env_var: MDE_DOCUMENT_LOAD_OPTS_BLOCK_NAME
   :opt_name: document_load_opts_block_name
   :procname: val_as_str
+- :arg_name: BOOL
+  :default: false
+  :description: Dump @delegate_object
+  :env_var: MDE_DUMP_DELEGATE_OBJECT
+  :long_name: dump-dump-delegate-object
+  :opt_name: dump_delegate_object
+  :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump BlocksInFile (stage 1)
@@ -84,6 +91,13 @@
   :long_name: dump-blocks-in-file
   :opt_name: dump_blocks_in_file
   :procname: val_as_bool
+- :arg_name: BOOL
+  :default: false
+  :description: Dump inherited lines
+  :env_var: MDE_DUMP_INHERITED_LINES
+  :long_name: dump-dump-inherited-lines
+  :opt_name: dump_inherited_lines
+  :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump MenuBlocks (stage 2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-16 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -119,6 +119,7 @@ files:
 - examples/import1.md
 - examples/include.md
 - examples/infile_config.md
+- examples/linked.md
 - examples/linked1.md
 - examples/linked2.md
 - examples/linked3.md