markdown_exec 1.3.3.3 → 1.3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8091694c904ad7b42b26755d60fbf6f41954e9235581ddae1f1f88ea9c9e5d99
-  data.tar.gz: 157166f1eb136952293dd65e1fdd57e004982645ebfa2ca3d032710f1025f148
+  metadata.gz: 6c3c3615fdab637a5df4f5616d9c07f277e499f1f8de3a5fa70dda72ae2cb0b3
+  data.tar.gz: b7cb1a2abfeaf114f25aac530d316aa181ca1464af5426e5b1f0b5aaa3538320
 SHA512:
-  metadata.gz: 2c56339165f949439c6940c6a4b459f3f528bf0b07b5549990c24d73d9b4438a663b9442b3f025ea6d2ff7523671fbea0ca0b0e58f9d63d1aa29c8f52f79fc5f
-  data.tar.gz: 25a0119b56540c8bc663c9d0e5911889a8db79098875763299e8e9b06f8696ab5c93387dfe3467d8b03ce362ede84caeb3b8794d8b2f177a0822e3b4f2c7eef1
+  metadata.gz: 2bf8576d03115f6d769e961091d5a33bfc65fafdca8f2f282895230836670fb741a34a94beac49dc1008faa6ea293b3f882721b56f69fcbb697e4c011143ab7a
+  data.tar.gz: a53fecba24f39b4e5234164e4eada14a95b8c078111d50572c9094f5171671f3d79efc20065caaf67a1b7bce2f774c9cb52bb5c1bbbf8855678d317a3561bbef

data/CHANGELOG.md

@@ -106,6 +106,165 @@
 
 - [! ] option to use most recent named block if dupiclate, currently appends same-name blocks but lists twice in menu
 
+- [! ] improve error when imported file is not found
+
+- [ ] decorations for import block
+prefix line(s)
+inline replacements
+suffix line(s)
+
+```ruby
+##
+# Replace substrings in an input string based on a regular expression pattern
+# with named capture groups. The replacements are formatted using a provided
+# format string. Additional context can be provided to supplement or override 
+# the named captures in the format string.
+#
+# @param input_str [String] The input string to process.
+# @param regex [Regexp] The regular expression pattern with named capture groups.
+# @param format_str [String] The format string for sprintf.
+# @param context [Hash] Additional context to supplement or override named captures.
+#
+# @return [String] The processed string after replacements.
+#
+# def gsub_format(input_str, regex, format_str, context: {})
+#   input_str.gsub(regex) do
+#     captures_hash = $~.names.each_with_object({}) do |name, hash|
+#       hash[name.to_sym] = $~[name]
+#     end
+
+#     ### add import file name, line number, line, to captures_hash, chain
+#     # $~ (MatchData) - MatchData object created from the match; thread-local and frame-local. - English - $LAST_MATCH_INFO.
+#     # $& (Matched Substring) - The matched string. - English - $MATCH.
+#     # $` (Pre-Match Substring) - The string to the left of the match. - English - $PREMATCH.
+#     # $' (Post-Match Substring) - The string to the right of the match. - English - $POSTMATCH.
+#     # $+ (Last Matched Group) - The last group matched. - English - $LAST_PAREN_MATCH.
+
+#     sprintf(format_str, context.merge(captures_hash))
+#   end
+# end
+
+class Regexp
+  def gsub_format(input_str, format_str, context: {})
+    input_str.gsub(self) do
+      captures_hash = $~.names.each_with_object({}) do |name, hash|
+        hash[name.to_sym] = $~[name]
+      end
+
+#     ### add import file name, line number, line, to captures_hash, chain
+#     # $~ (MatchData) - MatchData object created from the match; thread-local and frame-local. - English - $LAST_MATCH_INFO.
+#     # $& (Matched Substring) - The matched string. - English - $MATCH.
+#     # $` (Pre-Match Substring) - The string to the left of the match. - English - $PREMATCH.
+#     # $' (Post-Match Substring) - The string to the right of the match. - English - $POSTMATCH.
+#     # $+ (Last Matched Group) - The last group matched. - English - $LAST_PAREN_MATCH.
+
+      # # Add file name, line number, line to captures_hash
+      # captures_hash[:file_name] = $~.pre_match.split("\n").last
+      # captures_hash[:line_number] = $~.pre_match.count("\n") + 1
+      # captures_hash[:line] = $&
+
+      sprintf(format_str, context.merge(captures_hash))
+    end
+  end
+end
+
+# # Example usage:
+# str = "123 example"
+# re = /(?<foo>\d+) (?<bar>\w+)/
+# fmt = "%<foo>d : %<bar>s"
+# new_str = gsub_format(str, re, fmt)
+# puts new_str  # Outputs: 123 : example
+
+require 'minitest/autorun'
+require_relative 'path_to_your_file' # Make sure to replace this with the path to the file containing the function
+
+class ReplaceWithFormatTest < Minitest::Test
+  def test_basic_replacement
+    input_str = "123 example"
+    re = /(?<foo>\d+) (?<bar>\w+)/
+    fmt = "%<foo>d : %<bar>s"
+    
+    result = gsub_format(input_str, re, fmt)
+    
+    assert_equal "123 : example", result
+  end
+  
+  def test_no_match
+    input_str = "This is a test."
+    re = /(?<foo>\d+) (?<bar>\w+)/
+    fmt = "%<foo>d : %<bar>s"
+    
+    result = gsub_format(input_str, re, fmt)
+    
+    assert_equal "This is a test.", result
+  end
+  
+  def test_multiple_matches
+    input_str = "123 example, 456 test"
+    re = /(?<foo>\d+) (?<bar>\w+)/
+    fmt = "[%<foo>d %<bar>s]"
+    
+    result = gsub_format(input_str, re, fmt)
+    
+    assert_equal "[123 example], [456 test]", result
+  end
+  
+  def test_different_named_captures
+    input_str = "Jane is 25 years old."
+    re = /(?<name>\w+) is (?<age>\d+)/
+    fmt = "%<name>s's age is %<age>d"
+    
+    result = gsub_format(input_str, re, fmt)
+    
+    assert_equal "Jane's age is 25", result
+  end
+  
+  def test_with_context
+    input_str = "Jane is 25 years old."
+    re = /(?<name>\w+) is (?<age>\d+)/
+    fmt = "%<name>s's age is %<age>d and she lives in %<city>s"
+    
+    result = gsub_format(input_str, re, fmt, context: { city: "New York" })
+    
+    assert_equal "Jane's age is 25 and she lives in New York", result
+  end
+end
+
+require 'minitest/autorun'
+require_relative 'path_to_your_file' # Ensure this path is correct
+
+class RegexpGsubFormatTest < Minitest::Test
+  def test_basic_replacement
+    input_str = "123 example"
+    re = /(?<foo>\d+) (?<bar>\w+)/
+    fmt = "%<foo>d : %<bar>s"
+    
+    result = re.gsub_format(input_str, fmt)
+    
+    assert_equal "123 : example", result
+  end
+
+  # ... [other tests remain mostly unchanged, just updating the method call]
+
+  def test_with_context
+    input_str = "Jane is 25 years old."
+    re = /(?<name>\w+) is (?<age>\d+)/
+    fmt = "%<name>s's age is %<age>d and she lives in %<city>s"
+    
+    result = re.gsub_format(input_str, fmt, context: { city: "New York" })
+    
+    assert_equal "Jane's age is 25 and she lives in New York", result
+  end
+end
+
+```
+
+## [1.3.5] - 2023-10-05
+
+### Changed
+
+- Fix display of menu dividers.
+
 ## [1.3.3] - 2023-10-03
 
 ### Added

data/Gemfile.lock

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

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "1.3.3.3"
+  echo "1.3.3.5"
 }
 
 _mde() {
@@ -138,4 +138,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2023-10-04 01:38:44 UTC"
+# echo "Updated: 2023-10-05 14:21:31 UTC"

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.3.3.3'
+  VERSION = '1.3.3.5'
 end

data/lib/markdown_exec.rb

@@ -5,6 +5,7 @@
 
 require 'English'
 require 'clipboard'
+require 'fileutils'
 require 'open3'
 require 'optparse'
 require 'shellwords'
@@ -259,7 +260,6 @@ module MarkdownExec
       else
         true
       end.tap_inspect
-    # binding.pry
     rescue StandardError => err
       warn("ERROR ** Filter::fcb_select?(); #{err.inspect}")
       raise err
@@ -357,7 +357,7 @@ module MarkdownExec
       selrows = @table.select do |fcb_title_groups|
         Filter.fcb_select? options, fcb_title_groups
       end
-      # binding.pry
+
       ### hide rows correctly
 
       if opts[:hide_blocks_by_name]
@@ -662,10 +662,7 @@ module MarkdownExec
     end
 
     def cfile
-# puts @options.inspect
-# binding.pry
       @cfile ||= CachedNestedFileReader.new(import_pattern: @options.fetch(:import_pattern))
-      # @cfile ||= CachedNestedFileReader.new(import_pattern: /^ *#insert (.+)$/)
     end
 
     # :reek:DuplicateMethodCall
@@ -944,7 +941,7 @@ module MarkdownExec
         blocks.push FCB.new({
                               # name: '',
                               chrome: true,
-                              text: format(
+                              name: format(
                                 opts[:menu_divider_format],
                                 opts[:menu_initial_divider]
                               ).send(opts[:menu_divider_color].to_sym),
@@ -953,7 +950,6 @@ module MarkdownExec
       end
 
       iter_blocks_in_file(opts) do |btype, fcb|
-        # binding.pry
         case btype
         when :filter
           ## return type of blocks to select
@@ -963,14 +959,12 @@ module MarkdownExec
         when :line
           ## convert line to block
           #
-          # binding.pry
           if opts[:menu_divider_match].present? &&
              (mbody = fcb.body[0].match opts[:menu_divider_match])
-            # binding.pry
             blocks.push FCB.new(
               { chrome: true,
                 disabled: '',
-                text: format(opts[:menu_divider_format],
+                name: format(opts[:menu_divider_format],
                              mbody[:name]).send(opts[:menu_divider_color].to_sym) }
             )
           elsif opts[:menu_task_match].present? &&
@@ -978,7 +972,7 @@ module MarkdownExec
             blocks.push FCB.new(
               { chrome: true,
                 disabled: '',
-                text: format(opts[:menu_task_format],
+                name: format(opts[:menu_task_format],
                              mbody[:name]).send(opts[:menu_task_color].to_sym) }
             )
           else
@@ -995,7 +989,7 @@ module MarkdownExec
         blocks.push FCB.new(
           { chrome: true,
             disabled: '',
-            text: format(opts[:menu_divider_format],
+            name: format(opts[:menu_divider_format],
                          opts[:menu_final_divider])
                                  .send(opts[:menu_divider_color].to_sym) }
         )
@@ -1277,18 +1271,24 @@ module MarkdownExec
       }
     end
 
+    ## insert exit option at head or tail
+    #
+    def prompt_menu_add_exit(_prompt_text, items, exit_option, _opts = {})
+      if @options[:menu_exit_at_top]
+        (@options[:menu_with_exit] ? [exit_option] : []) + items
+      else
+        items + (@options[:menu_with_exit] ? [exit_option] : [])
+      end
+    end
+
     ## tty prompt to select
     # insert exit option at head or tail
     # return selected option or nil
     #
     def prompt_with_quit(prompt_text, items, opts = {})
       exit_option = '* Exit'
-      all_items = if @options[:menu_exit_at_top]
-                    (@options[:menu_with_exit] ? [exit_option] : []) + items
-                  else
-                    items + (@options[:menu_with_exit] ? [exit_option] : [])
-                  end
-      sel = @prompt.select(prompt_text, all_items, opts.merge(filter: true))
+      sel = @prompt.select(prompt_text, prompt_menu_add_exit(prompt_text, items, exit_option, opts),
+                           opts.merge(filter: true))
       sel == exit_option ? nil : sel
     end
 
@@ -1375,7 +1375,7 @@ module MarkdownExec
                   @options[:logged_stdout_filename]
       @logged_stdout_filespec = @options[:logged_stdout_filespec]
       (dirname = File.dirname(@options[:logged_stdout_filespec]))
-      Dir.mkdir_p dirname
+      FileUtils.mkdir_p dirname
 
       ol = ["-STDOUT-\n"]
       ol += @execute_files&.fetch(EF_STDOUT, [])
@@ -1420,8 +1420,6 @@ module MarkdownExec
           end.compact
           return nil if bm.count.zero?
 
-          # binding.pry
-
           sel = prompt_with_quit pt, bm,
                                  per_page: opts[:select_page_height]
           return nil if sel.nil?
@@ -1530,7 +1528,7 @@ module MarkdownExec
           File.join opts[:saved_script_folder], opts[:saved_script_filename]
 
       dirname = File.dirname(@options[:saved_filespec])
-      Dir.mkdir_p dirname
+      FileUtils.mkdir_p dirname
       (shebang = if @options[:shebang]&.present?
                    "#{@options[:shebang]} #{@options[:shell]}\n"
                  else

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (1.3.3.3)
+# MDE - Markdown Executor (1.3.3.5)
 ---
 - :arg_name: NAME
   :compreply: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 1.3.3.3
+  version: 1.3.3.5
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard