markdown_exec 1.6 → 1.8

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (1.6)
+# MDE - Markdown Executor (1.8)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -77,6 +77,46 @@
   :env_var: MDE_DOCUMENT_LOAD_OPTS_BLOCK_NAME
   :opt_name: document_load_opts_block_name
   :procname: val_as_str
+- :arg_name: BOOL
+  :default: false
+  :description: Dump BlocksInFile (stage 1)
+  :env_var: MDE_DUMP_BLOCKS_IN_FILE
+  :opt_name: dump_blocks_in_file
+  :procname: val_as_bool
+- :arg_name: BOOL
+  :default: false
+  :description: Dump MenuBlocks (stage 2)
+  :env_var: MDE_DUMP_MENU_BLOCKS
+  :opt_name: dump_menu_blocks
+  :procname: val_as_bool
+- :arg_name: BOOL
+  :default: false
+  :description: Dump selected block
+  :env_var: MDE_DUMP_SELECTED_BLOCK
+  :opt_name: dump_selected_block
+  :procname: val_as_bool
+- :default: fg_rgbh_E0_E0_20
+  :description: Color of exception detail
+  :env_var: MDE_EXCEPTION_COLOR_DETAIL
+  :opt_name: exception_color_detail
+  :procname: val_as_str
+- :default: " - %{detail}\n"
+  :description: Format for exception detail
+  :env_var: MDE_EXCEPTION_FORMAT_DETAIL
+  :opt_name: exception_format_detail
+  :procname: val_as_str
+- :default: fg_rgbh_E0_20_20
+  :description: Color of exception name
+  :env_var: MDE_EXCEPTION_COLOR_NAME
+  :opt_name: exception_color_name
+  :procname: val_as_str
+- :default: |2-
+
+    %{name}
+  :description: Format for exception name
+  :env_var: MDE_EXCEPTION_FORMAT_NAME
+  :opt_name: exception_format_name
+  :procname: val_as_str
 - :arg_name: REGEX
   :default:
   :description: Exclude blocks with name matching
@@ -95,6 +135,23 @@
   :env_var: MDE_EXCLUDE_EXPECT_BLOCKS
   :opt_name: exclude_expect_blocks
   :procname: val_as_bool
+- :default: fg_rgbh_20_80_80
+  :description: execution_report_preview_frame_color
+  :env_var: MDE_EXECUTION_REPORT_PREVIEW_FRAME_COLOR
+  :opt_name: execution_report_preview_frame_color
+  :procname: val_as_str
+- :default: |2-
+
+     -^-
+  :description: execution_report_preview_head
+  :env_var: MDE_EXECUTION_REPORT_PREVIEW_HEAD
+  :opt_name: execution_report_preview_head
+  :procname: val_as_str
+- :default: " -v-"
+  :description: execution_report_preview_tail
+  :env_var: MDE_EXECUTION_REPORT_PREVIEW_TAIL
+  :opt_name: execution_report_preview_tail
+  :procname: val_as_str
 - :description: Exit app
   :long_name: exit
   :procname: exit
@@ -116,6 +173,12 @@
   :opt_name: filename
   :procname: val_as_str
   :short_name: f
+- :arg_name: FIND
+  :default: ''
+  :description: Find in documents
+  :long_name: find
+  :procname: find
+  :short_name: "?"
 - :default: "^# *(?<name>[^#]*?) *$"
   :env_var: MDE_HEADING1_MATCH
   :opt_name: heading1_match
@@ -148,7 +211,13 @@
   :env_var: MDE_HISTORY_PROPERTY_SEPARATOR
   :opt_name: history_property_separator
   :procname: val_as_str
-- :default: "^ *@import (.+)$"
+- :arg_name: HOW
+  :default: ''
+  :description: Find in YAML configuration options
+  :long_name: how
+  :procname: how
+  :short_name: "?"
+- :default: "^ *@import +(?<name>.+?) *$"
   :env_var: MDE_IMPORT_PATTERN
   :opt_name: import_pattern
   :procname: val_as_str
@@ -201,7 +270,7 @@
   :env_var: MDE_MENU_BACK_AT_TOP
   :opt_name: menu_back_at_top
   :procname: val_as_bool
-- :default: plain
+- :default: fg_rgbh_40_c0_f0
   :description: Color of menu bash
   :env_var: MDE_MENU_BASH_COLOR
   :opt_name: menu_bash_color
@@ -218,7 +287,7 @@
   :env_var: MDE_MENU_BLOCKS_WITH_HEADINGS
   :opt_name: menu_blocks_with_headings
   :procname: val_as_bool
-- :default: fg_rgbh_aa_bb_aa
+- :default: fg_rgbh_80_80_20
   :description: Color of menu chrome
   :env_var: MDE_MENU_CHROME_COLOR
   :opt_name: menu_chrome_color
@@ -228,7 +297,7 @@
   :env_var: MDE_MENU_CHROME_FORMAT
   :opt_name: menu_chrome_format
   :procname: val_as_str
-- :default: magenta
+- :default: fg_rgbh_20_98_80
   :description: Color of menu divider
   :env_var: MDE_MENU_DIVIDER_COLOR
   :opt_name: menu_divider_color
@@ -260,13 +329,30 @@
   :env_var: MDE_MENU_FINAL_DIVIDER
   :opt_name: menu_final_divider
   :procname: val_as_str
+- :default: '0'
+  :description: Import levels for blocks to appear in menu. Empty is all.
+  :env_var: MDE_MENU_IMPORT_LEVEL_MATCH
+  :opt_name: menu_import_level_match
+  :procname: val_as_str
+- :arg_name: BOOL
+  :default: true
+  :description: Include imported blocks in menu
+  :env_var: MDE_MENU_INCLUDE_IMPORTED_BLOCKS
+  :opt_name: menu_include_imported_blocks
+  :procname: val_as_bool
+- :arg_name: BOOL
+  :default: false
+  :description: Include imported notes in menu
+  :env_var: MDE_MENU_INCLUDE_IMPORTED_NOTES
+  :opt_name: menu_include_imported_notes
+  :procname: val_as_bool
 - :default:
     :line: ''
   :description: opening demarcation for menu
   :env_var: MDE_MENU_INITIAL_DIVIDER
   :opt_name: menu_initial_divider
   :procname: val_as_str
-- :default: red
+- :default: fg_rgbh_20_E0_20
   :description: Color of menu link
   :env_var: MDE_MENU_LINK_COLOR
   :opt_name: menu_link_color
@@ -276,7 +362,7 @@
   :env_var: MDE_MENU_LINK_FORMAT
   :opt_name: menu_link_format
   :procname: val_as_str
-- :default: fg_rgbh_88_88_88
+- :default: fg_rgbh_40_a0_a0
   :description: Color of menu note
   :env_var: MDE_MENU_NOTE_COLOR
   :opt_name: menu_note_color
@@ -303,12 +389,12 @@
   :env_var: MDE_MENU_OPTION_EXIT_NAME
   :opt_name: menu_option_exit_name
   :procname: val_as_str
-- :default: blue
+- :default: fg_rgbh_E0_60_E0
   :description: Color of menu opts
   :env_var: MDE_MENU_OPTS_COLOR
   :opt_name: menu_opts_color
   :procname: val_as_str
-- :default: cyan
+- :default: fg_rgbh_E0_20_20
   :description: Color of menu opts
   :env_var: MDE_MENU_OPTS_SET_COLOR
   :opt_name: menu_opts_set_color
@@ -318,7 +404,7 @@
   :env_var: MDE_MENU_OPTS_SET_FORMAT
   :opt_name: menu_opts_set_format
   :procname: val_as_str
-- :default: cyan
+- :default: fg_rgbh_A0_20_D0
   :description: Color of menu task
   :env_var: MDE_MENU_TASK_COLOR
   :opt_name: menu_task_color
@@ -338,12 +424,12 @@
   :env_var: MDE_MENU_TASK_SYMBOL
   :opt_name: menu_task_symbol
   :procname: val_as_str
-- :default: blue
+- :default: fg_rgbh_E0_80_20
   :description: Color of menu vars
   :env_var: MDE_MENU_VARS_COLOR
   :opt_name: menu_vars_color
   :procname: val_as_str
-- :default: cyan
+- :default: fg_rgbh_E0_80_20
   :description: Color of menu vars
   :env_var: MDE_MENU_VARS_SET_COLOR
   :opt_name: menu_vars_set_color
@@ -371,16 +457,6 @@
   :env_var: MDE_NO_CHROME
   :opt_name: no_chrome
   :procname: val_as_bool
-- :default: " #=#=#"
-  :description: Output divider
-  :env_var: MDE_OUTPUT_DIVIDER
-  :opt_name: output_divider
-  :procname: val_as_str
-- :default: yellow
-  :description: Color of output divider
-  :env_var: MDE_OUTPUT_DIVIDER_COLOR
-  :opt_name: output_divider_color
-  :procname: val_as_str
 - :arg_name: BOOL
   :default: false
   :description: Display summary for execution
@@ -388,6 +464,21 @@
   :long_name: output-execution-summary
   :opt_name: output_execution_summary
   :procname: val_as_bool
+- :default: "%{name}: %{value}"
+  :description: format for menu dividers and demarcations
+  :env_var: MDE_OUTPUT_EXECUTION_LABEL_FORMAT
+  :opt_name: output_execution_label_format
+  :procname: val_as_str
+- :default: fg_rgbh_20_D8_80
+  :description: Color of output_execution_label_name
+  :env_var: MDE_OUTPUT_EXECUTION_LABEL_NAME_COLOR
+  :opt_name: output_execution_label_name_color
+  :procname: val_as_str
+- :default: fg_rgbh_20_E0_80
+  :description: Color of output_execution_label_value
+  :env_var: MDE_OUTPUT_EXECUTION_LABEL_VALUE_COLOR
+  :opt_name: output_execution_label_value_color
+  :procname: val_as_str
 - :arg_name: BOOL
   :default: false
   :description: Output saved script filename at end of execution
@@ -423,19 +514,28 @@
 - :arg_name: BOOL
   :default: true
   :description: Pause afte executing a BASH block
-  :env_var: MDE_PAUSE_AFTER_BASH_EXEC
-  :opt_name: pause_after_bash_exec
+  :env_var: MDE_PAUSE_after_script_execution
+  :opt_name: pause_after_script_execution
   :procname: val_as_bool
-- :default: Continue?
-  :description: Prompt to continue
-  :env_var: MDE_PROMPT_AFTER_BASH_EXEC
-  :opt_name: prompt_after_bash_exec
-  :procname: val_as_str
-- :default: Process?
+- :default: |2-
+
+    Continue?
+  :description: Prompt after script execution
+  :env_var: MDE_PROMPT_after_script_execution
+  :opt_name: prompt_after_script_execution
+  :procname: val_as_str
+- :default: |2-
+
+    Process?
   :description: Prompt to approve a block
   :env_var: MDE_PROMPT_APPROVE_BLOCK
   :opt_name: prompt_approve_block
   :procname: val_as_str
+- :default: fg_rgbh_20_E8_80
+  :description: Color of prompt after script execution
+  :env_var: MDE_PROMPT_COLOR_AFTER_SCRIPT_EXECUTION
+  :opt_name: prompt_color_after_script_execution
+  :procname: val_as_str
 - :default: Exit
   :description: Prompt to exit app
   :env_var: MDE_PROMPT_EXIT
@@ -456,17 +556,23 @@
   :env_var: MDE_PROMPT_SCRIPT_TO_CLIPBOARD
   :opt_name: prompt_script_to_clipboard
   :procname: val_as_str
