markdown_exec 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b38cc422f735f0c00b0c31e6bd6253bda083e28890475220198109953ce9a74
-  data.tar.gz: c62e5bc1a2f294b783e4ce53341ae459f46251c25b076e6bb214e483f0c4a2c8
+  metadata.gz: 8c39aff829d6b7a3d4eb05134922cdb6fed1d54192fab72ba244d7d7ff73183e
+  data.tar.gz: f2bbfa6b9be857c718ba23c1bbc071b91ffe7ba027626c9a27b1d06c8bfce5a9
 SHA512:
-  metadata.gz: c1f902747ed7f5688ff734d0b43b8cda0cd9dcff8957290938a8689437c0090660c0534e98c739a7c85a55c066e8604d4593e063382bb68ca46be7e7aae5fc83
-  data.tar.gz: 1f6fdc9a5640a40159a49547784c09609b1889a4fcd0db7d4e333ff33c2a6a4f3d05ead80b05e4a9b75ae8ce4e880808dae3c37384f0145123824a27bc901ce7
+  metadata.gz: 1b97c91ff7b91da388ff9d3aed19ee5e15fd25bd4d6e8f3591a8997614736e27e1c12fb3682a3395bae5853131578b924cbf55284ffda2beb9b89843c8b7c2b7
+  data.tar.gz: 3056e41d512fa097204cae511a057b193c5ad3c70e406dee3da1df369bb0bed4f517137cf55e86ac6fcdc1308b70d604c75e9c2c2ee8c9b30edf0d5f574c006e

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [3.2.0] - 2025-07-24
+
+### Added
+
+- Option for number of inactive lines requiring a scroll point.
+- Option for variables to not export from a series.
+  Some intermediate results are not to be exported.
+  Names matching the regular expression are available for
+  calculation within the block but not after.
+
+### Changed
+
+- Intermediate results are available.
+  Fix the evaluation of sequences of expressions by providing
+  script lines for intermediate results.
+- Complete backtrace is available for exceptions.
+- Prevent abort when executing a block.
+  Often raised by YAML parsing.
+
 ## [3.1.1] - 2025-06-28
 
 ### Changed

data/Gemfile.lock

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

data/docs/ux-blocks-examples.md

@@ -61,19 +61,20 @@ transform: '%{major}.%{minor}.%{patch}'
 name: BRANCH_NAME
 init: ":exec"
 exec: "git branch --format='%(refname:short)'"
-validate: "^(?<type>feature|bugfix|hotfix)/(?<ticket>[A-Z]+-\d+)-(?<desc>.+)$"
+validate: '^(?<type>feature|bugfix|hotfix)/(?<ticket>[A-Z]+-\d+)-(?<desc>.+)$'
 transform: "${type}/${ticket}-${desc}"
 prompt: "Select or enter branch name"
 ```
 
 ### Environment Configuration with Dependencies
-```ux
+```ux @attrs[:body]
 name: DATABASE_URL
 require:
   - ENVIRONMENT
   - DB_HOST
   - DB_PORT
-format: "postgresql://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}"
+format: "postgresql://${DB_USER}:${DB_PASS}@${DATABASE_URL}:${DB_PORT}/${DB_NAME}"
+#format: "postgresql://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}"
 ```
 
 ### Multi-step Configuration
@@ -104,7 +105,7 @@ require:
 ```ux
 name: PHONE_NUMBER
 prompt: "Enter phone number"
-validate: "(?<country>\d{1,3})(?<area>\d{3})(?<number>\d{7})"
+validate: '(?<country>\d{1,3})(?<area>\d{3})(?<number>\d{7})'
 transform: "+${country} (${area}) ${number}"
 format: "Phone: ${PHONE_NUMBER}"
 ```
@@ -114,7 +115,7 @@ format: "Phone: ${PHONE_NUMBER}"
 name: GIT_STATUS
 init: ":exec"
 exec: "git status --porcelain"
-validate: "(?<status>[AMDR])\s+(?<file>.+)"
+validate: '(?<status>[AMDR])\s+(?<file>.+)'
 transform: "${status}: ${file}"
 format: "Changes: ${GIT_STATUS}"
 ``` 

data/lib/fcb.rb

@@ -75,6 +75,14 @@ module MarkdownExec
       full&.to_s&.pub_name(**kwargs)
     end
 
+    def body
+      @attrs[:body]
+    end
+
+    def body=(value)
+      @attrs[:body] = value
+    end
+
     def code_name_included?(*names)
       names.include?(@attrs[:oname])
     end
@@ -93,7 +101,9 @@ module MarkdownExec
     # 2024-08-04 match nickname
     # may not exist if block name is duplicated
     def delete_matching_name!(dependencies)
-      dependencies.delete(@attrs[:dname]) ||
+      ####
+      dependencies.delete(@attrs[:id]) ||
+        dependencies.delete(@attrs[:dname]) ||
         dependencies.delete(@attrs[:nickname]) ||
         dependencies.delete(@attrs[:oname]) ||
         dependencies.delete(@attrs.pub_name) ||
@@ -271,7 +281,8 @@ module MarkdownExec
     end
 
     def is_named?(name)
-      @attrs[:dname] == name ||
+      @attrs[:id] == name ||
+        @attrs[:dname] == name ||
         @attrs[:nickname] == name ||
         @attrs[:oname] == name ||
         @attrs.pub_name == name ||
@@ -361,6 +372,7 @@ module MarkdownExec
     end
 
     # Expand variables in attributes
+    # @return [void]
     def expand_variables_in_attributes!(pattern, replacements)
       @attrs[:raw_dname] ||= @attrs[:dname]
       @attrs[:dname] = @attrs[:dname]&.gsub(pattern) do |match|

data/lib/hash_delegator.rb

@@ -1442,12 +1442,17 @@ module MarkdownExec
         # Skip processing for shell-type blocks
         next if exclude_types.include?(block.type)
 
-        # Scan each block name for matches of the pattern
-        count_named_group_occurrences_block_body_fix_indent(block).scan(pattern) do |(_, _variable_name)|
-          pattern.match($LAST_MATCH_INFO.to_s) # Reapply match for named groups
-          id = $LAST_MATCH_INFO[group_name]
-          occurrence_count[id] += 1
-          occurrence_expressions[id] = $LAST_MATCH_INFO['expression']
+        begin
+
+          # Scan each block name for matches of the pattern
+          count_named_group_occurrences_block_body_fix_indent(block).scan(pattern) do |(_, _variable_name)|
+            pattern.match($LAST_MATCH_INFO.to_s) # Reapply match for named groups
+            id = $LAST_MATCH_INFO[group_name]
+            occurrence_count[id] += 1
+            occurrence_expressions[id] = $LAST_MATCH_INFO['expression']
+          end
+        rescue Interrupt
+          binding.irb
         end
       end
 
@@ -2588,6 +2593,8 @@ module MarkdownExec
         pattern: options_command_substitution_regexp
       )
       # no return
+    rescue StandardError
+      wwe 'fcb:', fcb, 'link_state:', link_state
     end
 
     def expand_variable_references!(
@@ -2645,17 +2652,23 @@ module MarkdownExec
           exportable = false
           command_result.warning = warning_required_empty(export) unless silent
         else
+          ### TBD validate/transform?  
+          # store the transformed value in ENV
           EnvInterface.set(export.name, command_result.stdout.to_s)
+
           new_lines << { name: export.name, force: force,
                          text: command_result.stdout }
         end
 
       when Hash
+        required_lines = []
+
         # each item in the hash is a variable name and value
         export_string.each do |name, expression|
           command_result, = output_from_adhoc_bash_script_file(
             join_array_of_arrays(
               bash_script_lines,
+              required_lines,
               %(printf '%s' "#{expression}")
             ),
             export,
@@ -2664,9 +2677,22 @@ module MarkdownExec
           if command_result.exit_status == EXIT_STATUS_REQUIRED_EMPTY
             command_result.warning = warning_required_empty(export) unless silent
           else
-            EnvInterface.set(name, command_result.stdout.to_s)
-            new_lines << { name: name, force: force,
-                           text: command_result.stdout }
+            transformed = command_result.stdout.to_s
+            ### TBD validate/transform?
+            # transformed = if command_result_w_e_t_nl.transformable transform_export_value(name_force[:text], export) else name_force[:text] end
+
+            # code for subsequent expression evaluations
+            required_lines << code_line_to_assign_a_variable(
+              name, transformed, force: force
+            )
+
+            if variable_is_exportable(name)
+              # store the transformed value in ENV
+              EnvInterface.set(name, transformed)
+
+              new_lines << { name: name, force: force,
+                            text: command_result.stdout }
+            end
           end
         end
       end
@@ -3266,7 +3292,7 @@ module MarkdownExec
 
       if mdoc
         mdoc.collect_recursively_required_code(
-          anyname: fcb.pub_name,
+          anyname: fcb.id,####
           label_format_above: @delegate_object[:shell_code_label_format_above],
           label_format_below: @delegate_object[:shell_code_label_format_below],
           block_source: block_source
@@ -3448,6 +3474,7 @@ module MarkdownExec
       [all_blocks, menu_blocks, mdoc]
     end
 
+    # enable scroll targets in long sequences of inactive lines
     def handle_consecutive_inactive_items!(menu_blocks)
       consecutive_inactive_count = 0
       menu_blocks.each do |fcb|
@@ -3455,7 +3482,10 @@ module MarkdownExec
           consecutive_inactive_count = 0
         else
           consecutive_inactive_count += 1
-          if (consecutive_inactive_count % (@delegate_object[:select_page_height] / 3)).zero?
+          if (consecutive_inactive_count %
+              (@delegate_object[:select_page_height] /
+               @delegate_object[:select_page_ratio])
+             ).zero?
             fcb.disabled = TtyMenu::ENABLE
             fcb.is_enabled_but_inactive = true
           end
@@ -4081,14 +4111,14 @@ module MarkdownExec
       end
     end
 
-    # Handle expression with wildcard characters
-    # allow user to select or enter
-    def puts_gets_oprompt_(filespec)
-      puts format(@delegate_object[:prompt_show_expr_format],
-                  { expr: filespec })
-      puts @delegate_object[:prompt_enter_filespec]
-      gets.chomp
-    end
+    # # Handle expression with wildcard characters
+    # # allow user to select or enter
+    # def puts_gets_oprompt_(filespec)
+    #   puts format(@delegate_object[:prompt_show_expr_format],
+    #               { expr: filespec })
+    #   puts @delegate_object[:prompt_enter_filespec]
+    #   gets.chomp
+    # end
 
     def read_saved_assets_for_history_table(
       asset: nil,
@@ -4445,12 +4475,14 @@ module MarkdownExec
         # no enabled options in page
         return
       end
+      ww 'selection', selection
 
       menu_list = opts.fetch(:match_dml, true) ? @dml_menu_blocks : menu_items
       menu_list ||= tty_menu_items
       selected = menu_list.find do |item|
         if item.instance_of?(Hash)
-          [item[:id], item[:name], item[:dname]].include?(selection)
+          ### [item[:id], item[:name], item[:dname]].include?(selection)
+          item[:id] == selection
         elsif item.instance_of?(MarkdownExec::FCB)
           item.id == selection
         else
@@ -4961,8 +4993,15 @@ module MarkdownExec
       command_result
     end
 
-    def warning_required_empty(export)
-      "A value must exist for: #{export.required.join(', ')}"
+    # true if the variable is exported in a series of evaluations
+    def variable_is_exportable(name)
+      local_name_pattern = @delegate_object.fetch(:local_name_pattern, '')
+
+      # export all if rule is empty
+      return true if local_name_pattern.empty?
+
+      # export if it its name does not match the rule
+      !(name =~ Regexp.new(local_name_pattern))
     end
 
     def vux_await_user_selection(prior_answer: @dml_block_selection)
@@ -5263,9 +5302,14 @@ module MarkdownExec
           vux_user_selected_block_name
 
         when :execute_block
-          ret = vux_execute_block_per_type(data, formatted_choice_ostructs)
-          vux_publish_block_name_for_external_automation(data)
-          ret
+          begin
+            ret = vux_execute_block_per_type(data, formatted_choice_ostructs)
+            vux_publish_block_name_for_external_automation(data)
+            ret
+          rescue StandardError
+            # error executing block, do not abort
+            InputSequencer.next_link_state(prior_block_was_link: false)
+          end
 
         when :close_ux
           if @vux_pipe_open.present? && File.exist?(@vux_pipe_open)
@@ -5519,6 +5563,10 @@ module MarkdownExec
       determine_block_state(selected_option)
     end
 
+    def warning_required_empty(export)
+      "A value must exist for: #{export.required.join(', ')}"
+    end
+
     # Handles the core logic for generating the command
     # file's metadata and content.
     def write_command_file(required_lines:, blockname:, shell: nil)

data/lib/markdown_exec/version.rb

@@ -1,3 +1,4 @@
+
 # frozen_string_literal: true
 
 # :reek:TooManyConstants
@@ -7,5 +8,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 end

data/lib/mdoc.rb

@@ -119,7 +119,9 @@ module MarkdownExec
         raise "Named code block `#{anyname}` not found. (@#{__LINE__})"
       end
 
