markdown_exec 3.0.7 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbc7513dd9f277050aee99dd0c2eb7d047a43d75ae763510131b150a678648f9
-  data.tar.gz: 1f8805e038d7a355bf3f68b47e066e30b4f1f75a269b907bfe8e55f83a9b9989
+  metadata.gz: db0df1de92fc6f0f9e015825c75de74529867c8e128ea1fa8042aeed6ce7a632
+  data.tar.gz: 2c3d84281cb92393d86b3920e365e5567823022cbbb8b0fc9121780160decc46
 SHA512:
-  metadata.gz: edb200a3b6c6edcb4ab1bb942cfe7f27f3fb5604d7a2ffa449f2b2bb3492f0ee0864226e1202a2269fbc731e09f5fc29da001ab22229edc81e8754d51ae486cd
-  data.tar.gz: 19bb30ed25a401d3ee94826ae82c9f02836f7b51493ab88b3197a6a5c2826d7d5f0580653a0f15a07ac43a97501be8387ec86e37f4aafb87b9d7530a89514a70
+  metadata.gz: dc269ea3ef8706322f031617df8b47fcaa9e14cbffc586bdf834e69c4d277120e0f9b7922257e7c68f332aa3ab188c9a79cd70f42fa8e1619d2d5beffac6cf8c
+  data.tar.gz: 042c2709076ce1eb8c201029f5404fab11933dea6f3d068616e2082bffed08a3baf6550fa5f6e9feaa7e3248797720df239a8e33e02a2e16385af4611d0d7a71

data/Gemfile.lock

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

data/bats/cli.bats

@@ -36,6 +36,18 @@ load 'test_helper'
    ' ARG1: 37'
 }
 
