markdown_exec 2.6.0 → 2.7.0

data/lib/input_sequencer.rb

@@ -94,18 +94,13 @@ class InputSequencer
       break if exit_when_bq_empty && bq_is_empty? && !now_menu.prior_block_was_link
 
       if now_menu.display_menu
-        # !!b
         break if run_yield(:end_of_cli, &block) == :exit
-        # !!b
 
         exit_when_bq_empty = false
         run_yield :display_menu, &block
-        # !!b
 
         choice = run_yield :user_choice, &block
-        # !!b
         break if choice == :break
-        # !!b
 
         raise BlockMissing, 'Block not recognized.' if choice.nil?
         # Exit loop and method to terminate the app
@@ -120,9 +115,7 @@ class InputSequencer
         if now_menu.block_name && !now_menu.block_name.empty?
           block_name = now_menu.block_name
         else
-          # break if bq_is_empty? # Exit loop if no more blocks to process
           if bq_is_empty? # Exit loop if no more blocks to process
-            # !!b
             run_yield :end_of_cli, &block
             break
           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.6.0'
+  VERSION = '2.7.0'
 end

data/lib/markdown_exec.rb

@@ -6,6 +6,7 @@
 require 'English'
 require 'clipboard'
 require 'fileutils'
+require 'io/console'
 require 'open3'
 require 'optparse'
 require 'shellwords'
@@ -405,6 +406,7 @@ module MarkdownExec
     #
     def execute_block_with_error_handling
       finalize_cli_argument_processing
+      @options.register_console_attributes(@options)    
       execute_initial_commands_and_main_loop(@options, @options.run_state)
     rescue FileMissingError
       warn "File missing: #{$!}"
@@ -991,6 +993,7 @@ module MarkdownExec
     end
 
     def select_document_if_multiple(files = list_markdown_files_in_path,
+                                    cycle: true,
                                     prompt: options[:prompt_select_md].to_s)
       return files[0] if (count = files.count) == 1
 
@@ -1004,7 +1007,9 @@ module MarkdownExec
                        :prompt_color_after_script_execution
                      ),
         files,
-        opts.merge(per_page: opts[:select_page_height])
+        HashDelegator.options_for_tty_menu(opts).merge(
+          cycle: cycle
+        )
       )
     end
 

data/lib/menu.src.yml

@@ -102,11 +102,11 @@
   :default: true
   :procname: val_as_bool
 
-# - :opt_name: command_substitution_regexp
-#   :env_var: MDE_COMMAND_SUBSTITUTION_REGEXP
-#   :description: command_substitution_regexp
-#   :default: "(?<expression>\\$\\((?<variable>[A-Z0-9a-z_]+)\\))"
-#   :procname: val_as_str
+- :opt_name: command_substitution_regexp
+  :env_var: MDE_COMMAND_SUBSTITUTION_REGEXP
+  :description: command_substitution_regexp
+  :default: "(?<expression>\\$\\((?<command>([^()]*(\\([^()]*\\))*[^()]*)*)\\))"
+  :procname: val_as_str
 
 - :long_name: config
   :description: Read configuration file
@@ -462,7 +462,7 @@
 
 - :opt_name: heading1_match
   :env_var: MDE_HEADING1_MATCH
-  :default: "^#(?<line>(?!#)(?<collapse>[+-~]?)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
+  :default: "^(?<indent>[ \t]*)#(?<collapse>[+-~]?)(?<leading>[ \t]*)(?<line>(?!#)(?<text>.*?))?(?<trailing>[ \t]*)$"
   :procname: val_as_str
 
 - :opt_name: heading2_center
@@ -482,7 +482,8 @@
 
 - :opt_name: heading2_match
   :env_var: MDE_HEADING2_MATCH
-  :default: "^##(?<line>(?!#)(?<collapse>[+-~]?)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
+  :default: "^(?<indent>[ \t]*)#{2}(?<collapse>[+-~]?)(?<leading>[ \t]*)(?<line>(?!#)(?<text>.*?))?(?<trailing>[ \t]*)$"
+
   :procname: val_as_str
 
 - :opt_name: heading3_center
@@ -502,7 +503,7 @@
 
 - :opt_name: heading3_match
   :env_var: MDE_HEADING3_MATCH
-  :default: "^###(?<collapse>[+-~]?)(?<line>(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
+  :default: "^(?<indent>[ \t]*)#{3}(?<collapse>[+-~]?)(?<gap>[ \t]*)(?<line>(?!#)(?<text>.*?))?(?<trailing>[ \t]*)$"
   :procname: val_as_str
 
 - :long_name: help
@@ -994,7 +995,7 @@
 - :opt_name: menu_table_rows_match
   :env_var: MDE_MENU_TABLE_ROWS_MATCH
   :description: Pattern for table rows
-  :default: '^(?<line>(?<indent>[ \t]*)(?<text>\|.*?)(?<trailing>[ \t]*))$'
+  :default: '^(?<indent>[ \t]*)(?<line>(?<text>\|.*?)(?<trailing>[ \t]*))$'
   :procname: val_as_str
 
 - :opt_name: menu_task_color
@@ -1256,6 +1257,12 @@
   :default: Other
   :procname: val_as_str
 
+- :opt_name: prompt_margin_left_text
+  :env_var: MDE_PROMPT_MARGIN_LEFT_TEXT
+  :description: prompt_margin_left_text
+  :default: "» "
+  :procname: val_as_str
+
 - :opt_name: prompt_no
   :env_var: MDE_PROMPT_NO
   :description: Prompt for no
@@ -1455,6 +1462,12 @@
   :default: mde_*.out.txt
   :procname: val_as_str
 
+- :opt_name: screen_width
+  :env_var: MDE_SCREEN_WIDTH
+  :description: Screen width for document and interface. 0 to use the actual dimension.
+  :default: 0
+  :procname: val_as_int
+
 - :opt_name: script_execution_frame_color
   :env_var: MDE_SCRIPT_EXECUTION_FRAME_COLOR
   :description: script_execution_frame_color

data/lib/menu.yml

@@ -83,6 +83,11 @@
   :arg_name: BOOL
   :default: true
   :procname: val_as_bool
+- :opt_name: command_substitution_regexp
+  :env_var: MDE_COMMAND_SUBSTITUTION_REGEXP
+  :description: command_substitution_regexp
+  :default: "(?<expression>\\$\\((?<command>([^()]*(\\([^()]*\\))*[^()]*)*)\\))"
+  :procname: val_as_str
 - :long_name: config
   :description: Read configuration file
   :arg_name: PATH
@@ -386,8 +391,8 @@
   :procname: val_as_bool
 - :opt_name: heading1_match
   :env_var: MDE_HEADING1_MATCH
-  :default: "^#(?<line>(?!#)(?<collapse>[+-~]?)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[
-    \t]*))?$"
+  :default: "^(?<indent>[ \t]*)#(?<collapse>[+-~]?)(?<leading>[ \t]*)(?<line>(?!#)(?<text>.*?))?(?<trailing>[
+    \t]*)$"
   :procname: val_as_str
 - :opt_name: heading2_center
   :env_var: MDE_HEADING2_CENTER
@@ -403,8 +408,8 @@
   :procname: val_as_bool
 - :opt_name: heading2_match
   :env_var: MDE_HEADING2_MATCH
-  :default: "^##(?<line>(?!#)(?<collapse>[+-~]?)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[
-    \t]*))?$"
+  :default: "^(?<indent>[ \t]*)#{2}(?<collapse>[+-~]?)(?<leading>[ \t]*)(?<line>(?!#)(?<text>.*?))?(?<trailing>[
+    \t]*)$"
   :procname: val_as_str
 - :opt_name: heading3_center
   :env_var: MDE_HEADING3_CENTER
@@ -420,8 +425,8 @@
   :procname: val_as_bool
 - :opt_name: heading3_match
   :env_var: MDE_HEADING3_MATCH
-  :default: "^###(?<collapse>[+-~]?)(?<line>(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[
-    \t]*))?$"
+  :default: "^(?<indent>[ \t]*)#{3}(?<collapse>[+-~]?)(?<gap>[ \t]*)(?<line>(?!#)(?<text>.*?))?(?<trailing>[
+    \t]*)$"
   :procname: val_as_str
 - :long_name: help
   :short_name: h
@@ -833,7 +838,7 @@
 - :opt_name: menu_table_rows_match
   :env_var: MDE_MENU_TABLE_ROWS_MATCH
   :description: Pattern for table rows
-  :default: "^(?<line>(?<indent>[ \\t]*)(?<text>\\|.*?)(?<trailing>[ \\t]*))$"
+  :default: "^(?<indent>[ \\t]*)(?<line>(?<text>\\|.*?)(?<trailing>[ \\t]*))$"
   :procname: val_as_str
 - :opt_name: menu_task_color
   :env_var: MDE_MENU_TASK_COLOR
@@ -1059,6 +1064,11 @@
   :description: User wants a custom file name
   :default: Other
   :procname: val_as_str
+- :opt_name: prompt_margin_left_text
+  :env_var: MDE_PROMPT_MARGIN_LEFT_TEXT
+  :description: prompt_margin_left_text
+  :default: "» "
+  :procname: val_as_str
 - :opt_name: prompt_no
   :env_var: MDE_PROMPT_NO
   :description: Prompt for no
@@ -1237,6 +1247,11 @@
   :arg_name: GLOB
   :default: mde_*.out.txt
   :procname: val_as_str
+- :opt_name: screen_width
+  :env_var: MDE_SCREEN_WIDTH
+  :description: Screen width for document and interface. 0 to use the actual dimension.
+  :default: 0
+  :procname: val_as_int
 - :opt_name: script_execution_frame_color
   :env_var: MDE_SCRIPT_EXECUTION_FRAME_COLOR
   :description: script_execution_frame_color

data/lib/ww.rb

@@ -17,7 +17,7 @@ end
 def ww(*objs, **kwargs)
   return unless $debug
 