-- :default: 'Choose a block:'
+- :default: |2-
+
+    Choose a block:
   :description: Prompt to select a block
   :env_var: MDE_PROMPT_SELECT_BLOCK
   :opt_name: prompt_select_block
   :procname: val_as_str
-- :default: 'Choose a file:'
+- :default: |2-
+
+    Choose a file:
   :description: Prompt to select a markdown document
   :env_var: MDE_PROMPT_SELECT_MD
   :opt_name: prompt_select_md
   :procname: val_as_str
-- :default: 'Choose a file:'
+- :default: |2-
+
+    Choose a file:
   :description: Prompt to select a saved file
   :env_var: MDE_PROMPT_SELECT_OUTPUT
   :opt_name: prompt_select_output
@@ -484,6 +590,12 @@
   :long_name: run-last-script
   :opt_name: run_last_script
   :procname: val_as_bool
+- :default: 1
+  :description: Runtime exception error level (warn if < 0, ignore if 0, abort if
+    > 0)
+  :env_var: MDE_RUNTIME_EXCEPTION_ERROR_LEVEL
+  :opt_name: runtime_exception_error_level
+  :procname: val_as_int
 - :arg_name: BOOL
   :default: false
   :description: Save executed script
@@ -498,6 +610,16 @@
   :long_name: save-execution-output
   :opt_name: save_execution_output
   :procname: val_as_bool
+- :default: "/"
+  :description: Pattern to replace in file names
+  :env_var: MDE_SAVED_FILENAME_PATTERN
+  :opt_name: saved_filename_pattern
+  :procname: val_as_str
+- :default: ",~"
+  :description: Replacement for pattern in file names
+  :env_var: MDE_SAVED_FILENAME_REPLACEMENT
+  :opt_name: saved_filename_replacement
+  :procname: val_as_str
 - :arg_name: INT
   :default: 493
   :description: chmod for saved scripts
@@ -536,6 +658,40 @@
   :env_var: MDE_SAVED_STDOUT_GLOB
   :opt_name: saved_stdout_glob
   :procname: val_as_str
+- :default: fg_rgbh_20_80_80
+  :description: script_execution_frame_color
+  :env_var: MDE_SCRIPT_EXECUTION_FRAME_COLOR
+  :opt_name: script_execution_frame_color
+  :procname: val_as_str
+- :default: |2-
+
+     -^-
+  :description: script_execution_head
+  :env_var: MDE_SCRIPT_EXECUTION_HEAD
+  :opt_name: script_execution_head
+  :procname: val_as_str
+- :default: " -v-\n"
+  :description: script_execution_tail
+  :env_var: MDE_SCRIPT_EXECUTION_TAIL
+  :opt_name: script_execution_tail
+  :procname: val_as_str
+- :default: fg_rgbh_20_80_80
+  :description: Color of output divider
+  :env_var: MDE_OUTPUT_DIVIDER_COLOR
+  :opt_name: script_preview_frame_color
+  :procname: val_as_str
+- :default: |2-
+
+     -^-
+  :description: script_preview_head
+  :env_var: MDE_SCRIPT_PREVIEW_HEAD
+  :opt_name: script_preview_head
+  :procname: val_as_str
+- :default: " -v-\n"
+  :description: script_preview_tail
+  :env_var: MDE_SCRIPT_PREVIEW_TAIL
+  :opt_name: script_preview_tail
+  :procname: val_as_str
 - :arg_name: REGEX
   :default:
   :description: Select blocks with name matching
@@ -571,6 +727,16 @@
   :env_var: MDE_SHELL
   :opt_name: shell
   :procname: val_as_str
+- :default: "#  -^-  +%{name}  -^-"
+  :description: shell_code_label_format_above
+  :env_var: MDE_SHELL_CODE_LABEL_FORMAT_ABOVE
+  :opt_name: shell_code_label_format_above
+  :procname: val_as_str
+- :default: "#  -v-  +%{name}  -v-"
+  :description: shell_code_label_format_below
+  :env_var: MDE_SHELL_CODE_LABEL_FORMAT_BELOW
+  :opt_name: shell_code_label_format_below
+  :procname: val_as_str
 - :description: List tab completions
   :long_name: tab-completions
   :opt_name: tab_completions