+@test 'vars in link block are appended to inherited lines - local link' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/requiring-blocks.md \
+   '[link-local-block-with-vars]' \
+   '* Exit_# [link-local-block-with-vars]_ARG1="37"_block: echo-ARG1_  file: docs/dev/linked-file.md_  vars:_    ARG1: arg1-from-link-file_block: output_arguments_  vars:_    ARG1: 37_block: missing_ARG1=37_output_arguments'
+}
+
+@test 'vars in link block are appended to inherited lines - external file' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/requiring-blocks.md \
+   '[link-file-block-with-vars]' \
+   '* Exit_# [link-file-block-with-vars]_ARG1="arg1-from-link-file"_echo-ARG1'
+}
+
 # the last block is a link block, so menu is displayed
 @test 'link block setting an environment variable requires a bash block' {
   BATS_OUTPUT_FILTER=A

data/docs/dev/linked-file.md

@@ -1,3 +1,6 @@
 ```bash :echo-ARG1
 echo "ARG1: $ARG1"
+```
+```opts :(document_opts)
+menu_with_inherited_lines: true
 ```

data/docs/dev/requiring-blocks.md

@@ -21,4 +21,5 @@ echo "ARG1: $ARG1"
 @import bats-document-configuration.md
 ```opts :(document_opts)
 menu_with_exit: true
+menu_with_inherited_lines: true
 ```

data/lib/evaluate_shell_expressions.rb

@@ -45,6 +45,10 @@ def evaluate_shell_expressions(initial_code, expressions, shell: '/bin/bash',
   end
 
   result_hash
+rescue StandardError
+  ww $@, $!, caller.deref
+  ww initial_code, expressions
+  raise StandardError, $!
 end
 
 return if $PROGRAM_NAME != __FILE__

data/lib/fcb.rb

@@ -23,6 +23,7 @@ def parse_yaml_of_ux_block(
     default: export['default'],
     echo: export['echo'],
     exec: export['exec'],
+    force: export['force'],
     init: export['init'],
     menu_format: export['format'] || export['menu_format'] || menu_format,
     name: name,
@@ -156,20 +157,26 @@ module MarkdownExec
       @attrs[:id] = id
 
       if @attrs[:type] == BlockType::UX
-        case data = YAML.load(@attrs[:body].join("\n"))
-        when Hash
-          export = parse_yaml_of_ux_block(
-            data,
-            menu_format: menu_format,
-            prompt: prompt
-          )
-
-          @attrs[:center] = table_center
-          oname = @attrs[:oname] = format(export.menu_format, export.to_h)
-          @attrs[:readonly] = export.readonly
-        else
-          # triggered by an empty or non-YAML block
-          return NullResult.new(message: 'Invalid YAML', data: data)
+        begin
+          case data = YAML.load(@attrs[:body].join("\n"))
+          when Hash
+            export = parse_yaml_of_ux_block(
+              data,
+              menu_format: menu_format,
+              prompt: prompt
+            )
+
+            @attrs[:center] = table_center
+            oname = @attrs[:oname] = format(export.menu_format, export.to_h)
+            @attrs[:readonly] = export.readonly
+          else
+            # triggered by an empty or non-YAML block
+            return NullResult.new(message: 'Invalid YAML', data: data)
+          end
+        rescue StandardError
+          ww $@, $!, caller.deref
+          ww @attrs[:body], data, export
+          raise StandardError, $!
         end
       end
 

data/lib/hash_delegator.rb

@@ -954,7 +954,7 @@ module MarkdownExec
                 blocks << fcb unless result.failure?
               end
             rescue StandardError
-              # ww $@, $!
+              ww $@, $!, caller.deref
               HashDelegator.error_handler('blocks_from_nested_files',
                                           { abort: true })
             end
@@ -978,7 +978,7 @@ module MarkdownExec
       end
       OpenStruct.new(blocks: blocks, results: results)
     rescue StandardError
-      # ww $@, $!
+      ww $@, $!, caller.deref
       HashDelegator.error_handler('blocks_from_nested_files')
     end
 
@@ -1166,19 +1166,8 @@ module MarkdownExec
           return command_result_w_e_t_nl if command_result_w_e_t_nl.failure?
 
           command_result_w_e_t_nl.new_lines =
-            command_result_w_e_t_nl.new_lines.map do |name_force|
-              transformed = if command_result_w_e_t_nl.transformable
-                              transform_export_value(name_force[:text], export)
-                            else
-                              name_force[:text]
-
-                            end
-              EnvInterface.set(name_force[:name], transformed)
-
-              code_line_safe_assign(
-                name_force[:name], transformed, force: name_force[:force]
-              )
-            end
+            process_command_result_lines(command_result_w_e_t_nl, export,
+                                         required_lines)
           required_lines.concat(command_result_w_e_t_nl.new_lines)
           ret_command_result = command_result_w_e_t_nl
         else
@@ -1188,22 +1177,19 @@ module MarkdownExec
 
       ret_command_result || CommandResult.new(stdout: required_lines)
     rescue StandardError
-      ww $@, $!
+      ww $@, $!, caller.deref
       HashDelegator.error_handler('code_from_ux_block_to_set_environment_variables')
     end
 
-    def env_set(name, value)
-      EnvInterface.set(name, value)
-    end
-
     # sets ENV
     def code_from_vars_block_to_set_environment_variables(selected)
       code_lines = []
+      # code_lines << '# code_from_vars_block_to_set_environment_variables'
       case data = YAML.load(selected.body.join("\n"))
       when Hash
         data.each do |key, value|
           EnvInterface.set(key, value.to_s)
-          code_lines.push "#{key}=#{Shellwords.escape(value)}"
+          code_lines << assign_key_value_in_bash(key, value)
 
           next unless @delegate_object[:menu_vars_set_format].present?
 
@@ -1701,10 +1687,6 @@ module MarkdownExec
       @prior_execution_block = nil
     end
 
-    def selected_shell(shell_name)
-      shell_name.empty? ? shell : shell_name
-    end
-
     # Determines the state of a selected block in the menu based
     #  on the selected option.
     # It categorizes the selected option into either EXIT, BACK,
@@ -1927,6 +1909,10 @@ module MarkdownExec
       result_text
     end
 
+    def env_set(name, value)
+      EnvInterface.set(name, value)
+    end
+
     # Execute a code block after approval and provide user interaction options.
     #
     # This method displays required code blocks, asks for user approval, and
@@ -2171,10 +2157,10 @@ module MarkdownExec
       # load key and values from link block into current environment
       #
       if link_block_data[LinkKeys::VARS]
-        code_lines.push BashCommentFormatter.format_comment(selected.pub_name)
-        (link_block_data[LinkKeys::VARS] || []).each do |(key, value)|
+        code_lines << BashCommentFormatter.format_comment(selected.pub_name)
+        link_block_data[LinkKeys::VARS].each do |key, value|
+          code_lines << assign_key_value_in_bash(key, value)
           EnvInterface.set(key, value.to_s)
-          code_lines.push(assign_key_value_in_bash(key, value))
         end
       end
 
@@ -2197,7 +2183,7 @@ module MarkdownExec
       if link_block_data.fetch(LinkKeys::EVAL,
                                false) || link_block_data.fetch(LinkKeys::EXEC,
                                                                false)
-        code_lines = link_block_data_eval(
+        code_lines += link_block_data_eval(
           link_state, code_lines, selected, link_block_data,
           block_source: block_source,
           shell: @delegate_object[:block_type_default]
@@ -2593,7 +2579,10 @@ module MarkdownExec
       )
 
       return if replacements.nil?
-      return if replacements == EvaluateShellExpression::StatusFail
+      if replacements == EvaluateShellExpression::StatusFail
+        # happens on first processing of blocks before requirements are met
+        return
+      end
 
       expand_blocks_with_replacements(blocks, replacements)
       # no return
@@ -2608,7 +2597,7 @@ module MarkdownExec
       export_string = string.nil? ? export.echo : string
       case export_string
       when String, Integer, Float, TrueClass, FalseClass
-        command_result, = output_from_adhoc_bash_script_file(
+        command_result, exportable, new_lines = output_from_adhoc_bash_script_file(
           join_array_of_arrays(
             bash_script_lines,
             %(printf '%s' "#{export_string}")
@@ -2997,7 +2986,11 @@ module MarkdownExec
     # convert single items to arrays
     def join_array_of_arrays(*args)
       args.map do |item|
-        item.nil? ? nil : (item.is_a?(Array) ? item : [item])
+        if item.nil?
+          nil
+        else
+          (item.is_a?(Array) ? item : [item])
+        end
       end.compact.flatten(1)
     end
 
@@ -3621,13 +3614,14 @@ module MarkdownExec
 
         exportable = export ? export.exportable : false
         new_lines = []
+        # new_lines << { comment: 'output_from_adhoc_bash_script_file' }
         if export
           new_lines << "#{export.name}="
           export_value = output
           ### transform?
 
           command_result, exportable, new_lines = export_echo_with_code(
-            ["#{export.name}=#{Shellwords.escape(export_value)}"],
+            [assign_key_value_in_bash(export.name, export_value)],
             export,
             force: force,
             silent: silent,
@@ -3793,6 +3787,35 @@ module MarkdownExec
 
     # private
 
+    def process_command_result_lines(command_result_w_e_t_nl, export,
+                                     required_lines)
+      command_result_w_e_t_nl.new_lines.map do |name_force|
+        comment = name_force.fetch(:comment, '')
+        name = name_force.fetch(:name, '')
+        if !name.empty?
+          transformed = if command_result_w_e_t_nl.transformable
+                          transform_export_value(name_force[:text], export)
+                        else
+                          name_force[:text]
+                        end
+
+          # store the transformed value in ENV
+          EnvInterface.set(name, transformed)
+
+          set = code_line_safe_assign(
+            name, transformed, force: name_force[:force]
+          )
+
+          comment.empty? ? set : "#{set} # #{comment}"
+        else
+          "# #{comment}" if comment.empty?
+        end
+      end
+    rescue StandardError
+      ww $@, $!, caller.deref
+      raise StandardError, $!
+    end
+
     def process_string_array(arr, begin_pattern: nil, end_pattern: nil, scan1: nil,
                              format1: nil, name: '')
       in_block = !begin_pattern.present?
@@ -4422,6 +4445,10 @@ module MarkdownExec
       selected
     end
 
+    def selected_shell(shell_name)
+      shell_name.empty? ? shell : shell_name
+    end
+
     def shell
       @delegate_object[:shell]
     end
@@ -4661,7 +4688,7 @@ module MarkdownExec
     )
       command_result = nil
       exportable = true
-      force = true
+      force = export.force.nil? ? true : export.force
       new_lines = []
       silent = false
       transformable = true
@@ -4711,7 +4738,7 @@ module MarkdownExec
         else
           export_init = menu_from_list_with_back(export.allow)
           command_result, exportable, new_lines = export_echo_with_code(
-            ["#{export.name}=#{Shellwords.escape(export_init)}"],
+            [assign_key_value_in_bash(export.name, export_init)],
             export,
             force: force,
             silent: silent,
@@ -4746,11 +4773,17 @@ module MarkdownExec
           transformable = false
         end
 
-        command_result = CommandResult.new(stdout: output)
+        if exportable
+          EnvInterface.set(export.name, output)
+          new_lines << { name: export.name, force: force,
+                         text: output }
+          command_result = CommandResult.new(stdout: output)
+        end
 
       when :exec, UxActSource::EXEC
-        command_result, = output_from_adhoc_bash_script_file(
-          join_array_of_arrays(bash_script_lines, export.exec)
+        command_result, exportable, new_lines = output_from_adhoc_bash_script_file(
+          join_array_of_arrays(bash_script_lines, export.exec),
+          export
         )
 
       else
@@ -4775,7 +4808,7 @@ module MarkdownExec
     )
       command_result = nil
       exportable = true
-      force = false
+      force = export.force.nil? ? false : export.force
       new_lines = []
       silent = true
       transformable = true
@@ -4795,11 +4828,12 @@ module MarkdownExec
             join_array_of_arrays(
               bash_script_lines,
               %(printf '%s' "#{export.echo}")
-            )
+            ),
+            export
           )
           export_init = cr_echo.stdout.split("\n").first
           command_result, exportable, new_lines = export_echo_with_code(
-            ["#{export.name}=#{Shellwords.escape(export_init)}"],
+            [assign_key_value_in_bash(export.name, export_init)],
             export,
             force: force,
             silent: silent,
@@ -4808,13 +4842,14 @@ module MarkdownExec
 
         when :exec, ExportValueSource::EXEC
           # extract first line from 'exec' output
-          command_result, = output_from_adhoc_bash_script_file(
-            join_array_of_arrays(bash_script_lines, export.exec)
+          command_result, exportable, new_lines = output_from_adhoc_bash_script_file(
+            join_array_of_arrays(bash_script_lines, export.exec),
+            export
           )
           unless command_result.failure?
             export_init = command_result.stdout.split("\n").first
             command_result, exportable, new_lines = export_echo_with_code(
-              ["#{export.name}=#{Shellwords.escape(export_init)}"],
+              [assign_key_value_in_bash(export.name, export_init)],
               export,
               force: force,
               silent: silent,
@@ -4826,7 +4861,7 @@ module MarkdownExec
           # first item from 'allow' list
           export_init = export.allow.first
           command_result, exportable, new_lines = export_echo_with_code(
-            ["#{export.name}=#{Shellwords.escape(export_init)}"],
+            [assign_key_value_in_bash(export.name, export_init)],
             export,
             force: force,
             silent: silent,
@@ -4859,7 +4894,7 @@ module MarkdownExec
       else
         export_init = export.init.to_s
         command_result, exportable, new_lines = export_echo_with_code(
-          ["#{export.name}=#{Shellwords.escape(export_init)}"],
+          [assign_key_value_in_bash(export.name, export_init)],
           export,
           force: force,
           silent: silent,
@@ -5862,7 +5897,7 @@ module MarkdownExec
         mdoc: @mdoc, selected: @selected, block_source: {}
       )
 
-      assert_equal ['code line', 'key=value'], result
+      assert_equal ['code line', 'key="value"'], result
     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 = '3.0.7'
+  VERSION = '3.0.9'
 end

data/lib/mdoc.rb

@@ -178,11 +178,12 @@ module MarkdownExec
                 collect_block_code_stdout(fcb)
               elsif [BlockType::OPTS].include? fcb.type
                 fcb.body # entire body is returned to requesing block
+
               elsif [BlockType::LINK,
                      BlockType::LOAD,
                      BlockType::UX,
                      BlockType::VARS].include? fcb.type
-                nil
+                nil # Vars for all types are collected later
               elsif fcb[:chrome] # for Link blocks like History
                 nil
               elsif fcb.type == BlockType::PORT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.9
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-10 00:00:00.000000000 Z
+date: 2025-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard