markdown_exec 1.3.0 → 1.3.1

data/Rakefile

@@ -3,8 +3,17 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'erb'
+# require 'rspec'
+require 'rubocop'
 require 'yaml'
 
+# begin
+#   require 'rspec/core/rake_task'
+#   RSpec::Core::RakeTask.new(:spec)
+# rescue LoadError
+#   puts 'RSpec is required to run some tests.'
+# end
+
 Rake::TestTask.new(:test) do |task|
   task.libs << 'test'
   task.libs << 'lib'
@@ -13,10 +22,13 @@ end
 
 require 'rubocop/rake_task'
 
+require_relative 'lib/cli'
 require_relative 'lib/markdown_exec/version'
 require_relative 'lib/shared'
 require_relative 'lib/tap'
 
+include CLI
+
 include Tap
 tap_config envvar: MarkdownExec::TAP_DEBUG
 
@@ -30,6 +42,7 @@ task :rubocopminitest do
 end
 
 task default: %i[test reek rubocop rubocopminitest]
+# task default: %i[spec test reek rubocop rubocopminitest]
 
 # task :default => :build
 
@@ -83,14 +96,14 @@ task :update_menu_yml do
       long_name: 'block-name',
       opt_name: 'block_name',
       short_name: 'b',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       arg_name: 'PATH',
       default: '.',
       description: 'Read configuration file',
       long_name: 'config',
-      proc1: 'path'
+      procname: 'path'
     },
     {
       arg_name: 'BOOL',
@@ -99,7 +112,7 @@ task :update_menu_yml do
       env_var: MarkdownExec::TAP_DEBUG,
       long_name: 'debug',
       short_name: 'd',
-      proc1: 'debug'
+      procname: 'debug'
     },
     {
       arg_name: 'RELATIVE_PATH',
@@ -109,13 +122,13 @@ task :update_menu_yml do
       long_name: 'filename',
       opt_name: 'filename',
       short_name: 'f',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       description: 'App help',
       long_name: 'help',
       short_name: 'h',
-      proc1: 'help'
+      procname: 'help'
     },
     {
       arg_name: 'RELATIVE_PATH',
@@ -125,7 +138,7 @@ task :update_menu_yml do
       long_name: 'path',
       opt_name: 'path',
       short_name: 'p',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       arg_name: 'BOOL',
@@ -135,24 +148,24 @@ task :update_menu_yml do
       long_name: 'user-must-approve',
       opt_name: 'user_must_approve',
       short_name: 'q',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: "Print the gem's version",
       long_name: 'version',
       short_name: 'v',
-      proc1: 'version'
+      procname: 'version'
     },
     {
       description: 'Exit app',
       long_name: 'exit',
       short_name: 'x',
-      proc1: 'exit' # ->(_) { exit }
+      procname: 'exit' # ->(_) { exit }
     },
     {
       description: 'Show current configuration values',
       short_name: '0',
-      proc1: 'show_config'
+      procname: 'show_config'
     },
 
     ## commands
@@ -161,7 +174,7 @@ task :update_menu_yml do
       description: 'List blocks',
       long_name: 'list-blocks',
       opt_name: 'list_blocks',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: 'List default configuration as environment variables',
@@ -177,49 +190,49 @@ task :update_menu_yml do
       description: 'List docs in current folder',
       long_name: 'list-docs',
       opt_name: 'list_docs',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: 'List recent saved output',
       long_name: 'list-recent-output',
       opt_name: 'list_recent_output',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: 'List recent saved scripts',
       long_name: 'list-recent-scripts',
       opt_name: 'list_recent_scripts',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: 'Select and execute a recently saved output',
       long_name: 'select-recent-output',
       opt_name: 'select_recent_output',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: 'Select and execute a recently saved script',
       long_name: 'select-recent-script',
       opt_name: 'select_recent_script',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: 'List tab completions',
       long_name: 'tab-completions',
       opt_name: 'tab_completions',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: 'Run most recently saved script',
       long_name: 'run-last-script',
       opt_name: 'run_last_script',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       description: 'Gem home folder',
       long_name: 'pwd',
       opt_name: 'pwd',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
 
     ## secondary options
@@ -231,7 +244,7 @@ task :update_menu_yml do
       env_var: 'MDE_DISPLAY_LEVEL',
       long_name: 'display-level',
       opt_name: 'display_level',