@@ -587,6 +753,16 @@
   :long_name: version
   :procname: version
   :short_name: v
+- :default: fg_rgbh_E0_E0_20
+  :description: Color of warning message
+  :env_var: MDE_WARNING_COLOR
+  :opt_name: warning_color
+  :procname: val_as_str
+- :default: 'Error: %{error}'
+  :description: Format of warning message
+  :env_var: MDE_WARNING_FORMAT
+  :opt_name: warning_format
+  :procname: val_as_str
 - :arg_name: INT.0-3
   :default: 1
   :description: Output display level (0 to 3 [data, +context, +info])

data/lib/method_sorter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ripper'
 require 'parser/current'
 
@@ -16,10 +18,10 @@ class MethodSorter
 
     method_nodes = []
 
-    # Look for method def nodes within each child node 
+    # Look for method def nodes within each child node
     class_node.children.compact.each do |child|
       if child.type == :begin
-        method_nodes += child.children.select {|n| n.type == :def}
+        method_nodes += child.children.select { |n| n.type == :def }
       end
     end
 
@@ -30,44 +32,44 @@ class MethodSorter
     #   return
     # end
 
-    # method_nodes = class_node.children.compact.select { |node| 
+    # method_nodes = class_node.children.compact.select { |node|
     #   node.type == :def
-    # }    
+    # }
 
-    sorted_methods = method_nodes.sort_by{ |n| n.children[0].to_s }
+    sorted_methods = method_nodes.sort_by { |n| n.children[0].to_s }
     ripper = Ripper.sexp(file_contents)
-    lines = ripper.each_with_index.map{|sexp, index| [sexp, index] }
-    
+    lines = ripper.each_with_index.map { |sexp, index| [sexp, index] }
+
     method_ranges = get_method_ranges(lines, method_nodes)
-    
+
     result = replace_method_ranges(lines, method_ranges, sorted_methods)
-    
-    puts result.compact.select{|v|v.is_a? String}.join("\n")
+
+    puts result.compact.select { |v| v.is_a? String }.join("\n")
     # File.write(@file_path, result.join)
   end
 
   private
-  
+
   def get_method_ranges(lines, method_nodes)
     method_nodes.map do |method_node|
       start_line = method_node.loc.line - 1
       end_line = start_line
-      
+
       while end_line < lines.size && lines[end_line][0] !~ /^end/
         end_line += 1
       end
-      
+
       (start_line..end_line)
     end
   end
-  
+
   def replace_method_ranges(lines, ranges, sorted_methods)
     result = lines.dup
-    
+
     ranges.each_with_index do |range, index|
-      result[range] = sorted_methods[index].loc.expression.source.split("\n") 
+      result[range] = sorted_methods[index].loc.expression.source.split("\n")
     end
-    
+
     result
   end
 end

data/lib/object_present.rb

@@ -43,7 +43,7 @@ class Object
       when 'FalseClass', 'TrueClass'
         true
       else
-        self && (!respond_to?(:blank?) || !blank?)
+        self && (!respond_to?(:present?) || !present?)
       end
     end
   end

data/lib/pty1.rb

@@ -1,26 +1,26 @@
+# frozen_string_literal: true
+
 require 'pty'
 
 def launch_and_interact_with_terminal
-  begin
-    PTY.spawn("bash") do |stdout, stdin, pid|
-      # Send a command to the terminal
-      stdin.puts "echo 'Hello from Ruby!'"
+  PTY.spawn('bash') do |stdout, stdin, _pid|
+    # Send a command to the terminal
+    stdin.puts "echo 'Hello from Ruby!'"
 
