markdown_exec 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41787e8352174177ca182e0376cabec7aee5923af43536a81fc2a9e61ee109e3
-  data.tar.gz: 6a6c1fa34bf57aad286892772dcdbec19abb41fdb0385a69e264fee70747f742
+  metadata.gz: 97323ce7d6c677603ca89432c9ca64e45ff205a5b6cc03a71f4be1210bf8104a
+  data.tar.gz: ccce852fe96571b00c4443012371ea5ad29caec29dfdc9649cec7da2c091defe
 SHA512:
-  metadata.gz: a4b9377c62c5054d077974b2056d7f89acd54088cd064d9c495b10eda49f64750154dc6618e6f7719dee93aaf3a0e0ca3cafa8d8fd7ca3ccbdb970e2c433b23c
-  data.tar.gz: c9ed40b8c0df7b4b41e2db40d495a420ae1a294bbdd0c7df7702f5bfd99c6e9931a89e197e0fb5b3109fbec3403ef2b7c28126b1f0d000c6aea7c0426cde9a34
+  metadata.gz: bc08d47d135d9a078240c6e3001322ec8b35b8fb4f7febeabec02729240d7524a40464d9d563aeb15e5c8d09695bd0b512251d970dfede46cf07bd377af72181
+  data.tar.gz: ec61f969d204b0216c02e2e13d270363aef35ecf3ad6ff5a26d653e2d5c8f1608ff3e70a24ab65ab3bd48d8c546e1a6c627734c8e03e08a2440c18b1d9db7fed

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.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/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "1.5"
+  echo "1.6"
 }
 
 _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-11-13 16:19:21 UTC"

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/markdown_exec/version.rb

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

data/lib/markdown_exec.rb

@@ -538,15 +538,24 @@ module MarkdownExec
     def create_and_add_chrome_blocks(blocks, fcb, opts, use_chrome)
       return unless use_chrome
 
-      if opts[:menu_note_match].present? && (mbody = fcb.body[0].match opts[:menu_note_match])
-        create_and_add_chrome_block(blocks, fcb, mbody, opts[:menu_note_format],
-                                    opts[:menu_note_color].to_sym)
-      elsif opts[:menu_divider_match].present? && (mbody = fcb.body[0].match opts[:menu_divider_match])
-        create_and_add_chrome_block(blocks, fcb, mbody, opts[:menu_divider_format],
-                                    opts[:menu_divider_color].to_sym)
-      elsif opts[:menu_task_match].present? && (mbody = fcb.body[0].match opts[:menu_task_match])
-        create_and_add_chrome_block(blocks, fcb, mbody, opts[:menu_task_format],
-                                    opts[:menu_task_color].to_sym)
+      match_criteria = [
+        { match: :menu_task_match, format: :menu_task_format,
+          color: :menu_task_color },
+        { match: :menu_divider_match, format: :menu_divider_format,
+          color: :menu_divider_color },
+        { match: :menu_note_match, format: :menu_note_format,
+          color: :menu_note_color }
+      ]
+
+      match_criteria.each do |criteria|
+        unless opts[criteria[:match]].present? &&
+               (mbody = fcb.body[0].match opts[criteria[:match]])
+          next
+        end
+
+        create_and_add_chrome_block(blocks, fcb, mbody, opts[criteria[:format]],
+                                    opts[criteria[:color]].to_sym)
+        break
       end
     end
 
@@ -730,6 +739,7 @@ module MarkdownExec
     end
 
     # 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)
@@ -893,6 +903,16 @@ module MarkdownExec
       ENV[MDE_HISTORY_ENV_NAME] = new_history
     end
 
+    # Indents all lines in a given string with a specified indentation string.
+    # @param body [String] A multi-line string to be indented.
+    # @param indent [String] The string used for indentation (default is an empty string).
+    # @return [String] A single string with each line indented as specified.
+    def indent_all_lines(body, indent = nil)
+      return body if !indent.present?
+
+      body.lines.map { |line| indent + line.chomp }.join("\n")
+    end
+
     ## Sets up the options and returns the parsed arguments
     #
     def initialize_and_parse_cli_options
@@ -1132,31 +1152,6 @@ module MarkdownExec
       end.to_yaml
     end
 
-    def menu_for_blocks(menu_options)
-      options = calculated_options.merge menu_options
-      menu = []
-      iter_blocks_in_file(options) do |btype, fcb|
-        case btype
-        when :filter
-          %i[blocks line]
-        when :line
-          if options[:menu_divider_match] &&
-             (mbody = fcb.body[0].match(options[:menu_divider_match]))
-            menu.push FCB.new({ dname: mbody[:name], oname: mbody[:name],
-                                disabled: '' })
-          end
-          if options[:menu_note_match] &&
-             (mbody = fcb.body[0].match(options[:menu_note_match]))
-            menu.push FCB.new({ dname: mbody[:name], oname: mbody[:name],
-                                disabled: '' })
-          end
-        when :blocks
-          menu += [fcb.oname]
-        end
-      end
-      menu
-    end
-
     ##
     # Generates a menu suitable for OptionParser from the menu items defined in YAML format.
     # @return [Array<Hash>] The array of option hashes for OptionParser.