-      proc1: 'val_as_int'
+      procname: 'val_as_int'
     },
     {
       arg_name: 'INT.1-',
@@ -240,7 +253,7 @@ task :update_menu_yml do
       env_var: 'MDE_LIST_COUNT',
       long_name: 'list-count',
       opt_name: 'list_count',
-      proc1: 'val_as_int'
+      procname: 'val_as_int'
     },
     {
       arg_name: 'PREFIX',
@@ -249,7 +262,7 @@ task :update_menu_yml do
       env_var: 'MDE_LOGGED_STDOUT_FILENAME_PREFIX',
       # long_name: 'logged-stdout-filename-prefix',
       opt_name: 'logged_stdout_filename_prefix',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       arg_name: 'BOOL',
@@ -258,7 +271,7 @@ task :update_menu_yml do
       env_var: 'MDE_MENU_BLOCKS_WITH_DOCNAME',
       # long_name: 'menu-blocks-with-docname',
       opt_name: 'menu_blocks_with_docname',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       arg_name: 'BOOL',
@@ -267,7 +280,7 @@ task :update_menu_yml do
       env_var: 'MDE_MENU_BLOCKS_WITH_HEADINGS',
       # long_name: 'menu-blocks-with-headings',
       opt_name: 'menu_blocks_with_headings',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       arg_name: 'BOOL',
@@ -276,7 +289,7 @@ task :update_menu_yml do
       env_var: 'MDE_OUTPUT_EXECUTION_SUMMARY',
       long_name: 'output-execution-summary',
       opt_name: 'output_execution_summary',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       arg_name: 'BOOL',
@@ -285,7 +298,7 @@ task :update_menu_yml do
       env_var: 'MDE_OUTPUT_SCRIPT',
       long_name: 'output-script',
       opt_name: 'output_script',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       arg_name: 'BOOL',
@@ -294,7 +307,7 @@ task :update_menu_yml do
       env_var: 'MDE_OUTPUT_STDOUT',
       long_name: 'output-stdout',
       opt_name: 'output_stdout',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       arg_name: 'BOOL',
@@ -303,7 +316,7 @@ task :update_menu_yml do
       env_var: 'MDE_SAVE_EXECUTED_SCRIPT',
       long_name: 'save-executed-script',
       opt_name: 'save_executed_script',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       arg_name: 'BOOL',
@@ -312,7 +325,7 @@ task :update_menu_yml do
       env_var: 'MDE_SAVE_EXECUTION_OUTPUT',
       long_name: 'save-execution-output',
       opt_name: 'save_execution_output',
-      proc1: 'val_as_bool'
+      procname: 'val_as_bool'
     },
     {
       arg_name: 'INT',
@@ -321,7 +334,7 @@ task :update_menu_yml do
       env_var: 'MDE_SAVED_SCRIPT_CHMOD',
       # long_name: 'saved-script-chmod',
       opt_name: 'saved_script_chmod',
-      proc1: 'val_as_int'
+      procname: 'val_as_int'
     },
     {
       arg_name: 'PREFIX',
@@ -330,7 +343,7 @@ task :update_menu_yml do
       env_var: 'MDE_SAVED_SCRIPT_FILENAME_PREFIX',
       # long_name: 'saved-script-filename-prefix',
       opt_name: 'saved_script_filename_prefix',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       arg_name: 'RELATIVE_PATH',
@@ -339,7 +352,7 @@ task :update_menu_yml do
       env_var: 'MDE_SAVED_SCRIPT_FOLDER',
       long_name: 'saved-script-folder',
       opt_name: 'saved_script_folder',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       arg_name: 'GLOB',
@@ -348,7 +361,7 @@ task :update_menu_yml do
       env_var: 'MDE_SAVED_SCRIPT_GLOB',
       # long_name: 'saved-script-glob',
       opt_name: 'saved_script_glob',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       arg_name: 'RELATIVE_PATH',
@@ -357,7 +370,7 @@ task :update_menu_yml do
       env_var: 'MDE_SAVED_STDOUT_FOLDER',
       long_name: 'saved-stdout-folder',
       opt_name: 'saved_stdout_folder',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       arg_name: 'GLOB',
@@ -366,133 +379,239 @@ task :update_menu_yml do
       env_var: 'MDE_SAVED_STDOUT_GLOB',
       # long_name: 'saved-stdout-glob',
       opt_name: 'saved_stdout_glob',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
 
     {
       default: '^[\(\[].*[\)\]]$',
       description: 'Pattern for blocks to hide from user-selection',
-      env_var: 'MDE_BLOCK_NAME_EXCLUDED_MATCH',
-      opt_name: 'block_name_excluded_match',
-      proc1: 'val_as_str'
+      env_var: 'MDE_BLOCK_NAME_HIDDEN_MATCH',
+      opt_name: 'block_name_hidden_match',
+      procname: 'val_as_str'
     },
     {
       default: ':(?<title>\S+)( |$)',
       env_var: 'MDE_BLOCK_NAME_MATCH',
       opt_name: 'block_name_match',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '%\([^\)]+\)',
       env_var: 'MDE_BLOCK_CALLS_SCAN',
       opt_name: 'block_calls_scan',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '\+\S+',
       env_var: 'MDE_BLOCK_REQUIRED_SCAN',
       opt_name: 'block_required_scan',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '<(?<full>(?<type>\$)?(?<name>[A-Za-z]\S*))',
       env_var: 'MDE_BLOCK_STDIN_SCAN',
       opt_name: 'block_stdin_scan',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '>(?<full>(?<type>\$)?(?<name>[A-Za-z]\S*))',
       env_var: 'MDE_BLOCK_STDOUT_SCAN',
       opt_name: 'block_stdout_scan',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '> ',
       env_var: 'MDE_DISPLAY_LEVEL_XBASE_PREFIX',
       opt_name: 'display_level_xbase_prefix',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '^`{3,}',
       env_var: 'MDE_FENCED_START_AND_END_MATCH',
       opt_name: 'fenced_start_and_end_match',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '^`{3,}(?<shell>[^`\s]*) *(?<name>.*)$',
       env_var: 'MDE_FENCED_START_EX_MATCH',
       opt_name: 'fenced_start_ex_match',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '^# *(?<name>[^#]*?) *$',
       env_var: 'MDE_HEADING1_MATCH',
       opt_name: 'heading1_match',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '^## *(?<name>[^#]*?) *$',
       env_var: 'MDE_HEADING2_MATCH',
       opt_name: 'heading2_match',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '^### *(?<name>.+?) *$',
       env_var: 'MDE_HEADING3_MATCH',
       opt_name: 'heading3_match',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '*.[Mm][Dd]',
       env_var: 'MDE_MD_FILENAME_GLOB',
       opt_name: 'md_filename_glob',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: '.+\\.md',
       env_var: 'MDE_MD_FILENAME_MATCH',
       opt_name: 'md_filename_match',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
+    },
+    {
+      default: '-:=   %s   =:-',
+      description: 'format for menu dividers and demarcations',
+      env_var: 'MDE_MENU_DIVIDER_FORMAT',
+      opt_name: 'menu_divider_format',
+      procname: 'val_as_str'
+    },
+    {
+      default: 'magenta',
+      description: 'Color of menu divider',
+      env_var: 'MDE_MENU_DIVIDER_COLOR',
+      opt_name: 'menu_divider_color',
+      procname: 'val_as_str'
     },
     {
       default: '^::: +(?<name>.+?)$',
       description: 'Pattern for topics/dividers in block selection menu',
       env_var: 'MDE_MENU_DIVIDER_MATCH',
       opt_name: 'menu_divider_match',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
+    },
+    {
+      default: '>',
+      description: 'Symbol before each divider',
+      env_var: 'MDE_MENU_DIVIDER_SYMBOL',
+      opt_name: 'menu_divider_symbol',
+      procname: 'val_as_str'
+    },
+    {
+      default: '~~~',
+      description: 'closing demarcations for menu',
+      env_var: 'MDE_MENU_FINAL_DIVIDER',
+      opt_name: 'menu_final_divider',
+      procname: 'val_as_str'
+    },
+    {
+      default: '',
+      description: 'opening demarcation for menu',
+      env_var: 'MDE_MENU_INITIAL_DIVIDER',
+      opt_name: 'menu_initial_divider',
+      procname: 'val_as_str'
     },
     {
       description: 'Options for viewing saved output file',
       env_var: 'MDE_OUTPUT_VIEWER_OPTIONS',
       opt_name: 'output_viewer_options',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
-      default: 24,
+      default: 36,
       description: 'Maximum # of rows in select list',
       env_var: 'MDE_SELECT_PAGE_HEIGHT',
       opt_name: 'select_page_height',
-      proc1: 'val_as_int'
+      procname: 'val_as_int'
     },
     {
       default: '#!/usr/bin/env',
       description: 'Shebang for saved scripts',
       env_var: 'MDE_SHEBANG',
       opt_name: 'shebang',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
       default: 'bash',
       description: 'Shell for launched scripts',
       env_var: 'MDE_SHELL',
       opt_name: 'shell',
-      proc1: 'val_as_str'
+      procname: 'val_as_str'
     },
     {
-      default: '- - %s - -',
-      env_var: 'MDE_MENU_DIVIDER_FORMAT',
-      opt_name: 'menu_divider_format',
-      proc1: 'val_as_str'
+      default: 'Process?',
+      description: 'Prompt to approve a block',
+      env_var: 'MDE_PROMPT_APPROVE_BLOCK',
+      opt_name: 'prompt_approve_block',
+      procname: 'val_as_str'
+    },
+    {
+      default: '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:',
+      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:',
+      description: 'Prompt to select a saved file',
+      env_var: 'MDE_PROMPT_SELECT_OUTPUT',
+      opt_name: 'prompt_select_output',
+      procname: 'val_as_str'
+    },
+    {
+      default: 'Copy script to clipboard',
+      description: 'Prompt to copy script to clipboard',
+      env_var: 'MDE_PROMPT_SCRIPT_TO_CLIPBOARD',
+      opt_name: 'prompt_script_to_clipboard',
+      procname: 'val_as_str'
+    },
+    {
+      default: 'Save script',
+      description: 'Prompt to save script',
+      env_var: 'MDE_PROMPT_SAVE_SCRIPT',
+      opt_name: 'prompt_save_script',
+      procname: 'val_as_str'
+    },
+    {
+      default: 'No',
+      description: 'Prompt for no',
+      env_var: 'MDE_PROMPT_NO',
+      opt_name: 'prompt_no',
+      procname: 'val_as_str'
+    },
+    {
+      default: 'Yes',
+      description: 'Prompt for yes',
+      env_var: 'MDE_PROMPT_YES',
+      opt_name: 'prompt_yes',
+      procname: 'val_as_str'
+    },
+    {
+      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'
+      # },
+      # {
+      #   default: '',
+      #   description: '',
+      #   env_var: 'MDE_PROMPT_',
+      #   opt_name: 'prompt_',
+      #   procname: 'val_as_str'
     }
   ]
 