-  ww0(*objs, **kwargs)
+  ww0(*objs, **kwargs.merge(locations: caller_locations))
 end
 
 def ww0(*objs,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -70,16 +70,16 @@ dependencies:
   name: yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 description: Interactively select and execute fenced code blocks in markdown files.
   Build complex scripts by naming and requiring blocks. Log resulting scripts and
   output. Re-run scripts.
@@ -109,6 +109,7 @@ files:
 - bats/bats.bats
 - bats/block-types.bats
 - bats/cli.bats
+- bats/command-substitution.bats
 - bats/fail.bats
 - bats/history.bats
 - bats/import.bats
@@ -116,6 +117,7 @@ files:
 - bats/mde.bats
 - bats/options-collapse.bats
 - bats/options.bats
+- bats/plain.bats
 - bats/publish.bats
 - bats/table.bats
 - bats/test_helper.bash
@@ -132,20 +134,25 @@ files:
 - docs/dev/block-type-opts.md
 - docs/dev/block-type-port.md
 - docs/dev/block-type-vars.md
+- docs/dev/command-substitution.md
 - docs/dev/data-blocks.md
 - docs/dev/disable.md
 - docs/dev/import-missing.md
 - docs/dev/import.md
 - docs/dev/linked-file.md
+- docs/dev/load1.sh
+- docs/dev/load_code.md
 - docs/dev/manage-saved-documents.md
 - docs/dev/menu-cli.md
+- docs/dev/no-active-elements.md
 - docs/dev/options-collapse.md
 - docs/dev/pass-through-arguments.md
 - docs/dev/requiring-blocks.md
+- docs/dev/screen-width.md
 - docs/dev/specs-import.md
 - docs/dev/specs.md
-- docs/dev/table-crash.md
 - docs/dev/table-indent.md
+- docs/dev/table-invalid.md
 - docs/dev/text-decoration.md
 - docs/dev/variable-expansion.md
 - examples/bash-blocks.md
@@ -156,6 +163,7 @@ files:
 - examples/data-files.md
 - examples/document_options.md
 - examples/duplicate_block.md
+- examples/example-document-opts.md
 - examples/import0.md
 - examples/import1.md
 - examples/include.md
@@ -172,9 +180,7 @@ files:
 - examples/linked3.md
 - examples/linked_show.md
 - examples/llm.md
-- examples/load1.sh
 - examples/load2.sh
-- examples/load_code.md
 - examples/nickname.md
 - examples/opts-blocks-require.md
 - examples/opts-blocks.md
@@ -188,6 +194,7 @@ files:
 - examples/table-markup.md
 - examples/text-markup.md
 - examples/title.md
+- examples/variable-expansion-save-block.md
 - examples/variable-expansion.md
 - examples/vars-blocks.md
 - examples/wrap.md

data/docs/dev/table-crash.md

@@ -1,39 +0,0 @@
-/ The lines below are an invalid table
-| Region| VPC ID| VPC Name
--
-# Demonstrate Tables
-
-Table flush at left.
-Centered columns.
-| Common Name| Species| Genus| Family| Year Discovered
-|:-:|:-:|:-:|:-:|:-:
-| Tapanuli Orangutan| Pongo tapanuliensis| Pongo| Hominidae| 2017
-| Psychedelic Frogfish| Histiophryne psychedelica| Histiophryne| Antennariidae| 2009
-| Ruby Seadragon| Phyllopteryx dewysea| Phyllopteryx| Syngnathidae| 2015
-
-  Table indented with two spaces.
-  Left-justified columns.
-  | Common Name| Species| Genus| Family| Year Discovered
-  |:-|:-|:-|:-|:-
-  | Illacme tobini (Millipede)| Illacme tobini| Illacme| Siphonorhinidae| 2016
-  | Cappuccino Snake| Hydrodynastes bicinctus| Hydrodynastes| Colubridae| 2021
-  | Homo luzonensis| Homo luzonensis| Homo| Hominidae| 2019
-
-	Table indented with one tab.
-	Right-justified columns.
-	| Common Name| Species| Genus| Family| Year Discovered
-	|-:|-:|-:|-:|-:
-	| Spiny Dandelion| Taraxacum japonicum| Taraxacum| Asteraceae| 2022
-	| Mythical Monkey| Cercopithecus lomamiensis| Cercopithecus| Cercopithecidae| 2012
-	| Yeti Crab| Kiwa hirsuta| Kiwa| Kiwaidae| 2005
-
-## Non-table text is not modified
-1. |
-2. ||
-    |
-    ||
-
-## markup with table
-| Common Name| Species| Genus| Family| Year Discovered
-|:-:|:-:|:-:|:-:|:-:
-| `Tapanuli Orangutan`| **Pongo tapanuliensis**| __Pongo__| Hominidae| 2017

data/examples/load_code.md

@@ -1,10 +0,0 @@
-Demonstrate loading inherited code via the command line.
-
-Run this command to display the inherited code.
-`mde --load-code examples/load1.sh examples/load_code.md display_variables`
-
-```bash :display_variables
-source bin/colorize_env_vars.sh
-echo The current value of environment variables:
-colorize_env_vars '' var1 var2
-```