markdown_exec 2.5.0 → 2.6.0

data/lib/menu.yml

@@ -8,6 +8,10 @@
   :arg_name: BOOL
   :default: false
   :procname: val_as_bool
+- :opt_name: block_batch_match
+  :env_var: MDE_BLOCK_BATCH_MATCH
+  :default: "@batch"
+  :procname: val_as_str
 - :opt_name: block_calls_scan
   :env_var: MDE_BLOCK_CALLS_SCAN
   :default: "%\\([^\\)]+\\)"
@@ -16,6 +20,10 @@
   :env_var: MDE_BLOCK_DISABLE_MATCH
   :default: "@disable"
   :procname: val_as_str
+- :opt_name: block_interactive_match
+  :env_var: MDE_BLOCK_INTERACTIVE_MATCH
+  :default: "@interactive"
+  :procname: val_as_str
 - :opt_name: block_name
   :long_name: block-name
   :short_name: b
@@ -112,6 +120,24 @@
   :env_var: MDE_DISPLAY_LEVEL_XBASE_PREFIX
   :default: "> "
   :procname: val_as_str
+- :opt_name: divider_match
+  :env_var: MDE_DIVIDER_MATCH
+  :description: Pattern for topics/dividers in block selection menu
+  :default: "^(?<indent>[ \t]*):::(?<collapse>[+-~]?)(?<leading>[ \t]*)(?<line>(?<text>.*?)(?<trailing>[
+    \t]*))?$"
+  :procname: val_as_str
+- :opt_name: divider4_center
+  :env_var: MDE_DIVIDER4_CENTER
+  :default: true
+  :procname: val_as_bool
+- :opt_name: divider4_collapse
+  :env_var: MDE_DIVIDER_COLLAPSE
+  :default: false
+  :procname: val_as_bool
+- :opt_name: divider4_collapsible
+  :env_var: MDE_DIVIDER_COLLAPSIBLE
+  :default: true
+  :procname: val_as_bool
 - :opt_name: document_configurations_directory
   :env_var: MDE_DOCUMENT_CONFIGURATIONS_DIRECTORY
   :description: Directory with files
@@ -133,7 +159,16 @@
 - :opt_name: document_load_opts_block_name
   :env_var: MDE_DOCUMENT_LOAD_OPTS_BLOCK_NAME
   :description: Name of Opts block to load with the document
-  :default: "(document_options)"
+  :default: "(document_opts)"
+  :procname: val_as_str
+- :opt_name: document_load_vars_block_name
+  :env_var: MDE_DOCUMENT_LOAD_VARS_BLOCK_NAME
+  :description: Name of Vars block to load with the document
+  :default: "(document_vars)"
+  :procname: val_as_str
+- :opt_name: document_play_bin
+  :env_var: MDE_DOCUMENT_PLAY_BIN
+  :default: play
   :procname: val_as_str
 - :opt_name: document_saved_lines_glob
   :env_var: MDE_DOCUMENT_SAVED_LINES_GLOB
@@ -341,25 +376,52 @@
   :env_var: MDE_HEADING1_CENTER
   :default: true
   :procname: val_as_bool
-- :opt_name: heading2_center
-  :env_var: MDE_HEADING1_CENTER
-  :default: true
+- :opt_name: heading1_collapse
+  :env_var: MDE_HEADING1_COLLAPSE
+  :default: false
   :procname: val_as_bool
-- :opt_name: heading3_center
-  :env_var: MDE_HEADING1_CENTER
-  :default: true
+- :opt_name: heading1_collapsible
+  :env_var: MDE_HEADING1_COLLAPSIBLE
+  :default: false
   :procname: val_as_bool
 - :opt_name: heading1_match
   :env_var: MDE_HEADING1_MATCH
-  :default: "^#(?<line>(?!#)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
+  :default: "^#(?<line>(?!#)(?<collapse>[+-~]?)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[
+    \t]*))?$"
   :procname: val_as_str
+- :opt_name: heading2_center
+  :env_var: MDE_HEADING2_CENTER
+  :default: true
+  :procname: val_as_bool
+- :opt_name: heading2_collapse
+  :env_var: MDE_HEADING2_COLLAPSE
+  :default: false
+  :procname: val_as_bool
+- :opt_name: heading2_collapsible
+  :env_var: MDE_HEADING2_COLLAPSIBLE
+  :default: true
+  :procname: val_as_bool
 - :opt_name: heading2_match
   :env_var: MDE_HEADING2_MATCH
-  :default: "^##(?<line>(?!#)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
+  :default: "^##(?<line>(?!#)(?<collapse>[+-~]?)(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[
+    \t]*))?$"
   :procname: val_as_str
+- :opt_name: heading3_center
+  :env_var: MDE_HEADING3_CENTER
+  :default: true
+  :procname: val_as_bool
+- :opt_name: heading3_collapse
+  :env_var: MDE_HEADING3_COLLAPSE
+  :default: false
+  :procname: val_as_bool
+- :opt_name: heading3_collapsible
+  :env_var: MDE_HEADING3_COLLAPSIBLE
+  :default: true
+  :procname: val_as_bool
 - :opt_name: heading3_match
   :env_var: MDE_HEADING3_MATCH
