markdown_exec 1.8.6 → 1.8.8

data/lib/menu.yml

@@ -1,10 +1,10 @@
-# MDE - Markdown Executor (1.8.6)
+# MDE - Markdown Executor (1.8.8)
 ---
 - :description: Show current configuration values
   :procname: show_config
   :short_name: '0'
 - :arg_name: BOOL
-  :default: false
+  :default: true
   :description: Display only blocks of type "bash"
   :env_var: MDE_BASH_ONLY
   :opt_name: bash_only
@@ -26,7 +26,7 @@
   :env_var: MDE_BLOCK_NAME_HIDDEN_MATCH
   :opt_name: block_name_hidden_match
   :procname: val_as_str
-- :default: "^[\\(\\[].*[\\)\\]]$"
+- :default: "^\\(.*\\)$"
   :description: Pattern for blocks to hide from user-selection
   :env_var: MDE_BLOCK_NAME_INCLUDE_MATCH
   :opt_name: block_name_include_match
@@ -35,6 +35,11 @@
   :env_var: MDE_BLOCK_NAME_MATCH
   :opt_name: block_name_match
   :procname: val_as_str
+- :default: "^\\[.*\\]$"
+  :description: Pattern for block nicknames (name is not used in menu)
+  :env_var: MDE_BLOCK_NAME_NICK_MATCH
+  :opt_name: block_name_nick_match
+  :procname: val_as_str
 - :default: "^{.+}$"
   :description: Pattern for block names to use as wrappers
   :env_var: MDE_BLOCK_NAME_WRAPPER_MATCH
@@ -61,6 +66,12 @@
   :description: Read configuration file
   :long_name: config
   :procname: path
+- :arg_name: BOOL
+  :default: true
+  :description: debounce_execution
+  :env_var: MDE_debounce_execution
+  :opt_name: debounce_execution
+  :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Debug output
@@ -152,6 +163,46 @@
   :env_var: MDE_EXCLUDE_EXPECT_BLOCKS
   :opt_name: exclude_expect_blocks
   :procname: val_as_bool
+- :default: "osascript -e '\n    tell application \"iTerm\"\n        tell application
+    \"System Events\"\n            tell application \"Finder\"\n                set
+    {posx, posy, screenWidth, screenHeight} to bounds of window of desktop\n            end
+    tell\n            tell application process \"Finder\"\n                set {missing
+    value, menubarHeight} to the size of menu bar 1\n            end tell\n        end
+    tell\n\n        set winHeight to (screenHeight * 2 / 3)\n        set winWidth
+    to (screenWidth / 2)\n        set xoff to menubarHeight * %{batch_index}\n        set
+    yoff to xoff mod (screenHeight - winHeight)\n        \n        create window with
+    default profile\n        tell the first window\n            set bounds to {xoff,
+    yoff, xoff + winWidth, yoff + winHeight}\n            tell the current session\n
+    \               write text \"alias cat_script=\\\"cat -n \\\\\\\"%{script_filespec}\\\\\\\"\\\"\"\n
+    \               write text \"alias less_script=\\\"less \\\\\\\"%{script_filespec}\\\\\\\"\\\"\"\n
+    \               write text \"alias run_script=\\\"%{script_filespec}\\\"\"\n                write
+    text \"alias vim_script=\\\"vim \\\\\\\"%{script_filespec}\\\\\\\"\\\"\"\n                delay
+    1\n\n                write text \"alias cat_output=\\\"cat -n \\\\\\\"%{output_filespec}\\\\\\\"\\\"\"\n
+    \               write text \"alias grep_output=\\\"read -p Pattern: pattern &&
+    grep \\\\\\\"\\\\$pattern\\\\\\\" \\\\\\\"%{output_filespec}\\\\\\\"\\\"\"\n                write
+    text \"alias less_output=\\\"less \\\\\\\"%{output_filespec}\\\\\\\"\\\"\"\n                delay
+    1\n\n                write text \"alias menu=\\\"select cmd in cat_script less_script
+    run_script vim_script cat_output grep_output less_output exit; do eval \\\\\\\"\\\\$cmd\\\\\\\";
+    done\\\"\"\n                delay 1\n\n                write text \"echo -ne \\\"\\\\033];
+    %{started_at} - %{document_filename} - %{block_name} \\\\007\\\"\"\n                write
+    text \"cd \\\"%{home}\\\"\"\n                write text \"\\\"%{script_filename}\\\"
+    | tee \\\"%{output_filespec}\\\"\"\n                delay 2\n\n                write
+    text \"menu\"\n            end tell\n        end tell\n    end tell'\n"
+  :description: execute_command_format
+  :env_var: MDE_EXECUTE_COMMAND_FORMAT
+  :opt_name: execute_command_format
+  :procname: val_as_str
+- :default: "%T"
+  :description: Format for time in window title
+  :env_var: MDE_EXECUTE_COMMAND_TITLE_TIME_FORMAT
+  :opt_name: execute_command_title_time_format
+  :procname: val_as_str
+- :arg_name: BOOL
+  :default: true
+  :description: Execute script in own window
+  :env_var: MDE_EXECUTE_IN_OWN_WINDOW
+  :opt_name: execute_in_own_window
+  :procname: val_as_bool
 - :default: fg_rgbh_7f_ff_00
   :description: execution_report_preview_frame_color
   :env_var: MDE_EXECUTION_REPORT_PREVIEW_FRAME_COLOR
@@ -205,15 +256,15 @@
   :long_name: find-path
   :opt_name: find_path
   :procname: val_as_str
-- :default: "^# *(?<name>[^#]*?) *$"
+- :default: "^# *(?<line>[^#]*?) *$"
   :env_var: MDE_HEADING1_MATCH
   :opt_name: heading1_match
   :procname: val_as_str
-- :default: "^## *(?<name>[^#]*?) *$"
+- :default: "^## *(?<line>[^#]*?) *$"
   :env_var: MDE_HEADING2_MATCH
   :opt_name: heading2_match
   :procname: val_as_str
-- :default: "^### *(?<name>.+?) *$"
+- :default: "^### *(?<line>.+?) *$"
   :env_var: MDE_HEADING3_MATCH
   :opt_name: heading3_match
   :procname: val_as_str
@@ -243,6 +294,10 @@
   :long_name: how
   :procname: how
   :short_name: "?"
+- :default:
+  :env_var: MDE_IMPORT_PATHS
+  :opt_name: import_paths
+  :procname: val_as_str
 - :default: "^ *@import +(?<name>.+?) *$"
   :env_var: MDE_IMPORT_PATTERN
   :opt_name: import_pattern
@@ -308,7 +363,7 @@
   :opt_name: menu_blocks_with_docname
   :procname: val_as_bool
 - :arg_name: BOOL
-  :default: false
+  :default: true
   :description: Controls whether headings(levels 1,2,3) are displayed in the block
     selection menu
   :env_var: MDE_MENU_BLOCKS_WITH_HEADINGS
@@ -356,6 +411,36 @@
   :env_var: MDE_MENU_FINAL_DIVIDER
   :opt_name: menu_final_divider
   :procname: val_as_str
+- :default: fg_rgbh_80_80_c0
+  :description: Color for heading 1 in menu
+  :env_var: MDE_MENU_HEADING1_COLOR
+  :opt_name: menu_heading1_color
+  :procname: val_as_str
+- :default: "# %{line}"
+  :description: format for menu heading1 in menu
+  :env_var: MDE_MENU_HEADING1_FORMAT
+  :opt_name: menu_heading1_format
+  :procname: val_as_str
+- :default: fg_rgbh_60_60_c0
+  :description: Color for heading 2 in menu
+  :env_var: MDE_MENU_HEADING2_COLOR
+  :opt_name: menu_heading2_color
+  :procname: val_as_str
+- :default: "## %{line}"
+  :description: format for menu heading2 in menu
+  :env_var: MDE_MENU_HEADING2_FORMAT
+  :opt_name: menu_heading2_format
+  :procname: val_as_str
+- :default: fg_rgbh_40_40_c0
+  :description: Color for heading 3 in menu
+  :env_var: MDE_MENU_HEADING3_COLOR
+  :opt_name: menu_heading3_color
+  :procname: val_as_str
+- :default: "### %{line}"
+  :description: format for menu heading3 in menu
+  :env_var: MDE_MENU_HEADING3_FORMAT
+  :opt_name: menu_heading3_format
+  :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
@@ -373,6 +458,22 @@
   :env_var: MDE_MENU_INCLUDE_IMPORTED_NOTES
   :opt_name: menu_include_imported_notes
   :procname: val_as_bool
+- :arg_name: BOOL
+  :default: true
+  :description: Display inherited lines at top of menu (vs bottom)
+  :env_var: MDE_MENU_INHERITED_LINES_AT_TOP
+  :opt_name: menu_inherited_lines_at_top
+  :procname: val_as_bool
+- :default: fg_rgbh_94_00_D3
+  :description: Color of inherited lines in menu
+  :env_var: MDE_MENU_INHERITED_LINES_COLOR
+  :opt_name: menu_inherited_lines_color
+  :procname: val_as_str
+- :default: "%{line}"
+  :description: format for inherited lines in menu
+  :env_var: MDE_MENU_INHERITED_LINES_FORMAT
+  :opt_name: menu_inherited_lines_format
+  :procname: val_as_str
 - :default:
     :line: ''
   :description: opening demarcation for menu
@@ -431,6 +532,11 @@
   :env_var: MDE_MENU_OPTS_SET_FORMAT
   :opt_name: menu_opts_set_format
   :procname: val_as_str
+- :default: "."
+  :description: Block name to display menu
+  :env_var: MDE_MENU_PERSIST_BLOCK_NAME
+  :opt_name: menu_persist_block_name
+  :procname: val_as_str
 - :default: fg_rgbh_ff_ff_ff
   :description: Color of menu task
   :env_var: MDE_MENU_TASK_COLOR
@@ -478,12 +584,38 @@
   :env_var: MDE_MENU_WITH_EXIT
   :opt_name: menu_with_exit
   :procname: val_as_bool
+- :arg_name: BOOL
+  :default: true
+  :description: Display inherited lines in menu
+  :env_var: MDE_MENU_WITH_INHERITED_LINES
+  :opt_name: menu_with_inherited_lines
+  :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Hide decorative menu entries
   :env_var: MDE_NO_CHROME
   :opt_name: no_chrome
   :procname: val_as_bool
+- :default:
+  :description: Expression to match to start collecting lines
+  :env_var: MDE_OUTPUT_ASSIGNMENT_BEGIN
+  :opt_name: output_assignment_begin
+  :procname: val_as_str
+- :default:
+  :description: Expression to match to stop collecting lines
+  :env_var: MDE_OUTPUT_ASSIGNMENT_END
+  :opt_name: output_assignment_begin
+  :procname: val_as_str
+- :default: "%{line} # !!!"
+  :description: Format for assignments from output
+  :env_var: MDE_OUTPUT_ASSIGNMENT_FORMAT
+  :opt_name: output_assignment_format
+  :procname: val_as_str
+- :default: "^ *(\\w+=.*?) *$"
+  :description: Pattern for assignments from output
+  :env_var: MDE_OUTPUT_ASSIGNMENT_MATCH
+  :opt_name: output_assignment_match
+  :procname: val_as_str
 - :arg_name: BOOL
   :default: false
   :description: Display summary for execution
@@ -539,7 +671,7 @@
   :procname: val_as_str
   :short_name: p
 - :arg_name: BOOL
-  :default: true
+  :default: false
   :description: Wheter to pause after manually executing a block and the next menu
   :env_var: MDE_PAUSE_AFTER_SCRIPT_EXECUTION
   :opt_name: pause_after_script_execution
@@ -563,6 +695,13 @@
   :env_var: MDE_PROMPT_COLOR_AFTER_SCRIPT_EXECUTION
   :opt_name: prompt_color_after_script_execution
   :procname: val_as_str
+- :default: |2-
+
+    Repeat this block?
+  :description: Prompt to debounce
+  :env_var: MDE_PROMPT_DEBOUNCE
+  :opt_name: prompt_debounce
+  :procname: val_as_str
 - :default: Exit
   :description: Prompt to exit app
   :env_var: MDE_PROMPT_EXIT
@@ -604,6 +743,11 @@
   :env_var: MDE_PROMPT_SELECT_OUTPUT
   :opt_name: prompt_select_output
   :procname: val_as_str
+- :default: Uninterrupted
+  :description: Uninterrupted execution
+  :env_var: MDE_PROMPT_UNINTERRUPTED
+  :opt_name: prompt_uninterrupted
+  :procname: val_as_str
 - :default: 'Yes'
   :description: Prompt for yes
   :env_var: MDE_PROMPT_YES
