markdown_exec 3.0.6 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90e469ce0209e21b14e2534769a953c7d8122a97e9fe22714e346620e5a3b46
-  data.tar.gz: 8edf46cc55bb88b2d8cb32a147ce9c730d7951ec1e87b249f346cb5aa226d836
+  metadata.gz: fd2355b28f935804fb135a650cc4260276be2bed20a8ed33cf9d188e01734466
+  data.tar.gz: 9e001b6252ebc4f012408e8a43373ab49b474d72982fc9bbc653c93e6d39c497
 SHA512:
-  metadata.gz: 8da075848dc51de098e42f6f09aaa99914c53604f892c473e9ea834cf99c9e3e9a9fa7e41604991c1d912ff637a186e6e4b5c9dfc3d7d2fbdffc9245262e5c4f
-  data.tar.gz: 892adbee4f68a4a1aedaf8aedd10baffa724f31454b31e8384def5eb97f4d5bb06e50f777a33afaa92fb1c1b2fd42c022a405208dbf41ba9d0ac31a0680145f2
+  metadata.gz: a17c1e662569ae1b0f34ecbb63571120c3d56bc2efdde29651240ec6d6d07e0f24e361ae9c95d34725f5c9f6a1c2d6f18fc9aad9971bdba3e2b2f850f14418d5
+  data.tar.gz: 95184776dfde2e6579aa18e0893a9f54180c2b641d65263f0d47f5533512611f3b92c9012959bb18c0c263ca3f50dccc42e4f69651f46a4af878d02784ce40ba

data/Gemfile.lock

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

data/lib/command_result.rb

@@ -14,45 +14,6 @@
 #   result.new_field = 42
 #   result.new_field     # => 42
 #   result.success?      # => true
-
-# require 'ostruct'
-
-# class CommandResult < OpenStruct
-#   def initialize(**attributes)
-#     # Set defaults
-#     defaults = { exit_status: 0, stdout: '' }
-#     super(defaults.merge(attributes))
-#   end
-
-#   def failure?
-#     !success?
-#   end
-
-#   def success?
-#     exit_status.zero?
-#   end
-
-#   # intercept specific getters and setters
-#   def new_lines
-#     # read current value
-# # binding.irb
-#     v = self[:new_lines]
-#     ww caller.deref[0..4], v
-#     v
-#   end
-
-#   # Intercept specific setter
-#   def new_lines=(value)
-#     ww caller.deref[0..4], value
-# # binding.irb
-#     super(value)
-#   end
-# end
-
-
-
-
-
 class CommandResult
   # @param attributes [Hash{Symbol=>Object}] initial named attributes
   def initialize(**attributes)
@@ -71,17 +32,17 @@ class CommandResult
     exit_status.zero?
   end
 
-  def new_lines
-    value = @attributes[:new_lines]
-    ww caller.deref[0..4], value    
-    value
-  end
-
-  # trap assignment to new_lines
-  def new_lines=(value)
-    ww caller.deref[0..4], value    
-    @attributes[:new_lines] = value
-  end
+  # def new_lines
+  #   value = @attributes[:new_lines]
+  #   ww caller.deref[0..4], value    
+  #   value
+  # end
+
+  # # trap assignment to new_lines
+  # def new_lines=(value)
+  #   ww caller.deref[0..4], value    
+  #   @attributes[:new_lines] = value
+  # end
 
   def method_missing(name, *args)
     key = name.to_s.chomp('=').to_sym

data/lib/evaluate_shell_expressions.rb

@@ -45,6 +45,11 @@ 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

@@ -232,7 +232,7 @@ module MarkdownExec
         export.init = case
                       when export.allow.present?
                         UxActSource::ALLOW
-                      when export.default.present?###keep?
+                      when export.default.present?
                         UxActSource::DEFAULT
                       when export.echo.present?
                         UxActSource::ECHO

data/lib/hash_delegator.rb

@@ -994,6 +994,9 @@ module MarkdownExec
       initial_code_required: false,
       occurrence_expressions: nil
     )
+ww commands
+ww link_state
+# binding.irb####
       evaluate_shell_expressions(
         (link_state&.inherited_lines_block || ''),
         commands,
@@ -1110,9 +1113,11 @@ module MarkdownExec
       selected, mdoc, inherited_code: nil, force: true, only_default: false,
       silent:
     )
+ww selected
       ret_command_result = nil
       exit_prompt = @delegate_object[:prompt_filespec_back]
 
+ww \
       required = mdoc.collect_recursively_required_code(
         anyname: selected.pub_name,
         label_format_above: @delegate_object[:shell_code_label_format_above],
@@ -1187,6 +1192,9 @@ module MarkdownExec
       end
 
       ret_command_result || CommandResult.new(stdout: required_lines)
+    rescue StandardError
+      ww $@, $!
+      HashDelegator.error_handler('code_from_ux_block_to_set_environment_variables')
     end
 
     def env_set(name, value)
@@ -2532,6 +2540,7 @@ module MarkdownExec
     end
 
     def expand_references!(fcb, link_state)
+ww fcb, link_state, caller.deref
       expand_variable_references!(
         blocks: [fcb],
         echo_formatter: method(:format_echo_command),
@@ -2574,15 +2583,22 @@ module MarkdownExec
       link_state:,
       pattern:
     )
+ww blocks####
+ww link_state
+# binding.irb
       variable_counts, occurrence_expressions = count_named_group_occurrences(
         blocks, pattern, group_name: group_name
       )
       return if variable_counts.nil? || variable_counts == {}
+ww [variable_counts, occurrence_expressions]
 
+ww \
       echo_commands = generate_echo_commands(
         variable_counts, formatter: echo_formatter
       )
 
+ww link_state
+ww \
       replacements = build_replacement_dictionary(
         echo_commands, link_state,
         initial_code_required: initial_code_required,
@@ -2590,8 +2606,13 @@ 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
+        ww "EvaluateShellExpression::StatusFail", echo_commands, link_state
+        return
+      end
 
+ww \
       expand_blocks_with_replacements(blocks, replacements)
       # no return
     end
@@ -2602,10 +2623,10 @@ module MarkdownExec
       exportable = true
       command_result = nil
       new_lines = []
-      export_string = string || export.echo
+      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}")
@@ -2994,7 +3015,7 @@ module MarkdownExec
     # convert single items to arrays
     def join_array_of_arrays(*args)
       args.map do |item|
-        item.is_a?(Array) ? item : [item]
+        item.nil? ? nil : (item.is_a?(Array) ? item : [item])
       end.compact.flatten(1)
     end
 
@@ -4746,8 +4767,9 @@ module MarkdownExec
         command_result = CommandResult.new(stdout: output)
 
       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
@@ -4792,7 +4814,8 @@ 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(
@@ -4805,8 +4828,9 @@ 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
@@ -5313,6 +5337,7 @@ module MarkdownExec
         mdoc_menu_and_blocks_from_nested_files(
           @dml_link_state, source_id: source_id
         )
+ww @dml_link_state####
       dump_delobj(@dml_blocks_in_file, @dml_menu_blocks, @dml_link_state)
     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.6'
+  VERSION = '3.0.8'
 end

metadata

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