markdown_exec 2.0.8.2 → 2.0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b3a2b14b7efe82967efab04742281a8233a24daebf7c68f11fec661c8cd80e
-  data.tar.gz: 16586313129a6c66cced3e45b6c94c758eba0fa0ea7fccce47a848366435ff11
+  metadata.gz: 942e4a005f42e2f3c2bd4542ba1b61e666c7379c0a2d81a5427f14ec76590a7d
+  data.tar.gz: c38976432cd43684654663876cd6ee5fa35b40339d5217bae00e282c29cd7415
 SHA512:
-  metadata.gz: b7bcb0cb4ffdf2979ccc749a9abe1aaf86314b7a4ecd8fa34f9d6bfac7ae7d8a62f1981dcbdf7f0e7dd211e193392f009865b2adcd5eb5aa9d15610cd60559bb
-  data.tar.gz: 5ab77246617cec9bb918a44e51d40ba1ef4d1215c57de9541538f2f10aa60e61144fad31e7bd7901d7985b95064863783258ddec35dea48fe1a86faf4dbd15f2
+  metadata.gz: e02a78e7a564273392203583c1b7d9502647c3379fa0894bf3b2a4b858127cfb8196a493d43e404395762449f267f8e68df48567585aa39d66d804c6c11e2edc
+  data.tar.gz: 1bf94ff09d5248dd54853eca88dbc8ebce6ce5c17e9e5110103a2bc91250fa099120a81c7de0f060afdc0d08c607e5fbb7096735aea9ffcb4c7a4ee9bb33220f

data/Gemfile.lock

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

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "2.0.8.2"
+  echo "2.0.8.3"
 }
 
 _mde() {
@@ -178,4 +178,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2024-06-07 23:43:21 UTC"
+# echo "Updated: 2024-06-15 14:50:18 UTC"

data/examples/linked.md

@@ -1,6 +1,7 @@
 Demonstrate setting variable values interactively for use in generated scripts.
 
 ```opts :(document_options)
+menu_with_inherited_lines: true
 pause_after_script_execution: false
 user_must_approve: false
 ```
@@ -40,7 +41,7 @@ vars:
 ::: Set variable ALPHA in a Vars block
 For each environment variable named in block,
  append an inherited line that assigns the variable the specified value.
-```vars :set_ALPHA_to_1_via_vars_block
+```vars :[set_ALPHA_to_1_via_vars_block]
 ALPHA: 1
 ```
 
@@ -48,7 +49,7 @@ ALPHA: 1
 For each environment variable in `vars`,
  append an inherited line that assigns the variable the specified value.
 Subsequently, run the `display_variable_ALPHA` block.
-```link :set_ALPHA_to_2_via_link_block_and_display
+```link :[set_ALPHA_to_2_via_link_block_and_display]
 block: display_variable_ALPHA
 vars:
   ALPHA: 2
@@ -59,14 +60,14 @@ Subsequently, run the `display_variable_ALPHA` block.
 ```bash :(bash_set_to_3)
 ALPHA=3
 ```
-```link :set_ALPHA_to_3_via_required_block_and_display +(bash_set_to_3)
+```link :[set_ALPHA_to_3_via_required_block_and_display] +(bash_set_to_3)
 block: display_variable_ALPHA
 ```
 
 Evaluate the code in the required block `(bash_eval_set_to_4)` and
  save (transformed) output into inherited lines.
 Subsequently, run the `display_variable_ALPHA` block.
-```link :set_ALPHA_to_4_via_evaluated_required_block_and_display +(bash_eval_set_to_4)
+```link :[set_ALPHA_to_4_via_evaluated_required_block_and_display] +(bash_eval_set_to_4)
 eval: true
 next_block: display_variable_ALPHA
 ```

data/lib/hash_delegator.rb

@@ -1482,6 +1482,7 @@ module MarkdownExec
     # @param mdoc [YourMDocClass] An instance of the MDoc class.
     #
     def execute_shell_type(selected:, mdoc:, block_source:, link_state: LinkState.new)
+# binding.irb
       if selected.fetch(:shell, '') == BlockType::LINK
         debounce_reset
         push_link_history_and_trigger_load(link_block_body: selected.fetch(:body, ''),
@@ -1695,7 +1696,6 @@ module MarkdownExec
 
     def inpseq_execute_block(block_name)
       @dml_block_state = block_state_for_name_from_cli(block_name)
-
       dump_and_warn_block_state(selected: @dml_block_state.block)
       @dml_link_state, @dml_menu_default_dname = \
         exec_bash_next_state(
@@ -1761,7 +1761,10 @@ module MarkdownExec
 
         if link_block_data.fetch(LinkKeys::EXEC, false)
           @run_state.files = Hash.new([])
-          execute_command_with_streams([cmd])
+          execute_command_with_streams([cmd]) do |_stdin, stdout, stderr, _thread|
+            line = stdout || stderr
+            output_lines.push(line) if line
+          end
 
           ## select output_lines that look like assignment or match other specs
           #
@@ -2121,7 +2124,7 @@ module MarkdownExec
     end
 
     def pop_add_current_code_to_head_and_trigger_load(link_state, block_names, code_lines,
-                                                      dependencies, selected)
+                                                      dependencies, selected, next_block_name: nil)
       pop = @link_history.pop # updatable
       if pop.document_filename
         next_state = LinkState.new(
@@ -2146,7 +2149,7 @@ module MarkdownExec
           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: HashDelegator.code_merge(link_state&.inherited_lines, code_lines),
-          next_block_name: '', # not link_block_data[LinkKeys::BLOCK] || ''
+          next_block_name: next_block_name,
           next_document_filename: @delegate_object[:filename], # not next_document_filename
           next_load_file: LoadFile::REUSE # not next_document_filename == @delegate_object[:filename] ? LoadFile::REUSE : LoadFile::LOAD
         )
@@ -2424,7 +2427,7 @@ module MarkdownExec
         end
       end
 
-      ## append blocks loaded, apply LinkKeys::EVAL
+      ## append blocks loaded
       #
       if (load_expr = link_block_data.fetch(LinkKeys::LOAD, '')).present?
         load_filespec = load_filespec_from_expression(load_expr)
@@ -2439,10 +2442,11 @@ module MarkdownExec
       end
 
       next_document_filename = write_inherited_lines_to_file(link_state, link_block_data)
+      next_block_name = link_block_data.fetch(LinkKeys::NEXT_BLOCK, nil) || link_block_data.fetch(LinkKeys::BLOCK, nil) || ''
 
       if link_block_data[LinkKeys::RETURN]
         pop_add_current_code_to_head_and_trigger_load(link_state, block_names, code_lines,
-                                                      dependencies, selected)
+                                                      dependencies, selected, next_block_name: next_block_name)
 
       else
         link_history_push_and_next(
@@ -2451,8 +2455,7 @@ module MarkdownExec
           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: HashDelegator.code_merge(link_state&.inherited_lines, code_lines),
-          next_block_name: link_block_data.fetch(LinkKeys::NEXT_BLOCK,
-                                                 nil) || link_block_data[LinkKeys::BLOCK] || '',
+          next_block_name: next_block_name,
           next_document_filename: next_document_filename,
           next_load_file: next_document_filename == @delegate_object[:filename] ? LoadFile::REUSE : LoadFile::LOAD
         )

data/lib/markdown_exec/version.rb

@@ -7,5 +7,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '2.0.8.2'
+  VERSION = '2.0.8.3'
 end

metadata

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