markdown_exec 1.5 → 1.7

data/lib/mdoc.rb

@@ -209,9 +209,6 @@ module MarkdownExec
       end
     end
 
-    # def load_auto_blocks(opts)
-    # end
-
     # Recursively fetches required code blocks for a given list of requirements.
     #
     # @param reqs [Array<String>] An array of requirements to start the recursion from.

data/lib/menu.src.yml

@@ -1,7 +1,7 @@
 ---
 - :description: Show current configuration values
   :procname: show_config
-  :short_name: '0'
+  :short_name: "0"
 
 - :arg_name: BOOL
   :default: false
@@ -113,17 +113,37 @@
   :opt_name: exclude_expect_blocks
   :procname: val_as_bool
 
+- :default: magenta
+  :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: "\n -^-"
+  :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
   :short_name: x
 
-- :default: "^`{3,}"
+## match fenced code indented by spaces
+#
+- :default: "^(?<indent> *)`{3,}"
   :env_var: MDE_FENCED_START_AND_END_REGEX
   :opt_name: fenced_start_and_end_regex
   :procname: val_as_str
 
-- :default: "^`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*) *$"
+- :default: "^(?<indent> *)`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*) *$"
   :env_var: MDE_FENCED_START_EXTENDED_REGEX
   :opt_name: fenced_start_extended_regex
   :procname: val_as_str
@@ -176,7 +196,7 @@
   :opt_name: history_property_separator
   :procname: val_as_str
 
-- :default: "^ *@import (.+)$"
+- :default: "^ *@import +(?<name>.+?) *$"
   :env_var: MDE_IMPORT_PATTERN
   :opt_name: import_pattern
   :procname: val_as_str
@@ -311,6 +331,26 @@
   :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
@@ -330,7 +370,7 @@
   :opt_name: menu_link_format
   :procname: val_as_str
 
-- :default: fg_rgbh_44_44_44
+- :default: fg_rgbh_88_88_88
   :description: Color of menu note
   :env_var: MDE_MENU_NOTE_COLOR
   :opt_name: menu_note_color
@@ -342,7 +382,9 @@
   :opt_name: menu_note_format
   :procname: val_as_str
 
-- :default: "^\\+ *(?<line>.*?) *$"
+## all non-blank lines are notes
+#
+- :default: "^(?<line>.*?) *$"
   :description: Pattern for notes in block selection menu
   :env_var: MDE_MENU_NOTE_MATCH
   :opt_name: menu_note_match
@@ -443,18 +485,6 @@
   :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
@@ -463,6 +493,24 @@
   :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: yellow
+  :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: plain
+  :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
@@ -503,29 +551,35 @@
 - :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
+- :default: "\nContinue?"
+  :description: Prompt after script execution
+  :env_var: MDE_PROMPT_after_script_execution
+  :opt_name: prompt_after_script_execution
   :procname: val_as_str
 
-- :default: Process?
+- :default: "\nProcess?"
   :description: Prompt to approve a block
   :env_var: MDE_PROMPT_APPROVE_BLOCK
   :opt_name: prompt_approve_block
   :procname: val_as_str
 
+- :default: cyan
+  :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
   :opt_name: prompt_exit
   :procname: val_as_str
 
-- :default: 'No'
+- :default: "No"
   :description: Prompt for no
   :env_var: MDE_PROMPT_NO
   :opt_name: prompt_no
@@ -543,25 +597,25 @@
   :opt_name: prompt_script_to_clipboard
   :procname: val_as_str
 
-- :default: 'Choose a block:'
+- :default: "\nChoose 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: "\nChoose 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: "\nChoose a file:"
   :description: Prompt to select a saved file
   :env_var: MDE_PROMPT_SELECT_OUTPUT
   :opt_name: prompt_select_output
   :procname: val_as_str
 
-- :default: 'Yes'
+- :default: "Yes"
   :description: Prompt for yes
   :env_var: MDE_PROMPT_YES
   :opt_name: prompt_yes
@@ -593,6 +647,18 @@
   :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
@@ -637,6 +703,42 @@
   :opt_name: saved_stdout_glob
   :procname: val_as_str
 
+- :default: green
+  :description: script_execution_frame_color
+  :env_var: MDE_SCRIPT_EXECUTION_FRAME_COLOR
+  :opt_name: script_execution_frame_color
+  :procname: val_as_str
+
+- :default: "\n -^-"
+  :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: yellow
+  :description: Color of output divider
+  :env_var: MDE_OUTPUT_DIVIDER_COLOR
+  :opt_name: script_preview_frame_color
+  :procname: val_as_str
+
+- :default: "\n -^-"
+  :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
@@ -652,7 +754,7 @@
   :procname: val_as_str
 
 - :default: 36
-  :description: 'Maximum # of rows in select list'
+  :description: "Maximum # of rows in select list"
   :env_var: MDE_SELECT_PAGE_HEIGHT
   :opt_name: select_page_height
   :procname: val_as_int
@@ -697,3 +799,15 @@
   :long_name: version
   :procname: version
   :short_name: v
+
+- :default: red
+  :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

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (1.5)
+# MDE - Markdown Executor (1.7)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -95,15 +95,33 @@
   :env_var: MDE_EXCLUDE_EXPECT_BLOCKS
   :opt_name: exclude_expect_blocks
   :procname: val_as_bool
+- :default: magenta
+  :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
   :short_name: x
-- :default: "^`{3,}"
+- :default: "^(?<indent> *)`{3,}"
   :env_var: MDE_FENCED_START_AND_END_REGEX
   :opt_name: fenced_start_and_end_regex
   :procname: val_as_str
-- :default: "^`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*) *$"
+- :default: "^(?<indent> *)`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*)
+    *$"
   :env_var: MDE_FENCED_START_EXTENDED_REGEX
   :opt_name: fenced_start_extended_regex
   :procname: val_as_str
@@ -147,7 +165,7 @@
   :env_var: MDE_HISTORY_PROPERTY_SEPARATOR
   :opt_name: history_property_separator
   :procname: val_as_str
-- :default: "^ *@import (.+)$"
+- :default: "^ *@import +(?<name>.+?) *$"
   :env_var: MDE_IMPORT_PATTERN
   :opt_name: import_pattern
   :procname: val_as_str
@@ -259,6 +277,23 @@
   :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
@@ -275,7 +310,7 @@
   :env_var: MDE_MENU_LINK_FORMAT
   :opt_name: menu_link_format
   :procname: val_as_str
-- :default: fg_rgbh_44_44_44
+- :default: fg_rgbh_88_88_88
   :description: Color of menu note
   :env_var: MDE_MENU_NOTE_COLOR
   :opt_name: menu_note_color
@@ -285,7 +320,7 @@
   :env_var: MDE_MENU_NOTE_FORMAT
   :opt_name: menu_note_format
   :procname: val_as_str
-- :default: "^\\+ *(?<line>.*?) *$"
+- :default: "^(?<line>.*?) *$"
   :description: Pattern for notes in block selection menu
   :env_var: MDE_MENU_NOTE_MATCH
   :opt_name: menu_note_match
@@ -370,16 +405,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
@@ -387,6 +412,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: yellow
+  :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: plain
+  :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
@@ -422,19 +462,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: cyan
+  :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
@@ -455,17 +504,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
@@ -497,6 +552,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
@@ -535,6 +600,40 @@
   :env_var: MDE_SAVED_STDOUT_GLOB
   :opt_name: saved_stdout_glob
   :procname: val_as_str
+- :default: green
+  :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: yellow
+  :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
@@ -586,6 +685,16 @@
   :long_name: version
   :procname: version
   :short_name: v
+- :default: red
+  :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/option_value.rb

@@ -65,7 +65,8 @@ if $PROGRAM_NAME == __FILE__
     end
 
     def test_for_hash_with_empty_value
-      assert_equal 'default', MarkdownExec::OptionValue.for_hash([], 'default')
+      assert_equal 'default',
+                   MarkdownExec::OptionValue.for_hash([], 'default')
     end
 
     def test_for_yaml_with_string
@@ -82,7 +83,8 @@ if $PROGRAM_NAME == __FILE__
     end
 
     def test_for_yaml_with_empty_value
-      assert_equal 'default', MarkdownExec::OptionValue.for_yaml([], 'default')
+      assert_equal 'default',
+                   MarkdownExec::OptionValue.for_yaml([], 'default')
     end
   end
 end