markdown_exec 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 401f0583b9951f0cfd6259313d7120d2f5f7fbbb3c596110eeafe449f63b9ca7
-  data.tar.gz: 8c411e5c1f3ae394d76a2e0fbbc92aae009e31ba0e17b9fa29d30dabfd8b8e5a
+  metadata.gz: 7b38cc422f735f0c00b0c31e6bd6253bda083e28890475220198109953ce9a74
+  data.tar.gz: c62e5bc1a2f294b783e4ce53341ae459f46251c25b076e6bb214e483f0c4a2c8
 SHA512:
-  metadata.gz: 896ac3441e10cac18bbccbe02913612f8a926a7108dd86a9b01d0dc8354d1da4f8ca58dcb8413f460072277802639be2bd4421efc83abced9e18ea9212505010
-  data.tar.gz: 4804a98ff4a6ff6a5d7ba7dc0739e6ec2d6b7a115dd7f6198955261bf1d07ed62e93c9d1180570e14f3d1e43e6a59a6ae587c21fbbd13d02491b79ad7ac92e1e
+  metadata.gz: c1f902747ed7f5688ff734d0b43b8cda0cd9dcff8957290938a8689437c0090660c0534e98c739a7c85a55c066e8604d4593e063382bb68ca46be7e7aae5fc83
+  data.tar.gz: 1f6fdc9a5640a40159a49547784c09609b1889a4fcd0db7d4e333ff33c2a6a4f3d05ead80b05e4a9b75ae8ce4e880808dae3c37384f0145123824a27bc901ce7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.1.1] - 2025-06-28
+
+### Changed
+
+- Fix inherited lines for chained blocks.
+- Optimize import text replacement.
+
 ## [3.1.0] - 2025-06-23
 
 ### Added

data/Gemfile.lock

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

data/bats/block-type-ux-require-chained.bats

@@ -0,0 +1,9 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'initial value, inherited lines' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-require-chained.md \
+   '[SPECIES]' \
+   'ENTITY = Pongo tapanuliensis,Pongo_ENTITY="Pongo tapanuliensis,Pongo"_SPECIES=Pongo\ tapanuliensis_GENUS=Pongo_NAME=Pongo\ tapanuliensis\ -\ Pongo_NAME2=Pongo\ tapanuliensis\ -\ Pongo_SPECIES=Pongo tapanuliensis_GENUS=Pongo_NAME=Pongo tapanuliensis - Pongo_NAME2=Pongo tapanuliensis - Pongo'
+}

data/bats/block-type-ux-require.bats

@@ -6,3 +6,9 @@ load 'test_helper'
   spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-require.md \
    'SPECIES=Pongo tapanuliensis_GENUS=Pongo_NAME=Pongo tapanuliensis - Pongo_NAME2=Pongo tapanuliensis - Pongo'
 }
+
+@test 'inherited lines' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-require.md \
+   '(menu_with_inherited_lines)' \
+   'SPECIES=Pongo\ tapanuliensis_GENUS=Pongo_NAME=Pongo\ tapanuliensis\ -\ Pongo_NAME2=Pongo\ tapanuliensis\ -\ Pongo_SPECIES=Pongo tapanuliensis_GENUS=Pongo_NAME=Pongo tapanuliensis - Pongo_NAME2=Pongo tapanuliensis - Pongo'
+}

data/bats/load-vars-state-demo.bats

