markdown_exec 2.0.8.1 → 2.0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7b742cc128a608c349ed6ff8b9f921b2e400acb269c4aba3f24d72f43cf007
-  data.tar.gz: cb0c023316b682f309313167a6900d037df036fa48e451b2dd781d40fed35215
+  metadata.gz: 39b3a2b14b7efe82967efab04742281a8233a24daebf7c68f11fec661c8cd80e
+  data.tar.gz: 16586313129a6c66cced3e45b6c94c758eba0fa0ea7fccce47a848366435ff11
 SHA512:
-  metadata.gz: fa191e7433c5dcb5c514894cfdf4bbc3c60b15c416aa7693374eafb40ad39cfeff46bcaa23eed470d8ca67804adc209b4ab6f744d62c8b3f6c4a2f336e43e0f2
-  data.tar.gz: 260e03667d03854c4d628465d346a1a53029cab8ea1df2614f3fa500df194adc373687e9e096735ed01c41a0bd968f2788a8a60a853c06e9d0ef540409326ab6
+  metadata.gz: b7bcb0cb4ffdf2979ccc749a9abe1aaf86314b7a4ecd8fa34f9d6bfac7ae7d8a62f1981dcbdf7f0e7dd211e193392f009865b2adcd5eb5aa9d15610cd60559bb
+  data.tar.gz: 5ab77246617cec9bb918a44e51d40ba1ef4d1215c57de9541538f2f10aa60e61144fad31e7bd7901d7985b95064863783258ddec35dea48fe1a86faf4dbd15f2

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.2)
       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.2"
 }
 
 _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-07 23:43:21 UTC"

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(
@@ -1827,6 +1828,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

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.2'
 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.2
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard