markdown_exec 1.2.0 → 1.3.1

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "1.2.0"
+  echo "1.3.1"
 }
 
 _mde() {
@@ -34,17 +34,23 @@ _mde() {
             
               --debug) COMPREPLY="0"; return 0 ;;
             
-              --display-level) COMPREPLY="1"; return 0 ;;
+              -d) COMPREPLY="0"; return 0 ;;
             
               --filename) COMPREPLY="."; return 0 ;;
             
-              --list-count) COMPREPLY="32"; return 0 ;;
+              -f) COMPREPLY="."; return 0 ;;
+            
+              --path) COMPREPLY="."; return 0 ;;
+            
+              -p) COMPREPLY="."; return 0 ;;
             
-              --logged-stdout-filename-prefix) COMPREPLY="mde"; return 0 ;;
+              --user-must-approve) COMPREPLY="1"; return 0 ;;
             
-              --menu-blocks-with-docname) COMPREPLY="0"; return 0 ;;
+              -q) COMPREPLY="1"; return 0 ;;
             
-              --menu-blocks-with-headings) COMPREPLY="0"; return 0 ;;
+              --display-level) COMPREPLY="1"; return 0 ;;
+            
+              --list-count) COMPREPLY="32"; return 0 ;;
             
               --output-execution-summary) COMPREPLY="0"; return 0 ;;
             
@@ -52,26 +58,14 @@ _mde() {
             
               --output-stdout) COMPREPLY="1"; return 0 ;;
             
-              --path) COMPREPLY="."; return 0 ;;
-            
               --save-executed-script) COMPREPLY="0"; return 0 ;;
             
               --save-execution-output) COMPREPLY="0"; return 0 ;;
             
-              --saved-script-chmod) COMPREPLY="493"; return 0 ;;
-            
-              --saved-script-filename-prefix) COMPREPLY="mde"; return 0 ;;
-            
               --saved-script-folder) COMPREPLY="logs"; return 0 ;;
             
-              --saved-script-glob) COMPREPLY="mde_\*.sh"; return 0 ;;
-            
               --saved-stdout-folder) COMPREPLY="logs"; return 0 ;;
             
-              --saved-stdout-glob) COMPREPLY="mde_\*.out.txt"; return 0 ;;
-            
-              --user-must-approve) COMPREPLY="1"; return 0 ;;
-            
       esac
     fi
   fi
@@ -80,7 +74,7 @@ _mde() {
   # present matching option names
   #
   if [[ ${cur} == -* ]] ; then
-    opts=("--list-blocks" "--list-default-env" "--list-default-yaml" "--list-docs" "--list-recent-output" "--list-recent-scripts" "--pwd" "--run-last-script" "--select-recent-output" "--select-recent-script" "--menu-export" "--tab-completions" "--help" "--version" "--exit" "--config" "--debug" "--display-level" "--block-name" "--filename" "--list-count" "--logged-stdout-filename-prefix" "--menu-blocks-with-docname" "--menu-blocks-with-headings" "--output-execution-summary" "--output-script" "--output-stdout" "--path" "--save-executed-script" "--save-execution-output" "--saved-script-chmod" "--saved-script-filename-prefix" "--saved-script-folder" "--saved-script-glob" "--saved-stdout-folder" "--saved-stdout-glob" "--user-must-approve")
+    opts=("--block-name" "--config" "--debug" "--filename" "--help" "--path" "--user-must-approve" "--version" "--exit" "--list-blocks" "--list-default-env" "--list-default-yaml" "--list-docs" "--list-recent-output" "--list-recent-scripts" "--select-recent-output" "--select-recent-script" "--tab-completions" "--run-last-script" "--pwd" "--display-level" "--list-count" "--output-execution-summary" "--output-script" "--output-stdout" "--save-executed-script" "--save-execution-output" "--saved-script-folder" "--saved-stdout-folder")
     COMPREPLY=( $(compgen -W "$(printf "'%s' " "${opts[@]}")" -- "${cur}") )
 
     return 0
@@ -93,23 +87,31 @@ _mde() {
   if [[ -z ${cur} ]] ; then
     case $prev in
       
+          --block-name) COMPREPLY=".NAME."; return 0 ;;
+        
+          -b) COMPREPLY=".NAME."; return 0 ;;
+        
           --config) COMPREPLY=".PATH."; return 0 ;;
         
           --debug) COMPREPLY=".BOOL."; return 0 ;;
         