@@ -1321,7 +1316,7 @@ module MarkdownExec
         next if Filter.prepared_not_in_menu?(opts, fcb)
 
         fcb.merge!(
-          name: fcb.dname,
+          name: indent_all_lines(fcb.dname, fcb.fetch(:indent, nil)),
           label: BlockLabel.make(
             body: fcb[:body],
             filename: opts[:filename],
@@ -1653,6 +1648,7 @@ module MarkdownExec
       fcb = FCB.new
       fcb.headings = headings
       fcb.oname = fcb.dname = fcb_title_groups.fetch(:name, '')
+      fcb.indent = fcb_title_groups.fetch(:indent, '')
       fcb.shell = fcb_title_groups.fetch(:shell, '')
       fcb.title = fcb_title_groups.fetch(:name, '')
       fcb.body = []
@@ -1749,7 +1745,13 @@ module MarkdownExec
           state[:in_fenced_block] = true
         end
       elsif state[:in_fenced_block] && state[:fcb].body
-        state[:fcb].body += [line.chomp]
+        ## add line to fenced code block
+        # remove fcb indent if possible
+        #
+        state[:fcb].body += [
+          line.chomp.sub(/^#{state[:fcb].indent}/, '')
+        ]
+
       else
         process_line(line, opts, selected_messages, &block)
       end

data/lib/menu.src.yml

@@ -118,12 +118,14 @@
   :procname: exit
   :short_name: x
 
-- :default: "^`{3,}"
+## match fenced code indented by spaces
+#
+- :default: "^(?<indent> *)`{3,}"
   :env_var: MDE_FENCED_START_AND_END_REGEX
   :opt_name: fenced_start_and_end_regex
   :procname: val_as_str
 
-- :default: "^`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*) *$"
+- :default: "^(?<indent> *)`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*) *$"
   :env_var: MDE_FENCED_START_EXTENDED_REGEX
   :opt_name: fenced_start_extended_regex
   :procname: val_as_str
@@ -330,7 +332,7 @@
   :opt_name: menu_link_format
   :procname: val_as_str
 
-- :default: fg_rgbh_44_44_44
+- :default: fg_rgbh_88_88_88
   :description: Color of menu note
   :env_var: MDE_MENU_NOTE_COLOR
   :opt_name: menu_note_color
@@ -342,7 +344,9 @@
   :opt_name: menu_note_format
   :procname: val_as_str
 
-- :default: "^\\+ *(?<line>.*?) *$"
+## all non-blank lines are notes
+#
+- :default: "^(?<line>.*?) *$"
   :description: Pattern for notes in block selection menu
   :env_var: MDE_MENU_NOTE_MATCH
   :opt_name: menu_note_match

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (1.5)
+# MDE - Markdown Executor (1.6)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -99,11 +99,12 @@
   :long_name: exit
   :procname: exit
   :short_name: x
-- :default: "^`{3,}"
+- :default: "^(?<indent> *)`{3,}"
   :env_var: MDE_FENCED_START_AND_END_REGEX
   :opt_name: fenced_start_and_end_regex
   :procname: val_as_str
-- :default: "^`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*) *$"
+- :default: "^(?<indent> *)`{3,}(?<shell>[^`\\s]*) *:?(?<name>[^\\s]*) *(?<rest>.*)
+    *$"
   :env_var: MDE_FENCED_START_EXTENDED_REGEX
   :opt_name: fenced_start_extended_regex
   :procname: val_as_str
@@ -275,7 +276,7 @@
   :env_var: MDE_MENU_LINK_FORMAT
   :opt_name: menu_link_format
   :procname: val_as_str
-- :default: fg_rgbh_44_44_44
+- :default: fg_rgbh_88_88_88
   :description: Color of menu note
   :env_var: MDE_MENU_NOTE_COLOR
   :opt_name: menu_note_color
@@ -285,7 +286,7 @@
   :env_var: MDE_MENU_NOTE_FORMAT
   :opt_name: menu_note_format
   :procname: val_as_str
-- :default: "^\\+ *(?<line>.*?) *$"
+- :default: "^(?<line>.*?) *$"
   :description: Pattern for notes in block selection menu
   :env_var: MDE_MENU_NOTE_MATCH
   :opt_name: menu_note_match

data/lib/pty1.rb

@@ -0,0 +1,26 @@
+require 'pty'
+
+def launch_and_interact_with_terminal
+  begin
+    PTY.spawn("bash") do |stdout, stdin, pid|
+      # Send a command to the terminal
+      stdin.puts "echo 'Hello from Ruby!'"
+
+      # Read the output of the command
+      stdout.each do |line|
+        puts line
+        break if line.include?("Hello from Ruby!")
+      end
+
+      # You can continue to interact with the terminal here
+      # ...
+
+      # Ensure to exit the spawned shell
+      stdin.puts "exit"
+    end
+  rescue PTY::ChildExited => e
+    puts "The child process exited!"
+  end
+end
+
+launch_and_interact_with_terminal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -144,6 +144,7 @@ files:
 - lib/method_sorter.rb
 - lib/object_present.rb
 - lib/option_value.rb
+- lib/pty1.rb
 - lib/regexp.rb
 - lib/rspec_helpers.rb
 - lib/saved_assets.rb