-      nickname = name_block.pub_name
+      # nickname = name_block.pub_name
+      ####
+      nickname = name_block.id
 
       dependencies = collect_dependencies(pubname: nickname)
       # !!t dependencies.count
@@ -164,6 +166,8 @@ module MarkdownExec
       anyname:, block_source:,
       label_body: true, label_format_above: nil, label_format_below: nil
     )
+      ww 'anyname:', anyname
+      ww 'block_source:', block_source
       block_search = collect_block_dependencies(anyname: anyname)
       if block_search[:blocks]
         blocks = collect_wrapped_blocks(block_search[:blocks])

data/lib/menu.src.yml

@@ -688,6 +688,12 @@
   :default: ''
   :procname: val_as_str
 
+- :opt_name: local_name_pattern
+  :env_var: MDE_LOCAL_NAME_PATTERN
+  :description: Pattern for variables not exported in a series of evaluations
+  :default: '^.{1,3}$'
+  :procname: val_as_str
+
 - :opt_name: logged_stdout_filename_prefix
   :env_var: MDE_LOGGED_STDOUT_FILENAME_PREFIX
   :description: Name prefix for stdout files
@@ -1594,6 +1600,12 @@
   :default: 0
   :procname: val_as_int
 
+- :opt_name: select_page_ratio
+  :env_var: MDE_SELECT_PAGE_RATIO
+  :description: Number of lines of inactive text that require a scroll point, as a ratio of the page height.
+  :default: 2
+  :procname: val_as_int
+
 - :opt_name: shebang
   :env_var: MDE_SHEBANG
   :description: Shebang for saved scripts