@@ -754,12 +898,12 @@
   :env_var: MDE_SHELL
   :opt_name: shell
   :procname: val_as_str
-- :default: "#  -^-  +%{block_name}  -o-  %{document_filename}  -^-"
+- :default: "#  -^-"
   :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-  +%{block_name}  -v-"
+- :default: "#  -v-  +%{block_name}  -o-  %{document_filename}  -v-"
   :description: shell_code_label_format_below
   :env_var: MDE_SHELL_CODE_LABEL_FORMAT_BELOW
   :opt_name: shell_code_label_format_below
@@ -769,7 +913,7 @@
   :opt_name: tab_completions
   :procname: val_as_bool
 - :arg_name: BOOL
-  :default: true
+  :default: false
   :description: Requires user approval before executing a script
   :env_var: MDE_USER_MUST_APPROVE
   :long_name: user-must-approve

data/lib/saved_assets.rb

@@ -12,18 +12,20 @@ module MarkdownExec
   # method derives a name for stdout redirection.
   #
   class SavedAsset
-    FNR11 = /pattern1/.freeze # TODO: Replace with actual pattern
-    FNR12 = 'replacement_string' # TODO: Replace with actual replacement string
+    FNR11 = %r{/|:}.freeze
+    FNR12 = '_'
+    DEFAULT_FTIME = '%F-%H-%M-%S'
 
     # Generates a formatted script name based on the provided parameters.
-    def self.script_name(filename:, prefix:, time:, blockname:)
-      fne = filename.gsub(FNR11, FNR12)
-      "#{[prefix, time.strftime('%F-%H-%M-%S'), fne, ',', blockname].join('_')}.sh"
+    def self.script_name(filename:, prefix:, time:, blockname:, ftime: DEFAULT_FTIME, join_str: '_', pattern: FNR11, replace: FNR12, exts: '.sh')
+      fne = filename.gsub(pattern, replace)
+      "#{[prefix, time.strftime(ftime), fne, ',', blockname].join(join_str)}#{exts}"
     end
 
     # Generates a formatted stdout name based on the provided parameters.
-    def self.stdout_name(filename:, prefix:, time:, blockname:)
-      "#{[prefix, time.strftime('%F-%H-%M-%S'), filename, blockname].join('_')}.out.txt"
+    def self.stdout_name(filename:, prefix:, time:, blockname:, ftime: DEFAULT_FTIME, join_str: '_', pattern: FNR11, replace: FNR12, exts: '.out.txt')
+      fne = filename.gsub(pattern, replace)
+      "#{[prefix, time.strftime(ftime), fne, ',', blockname].join(join_str)}#{exts}"
     end
   end
 end
@@ -50,7 +52,7 @@ if $PROGRAM_NAME == __FILE__
       time = Time.new(2023, 1, 1, 12, 0, 0)
       blockname = 'block1'
 
-      expected_name = 'test_2023-01-01-12-00-00_sample.txt_block1.out.txt'
+      expected_name = 'test_2023-01-01-12-00-00_sample.txt_,_block1.out.txt'
       assert_equal expected_name,
                    MarkdownExec::SavedAsset.stdout_name(filename: filename, prefix: prefix, time: time,
                                                         blockname: blockname)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.8
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -81,8 +81,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 description: Interactively select and execute fenced code blocks in markdown files.
-  Build complex scripts by linking documents and naming and requiring blocks. Log
-  resulting scripts and output. Re-run scripts.
+  Build complex scripts by naming and requiring blocks. Log resulting scripts and
+  output. Re-run scripts.
 email:
 - fareed@phomento.com
 executables:
@@ -118,11 +118,15 @@ files:
 - examples/import0.md
 - examples/import1.md
 - examples/include.md
+- examples/indent.md
 - examples/infile_config.md
 - examples/linked.md
 - examples/linked1.md
 - examples/linked2.md
 - examples/linked3.md
+- examples/load1.sh
+- examples/load2.sh
+- examples/nickname.md
 - examples/opts.md
 - examples/pass-through.md
 - examples/plant.md
@@ -135,6 +139,7 @@ files:
 - lib/block_label.rb
 - lib/block_types.rb
 - lib/cached_nested_file_reader.rb
+- lib/ce_get_cost_and_usage.rb
 - lib/cli.rb
 - lib/colorize.rb
 - lib/constants.rb
@@ -143,6 +148,7 @@ files:
 - lib/exceptions.rb
 - lib/fcb.rb
 - lib/filter.rb
+- lib/find_files.rb
 - lib/fout.rb
 - lib/hash.rb
 - lib/hash_delegator.rb
@@ -152,17 +158,13 @@ files:
 - lib/mdoc.rb
 - lib/menu.src.yml
 - lib/menu.yml
-- lib/method_sorter.rb
 - lib/object_present.rb
 - lib/option_value.rb
-- lib/pty1.rb
 - lib/regexp.rb
-- lib/regexp_replacer.rb
 - lib/rspec_helpers.rb
 - lib/saved_assets.rb
 - 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

data/lib/method_sorter.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-require 'ripper'
-require 'parser/current'
-
-class MethodSorter
-  def initialize(file_path)
-    @file_path = file_path
-  end
-
-  def sort
-    file_contents = File.read(@file_path)
-
-    ast = Parser::CurrentRuby.parse(file_contents)
-
-    # Find the class node
-    class_node = ast.children.find { |node| node.type == :class }
-
-    method_nodes = []
-
-    # 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 }
-      end
-    end
-
-    # Sort and process method nodes
-    # class_node = ast.children.find { |node| node.type == :class }
-    # unless class_node
-    #   puts "No class node found in #{@file_path}"
-    #   return
-    # end
-
-    # method_nodes = class_node.children.compact.select { |node|
-    #   node.type == :def
-    # }
-
-    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] }
-
-    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")
-    # 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")
-    end
-
-    result
-  end
-end
-
-sorter = MethodSorter.new(ARGV[0])
-sorter.sort

data/lib/pty1.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'pty'
-
-def launch_and_interact_with_terminal
-  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
-
-    # You can continue to interact with the terminal here
-    # ...
-
-    # 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_replacer.rb

@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# encoding=utf-8
-
-require 'find'
-
-class RegexpReplacer
-  # Constructor to initialize with file path
-  def initialize(file_path)
-    @file_path = file_path
-  end
-
-  # Perform the replacement based on the specified option
-  def perform_replacement(option)
-    content = File.read(@file_path)
-    modified_content = case option
-                       when 1
-                         replace_pattern1(content)
-                       when 2
-                         replace_pattern2(content)
-                       else
-                         raise "Invalid option. Please choose 1 or 2."
-                       end
-    File.write(@file_path, modified_content)
-  end
-
-  private
-
-  # Replacement for pattern 1
-  def replace_pattern1(content)
-    regexp = /^( *)# (@\w+) ('.+)/
-    substitution = '\1;;pp __LINE__,\3 #\2'
-    content.gsub(regexp, substitution)
-  end
-
-  # Replacement for pattern 2
-  def replace_pattern2(content)
-    regexp = /^( *);;pp __LINE__,(.+) #(@\w+)/
-    substitution = '\1# \3 \2'
-    content.gsub(regexp, substitution)
-  end
-end
-
-# Running the script with command line arguments
-if ARGV.length != 2
-  puts "Usage: ruby regexp_replacer.rb [file_path] [option (1 or 2)]"
-  exit
-end
-
-file_path, option = ARGV
-replacer = RegexpReplacer.new(file_path)
-begin
-  replacer.perform_replacement(option.to_i)
-  puts "Replacement performed successfully."
-rescue StandardError => e
-  puts "Error: #{e.message}"
-end

data/lib/sort_yaml_gpt4.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-def sort_yaml(input_yaml)
-  # Parse the input YAML
-  data = YAML.load(input_yaml)
-
-  # Ensure data is an array of hashes
-  unless data.is_a?(Array) && data.all? { |item| item.is_a?(Hash) }
-    raise ArgumentError, 'Input YAML must be an array of hashes.'
-  end
-
-  # Sort items by 'opt_name' values
-  sorted_data = data.sort_by do |item|
-    (item[:opt_name] || item[:long_name] || item[:short_name]).to_s
-  end
-
-  # Sort keys in each item
-  sorted_data.each do |item|
-    item.replace(item.sort.to_h)
-  end
-
-  # Convert the sorted data back to YAML and write to stdout
-  puts YAML.dump(sorted_data).gsub("\n-", "\n\n-")
-end
-
-# Read YAML from stdin
-input_yaml = $stdin.read
-
-# Call the function with input YAML
-sort_yaml(input_yaml)