markdown_exec 1.8.2 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84609b91b353913fe01e7f2b0a2134af9eaf9ec09ba79bc8edfcfd94f87b11d6
-  data.tar.gz: 4a73cba2c97774245c39376cd310e59d31e8d3230a9c1307d623576b21061afa
+  metadata.gz: 4e802d2af4a779aad7091b20ab189a4c324f15f53643880758b7aac76549ba49
+  data.tar.gz: 2d6f910706bd10232f8bb87313364f671d3871e06382d57dd6248f07c4e497f2
 SHA512:
-  metadata.gz: 734f4e6b036b5dc100b41beddd9a51faa86cbb3b4813d6e83488ae351d513f7d0a84c3ea0746fc9f96ab55bb30f61d1b2df6c5b8696af0fc95c6e6291e4a093c
-  data.tar.gz: 0c869ee545f85cd0b514aed9f479071d6c9b4641f1b39fac35489aa1261d26d3e55c2ea424e7edc0634c1662f79a624cd3f477bbe07d7df3c3acfb91ae1b7a6e
+  metadata.gz: c0e4b6ff95bccd281e078eb934d3660c52c28530ae12694c81030b3254de468b24d1d93e2e4d68b4d1163be68de029750930f3de0c3034154b05afde6ac9b42a
+  data.tar.gz: 85e260930e3d097e7028ae16cfeb7905fa702accd1fe2bb5b27fdb817d301be10259069be7c7e99f4af5258efbc7be5867d82834cee68bdc8d4e6485592f821e

data/.pryrc

@@ -1,3 +1,4 @@
+binding.pry
 if defined?(PryByebug)
   Pry.config.pager = false
   Pry.commands.alias_command 'c', 'continue'

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [1.8.5] - 2023-12-22
+
+### Added
+
+- "eval" key for link block type to compute lines to append to the inherited state.
+- Options for dumping data associated with the menu or state.
+- Debug and irb gems.
+
+## [1.8.4] - 2023-12-15
+
+### Added
+
+- Options to dump blocks when processed.
+
+### Changed
+
+- Refactor code generation for and after Link blocks
+
 ## [1.8.2] - 2023-12-12
 
 ### Changed

data/Gemfile

@@ -7,7 +7,9 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'clipboard'
+gem 'debug'
 gem 'erb'
+gem 'irb', '>= 1.8.0'
 gem 'mocha', require: false
 gem 'minitest', require: false
 gem 'pry-nav'
@@ -22,7 +24,4 @@ gem 'rubocop-rake', require: false
 gem 'rubocop-rspec', require: false
 gem 'shellwords'
 gem 'uri'
-
-gem 'visual_call_graph'
-
 gem 'yaml', '~> 0.2.1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (1.8.2)
+    markdown_exec (1.8.5)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)
@@ -39,6 +39,9 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
+    debug (1.9.0)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     debug_inspector (1.1.0)
     diff-lcs (1.5.0)
     erb (4.0.3)