-  :default: "^###(?<line>(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[ \t]*))?$"
+  :default: "^###(?<collapse>[+-~]?)(?<line>(?<indent>[ \t]*)(?<text>.*?)(?<trailing>[
+    \t]*))?$"
   :procname: val_as_str
 - :long_name: help
   :short_name: h
@@ -501,6 +563,12 @@
   :env_var: MDE_MD_FILENAME_MATCH
   :default: ".+\\.md"
   :procname: val_as_str
+- :opt_name: menu_active_color_pastel_messages
+  :env_var: MDE_MENU_ACTIVE_COLOR_PASTEL_MESSAGES
+  :description: menu_active_color_pastel_messages
+  :default:
+  - bright_magenta
+  - on_black
 - :opt_name: menu_back_at_top
   :env_var: MDE_MENU_BACK_AT_TOP
   :description: Display Back option at top of menu (vs bottom)
@@ -535,6 +603,16 @@
   :description: format for menu chromes
   :default: "%{line}"
   :procname: val_as_str
+- :opt_name: menu_collapsible_symbol_collapsed
+  :env_var: MDE_MENU_COLLAPSIBLE_SYMBOL_COLLAPSED
+  :description: menu_collapsible_symbol_collapsed
+  :default: "⬢"
+  :procname: val_as_str
+- :opt_name: menu_collapsible_symbol_expanded
+  :env_var: MDE_MENU_COLLAPSIBLE_SYMBOL_expandED
+  :description: menu_collapsible_symbol_expanded
+  :default: "⬡"
+  :procname: val_as_str
 - :opt_name: menu_divider_color
   :env_var: MDE_MENU_DIVIDER_COLOR
   :description: Color of menu divider
@@ -545,11 +623,6 @@
   :description: format for menu dividers and demarcations
   :default: "-:=   %{line}   =:-"
   :procname: val_as_str
-- :opt_name: menu_divider_match
-  :env_var: MDE_MENU_DIVIDER_MATCH
-  :description: Pattern for topics/dividers in block selection menu
-  :default: "^(?<indent>[ \t]*):::(?<line>(?<text>.*?)(?<trailing>[ \t]*))?$"
-  :procname: val_as_str
 - :opt_name: menu_divider_symbol
   :env_var: MDE_MENU_DIVIDER_SYMBOL
   :description: Symbol before each divider
@@ -760,7 +833,7 @@
 - :opt_name: menu_table_rows_match
   :env_var: MDE_MENU_TABLE_ROWS_MATCH
   :description: Pattern for table rows
-  :default: "^(?<line>[ \\t]*(?<text>\\|.*?)(?<trailing>[ \\t]*))$"
+  :default: "^(?<line>(?<indent>[ \\t]*)(?<text>\\|.*?)(?<trailing>[ \\t]*))$"
   :procname: val_as_str
 - :opt_name: menu_task_color
   :env_var: MDE_MENU_TASK_COLOR
@@ -922,6 +995,14 @@
   :arg_name: BOOL
   :default: false
   :procname: val_as_bool
+- :opt_name: play_bin_batch
+  :env_var: MDE_PLAY_BIN_BATCH
+  :default: play
+  :procname: val_as_str
+- :opt_name: play_bin_interactive
+  :env_var: MDE_PLAY_BIN_INTERACTIVE
+  :default: play_interactive
+  :procname: val_as_str
 - :opt_name: probe
   :long_name: probe
   :env_var: MDE_PROBE
@@ -1255,6 +1336,11 @@
   :env_var: MDE_TABLE_BORDER_COLOR
   :description: Color for table border
   :default: fg_bg_rgbh_00_00_df_14_18_1c
+- :opt_name: table_center
+  :env_var: MDE_TABLE_CENTER
+  :arg_name: BOOL
+  :default: true
+  :procname: val_as_bool
 - :opt_name: table_header_row_color
   :env_var: MDE_TABLE_HEADER_ROW_COLOR
   :description: Color for table header row

data/lib/ww.rb

@@ -2,42 +2,95 @@
 
 # encoding=utf-8
 require 'pp'
+require 'stringio'
+
+LOG_LEVELS = %i[debug info warn error fatal]
 
 $debug = $DEBUG || !ENV['WW'].nil?
 
 # attribution in output unless disabled
 if $debug && ENV['WW_MINIMUM'].nil?
-  $stderr.puts "WW Debugging per $DEBUG ('ruby --debug')" if $DEBUG
-  $stderr.puts "WW Debugging per environment variable WW" if !ENV['WW'].nil?
+  warn "WW Debugging per $DEBUG ('ruby --debug')" if $DEBUG
+  warn 'WW Debugging per environment variable WW' unless ENV['WW'].nil?
 end
 
-# def wtr(*objs, full_backtrace: false, single_line: false)
-#   ww(['->'] + objs,
-#      locations: caller_locations[2..-1],
-#      full_backtrace: full_backtrace,
-#      single_line: single_line)
-# end
-
-def ww(*objs, full_backtrace: false, single_line: false,
-       locations: caller_locations)
+def ww(*objs, **kwargs)
   return unless $debug
 