-          --display-level) COMPREPLY=".INT.0-2."; return 0 ;;
-        
-          --block-name) COMPREPLY=".NAME."; return 0 ;;
+          -d) COMPREPLY=".BOOL."; return 0 ;;
         
           --filename) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
         
-          --list-count) COMPREPLY=".INT.1-."; 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 ;;
         
-          --logged-stdout-filename-prefix) COMPREPLY=".PREFIX."; return 0 ;;
+          -q) COMPREPLY=".BOOL."; return 0 ;;
         
-          --menu-blocks-with-docname) COMPREPLY=".BOOL."; return 0 ;;
+          --display-level) COMPREPLY=".INT.0-3."; return 0 ;;
         
-          --menu-blocks-with-headings) COMPREPLY=".BOOL."; return 0 ;;
+          --list-count) COMPREPLY=".INT.1-."; return 0 ;;
         
           --output-execution-summary) COMPREPLY=".BOOL."; return 0 ;;
         
@@ -117,26 +119,14 @@ _mde() {
         
           --output-stdout) COMPREPLY=".BOOL."; return 0 ;;
         
-          --path) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
-        
           --save-executed-script) COMPREPLY=".BOOL."; return 0 ;;
         
           --save-execution-output) COMPREPLY=".BOOL."; return 0 ;;
         
-          --saved-script-chmod) COMPREPLY=".INT."; return 0 ;;
-        
-          --saved-script-filename-prefix) COMPREPLY=".PREFIX."; return 0 ;;
-        
           --saved-script-folder) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
         
-          --saved-script-glob) COMPREPLY=".GLOB."; return 0 ;;
-        
           --saved-stdout-folder) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
         
-          --saved-stdout-glob) COMPREPLY=".GLOB."; return 0 ;;
-        
-          --user-must-approve) COMPREPLY=".BOOL."; return 0 ;;
-        
     esac
   fi
 
@@ -148,4 +138,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2022-06-12 20:31:36 UTC"
+# echo "Updated: 2022-10-29 23:24:15 UTC"

data/bin/tab_completion.sh.erb