data/lib/menu.yml

@@ -582,6 +582,11 @@
   :arg_name: PATH
   :default: ''
   :procname: val_as_str
+- :opt_name: local_name_pattern
+  :env_var: MDE_LOCAL_NAME_PATTERN
+  :description: Pattern for variables not exported in a series of evaluations
+  :default: "^.{1,3}$"
+  :procname: val_as_str
 - :opt_name: logged_stdout_filename_prefix
   :env_var: MDE_LOGGED_STDOUT_FILENAME_PREFIX
   :description: Name prefix for stdout files
@@ -1362,6 +1367,12 @@
   :description: 'Maximum # of rows in select list. Detects current limit if not specified.'
   :default: 0
   :procname: val_as_int
+- :opt_name: select_page_ratio
+  :env_var: MDE_SELECT_PAGE_RATIO
+  :description: Number of lines of inactive text that require a scroll point, as a
+    ratio of the page height.
+  :default: 2
+  :procname: val_as_int
 - :opt_name: shebang
   :env_var: MDE_SHEBANG
   :description: Shebang for saved scripts

data/lib/ww.rb

@@ -26,7 +26,9 @@ end
 # select enabled, for exceptions
 # print a data object for the error, and the failing line
 def wwe(*objs, **kwargs)
-  ww0(*objs, **kwargs.merge(locations: caller_locations[0..0]))
+  ww0(*objs,
+      **kwargs.merge(full_backtrace: true,
+                     locations: caller_locations))
 
   raise StandardError, objs.first[:error]
 end

metadata

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