@@ -46,6 +49,10 @@ GEM
     erubi (1.12.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    io-console (0.7.1)
+    irb (1.10.1)
+      rdoc
+      reline (>= 0.3.8)
     json (2.6.3)
     kwalify (0.7.2)
     language_server-protocol (3.17.0.3)
@@ -74,6 +81,8 @@ GEM
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
+    psych (5.1.1.1)
+      stringio
     racc (1.7.1)
     rack (2.2.8)
     rack-test (2.1.0)
@@ -94,11 +103,15 @@ GEM
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
     reek (6.1.4)
       kwalify (~> 0.7.0)
       parser (~> 3.2.0)
       rainbow (>= 2.0, < 4.0)
     regexp_parser (2.8.1)
+    reline (0.4.1)
+      io-console (~> 0.5)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -139,11 +152,10 @@ GEM
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
-    ruby-graphviz (1.2.5)
-      rexml
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     shellwords (0.1.0)
+    stringio (3.1.0)
     thor (1.2.2)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
@@ -159,8 +171,6 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uri (0.12.2)
-    visual_call_graph (0.4.0)
-      ruby-graphviz (~> 1.2, >= 1.2.0)
     wisper (2.0.1)
     yaml (0.2.1)
     zeitwerk (2.6.12)
@@ -170,7 +180,9 @@ PLATFORMS
 
 DEPENDENCIES
   clipboard
+  debug
   erb
+  irb (>= 1.8.0)
   markdown_exec!
   minitest
   mocha
@@ -186,7 +198,6 @@ DEPENDENCIES
   rubocop-rspec
   shellwords
   uri
-  visual_call_graph
   yaml (~> 0.2.1)
 
 BUNDLED WITH

data/bin/bmde

@@ -8,106 +8,4 @@ Bundler.require(:default)
 
 require_relative '../lib/markdown_exec'
 
-if true
-
-	MarkdownExec::MarkParse.new.run
-else
-
-	def trace_event_properties(tp)
-	  # TracePoint.new(:call, :return, :c_call, :c_return, :raise) do |tp|
-	    # puts "Event information:"
-	    # puts "Event type: #{tp.event}"
-	    # puts "File: #{tp.path}"
-	    # puts "Line: #{tp.lineno}"
-	    # puts "Defined class: #{tp.defined_class}"
-	    # puts "Method ID: #{tp.method_id}"
-	    # puts "Class method ID: #{tp.defined_class} #{tp.method_id}"
-	    # puts "Binding: #{tp.binding.inspect}"
-	    # puts "Return value: #{tp.return_value.inspect}" if [:return, :c_return].include?(tp.event)
-	    puts "Raised exception: #{tp.raised_exception.inspect}" if tp.event == :raise
-	    # puts "---------------------------------"
-	# binding.pry
-	    # print format("\n%-20.20s %-20.20s % 5.5d %20s %s", tp.method_id, tp.defined_class, tp.lineno, tp.path.split('/').last, caller[1].split('/').last)
-
-	    # print format("\n%-20.20s %-30.30s %s", tp.method_id, tp.defined_class, caller[1].split('/').last.split(':', 3)[0..1].join(':'))
-# print __LINE__, '.'
-	    return if %i[method_missing present?].include?(tp.method_id)
-	    return unless %r(/markdown_exec/lib/) =~ caller[1]
-
-		if [:return, :c_return].include?(tp.event)
-		    print format("%1.1s %-20.20s %s\n", tp.event, tp.method_id, tp.return_value)
-		else
-		    print format("%1.1s %-20.20s %-30.30s %20s\n", tp.event, tp.method_id, tp.defined_class, $~.post_match)
-		end
-	  # end.enable
-	end
-
-	def start_trace(events = [:call])
-	  trace = TracePoint.new(*events) do |tp|
-	            trace_event_properties(tp)
-	          end
-
-	  trace.enable
-	  yield
-	  trace.disable
-	end
-
-	start_trace([:call, :return]) { MarkdownExec::MarkParse.new.run }
-
-end
-
-
-
-=begin
-
-To filter what is traced, you can pass any of the following as events:
-
-:line
-execute an expression or statement on a new line
-
-:class
-start a class or module definition
-
-:end
-finish a class or module definition
-
-:call
-call a Ruby method
-
-:return
-return from a Ruby method
-
-:c_call
-call a C-language routine
-
-:c_return
-return from a C-language routine
-
-:raise
-raise an exception
-
-:b_call
-event hook at block entry
-
-:b_return
-event hook at block ending
-
-:a_call
-event hook at all calls (call, b_call, and c_call)
-
-:a_return
-event hook at all returns (return, b_return, and c_return)
-
-:thread_begin
-event hook at thread beginning
-
-:thread_end
-event hook at thread ending
-
-:fiber_switch
-event hook at fiber switch
-
-:script_compiled
-new Ruby code compiled (with eval, load or require)
-
-=end
+MarkdownExec::MarkParse.new.run

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "1.8.2"
+  echo "1.8.5"
 }
 
 _mde() {
@@ -36,6 +36,16 @@ _mde() {
             
               -d) COMPREPLY="0"; return 0 ;;
             
+              --dump-dump-delegate-object) COMPREPLY="0"; return 0 ;;
+            
+              --dump-blocks-in-file) COMPREPLY="0"; return 0 ;;
+            
+              --dump-dump-inherited-lines) COMPREPLY="0"; return 0 ;;
+            
+              --dump-menu-blocks) COMPREPLY="0"; return 0 ;;
+            
+              --dump-selected-block) COMPREPLY="0"; return 0 ;;
+            
               --filename) COMPREPLY="."; return 0 ;;
             
               -f) COMPREPLY="."; return 0 ;;
@@ -82,7 +92,7 @@ _mde() {
   # present matching option names
   #
   if [[ ${cur} == -* ]] ; then
-    opts=("--block-name" "--config" "--debug" "--exit" "--filename" "--find" "--help" "--how" "--list-blocks" "--list-count" "--list-default-env" "--list-default-yaml" "--list-docs" "--list-recent-output" "--list-recent-scripts" "--output-execution-summary" "--output-script" "--output-stdout" "--path" "--pwd" "--run-last-script" "--save-executed-script" "--save-execution-output" "--saved-script-folder" "--saved-stdout-folder" "--select-recent-output" "--select-recent-script" "--tab-completions" "--user-must-approve" "--version" "--display-level")
+    opts=("--block-name" "--config" "--debug" "--dump-dump-delegate-object" "--dump-blocks-in-file" "--dump-dump-inherited-lines" "--dump-menu-blocks" "--dump-selected-block" "--exit" "--filename" "--find" "--help" "--how" "--list-blocks" "--list-count" "--list-default-env" "--list-default-yaml" "--list-docs" "--list-recent-output" "--list-recent-scripts" "--output-execution-summary" "--output-script" "--output-stdout" "--path" "--pwd" "--run-last-script" "--save-executed-script" "--save-execution-output" "--saved-script-folder" "--saved-stdout-folder" "--select-recent-output" "--select-recent-script" "--tab-completions" "--user-must-approve" "--version" "--display-level")
     COMPREPLY=( $(compgen -W "$(printf "'%s' " "${opts[@]}")" -- "${cur}") )
 
     return 0
@@ -105,6 +115,16 @@ _mde() {
         
           -d) COMPREPLY=".BOOL."; return 0 ;;
         
+          --dump-dump-delegate-object) COMPREPLY=".BOOL."; return 0 ;;
+        
+          --dump-blocks-in-file) COMPREPLY=".BOOL."; return 0 ;;
+        
+          --dump-dump-inherited-lines) COMPREPLY=".BOOL."; return 0 ;;
+        
+          --dump-menu-blocks) COMPREPLY=".BOOL."; return 0 ;;
+        
+          --dump-selected-block) COMPREPLY=".BOOL."; return 0 ;;
+        
           --filename) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
         
           -f) COMPREPLY=".RELATIVE_PATH."; return 0 ;;
@@ -154,4 +174,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2023-12-12 16:37:57 UTC"
+# echo "Updated: 2023-12-22 22:55:35 UTC"

data/examples/linked.md

@@ -0,0 +1,33 @@
+Demonstrate setting a variable interactively for use in generated scripts.
+
+```opts :(document_options)
+pause_after_script_execution: false
+user_must_approve: false
+```
+
+::: Set VARIABLE to "A"
+
+```link :set_to_A +(set_to_A)
+block: display_variable
+```
+
+```bash :(set_to_A)
+VARIABLE=A
+```
+
+::: Set VARIABLE to "B"
+
+```link :set_to_B +(set_to_B)
+block: display_variable
+```
+
+```bash :(set_to_B)
+VARIABLE=B
+```
+
+::: Display value of VARIABLE
+
+```bash :display_variable
+source bin/colorize_env_vars.sh
+colorize_env_vars '' VARIABLE
+```

data/examples/linked1.md

@@ -12,10 +12,10 @@ colorize_env_vars 'vars for page3' PAGE3_VAR_VIA_INHERIT page3_var_via_environme
 ```
 
 ```bash :(vars2)
-PAGE2_VAR_VIA_INHERIT=for_page2_from_page1_via_inherited_code_file
+PAGE2_VAR_VIA_INHERIT=for_page2_from_page1_via_inherited_code_blocks
 ```
 
-```link :(linked2)
+```link :(linked2) +(vars2)
 file: examples/linked2.md
 ```
 

data/examples/linked2.md

@@ -17,7 +17,11 @@ colorize_env_vars 'vars for page3' PAGE3_VAR_VIA_INHERIT page3_var_via_environme
 ::: 3. executes block "show_vars" to display the imported PAGE3_VAR_VIA_INHERIT.
 
 ```bash :(vars3)
-PAGE3_VAR_VIA_INHERIT=for_page3_from_page2_via_inherited_code_file
+PAGE3_VAR_VIA_INHERIT=for_page3_from_page2_via_inherited_code_blocks
+```
+
+```link :(linked3) +(vars3)
+file: examples/linked3.md
 ```
 
 ```link :linked3_import_vars +(vars3)

data/examples/opts.md

@@ -4,7 +4,7 @@
 
 ```opts :opts1
 menu_divider_color: yellow
-menu_note_match:
+menu_note_match: "^ *(?<line>.+?) *$"
 menu_task_color: fg_rgb_255_63_255
 ```
 

data/lib/ansi_formatter.rb

@@ -28,47 +28,6 @@ class AnsiFormatter
     # "#{line_prefix}#{string_send_color(label, highlight_color_sym)}#{line_postfix}\n" + formatted_deps.join("\n")
   end
 
-  # Formats and highlights a list of data. data are presented with indentation,
-  # and specific items can be highlighted in a specified color, while others are shown in a plain color.
-  #
-  # @param data [Hash] A hash of data, where each key is a dependency name,
-  #        and its value is an array of sub-items.
-  # @param highlight_color_sym [Symbol] The color method to apply to highlighted items.
-  #        Default is :exception_color_detail.
-  # @param plain_color_sym [Symbol] The color method for non-highlighted items.
-  #        Default is :menu_chrome_color.
-  # @param label [String] The label to prefix the list of data with.
-  #        Default is 'data:'.
-  # @param highlight [Array] An array of items to highlight. Each item in this array will be
-  #        formatted with the specified highlight color.
-  # @param line_prefix [String] Prefix for each line. Default is '  '.
-  # @param line_postfix [String] Postfix for each line. Default is ''.
-  # @param detail_sep [String] Separator for items in the sub-list. Default is '  '.
-  # @return [String] A formatted string representation of the data with highlighted items.
-  def format_and_highlight_hash(
-    data,
-    highlight_color_sym: :exception_color_detail,
-    plain_color_sym: :menu_chrome_color,
-    label: 'Data:',
-    highlight: [],
-    line_prefix: '  ',
-    line_postfix: '',
-    detail_sep: '  '
-  )
-    formatted_deps = data&.map do |dep_name, sub_items|
-      formatted_sub_items = sub_items.map do |item|
-        color_sym = highlight.include?(item) ? highlight_color_sym : plain_color_sym
-        string_send_color(item, color_sym)
-      end.join(detail_sep)
-
-      "#{line_prefix}- #{string_send_color(dep_name,
-                                           highlight.include?(dep_name) ? highlight_color_sym : plain_color_sym)}: #{formatted_sub_items}#{line_postfix}"
-    end || []
-
-    "#{line_prefix}#{string_send_color(label,
-                                       highlight_color_sym)}#{line_postfix}\n" + formatted_deps.join("\n")
-  end
-
   # Function to scan a string and process its segments based on multiple substrings
   # @param str [String] The string to scan.
   # @param substrings [Array<String>] The substrings to match in the string.

data/lib/constants.rb

@@ -14,7 +14,7 @@ class LoadFile
   Reuse = false
 end
 
-LoadFileNextBlock = Struct.new(:load_file, :next_block)
+LoadFileLinkState = Struct.new(:load_file, :link_state)
 
 class MenuControl
   Fresh = false

data/lib/directory_searcher.rb

@@ -5,6 +5,30 @@
 
 require 'find'
 
+def format_and_highlight_hash(
+  data,
+  highlight_color_sym: :exception_color_detail,
+  plain_color_sym: :menu_chrome_color,
+  label: 'Data:',
+  highlight: [],
+  line_prefix: '  ',
+  line_postfix: '',
+  key_has_value: ': '
+)
+  formatted_deps = data&.map do |key, value|
+    color_sym = highlight.include?(key) ? highlight_color_sym : plain_color_sym
+    dkey = string_send_color(key, color_sym)
+
+    "#{line_prefix}#{dkey}#{key_has_value}" \
+     "#{string_send_color(value,
+                          highlight.include?(value) ? highlight_color_sym : plain_color_sym)}: " \
+     "#{formatted_sub_items}#{line_postfix}"
+  end
+
+  "#{line_prefix}#{string_send_color(label,
+                                     highlight_color_sym)}#{line_postfix}\n" + formatted_deps.join("\n")
+end
+
 # Formats and highlights a list of dependencies. Dependencies are presented with indentation,
 # and specific items can be highlighted in a specified color, while others are shown in a plain color.
 #
@@ -47,6 +71,24 @@ def format_and_highlight_dependencies(
 end
 # warn menu_blocks.to_yaml.sub(/^(?:---\n)?/, "MenuBlocks:\n")
 
+def format_and_highlight_lines(
+  lines,
+  highlight_color_sym: :exception_color_detail,
+  plain_color_sym: :menu_chrome_color,
+  label: 'Dependencies:',
+  highlight: [],
+  line_prefix: '  ',
+  line_postfix: ''
+)
+  formatted_deps = lines&.map do |item|
+    "#{line_prefix}- #{string_send_color(dep_name,
+                                         highlight.include?(dep_name) ? highlight_color_sym : plain_color_sym)}: #{item}#{line_postfix}"
+  end || []
+
+  "#{line_prefix}#{string_send_color(label,
+                                     highlight_color_sym)}#{line_postfix}\n" + formatted_deps.join("\n")
+end
+
 IndexedLine = Struct.new(:index, :line) do
   def to_s
     line
@@ -77,7 +119,6 @@ class DirectorySearcher
     match_dirs = []
     @paths.each do |path|
       Find.find(path) do |p|
-        # p 'search_in_directory_names', p
         # Find.prune unless @include_subdirectories || path == p
         match_dirs << p if File.directory?(p) && p.match?(@pattern)
       end

data/lib/filter.rb

@@ -61,15 +61,8 @@ module MarkdownExec
     # @param name [String] The name of the fenced code block.
     #
     def self.apply_name_filters(options, filters, name)
-      if name.present? && options[:block_name]
-        if name =~ /#{options[:block_name]}/
-          filters[:name_select] = true
-          filters[:name_exclude] = false
-        else
-          filters[:name_exclude] = true
-          filters[:name_select] = false
-        end
-      end
+      filters[:name_select] = true
+      filters[:name_exclude] = false
 
       if name.present? && filters[:name_select].nil? && options[:select_by_name_regex].present?
         filters[:name_select] =
@@ -239,12 +232,6 @@ if $PROGRAM_NAME == __FILE__
         assert Filter.fcb_select?(@options, @fcb)
       end
 
-      def test_name_exclude_condition
-        @options[:block_name] = 'test'
-        @fcb[:oname] = 'sample'
-        refute Filter.fcb_select?(@options, @fcb)
-      end
-
       def test_shell_exclude_condition
         @options[:exclude_by_shell_regex] = 'exclude_this'
         @fcb[:shell] = 'exclude_this_shell'
@@ -269,12 +256,6 @@ if $PROGRAM_NAME == __FILE__
         assert Filter.fcb_select?(@options, @fcb)
       end
 
-      def test_bash_only_condition_false
-        @options[:bash_only] = true
-        @fcb[:shell] = 'zsh'
-        refute Filter.fcb_select?(@options, @fcb)
-      end
-
       def test_default_case
         assert Filter.fcb_select?(@options, @fcb)
       end