markdown_exec 1.4.1 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6655d4d2fdbf1334fd7eb786e8b8e3e8401ac0e8cb0e10927c1e426be9422d83
-  data.tar.gz: 5e2e1272f186e8fb00d240fd11501cdc5630ab497298fcc02e43c42c9b3e0f45
+  metadata.gz: 97323ce7d6c677603ca89432c9ca64e45ff205a5b6cc03a71f4be1210bf8104a
+  data.tar.gz: ccce852fe96571b00c4443012371ea5ad29caec29dfdc9649cec7da2c091defe
 SHA512:
-  metadata.gz: 63ab33098867f8f1af0b0281690e816cd657d9fc42181cdb895ee78ab2e722cc5c63303d2c2be7f9791a7cacc9503cbfc45d9277b1a35e5cdb33ef4217a8607a
-  data.tar.gz: 4535992b37f72e175388264c3e7ab9f5189a06e57b8a973521d95f62ea75a22de445518f19577563d78a81ebc2c8a99c3cc3e24639f04f792ad9017780c426bb
+  metadata.gz: bc08d47d135d9a078240c6e3001322ec8b35b8fb4f7febeabec02729240d7524a40464d9d563aeb15e5c8d09695bd0b512251d970dfede46cf07bd377af72181
+  data.tar.gz: ec61f969d204b0216c02e2e13d270363aef35ecf3ad6ff5a26d653e2d5c8f1608ff3e70a24ab65ab3bd48d8c546e1a6c627734c8e03e08a2440c18b1d9db7fed

data/.rubocop.yml

@@ -14,7 +14,9 @@ Layout/LineContinuationLeadingSpace:
   Enabled: false
 
 Layout/LineLength:
-  Max: 96
+  Max: 72
+  # Max: 80
+  # Max: 96
 
 Lint/Debugger:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [1.6] - 2023-11-13
+
+### Added
+
+- Options to remember a block's indentation in the source document and to display with same indentation in the menu.
+
+### Changed
+
+- Note option matches the remaining lines in the document and they are displayed in the menu.
+
+## [1.5] - 2023-11-08
+
+### Added
+
+- Confirmation between execution of block and display of next menu.
+- Option for block loaded automatically per document.
+- Options for note lines copied from source into menu.
+- Options to format menu chrome.
+- Options to generate title for a block without a name.
+- Remove consecutive blank lines from menu.
+- Restore options between menu choices. Add options for "notes" in menu.
+
 ## [1.4.1] - 2023-11-02
 
 ### Added

data/Gemfile

@@ -22,4 +22,7 @@ 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.4.1)
+    markdown_exec (1.6)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)
@@ -139,6 +139,8 @@ 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)
@@ -157,6 +159,8 @@ 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)
@@ -182,6 +186,7 @@ DEPENDENCIES
   rubocop-rspec
   shellwords
   uri
+  visual_call_graph
   yaml (~> 0.2.1)
 
 BUNDLED WITH

data/bin/bmde

@@ -8,4 +8,106 @@ Bundler.require(:default)
 
 require_relative '../lib/markdown_exec'
 
-MarkdownExec::MarkParse.new.run
+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

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "1.4.1"
+  echo "1.6"
 }
 
 _mde() {
@@ -138,4 +138,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2023-11-02 13:20:09 UTC"
+# echo "Updated: 2023-11-13 16:19:21 UTC"

data/examples/opts.md

@@ -4,10 +4,19 @@
 
 ```opts :opts1
 menu_divider_color: yellow
+menu_note_match:
 menu_task_color: fg_rgb_255_63_255
 ```
 
 ```opts :opts2
-menu_divider_color: fg_rgb_255_0_255
+menu_divider_color: red
+menu_note_color: yellow
+menu_note_match: "^\\+ +(?<line>.+?) *$"
 menu_task_color: fg_rgb_127_127_255
 ```
+
+```opts :(document_options)
+menu_divider_color: green
+menu_link_color: fg_rgbh_88_cc_66
+menu_note_color: yellow
+```

data/lib/block_types.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-BLOCK_TYPE_BASH = 'bash'
-BLOCK_TYPE_LINK = 'link'
-BLOCK_TYPE_OPTS = 'opts'
-BLOCK_TYPE_PORT = 'port'
-BLOCK_TYPE_VARS = 'vars'
+class BlockType
+  ALL = [
+    BASH = 'bash',
+    LINK = 'link',
+    OPTS = 'opts',
+    PORT = 'port',
+    VARS = 'vars'
+  ].freeze
+end

data/lib/filter.rb

@@ -125,7 +125,7 @@ module MarkdownExec
 
       return unless options[:bash_only]
 
-      filters[:shell_default] = (shell == BLOCK_TYPE_BASH)
+      filters[:shell_default] = (shell == BlockType::BASH)
     end
 
     # Evaluates the filter settings to make a final decision on
@@ -138,8 +138,8 @@ module MarkdownExec
     # if it should be excluded.
     #
     def self.evaluate_filters(options, filters)
-      if options[:no_chrome] && filters[:fcb_chrome] == true
-        false
+      if filters[:fcb_chrome] == true
+        !options[:no_chrome]
       elsif options[:exclude_expect_blocks] && filters[:shell_expect] == true
         false
       elsif filters[:hidden_name] == true
@@ -159,6 +159,17 @@ module MarkdownExec
         true
       end
     end
+
+    # blocks for menu, without missing exit and back chrome
+    # remove hidden blocks
+    #
+    def self.prepared_not_in_menu?(options, fcb)
+      fcb[:shell] == BlockType::BASH &&
+        ((options[:block_name_include_match].present? &&
+                  fcb[:oname] =~ /#{options[:block_name_include_match]}/) ||
+         (options[:block_name_wrapper_match].present? &&
+                  fcb[:oname] =~ /#{options[:block_name_wrapper_match]}/))
+    end
   end
 end
 
@@ -239,7 +250,7 @@ if $PROGRAM_NAME == __FILE__
 
       def test_bash_only_condition_true
         @options[:bash_only] = true
-        @fcb[:shell] = BLOCK_TYPE_BASH
+        @fcb[:shell] = BlockType::BASH
         assert Filter.fcb_select?(@options, @fcb)
       end
 

data/lib/markdown_exec/version.rb

@@ -7,5 +7,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '1.4.1'
+  VERSION = '1.6'
 end