markdown_exec 2.0.8.1 → 2.0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7b742cc128a608c349ed6ff8b9f921b2e400acb269c4aba3f24d72f43cf007
-  data.tar.gz: cb0c023316b682f309313167a6900d037df036fa48e451b2dd781d40fed35215
+  metadata.gz: 942e4a005f42e2f3c2bd4542ba1b61e666c7379c0a2d81a5427f14ec76590a7d
+  data.tar.gz: c38976432cd43684654663876cd6ee5fa35b40339d5217bae00e282c29cd7415
 SHA512:
-  metadata.gz: fa191e7433c5dcb5c514894cfdf4bbc3c60b15c416aa7693374eafb40ad39cfeff46bcaa23eed470d8ca67804adc209b4ab6f744d62c8b3f6c4a2f336e43e0f2
-  data.tar.gz: 260e03667d03854c4d628465d346a1a53029cab8ea1df2614f3fa500df194adc373687e9e096735ed01c41a0bd968f2788a8a60a853c06e9d0ef540409326ab6
+  metadata.gz: e02a78e7a564273392203583c1b7d9502647c3379fa0894bf3b2a4b858127cfb8196a493d43e404395762449f267f8e68df48567585aa39d66d804c6c11e2edc
+  data.tar.gz: 1bf94ff09d5248dd54853eca88dbc8ebce6ce5c17e9e5110103a2bc91250fa099120a81c7de0f060afdc0d08c607e5fbb7096735aea9ffcb4c7a4ee9bb33220f

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+Pass-through arguments after "--" to the script
+M       Gemfile.lock
+M       bin/tab_completion.sh
+M       examples/pass-through.md
+M       lib/hash_delegator.rb
+M       lib/markdown_exec.rb
+M       lib/markdown_exec/version.rb
+M       lib/menu.src.yml
+M       lib/menu.yml
+
 ## [2.0.8] - 2024-06-05
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (2.0.8.1)
+    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.1"
+  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-06 01:08:57 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/examples/pass-through.md

@@ -1,14 +1,32 @@
+```opts :(document_options)
+execute_in_own_window: false
+pause_after_script_execution: true
+save_executed_script: true
+saved_script_folder: ../mde_logs
+```
 Pass-through arguments after "--" to the executed script.
 
 A block can expect arguments to receive all arguments to MDE after "--".
 
-For `mde examples/pass-through.md output_arguments -- 123`,
+For `mde examples/pass-through.md output_arguments -- 1 23`,
 this block outputs:
 
-        ARGS: 123
+        ARGS: 1 23
+
+::: Test
+```bash
+mde examples/pass-through.md output_arguments -- 1 23
+```
 
-::: This block will output any arguments after "--" in the command line.
+::: These options toggle the use of a separate window.
+```opts
+execute_in_own_window: true
+```
+```opts
+execute_in_own_window: false
+```
 
+::: This block will output any command line arguments after "--".
 ```bash :output_arguments
 echo "ARGS: $*"
 ```

data/lib/hash_delegator.rb

@@ -804,7 +804,7 @@ module MarkdownExec
         system(
           format(
             @delegate_object[:execute_command_format],
-            command_execute_in_own_window_format_arguments
+            command_execute_in_own_window_format_arguments(rest: args ? args.join(' ') : '')
           )
         )
 
@@ -832,7 +832,7 @@ module MarkdownExec
       @fout.fout "Error ENOENT: #{err.inspect}"
     end
 
-    def command_execute_in_own_window_format_arguments(home: Dir.pwd)
+    def command_execute_in_own_window_format_arguments(home: Dir.pwd, rest: '')
       {
         batch_index: @run_state.batch_index,
         batch_random: @run_state.batch_random,
@@ -842,6 +842,7 @@ module MarkdownExec
         home: home,
         output_filename: File.basename(@delegate_object[:logged_stdout_filespec]),
         output_filespec: @delegate_object[:logged_stdout_filespec],
+        rest: rest,
         script_filename: @run_state.saved_filespec,
         script_filespec: File.join(home, @run_state.saved_filespec),
         started_at: @run_state.started_at.strftime(
@@ -1481,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, ''),
@@ -1694,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(
@@ -1760,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
           #
@@ -1827,6 +1831,7 @@ module MarkdownExec
         document_filename: File.basename(@delegate_object[:filename]),
         document_filespec: @delegate_object[:filename],
         home: Dir.pwd,
+        # rest: '',
         started_at: Time.now.utc.strftime(@delegate_object[:execute_command_title_time_format])
       }
     end
@@ -2119,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(
@@ -2144,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
         )
@@ -2422,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)
@@ -2437,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(
@@ -2449,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.1'
+  VERSION = '2.0.8.3'
 end

data/lib/markdown_exec.rb

@@ -275,7 +275,7 @@ module MarkdownExec
     end
 
     # return arguments before ARGV_SEP
-    # arguments after ARGV_SEP are passed to the generatede script
+    # arguments after ARGV_SEP are passed to the generated script
     #
     def arguments_for_mde(argv = ARGV)
       case ind = argv.find_index(ARGV_SEP)

data/lib/menu.src.yml

@@ -233,8 +233,6 @@
   :opt_name: exclude_expect_blocks
   :procname: val_as_bool
 
-# - :default: >
-#   osascript scripts/applescript/mde.applescript "%{batch_index}" "%{home}" " %{started_at} - %{document_filename} - %{block_name} " "%{script_filespec}" "%{output_filespec}"
 - :default: >
     osascript -e '
       on run argv
@@ -252,7 +250,7 @@
                       write text "o=" & quoted form of output_filespec & ""
                       write text "cd " & quoted form of home & ""
                       write text "echo -ne \"\\033]; " & title & " \\007\""
-                      write text "\"$s\" 2>&1 | tee -a \"$o\""
+                      write text "\"$s\" %{rest} 2>&1 | tee -a \"$o\""
                   end tell
               end tell
           end tell
@@ -261,6 +259,9 @@
   :env_var: MDE_EXECUTE_COMMAND_FORMAT
   :opt_name: execute_command_format
   :procname: val_as_str
+# execute_command_format using a saved script
+# - :default: >
+#   osascript scripts/applescript/mde.applescript "%{batch_index}" "%{home}" " %{started_at} - %{document_filename} - %{block_name} " "%{script_filespec}" "%{output_filespec}" %{rest}
 
 - :default: "%T"
   :description: Format for time in window title
@@ -1037,7 +1038,7 @@
 
 - :arg_name: BOOL
   :default: false
-  :description: Wheter to save an executed script`
+  :description: Whether to save an executed script
   :env_var: MDE_SAVE_EXECUTED_SCRIPT
   :opt_name: save_executed_script
   :procname: val_as_bool

data/lib/menu.yml

@@ -211,7 +211,7 @@
                       write text "o=" & quoted form of output_filespec & ""
                       write text "cd " & quoted form of home & ""
                       write text "echo -ne \"\\033]; " & title & " \\007\""
-                      write text "\"$s\" 2>&1 | tee -a \"$o\""
+                      write text "\"$s\" %{rest} 2>&1 | tee -a \"$o\""
                   end tell
               end tell
           end tell
@@ -884,7 +884,7 @@
   :procname: val_as_int
 - :arg_name: BOOL
   :default: false
-  :description: Wheter to save an executed script`
+  :description: Whether to save an executed script
   :env_var: MDE_SAVE_EXECUTED_SCRIPT
   :opt_name: save_executed_script
   :procname: val_as_bool

metadata

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