@@ -4,23 +4,23 @@ load 'test_helper'
 
 @test 'document initial state' {
   spec_mde_xansi_dname_doc_blocks_expect docs/dev/load-vars-state-demo.md \
-   'var1 = line1_var3 = line6_  inherited_lines_  - : var1="line1"_  - : var3="line6"_                                 LOAD BLOCK STATE MODIFICATION DEMO__This document demonstrates how a LOAD block can modify the inherited state that was initially set_by VARS blocks.__First, establish baseline variables using a VARS block:__Use a LOAD block to modify the initial state:__load-mode-default_load-mode-append_load-mode-replace'
+   'var1 = line1_var3 = line6_  inherited_lines_  - : var1="line1"_  - : var3="line6"_            LOAD BLOCK STATE MODIFICATION DEMO__This document demonstrates how a LOAD block can modify_the inherited state that was initially set by VARS_blocks.__First, establish baseline variables using a VARS block:__Use a LOAD block to modify the initial state:__load-mode-default_load-mode-append_load-mode-replace'
 }
 
 @test 'load-mode-default' {
   spec_mde_xansi_dname_doc_blocks_expect docs/dev/load-vars-state-demo.md \
    load-mode-default \
-   'var1 = line1_var3 = line6_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  - : # line 1_  - : var1=line2_  - : # line 3_  - : var2=line4_  - : # line 5_                                 LOAD BLOCK STATE MODIFICATION DEMO__This document demonstrates how a LOAD block can modify the inherited state that was initially set_by VARS blocks.__First, establish baseline variables using a VARS block:__Use a LOAD block to modify the initial state:__load-mode-default_load-mode-append_load-mode-replace'
+   'var1 = line1_var3 = line6_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  - : # line 1_  - : var1=line2_  - : # line 3_  - : var2=line4_  - : # line 5_            LOAD BLOCK STATE MODIFICATION DEMO__This document demonstrates how a LOAD block can modify_the inherited state that was initially set by VARS_blocks.__First, establish baseline variables using a VARS block:__Use a LOAD block to modify the initial state:__load-mode-default_load-mode-append_load-mode-replace'
 }
 
 @test 'load-mode-append' {
   spec_mde_xansi_dname_doc_blocks_expect docs/dev/load-vars-state-demo.md \
    load-mode-append \
-   'var1 = line1_var3 = line6_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  - : # line 1_  - : var1=line2_  - : # line 3_  - : var2=line4_  - : # line 5_                                 LOAD BLOCK STATE MODIFICATION DEMO__This document demonstrates how a LOAD block can modify the inherited state that was initially set_by VARS blocks.__First, establish baseline variables using a VARS block:__Use a LOAD block to modify the initial state:__load-mode-default_load-mode-append_load-mode-replace'
+   'var1 = line1_var3 = line6_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  - : # line 1_  - : var1=line2_  - : # line 3_  - : var2=line4_  - : # line 5_            LOAD BLOCK STATE MODIFICATION DEMO__This document demonstrates how a LOAD block can modify_the inherited state that was initially set by VARS_blocks.__First, establish baseline variables using a VARS block:__Use a LOAD block to modify the initial state:__load-mode-default_load-mode-append_load-mode-replace'
 }
 
 @test 'load-mode-replace' {
   spec_mde_xansi_dname_doc_blocks_expect docs/dev/load-vars-state-demo.md \
    load-mode-replace \
-   'var1 = line1_var3 = line6_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  inherited_lines_  - : # line 1_  - : var1=line2_  - : # line 3_  - : var2=line4_  - : # line 5_                                 LOAD BLOCK STATE MODIFICATION DEMO__This document demonstrates how a LOAD block can modify the inherited state that was initially set_by VARS blocks.__First, establish baseline variables using a VARS block:__Use a LOAD block to modify the initial state:__load-mode-default_load-mode-append_load-mode-replace'
+   'var1 = line1_var3 = line6_  inherited_lines_  - : var1="line1"_  - : var3="line6"_  inherited_lines_  - : # line 1_  - : var1=line2_  - : # line 3_  - : var2=line4_  - : # line 5_            LOAD BLOCK STATE MODIFICATION DEMO__This document demonstrates how a LOAD block can modify_the inherited state that was initially set by VARS_blocks.__First, establish baseline variables using a VARS block:__Use a LOAD block to modify the initial state:__load-mode-default_load-mode-append_load-mode-replace'
 }

data/docs/dev/block-type-ux-require-chained.md

@@ -0,0 +1,33 @@
+/ UX blocks may requiring other UX blocks
+```vars :(document_vars)
+ENTITY: Pongo tapanuliensis,Pongo
+```
+```ux :[SPECIES] +[GENUS] +[NAME]
+act: :echo
+echo: "${ENTITY%%,*}"
+force: true
+init: false
+name: SPECIES
+```
+```ux :[GENUS]
+echo: "${ENTITY##*,}"
+force: true
+init: false
+name: GENUS
+```
+```ux :[NAME] +[NAME2]
+echo: "$SPECIES - $GENUS"
+force: true
+init: false
+name: NAME
+```
+```ux :[NAME2]
+echo: "$NAME"
+force: true
+init: false
+name: NAME2
+```
+```opts :(document_opts)
+menu_with_inherited_lines: true
+```
+@import bats-document-configuration.md

data/docs/dev/block-type-ux-require.md

@@ -4,20 +4,28 @@ ENTITY='Pongo tapanuliensis,Pongo'
 ```
 ```ux +(shell)
 echo: "${ENTITY%%,*}"
+force: true
 name: SPECIES
 ```
 ```ux +(shell)
 echo: "${ENTITY##*,}"
+force: true
 name: GENUS
 ```
 / executed in context of prior ux blocks, uses their initial values
 ```ux
 echo: "$SPECIES - $GENUS"
+force: true
 name: NAME
 ```
 / executed after other ux blocks, uses their initial values
 ```ux
 echo: "$NAME"
+force: true
 name: NAME2
 ```
+/ This block is not visible. Execute to display the inherited lines for testing.
+```opts :(menu_with_inherited_lines)
+menu_with_inherited_lines: true
+```
 @import bats-document-configuration.md

data/lib/cached_nested_file_reader.rb

@@ -123,7 +123,9 @@ class CachedNestedFileReader
       /([A-Za-z_]\w*)=(?:"([^"]*)"|'([^']*)'|(\S+))/
     ) do |key, quoted_double, quoted_single, unquoted|
       value = quoted_double || quoted_single || unquoted
-      params[key] = value
+      # skip replacement of equal values
+      # otherwise, the text is not available for other substitutions
+      params[key] = value if key != value
     end
     params
   end

data/lib/env_interface.rb

@@ -10,7 +10,7 @@ class EnvInterface
     # @param transform [Proc] Optional transformation to apply to the value
     # @return [Object] The environment variable value
     def get(key, default: nil, transform: nil)
-ww key, \
+wwt :env, key, \
       value = ENV[key]
       return default if value.nil?
 
@@ -23,7 +23,7 @@ ww key, \
     # @param transform [Proc] Optional transformation to apply before setting
     # @return [String] The set value
     def set(key, value, transform: nil)
-ww key, caller.deref[0..3], value
+wwt :env, key, caller.deref[0..3], value
       transformed_value = transform ? transform.call(value) : value
       ENV[key] = transformed_value.to_s
     end

data/lib/hash_delegator.rb

@@ -1110,7 +1110,7 @@ module MarkdownExec
       selected, mdoc, inherited_code: nil, force: true, only_default: false,
       silent:
     )
-      wwt :fcb, 'ux block with code', selected
+      wwt :fcb, 'selected:', selected
       ret_command_result = nil
       exit_prompt = @delegate_object[:prompt_filespec_back]
 
@@ -1169,10 +1169,12 @@ module MarkdownExec
           end
           return command_result_w_e_t_nl if command_result_w_e_t_nl.failure?
 
+          # update the required lines for this and subsequent blocks
           command_result_w_e_t_nl.new_lines =
             process_command_result_lines(command_result_w_e_t_nl, export,
                                          required_lines)
           required_lines.concat(command_result_w_e_t_nl.new_lines)
+          command_result_w_e_t_nl.new_lines = required_lines
           ret_command_result = command_result_w_e_t_nl
         else
           raise "Invalid data type: #{data.inspect}"

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.1.0'
+  VERSION = '3.1.1'
 end

data/lib/ww.rb

@@ -19,7 +19,8 @@ def ww(*objs, **kwargs)
   # return the last item in the list, as the label is usually first
   return objs.last unless $debug
 
-  ww0(*objs, **kwargs.merge(locations: caller_locations))
+  locations = kwargs[:locations] || caller_locations
+  ww0(*objs, **kwargs.merge(locations: locations))
 end
 
 # select enabled, for exceptions
@@ -33,6 +34,8 @@ end
 # selectively enabled, for process tracking
 # print the failing line
 def wwp(*objs, **kwargs)
+  return objs.last unless $debug
+
   ww(*objs, **kwargs.merge(locations: caller_locations[0..0]))
 end
 
@@ -40,7 +43,7 @@ end
 # print the failing line
 # eg wwt :line, 'data:', data
 def wwt(*objs, **kwargs)
-  # return if [:line].include? objs.first
+  return objs.last if !$debug || %i[env].include?(objs.first)
 
   formatted = ['Tagged', objs.first] + objs[1..]
   ww(*formatted, **kwargs.merge(locations: caller_locations[0..0]))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-23 00:00:00.000000000 Z
+date: 2025-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -124,6 +124,7 @@ files:
 - bats/block-type-ux-hidden.bats
 - bats/block-type-ux-invalid.bats
 - bats/block-type-ux-readonly.bats
+- bats/block-type-ux-require-chained.bats
 - bats/block-type-ux-require.bats
 - bats/block-type-ux-required-variables.bats
 - bats/block-type-ux-row-format.bats
@@ -182,6 +183,7 @@ files:
 - docs/dev/block-type-ux-hidden.md
 - docs/dev/block-type-ux-invalid.md
 - docs/dev/block-type-ux-readonly.md
+- docs/dev/block-type-ux-require-chained.md
 - docs/dev/block-type-ux-require.md
 - docs/dev/block-type-ux-required-variables.md
 - docs/dev/block-type-ux-row-format.md