markdown_exec 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25d73d643251be40fcf14edd59a890d3d4fca847217b02c9ee6ad6fdbb06b72e
-  data.tar.gz: 8bde8d7e84230d50f34425fa3d549c9bbf7b78bb89219290a454547ba6a6b001
+  metadata.gz: 41787e8352174177ca182e0376cabec7aee5923af43536a81fc2a9e61ee109e3
+  data.tar.gz: 6a6c1fa34bf57aad286892772dcdbec19abb41fdb0385a69e264fee70747f742
 SHA512:
-  metadata.gz: 04fec544c21aac267c89868755a76cbc0f0565cc676ed3ed647ab9459c7308cf01a26572cb059a0aadc26c403067b3ead4fcd2ce5d05051320ee2aa2b8dee911
-  data.tar.gz: 3f6ffedbddbf9a15c3fa7c05b24f61367dbff5c717328a333b1cded39ebba13e18f333383f4d35786b565b8985f2433e683daadf01a89963a606471415a4a503
+  metadata.gz: a4b9377c62c5054d077974b2056d7f89acd54088cd064d9c495b10eda49f64750154dc6618e6f7719dee93aaf3a0e0ca3cafa8d8fd7ca3ccbdb970e2c433b23c
+  data.tar.gz: c9ed40b8c0df7b4b41e2db40d495a420ae1a294bbdd0c7df7702f5bfd99c6e9931a89e197e0fb5b3109fbec3403ef2b7c28126b1f0d000c6aea7c0426cde9a34

data/.pryrc

@@ -1,9 +1,11 @@
 if defined?(PryByebug)
   Pry.config.pager = false
   Pry.commands.alias_command 'c', 'continue'
+  Pry.commands.alias_command 'd', 'down'
   Pry.commands.alias_command 'f', 'finish'
-  Pry.commands.alias_command 's', 'step'
   Pry.commands.alias_command 'n', 'next'
+  Pry.commands.alias_command 's', 'step'
+  Pry.commands.alias_command 'u', 'up'
 
   Pry::Commands.command /^$/, 'repeat last command' do
     _pry_.run_command Pry.history.to_a.last

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,34 @@
 # Changelog
 
+## [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
+
+- Support for nested links.
+  A Link block name can be followed by the block name to execute in the linked document.
+  Nested links result in scripts with nested required blocks.
+
+## [1.4] - 2023-10-31
+
+### Added
+
+- Add required code blocks to link block types.
+  Allows for nested required code as links are navigated.
+
+- Add fg_rgbh_* methods to process hex RGB specifications.
+
 ## [1.3.9] - 2023-10-29
 
 Add block types for linking and variable control

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (1.4)
+    markdown_exec (1.5)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)

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"
+  echo "1.5"
 }
 
 _mde() {
@@ -138,4 +138,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2023-10-31 15:43:43 UTC"
+# echo "Updated: 2023-11-08 15:34:04 UTC"

data/examples/linked1.md

@@ -15,6 +15,7 @@ colorize_env_vars 'vars for page3' PAGE3_VAR_VIA_INHERIT page3_var_via_environme
 ::: 1. requires a block that sets environment variable PAGE2_VAR_VIA_INHERIT,
 ::: 2. navigates to document 2, and
 ::: 3. executes block "show_vars" to display the imported PAGE2_VAR_VIA_INHERIT.
+::: Any script generated by page 2 will contain the inherited code.
 
 ```bash :(vars2)
 PAGE2_VAR_VIA_INHERIT=for_page2_from_page1_via_inherited_code_file

data/examples/linked2.md

@@ -11,7 +11,6 @@ colorize_env_vars 'vars for page2' PAGE2_VAR_VIA_INHERIT page2_var_via_environme
 colorize_env_vars 'vars for page3' PAGE3_VAR_VIA_INHERIT page3_var_via_environment
 ```
 
-
 ::: This Link block requires a block that
 ::: 1. sets environment variable PAGE3_VAR_VIA_INHERIT,
 ::: 2. navigates to document 3, and

data/examples/opts.md

@@ -1,13 +1,25 @@
 # Demo configuring options
-
++ note1
+a
 ::: These Opts blocks set the color of a couple of menu options to demonstrate the live update of options.
-
+b
++ note2
+c
 ```opts :opts1
 menu_divider_color: yellow
+menu_note_match:
 menu_task_color: fg_rgb_255_63_255
 ```
-
++ note3
 ```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
 ```
++ note4
+```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'
+  VERSION = '1.5'
 end