markdown_exec 1.5 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41787e8352174177ca182e0376cabec7aee5923af43536a81fc2a9e61ee109e3
-  data.tar.gz: 6a6c1fa34bf57aad286892772dcdbec19abb41fdb0385a69e264fee70747f742
+  metadata.gz: 97045160c53b7dca3998f6d700bf136f500826141d226f9f2cc650d15e6d1ba7
+  data.tar.gz: c69c23b07fcb3304d0209f79596619fbe54d0c2bb9a03f94c8598e3358c25ed7
 SHA512:
-  metadata.gz: a4b9377c62c5054d077974b2056d7f89acd54088cd064d9c495b10eda49f64750154dc6618e6f7719dee93aaf3a0e0ca3cafa8d8fd7ca3ccbdb970e2c433b23c
-  data.tar.gz: c9ed40b8c0df7b4b41e2db40d495a420ae1a294bbdd0c7df7702f5bfd99c6e9931a89e197e0fb5b3109fbec3403ef2b7c28126b1f0d000c6aea7c0426cde9a34
+  metadata.gz: a525dc3c727c38aba2d52382871650b6d2636891028a6def27f8958fcd78ae46afcb8fbbeb0f1bfdb0d550beb22c7cc90c67744c52143490f0a27c75c9158442
+  data.tar.gz: ae304dc41d17d2763a17b518da50956f0271ca401a4bc78929200eeb17ab3d19dfd148db76f104aed8216120c38673d19c9e56af018d3c9d83534c8901cc0915

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 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

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.5)
+    markdown_exec (1.7)
       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/Rakefile

@@ -81,6 +81,7 @@ task :minitest do
     './lib/cached_nested_file_reader.rb',
     './lib/fcb.rb',
     './lib/filter.rb',
+    './lib/hash_delegator.rb',
     './lib/markdown_exec.rb',
     './lib/mdoc.rb',
     './lib/object_present.rb',

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "1.5"
+  echo "1.7"
 }
 
 _mde() {
@@ -138,4 +138,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2023-11-08 15:34:04 UTC"
+# echo "Updated: 2023-12-01 18:34:38 UTC"

data/examples/import0.md

@@ -1,8 +1,44 @@
-```bash :01
-01
-```
+This is Page 0
+
 @import import1.md
-```bash :03
-03
+
+```opts :(document_options)
+user_must_approve: true
+```
+
+::: Page 0 code blocks
+
+```bash :page0_block1 +(page0_block2) +(page1_block2)
+echo "page 0 block 1 visible"
+# requires page 0 block 2
+# imports page 1
+# requires page 1 block 2
+```
+
+```bash :(page0_block2)
+echo "page 0 block 2 hidden"
 ```
 
+::: Control display of code blocks
+
+```opts :hide_imported_blocks
+menu_include_imported_blocks: false
+```
+
+```opts :show_imported_blocks
+menu_include_imported_blocks: true
+```
+
+::: Control display of notes
+
+```opts :hide_imported_notes
+menu_include_imported_notes: false
+```
+
+```opts :show_imported_notes
+menu_include_imported_notes: true
+```
+
+```link :page_1
+file: examples/import1.md
+```

data/examples/import1.md

@@ -1,10 +1,11 @@
-```bash :11
-11
-```
-```bash :12
-12
-```
-```bash:13
-13
+This is Page 1
+
+::: Page 1 code blocks
+
+```bash :page1_block1
+echo "page 1 block 1 visible"
 ```
 
+```bash :(page1_block2)
+echo "page 1 block 2 hidden"
+```

data/examples/linked1.md

@@ -11,16 +11,20 @@ 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
 ```
 
+```bash :(vars2)
+PAGE2_VAR_VIA_INHERIT=for_page2_from_page1_via_inherited_code_file
+```
+
+```link :(linked2)
+file: examples/linked2.md
+```
+
 ::: This Link block
 ::: 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
-```
-
 ```link :linked2_import_vars +(vars2)
 file: examples/linked2.md
 block: show_vars

data/examples/opts.md

@@ -1,23 +1,20 @@
 # 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: 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

data/lib/array.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+class Array
+  # Processes each element of the array, yielding the previous, current, and next elements to the given block.
+  # Deletes the current element if the block returns true.
+  # @return [Array] The modified array after conditional deletions.
+  def process_and_conditionally_delete!
+    i = 0
+    while i < length
+      prev_item = self[i - 1] unless i.zero?
+      current_item = self[i]
+      next_item = self[i + 1]
+
+      should_delete = yield prev_item, current_item, next_item
+      if should_delete
+        delete_at(i)
+      else
+        i += 1
+      end
+    end
+
+    self
+  end
+end

data/lib/array_util.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+module ArrayUtil
+  def self.partition_by_predicate(arr)
+    true_list = []
+    false_list = []
+
+    arr.each do |element|
+      if yield(element)
+        true_list << element
+      else
+        false_list << element
+      end
+    end
+
+    [true_list, false_list]
+  end
+end

data/lib/cached_nested_file_reader.rb

@@ -5,6 +5,16 @@
 
 # version 2023-10-03
 
+require 'fileutils'
+require_relative 'exceptions'
+
+# a struct to hold the data for a single line
+NestedLine = Struct.new(:text, :depth) do
+  def to_s
+    text
+  end
+end
+
 ##
 # The CachedNestedFileReader class provides functionality to read file lines with the ability
 # to process '#import filename' directives. When such a directive is encountered in a file,
@@ -13,42 +23,58 @@
 # It allows clients to read lines with or without providing a block.
 #
 class CachedNestedFileReader
+  include Exceptions
+
   def initialize(import_pattern: /^ *#import (.+)$/)
     @file_cache = {}
     @import_pattern = import_pattern
   end
 
-  def readlines(filename, &block)
+  def error_handler(name = '', opts = {})
+    Exceptions.error_handler(
+      "CachedNestedFileReader.#{name} -- #{$!}",
+      opts
+    )
+  end
+
+  def warn_format(name, message, opts = {})
+    Exceptions.warn_format(
+      "CachedNestedFileReader.#{name} -- #{message}",
+      opts
+    )
+  end
+
+  def readlines(filename, depth = 0, &block)
     if @file_cache.key?(filename)
-      @file_cache[filename].each(&block) if block_given?
+      @file_cache[filename].each(&block) if block
       return @file_cache[filename]
     end
 
     directory_path = File.dirname(filename)
-    lines = File.readlines(filename, chomp: true)
+    # lines = File.readlines(filename, chomp: true)
     processed_lines = []
 
-    lines.each do |line|
-      if (match = line.match(@import_pattern))
-        included_file_path = if match[1].strip.match %r{^/}
-                               match[1].strip
+    File.readlines(filename, chomp: true).each do |line|
+      if Regexp.new(@import_pattern) =~ line
+        name_strip = $~[:name].strip
+        included_file_path = if name_strip =~ %r{^/}
+                               name_strip
                              else
-                               File.join(directory_path, match[1].strip)
+                               File.join(directory_path, name_strip)
                              end
-        processed_lines += readlines(included_file_path, &block)
+        processed_lines += readlines(included_file_path, depth + 1,
+                                     &block)
       else
-        processed_lines.push(line)
-        yield line if block_given?
+        nested_line = NestedLine.new(line, depth)
+        processed_lines.push(nested_line)
+        block&.call(nested_line)
       end
     end
 
     @file_cache[filename] = processed_lines
-  end
-
-  private
-
-  def fetch_lines(filename)
-    @fetch_lines_cache[filename] ||= File.readlines(filename, chomp: true)
+  rescue Errno::ENOENT
+    # Exceptions.error_handler('readlines', { abort: true })
+    warn_format('readlines', "No such file -- #{filename}", { abort: true })
   end
 end
 
@@ -56,10 +82,6 @@ if $PROGRAM_NAME == __FILE__
   require 'minitest/autorun'
   require 'tempfile'
 
-  ##
-  # The CachedNestedFileReaderTest class provides testing for
-  # the CachedNestedFileReader class.
-  #
   class CachedNestedFileReaderTest < Minitest::Test
     def setup
       @file2 = Tempfile.new('test2.txt')
@@ -69,7 +91,7 @@ if $PROGRAM_NAME == __FILE__
       @file1 = Tempfile.new('test1.txt')
       @file1.write("Line1\nLine2\n #insert #{@file2.path}\nLine3")
       @file1.rewind
-      @reader = CachedNestedFileReader.new(import_pattern: /^ *#insert (.+)$/)
+      @reader = CachedNestedFileReader.new(import_pattern: /^ *#insert (?'name'.+)$/)
     end
 
     def teardown
@@ -81,28 +103,26 @@ if $PROGRAM_NAME == __FILE__
     end
 
     def test_readlines_without_imports
-      result = []
-      @reader.readlines(@file2.path) { |line| result << line }
+      result = @reader.readlines(@file2.path).map(&:to_s)
       assert_equal %w[ImportedLine1 ImportedLine2], result
     end
 
     def test_readlines_with_imports
-      result = []
-      @reader.readlines(@file1.path) { |line| result << line }
-      assert_equal %w[Line1 Line2 ImportedLine1 ImportedLine2 Line3], result
+      result = @reader.readlines(@file1.path).map(&:to_s)
+      assert_equal %w[Line1 Line2 ImportedLine1 ImportedLine2 Line3],
+                   result
     end
 
     def test_caching_functionality
       # First read
-      result1 = []
-      @reader.readlines(@file2.path) { |line| result1 << line }
+
+      result1 = @reader.readlines(@file2.path).map(&:to_s)
 
       # Simulate file content change
       @file2.reopen(@file2.path, 'w') { |f| f.write('ChangedLine') }
 
       # Second read (should read from cache, not the changed file)
-      result2 = []
-      @reader.readlines(@file2.path) { |line| result2 << line }
+      result2 = @reader.readlines(@file2.path).map(&:to_s)
 
       assert_equal result1, result2
       assert_equal %w[ImportedLine1 ImportedLine2], result2

data/lib/constants.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+class ExecutionStreams
+  StdErr = :stderr
+  StdIn  = :stdin
+  StdOut = :stdout
+end
+
+class LoadFile
+  Load = true
+  Reuse = false
+end
+
+LoadFileNextBlock = Struct.new(:load_file, :next_block)
+
+class MenuControl
+  Fresh = false
+  Repeat = true
+end
+
+class MenuOptions
+  YES = 1
+  NO = 2
+  SCRIPT_TO_CLIPBOARD = 3
+  SAVE_SCRIPT = 4
+end
+
+class MenuState
+  BACK = :back
+  CONTINUE = :continue
+  EXIT = :exit
+end
+
+# selected block and subsequent menu state
+#
+SelectedBlockMenuState = Struct.new(:block, :state)
+
+SHELL_COLOR_OPTIONS = {
+  BlockType::BASH => :menu_bash_color,
+  BlockType::LINK => :menu_link_color,
+  BlockType::OPTS => :menu_opts_color,
+  BlockType::VARS => :menu_vars_color
+}.freeze

data/lib/env.rb

@@ -18,7 +18,8 @@ module Env
 
   # :reek:UtilityFunction
   def env_bool_false(name)
-    !(val = (name && ENV.fetch(name, nil))).nil? && !(val.empty? || val == '0')
+    !(val = (name && ENV.fetch(name,
+                               nil))).nil? && !(val.empty? || val == '0')
   end
 
   # skip :reek:DataClump

data/lib/exceptions.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+module Exceptions
+  def self.error_handler(name = '', opts = {}, format_string: "\nError: %{name} -- %{message}", color_symbol: :red, take_count: 16)
+    warn(error = format(format_string,
+                        { name: name, message: $! }).send(color_symbol))
+    warn($@.select do |s|
+           s.include? 'markdown_exec'
+         end.reject { |s| s.include? 'vendor' }.take(take_count).map.with_index { |line, ind| " *   #{ind}: #{line}" })
+
+    binding.pry if $tap_enable
+    raise ArgumentError, error unless opts.fetch(:abort, true)
+
+    exit 1
+  end
+
+  def self.warn_format(message = '', opts = {})
+    warn(
+      error = format(
+        opts.fetch(:format_string, "\nError: %{error}"),
+        { error: message }
+      ).send(opts.fetch(:color_symbol, :yellow))
+    )
+    # warn(caller.take(4).map.with_index { |line, ind| " *   #{ind}: #{line}" })
+
+    binding.pry if $tap_enable
+    raise ArgumentError, error unless opts.fetch(:abort, false)
+
+    exit 1
+  end
+end

data/lib/fcb.rb

@@ -19,6 +19,7 @@ module MarkdownExec
         call: nil,
         headings: [],
         dname: nil,
+        indent: '',
         name: nil,
         oname: nil,
         reqs: [],
@@ -29,6 +30,39 @@ module MarkdownExec
       }.merge(options)
     end
 
+    def title=(value)
+      @attrs[:title] = value
+    end
+
+    # Derives a title from the body of an FCB object.
+    # @param fcb [Object] The FCB object whose title is to be derived.
+    # @return [String] The derived title.
+    def derive_title_from_body
+      body_content = @attrs[:body]
+      unless body_content
+        @attrs[:title] = ''
+        return
+      end
+
+      @attrs[:title] = if body_content.count == 1
+                         body_content.first
+                       else
+                         format_multiline_body_as_title(body_content)
+                       end
+    end
+
+    private
+
+    # Formats multiline body content as a title string.
+    # indents all but first line with two spaces so it displays correctly in menu
+    # @param body_lines [Array<String>] The lines of body content.
+    # @return [String] Formatted title.
+    def format_multiline_body_as_title(body_lines)
+      body_lines.map.with_index do |line, index|
+        index.zero? ? line : "  #{line}"
+      end.join("\n") << "\n"
+    end
+
     # :reek:ManualDispatch
     def method_missing(method, *args, &block)
       method_name = method.to_s
@@ -48,7 +82,9 @@ module MarkdownExec
       raise err # Here, we simply propagate the original error instead of wrapping it in a StandardError.
     end
 
-    def respond_to_missing?(method_name, _include_private = false)
+    public
+
+    def respond_to_missing?(method_name, include_private = false)
       @attrs.key?(method_name.to_sym) || super
     end
 
@@ -63,6 +99,9 @@ module MarkdownExec
 end
 
 if $PROGRAM_NAME == __FILE__
+  require 'bundler/setup'
+  Bundler.require(:default)
+
   require 'minitest/autorun'
   require 'yaml'
 
@@ -73,6 +112,7 @@ if $PROGRAM_NAME == __FILE__
         call: 'Sample call',
         headings: %w[Header1 Header2],
         dname: 'Sample name',
+        indent: '',
         name: 'Sample name',
         oname: 'Sample name',
         reqs: %w[req1 req2],