-  def cil(caller_info)
-    "#{caller_info.lineno} : #{File.basename(caller_info.path)} : " \
-      "#{caller_info.label}"
+  ww0(*objs, **kwargs)
+end
+
+def ww0(*objs,
+        category: nil,
+        full_backtrace: false,
+        level: :debug,
+        locations: caller_locations,
+        log_file: nil,
+        output: $stderr,
+        single_line: false,
+        timestamp: false)
+  # Format caller information line
+  def caller_info_line(caller_info)
+    "#{caller_info.lineno} : #{caller_info.path.sub(%r{^#{Dir.pwd}},
+                                                    '')} : #{caller_info.label}"
   end
+  # Validate log level
+  raise ArgumentError,
+        "Invalid log level: #{level}" unless LOG_LEVELS.include?(level)
 
+  # Generate backtrace
   backtrace = if full_backtrace
-                locations.map do |caller_info|
-                  cil(caller_info)
-                end
+                locations.map { |caller_info| caller_info_line(caller_info) }
               else
-                [cil(locations[0, 1].first)]
+                [caller_info_line(locations.first)]
               end
+
+  # Add optional timestamp
+  time_prefix = timestamp ? "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}] " : ''
+
+  # Add log level and category prefix
+  level_prefix = "[#{level.to_s.upcase}]"
+  category_prefix = category ? "[#{category}] " : ''
+
+  # Combine all parts into the final message
+  header = "#{time_prefix}#{level_prefix} #{category_prefix}"
   trace = backtrace + objs
-  if single_line
-    PP.singleline_pp(trace, $stderr)
-  else
-    PP.pp(trace, $stderr)
+  formatted_message = if single_line
+                        io = StringIO.new
+                        PP.singleline_pp(trace, io)
+                        "#{header} #{io.string}"
+                      else
+                        io = StringIO.new
+                        PP.pp(trace, io)
+                        "#{header}\n#{io.string}"
+                      end
+
+  # Output to $stderr or specified IO object
+  output.puts formatted_message
+  output.flush
+
+  # Optionally log to a file
+  return unless log_file
+
+  File.open(log_file, 'a') do |file|
+    file.puts(formatted_message)
+  end
+end
+
+class Array
+  unless defined?(deref)
+    def deref
+      map(&:deref).select do |line|
+        !%r{^/vendor/}.match(line)
+      end
+    end
+  end
+end
+
+class String
+  unless defined?(deref)
+    def deref
+      sub(%r{^#{Dir.pwd}}, '')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -70,14 +70,14 @@ dependencies:
   name: yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 description: Interactively select and execute fenced code blocks in markdown files.
@@ -114,9 +114,12 @@ files:
 - bats/import.bats
 - bats/markup.bats
 - bats/mde.bats
+- bats/options-collapse.bats
 - bats/options.bats
 - bats/publish.bats
+- bats/table.bats
 - bats/test_helper.bash
+- bats/variable-expansion.bats
 - bin/bmde
 - bin/colorize_env_vars.sh
 - bin/console
@@ -131,14 +134,18 @@ files:
 - docs/dev/block-type-vars.md
 - docs/dev/data-blocks.md
 - docs/dev/disable.md
+- docs/dev/import-missing.md
 - docs/dev/import.md
 - docs/dev/linked-file.md
 - docs/dev/manage-saved-documents.md
 - docs/dev/menu-cli.md
+- docs/dev/options-collapse.md
 - docs/dev/pass-through-arguments.md
 - docs/dev/requiring-blocks.md
 - docs/dev/specs-import.md
 - docs/dev/specs.md
+- docs/dev/table-crash.md
+- docs/dev/table-indent.md
 - docs/dev/text-decoration.md
 - docs/dev/variable-expansion.md
 - examples/bash-blocks.md
@@ -186,20 +193,18 @@ files:
 - examples/wrap.md
 - lib/ansi_formatter.rb
 - lib/ansi_string.rb
-- lib/append_to_bash_history.rb
 - lib/argument_processor.rb
 - lib/array.rb
 - lib/array_util.rb
 - 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/collapser.rb
 - lib/color_scheme.rb
 - lib/colorize.rb
 - lib/constants.rb
 - lib/directory_searcher.rb
-- lib/doh.rb
 - lib/env.rb
 - lib/evaluate_shell_expressions.rb
 - lib/exceptions.rb
@@ -213,7 +218,6 @@ files:
 - lib/hierarchy_string.rb
 - lib/input_sequencer.rb
 - lib/instance_method_wrapper.rb
-- lib/layered_hash.rb
 - lib/link_history.rb
 - lib/markdown_exec.rb
 - lib/markdown_exec/version.rb
@@ -223,7 +227,6 @@ files:
 - lib/namer.rb
 - lib/object_present.rb
 - lib/option_value.rb
-- lib/poly.rb
 - lib/regexp.rb
 - lib/resize_terminal.rb
 - lib/rspec_helpers.rb