@@ -511,8 +630,8 @@ def update_tab_completion(target)
 
   svhs = YAML.load File.open(MENU_YML)
   svhs.each do |svh|
-    svh[:compreply] = value_for_cli(svh[:default]) if svh[:compreply].nil?
-  end.tap_inspect name: :svhs, format: :yaml
+    svh[:compreply] = CLI::value_for_cli(svh[:default]) if svh[:compreply].nil?
+  end.tap_inspect name: :svhs, type: :yaml
 
   File.write target, ERB.new(File.read(filespec = File.join(BF, 'tab_completion.sh.erb'))).result(binding)
   puts `stat #{filespec}`

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "1.3.0"
+  echo "1.3.1"
 }
 
 _mde() {
@@ -34,12 +34,20 @@ _mde() {
             
               --debug) COMPREPLY="0"; return 0 ;;
             
+              -d) COMPREPLY="0"; return 0 ;;
+            
               --filename) COMPREPLY="."; return 0 ;;
             
+              -f) COMPREPLY="."; return 0 ;;
+            
               --path) COMPREPLY="."; return 0 ;;
             
+              -p) COMPREPLY="."; return 0 ;;
+            
               --user-must-approve) COMPREPLY="1"; return 0 ;;
             
+              -q) COMPREPLY="1"; return 0 ;;
+            
               --display-level) COMPREPLY="1"; return 0 ;;
             
               --list-count) COMPREPLY="32"; return 0 ;;
@@ -81,17 +89,27 @@ _mde() {
       
           --block-name) COMPREPLY=".NAME."; return 0 ;;
         
+          -b) COMPREPLY=".NAME."; return 0 ;;
+        
           --config) COMPREPLY=".PATH."; return 0 ;;
         
           --debug) COMPREPLY=".BOOL."; return 0 ;;
         
+          -d) COMPREPLY=".BOOL."; return 0 ;;
+        
           --filename) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
         
+          -f) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
+        
           --path) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
         
+          -p) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
+        
           --user-must-approve) COMPREPLY=".BOOL."; return 0 ;;
         
-          --display-level) COMPREPLY=".INT.0-2."; return 0 ;;
+          -q) COMPREPLY=".BOOL."; return 0 ;;
+        
+          --display-level) COMPREPLY=".INT.0-3."; return 0 ;;
         
           --list-count) COMPREPLY=".INT.1-."; return 0 ;;
         
@@ -120,4 +138,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2022-07-16 23:32:32 UTC"
+# echo "Updated: 2022-10-29 23:24:15 UTC"