@@ -30,6 +30,7 @@ _mde() {
     if [[ ${prev} == -* ]] ; then
       case $prev in
         <% svhs.each do |svh|
+
           svn = svh[:long_name]
           if svn && svh[:arg_name]
             svn = '--' + svh[:long_name]
@@ -43,6 +44,21 @@ _mde() {
               <%= svn + ') COMPREPLY="' + svh[:compreply] + '"; return 0 ;;' %>
             <% end
           end
+
+          svn = svh[:short_name]
+          if svn && svh[:arg_name]
+            svn = '-' + svh[:short_name]
+            if svh[:compreply] == false
+              # nothing
+            elsif svh[:compreply].nil? %>
+              <%= svn + ') __filedirs_all; return 0 ;;' %>
+            <% elsif svh[:compreply].empty?
+              # nothing
+            else %>
+              <%= svn + ') COMPREPLY="' + svh[:compreply] + '"; return 0 ;;' %>
+            <% end
+          end
+
         end %>
       esac
     fi
@@ -65,11 +81,18 @@ _mde() {
   if [[ -z ${cur} ]] ; then
     case $prev in
       <% svhs.each do |svh|
+
         svn = svh[:long_name]
         if svn && svh[:arg_name]
           svn = '--' + svh[:long_name] %>
           <%= svn + ') COMPREPLY=".' + svh[:arg_name] + '."; return 0 ;;' %>
         <% end
+
+        svn = svh[:short_name]
+        if svn && svh[:arg_name]
+          svn = '-' + svh[:short_name] %>
+          <%= svn + ') COMPREPLY=".' + svh[:arg_name] + '."; return 0 ;;' %>
+        <% end
       end %>
     esac
   fi

data/lib/cli.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+# utility functions to provide CLI
+#
+module CLI
+  # skip :reek:UtilityFunction
+  def value_for_cli(value)
+    case value.class.to_s
+    when 'String'
+      Shellwords.escape value
+    when 'FalseClass', 'TrueClass'
+      value ? '1' : '0'
+    else
+      Shellwords.escape value.to_s
+    end
+  end
+end

data/lib/environment_opt_parse.rb

@@ -0,0 +1,200 @@
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+require 'optparse'
+require 'yaml'
+
+require_relative 'object_present'
+
+class Hash
+  unless defined?(sym_keys)
+    def sym_keys
+      transform_keys(&:to_sym)
+      # map do |key, value|
+      #   [key.to_sym, value]
+      # end.to_h
+    end
+  end
+end
+
+class EnvironmentOptParse
+  attr_reader :options, :remainder
+
+  # utility functions to create menu
+  #
+  module Menu
+    def menu_all(menu_data, lambdas, config)
+      config.tap_yaml 'config'
+      input_option_values, remainder, = menu_parse(add_proc(menu_data, lambdas))
+      # options = menu_default_option_values(menu_data).merge input_option_values
+      # options = (menu_default_option_values(menu_data)).merge(input_option_values).tap_yaml 'options1'
+      options = menu_default_option_values(menu_data).merge(config).merge(input_option_values) #.tap_yaml 'options2'
+      # options = menu_data.map do |menu_item|
+      #   menu_item.tap_inspect 'menu_item'
+      #   mion = menu_item[:opt_name]&.to_sym.tap_inspect 'mion'
+      #   omion = config[mion].tap_inspect 'omion'
+      #   unless omion.nil?
+      #     menu_item[:default] = omion
+      #   end
+      #   menu_item
+      # end,
+
+      [options, remainder]
+    end
+
+    def add_proc(menu_data, lambdas)
+      menu_data.each do |menu_item|
+        menu_item.tap_yaml 'menu_item'
+        procname = menu_item[:procname]
+        next if procname.nil?
+
+        menu_item[:proccode] = lambdas.fetch(procname.to_sym, menu_item[:procname])
+      end.tap_yaml
+    end
+
+    def menu_default_option_values(menu_data)
+      menu_data.map do |item|
+        item_default = item[:default]
+        next if item_default.nil?
+        next unless item[:opt_name].present?
+
+        [item[:opt_name].to_sym, item_default]
+      end.compact.to_h
+    end
+
+    def menu_help(menu_data)
+      options = {}
+      option_parser = OptionParser.new do |opts|
+        opts.banner = [
+          "#{APP_NAME} - #{APP_DESC} (#{VERSION})",
+          "Usage: #{File.basename($PROGRAM_NAME)} [options]"
+        ].join("\n")
+
+        menu_data.each do |item|
+          menu_option_append opts, options, item
+        end
+      end
+
+      option_parser.help
+    end
+
+    def menu_option_append(opts, options, item)
+      return unless item[:long_name].present? || item[:short_name].present?
+
+      mmoo = [
+        # long name
+        if item[:long_name].present?
+          "--#{item[:long_name]}#{item[:arg_name].present? ? " #{item[:arg_name]}" : ''}"
+        end,
+
+        # short name
+        item[:short_name].present? ? "-#{item[:short_name]}" : nil,
+
+        # description and default
+        [item[:description],
+         item[:default].present? ? "[#{value_for_menu item[:default]}]" : nil].compact.join('  '),
+
+        # apply proccode, if present, to value
+        # save value to options hash if option is named
+        #
+        lambda { |value|
+          (item[:proccode] ? item[:proccode].call(value) : value).tap do |converted|
+            opt_name = item[:opt_name]
+            next if opt_name.nil?
+
+            options[opt_name.to_sym] = converted if item[:opt_name]
+          end
+        }
+      ].compact
+      opts.on(*mmoo)
+    end
+
+    def menu_parse(menu_options)
+      options = {}
+      option_parser = OptionParser.new do |opts|
+        menu_options.each do |item|
+          item[:opt_name] = item[:opt_name]&.to_sym
+          menu_option_append opts, options, item
+        end
+      end
+      option_parser.load # filename defaults to basename of the program without suffix in a directory ~/.options
+      option_parser.environment # env defaults to the basename of the program.
+      remainder = option_parser.parse!
+
+      [options, remainder, option_parser.help]
+    end
+
+    # skip :reek:UtilityFunction
+    def value_for_menu(value)
+      case value.class.to_s
+      when 'String'
+        value
+      when 'FalseClass', 'TrueClass'
+        value ? '1' : '0'
+      else
+        value.to_s
+      end
+    end
+  end
+
+  include Menu
+
+  def initialize(menu: {}, lambdas: nil, options: nil, version: nil)
+    @menu = if menu.class.to_s == 'String'
+              filetext = File.read(menu).tap_yaml 'filetext'
+              fileyaml = YAML.load(filetext)
+              fileyaml.map(&:sym_keys)
+            else
+              menu
+            end.tap_yaml '@menu'
+    @lambdas = lambdas
+    @version = version || '0.1'
+    # @options = {}
+    @options = if options.class.to_s == 'String'
+                 YAML.safe_load(File.read(options)).sym_keys.tap_yaml '@options'
+               else
+                 {}
+               end #.tap_yaml '@options'
+
+    parse!
+  end
+
+  def parse!
+    @options, @remainder = menu_all(
+      @menu,
+      # @menu.map do |menu_item|
+      #   menu_item.tap_inspect 'menu_item'
+      #   mion = menu_item[:opt_name]&.to_sym.tap_inspect 'mion'
+      #   omion = @options[mion].tap_inspect 'omion'
+      #   unless omion.nil?
+      #     @options[menu_item[:default]] = omion
+      #   end
+      #   menu_item
+      # end,
+      {
+        debug: ->(value) { tap_config value: value },
+
+        # stdout_configuration: lambda { |_| self.options.tap_puts 'eop' },
+        # stdout_configuration: (lambda { |options|
+        #   lambda { |v| options.tap_puts 'eop_l' }
+        # }).call(@options),
+
+        stdout_defaults: ->(_) { menu_default_option_values(@menu).to_yaml.tap_puts },
+        stdout_help: lambda { |_|
+                       menu_help(@menu).tap_puts
+                       exit
+                     },
+        val_as_bool: ->(value) { value.class.to_s == 'String' ? (value.chomp != '0') : value },
+        val_as_int: ->(value) { value.to_i },
+        val_as_str: ->(value) { value.to_s },
+        version: lambda { |_|
+                   @version.tap_puts
+                   exit
+                 }
+      }.merge(@lambdas || {}),
+      @options
+    )
+    @options #.tap_yaml '@options'
+  end
+end

data/lib/globfiles.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+# require 'json'
+# require 'yaml'
+
+# require_relative 'env'
+# include Env
+
+## directory listing of saved files matching glob
+#
+class Globfiles
+  def initialize(folder, glob)
+    @folder = folder
+    @glob = glob
+  end
+
+  def list_all
+    Dir.glob(File.join(@folder, @glob)).tap_inspect
+  end
+
+  ## single most recent item
+  #
+  def most_recent(arr = nil)
+    arr = list_all if arr.nil?
+    return if arr.count < 1
+
+    arr.max.tap_inspect
+  end
+
+  ## multiple recent items
+  #
+  def most_recent_list(list_count, arr = nil)
+    arr = list_all if arr.nil?
+    return if (ac = arr.count) < 1
+
+    arr.sort[-[ac, list_count].min..].reverse.tap_inspect
+  end
+end # class Globfiles

data/lib/markdown_exec/version.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+# :reek:TooManyConstants
 module MarkdownExec
   APP_DESC = 'Markdown Executor'
   APP_NAME = 'MDE'
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
-  VERSION = '1.2.0'
+  TAP_DEBUG = 'MDE_DEBUG'
+  VERSION = '1.3.1'
 end