-      # Read the output of the command
-      stdout.each do |line|
-        puts line
-        break if line.include?("Hello from Ruby!")
-      end
+    # Read the output of the command
+    stdout.each do |line|
+      puts line
+      break if line.include?('Hello from Ruby!')
+    end
 
-      # You can continue to interact with the terminal here
-      # ...
+    # You can continue to interact with the terminal here
+    # ...
 
-      # Ensure to exit the spawned shell
-      stdin.puts "exit"
-    end
-  rescue PTY::ChildExited => e
-    puts "The child process exited!"
+    # Ensure to exit the spawned shell
+    stdin.puts 'exit'
   end
+rescue PTY::ChildExited
+  puts 'The child process exited!'
 end
 
 launch_and_interact_with_terminal

data/lib/regexp.rb

@@ -25,15 +25,13 @@
 # captures_hash[:file_name] = $~.pre_match.split("\n").last
 # captures_hash[:line_number] = $~.pre_match.count("\n") + 1
 # captures_hash[:line] = $&
-
-require 'English'
 class Regexp
   def gsub_format(input_str, format_str, context: {})
     input_str.gsub(self) do
       format(
         format_str,
-        context.merge($LAST_MATCH_INFO.names.each_with_object({}) do |name, hash|
-          hash[name.to_sym] = $LAST_MATCH_INFO[name]
+        context.merge($~.names.each_with_object({}) do |name, hash|
+          hash[name.to_sym] = $~[name]
         end)
       )
     end

data/lib/shared.rb

@@ -16,11 +16,6 @@ DISPLAY_LEVEL_DUMP = 3
 DISPLAY_LEVEL_DEFAULT = DISPLAY_LEVEL_ADMIN
 DISPLAY_LEVEL_MAX = DISPLAY_LEVEL_DUMP
 
-# @execute_files[ind] = @execute_files[ind] + [block]
-EF_STDOUT = 0
-EF_STDERR = 1
-EF_STDIN = 2
-
 LOCAL_YML = 'menu.yml'
 MENU_YML = "lib/#{LOCAL_YML}"
 

data/lib/string_util.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+module StringUtil
+  # Splits the given string on the first occurrence of the specified character.
+  # Returns an array containing the portion of the string before the character and the rest of the string.
+  #
+  # @param input_str [String] The string to be split.
+  # @param split_char [String] The character on which to split the string.
+  # @return [Array<String>] An array containing two elements: the part of the string before split_char, and the rest of the string.
+  def self.partition_at_first(input_str, split_char)
+    split_index = input_str.index(split_char)
+
+    if split_index.nil?
+      [input_str, '']
+    else
+      [input_str[0...split_index], input_str[(split_index + 1)..-1]]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.8'
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -113,6 +113,7 @@ files:
 - bin/setup
 - bin/tab_completion.sh
 - bin/tab_completion.sh.erb
+- examples/colors.md
 - examples/duplicate_block.md
 - examples/import0.md
 - examples/import1.md
@@ -127,15 +128,23 @@ files:
 - examples/port.md
 - examples/vars.md
 - examples/wrap.md
+- lib/ansi_formatter.rb
+- lib/array.rb
+- lib/array_util.rb
 - lib/block_label.rb
 - lib/block_types.rb
 - lib/cached_nested_file_reader.rb
 - lib/cli.rb
 - lib/colorize.rb
+- lib/constants.rb
+- lib/directory_searcher.rb
 - lib/env.rb
-- lib/environment_opt_parse.rb
+- lib/exceptions.rb
 - lib/fcb.rb
 - lib/filter.rb
+- lib/fout.rb
+- lib/hash.rb
+- lib/hash_delegator.rb
 - lib/markdown_exec.rb
 - lib/markdown_exec/version.rb
 - lib/mdoc.rb
@@ -151,6 +160,7 @@ files:
 - lib/saved_files_matcher.rb
 - lib/shared.rb
 - lib/sort_yaml_gpt4.rb
+- lib/string_util.rb
 - lib/tap.rb
 homepage: https://rubygems.org/gems/markdown_exec
 licenses: