markdown_exec 2.8.3 → 2.8.5

data/lib/menu.src.yml

@@ -103,6 +103,12 @@
   :default: true
   :procname: val_as_bool
 
+- :opt_name: command_substitution_format
+  :env_var: MDE_COMMAND_SUBSTITUTION_FORMAT
+  :description: command_substitution_format
+  :default: '$(%s)'
+  :procname: val_as_str
+
 - :opt_name: command_substitution_regexp
   :env_var: MDE_COMMAND_SUBSTITUTION_REGEXP
   :description: command_substitution_regexp
@@ -207,12 +213,6 @@
   :default: "(document_shell)"
   :procname: val_as_str
 
-- :opt_name: document_load_ux_block_name
-  :env_var: MDE_DOCUMENT_LOAD_UX_BLOCK_NAME
-  :description: Name of UX block to load with the document
-  :default: "\\[.*document_ux.*\\]"
-  :procname: val_as_str
-
 - :opt_name: document_load_vars_block_name
   :env_var: MDE_DOCUMENT_LOAD_VARS_BLOCK_NAME
   :description: Name of Vars block to load with the document
@@ -914,7 +914,9 @@
 - :opt_name: menu_note_match
   :env_var: MDE_MENU_NOTE_MATCH
   :description: Pattern for notes in block selection menu
-  :default: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
+  # 'line' excludes 'indent' and 'trailing'
+  # 'text' group matches multiline from variable expansion
+  :default: "^(?'indent'[ \t]*)(?'line'(?!/)(?'text'.*))(?'trailing'[ \t]*)?$"
   :procname: val_as_str
 
 - :opt_name: menu_option_back_name
@@ -1661,6 +1663,12 @@
   :default: true
   :procname: val_as_bool
 
+- :opt_name: variable_expression_format
+  :env_var: MDE_VARIABLE_EXPRESSION_FORMAT
+  :description: variable_expression_format
+  :default: '${%s}'
+  :procname: val_as_str
+
 - :opt_name: variable_expression_regexp
   :env_var: MDE_VARIABLE_EXPRESSION_REGEXP
   :description: variable_expression_regexp

data/lib/menu.yml

@@ -84,6 +84,11 @@
   :arg_name: BOOL
   :default: true
   :procname: val_as_bool
+- :opt_name: command_substitution_format
+  :env_var: MDE_COMMAND_SUBSTITUTION_FORMAT
+  :description: command_substitution_format
+  :default: "$(%s)"
+  :procname: val_as_str
 - :opt_name: command_substitution_regexp
   :env_var: MDE_COMMAND_SUBSTITUTION_REGEXP
   :description: command_substitution_regexp
@@ -172,11 +177,6 @@
   :description: Name of shell block to load with the document
   :default: "(document_shell)"
   :procname: val_as_str
-- :opt_name: document_load_ux_block_name
-  :env_var: MDE_DOCUMENT_LOAD_UX_BLOCK_NAME
-  :description: Name of UX block to load with the document
-  :default: "\\[.*document_ux.*\\]"
-  :procname: val_as_str
 - :opt_name: document_load_vars_block_name
   :env_var: MDE_DOCUMENT_LOAD_VARS_BLOCK_NAME
   :description: Name of Vars block to load with the document
@@ -772,7 +772,7 @@
 - :opt_name: menu_note_match
   :env_var: MDE_MENU_NOTE_MATCH
   :description: Pattern for notes in block selection menu
-  :default: "^(?<indent>[ \t]*)(?<line>(?!/)(?<text>.*?)(?<trailing>[ \t]*))?$"
+  :default: "^(?'indent'[ \t]*)(?'line'(?!/)(?'text'.*))(?'trailing'[ \t]*)?$"
   :procname: val_as_str
 - :opt_name: menu_option_back_name
   :env_var: MDE_MENU_OPTION_BACK_NAME
@@ -1419,6 +1419,11 @@
   :arg_name: BOOL
   :default: true
   :procname: val_as_bool
+- :opt_name: variable_expression_format
+  :env_var: MDE_VARIABLE_EXPRESSION_FORMAT
+  :description: variable_expression_format
+  :default: "${%s}"
+  :procname: val_as_str
 - :opt_name: variable_expression_regexp
   :env_var: MDE_VARIABLE_EXPRESSION_REGEXP
   :description: variable_expression_regexp

data/lib/namer.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 # encoding=utf-8
@@ -10,9 +9,7 @@ class Hash
   # block name in commands and documents
   def pub_name(**kwargs)
     full = fetch(:nickname, nil) || fetch(:oname, nil)
-    full&.to_s&.pub_name(**kwargs).tap { |ret|
-      pp [__LINE__, 'Hash.pub_name() ->', ret] if $pd
-    }
+    full&.to_s&.pub_name(**kwargs)
   end
 end
 
@@ -37,8 +34,8 @@ class String
                 self
               end
 
-    trimmed.gsub(pattern, replacement).tap { |ret|
+    trimmed.gsub(pattern, replacement).tap do |ret|
       pp [__LINE__, 'String.pub_name() ->', ret] if $pd
-    }
+    end
   end
 end

data/lib/null_result.rb

@@ -0,0 +1,131 @@
+#!/usr/bin/env -S bundle exec ruby
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+##
+# NullResult represents a fallback object returned when a valid result cannot be produced.
+#
+# This class implements the Null Object pattern and can optionally carry additional
+# failure details such as a custom message and a data payload.
+#
+# Example:
+#   result = SomeService.call
+#
+#   if result.failure?
+#     puts "Error: #{result.message}"
+#     puts "Details: #{result.data.inspect}" if result.data
+#   end
+#
+class NullResult
+  ##
+  # Initializes a new NullResult.
+  #
+  # @param message [String] a textual description of the failure (default: 'No valid result available')
+  # @param data [Hash, nil] additional structured data conveying details of the failure (default: nil)
+  def initialize(message: 'No valid result available', data: nil)
+    @message = message
+    @data = data
+  end
+
+  ##
+  # Indicates that the result is a failure.
+  #
+  # @return [Boolean] always true
+  def failure?
+    true
+  end
+
+  ##
+  # Indicates that the result is not a success.
+  #
+  # @return [Boolean] always false
+  def success?
+    false
+  end
+
+  ##
+  # Returns the failure message.
+  #
+  # @return [String] the message describing the failure
+  def message
+    @message
+  end
+
+  ##
+  # Returns additional failure details.
+  #
+  # @return [Hash, nil] structured data with failure details
+  def data
+    @data
+  end
+
+  ##
+  # Returns a string representation of the NullResult.
+  #
+  # @return [String]
+  def to_s
+    "NullResult(message: #{@message.inspect}, data: #{@data.inspect})"
+  end
+end
+
+# A default instance for cases where no extra details are required.
+DEFAULT_NULL_RESULT = NullResult.new
+
+return unless $PROGRAM_NAME == __FILE__
+
+require 'bundler/setup'
+Bundler.require(:default)
+
+require 'minitest/autorun'
+require 'mocha/minitest'
+
+require_relative 'ww'
+
+##
+# Tests for the NullResult class.
+#
+# This suite verifies that the default and custom initialization
+# of NullResult work as expected and that the public interface
+# (e.g. #message, #data, #success?, #failure?, and #to_s) behaves correctly.
+#
+class NullResultTest < Minitest::Test
+  def test_default_instance
+    nr = NullResult.new
+    assert_equal 'No valid result available', nr.message, 'Default message mismatch'
+    assert_nil nr.data, 'Default data should be nil'
+    refute nr.success?, 'Default instance should not be a success'
+    assert nr.failure?, 'Default instance should be a failure'
+    assert_match /NullResult/, nr.to_s, 'to_s should include the class name'
+  end
+
+  def test_custom_message
+    custom_message = 'Custom error message'
+    nr = NullResult.new(message: custom_message)
+    assert_equal custom_message, nr.message, 'Custom message mismatch'
+    assert_nil nr.data, 'Data should remain nil when not provided'
+  end
+
+  def test_custom_data
+    custom_data = { error: 'invalid', code: 404 }
+    nr = NullResult.new(data: custom_data)
+    assert_equal custom_data, nr.data, 'Custom data mismatch'
+    assert_equal 'No valid result available', nr.message, 'Default message expected'
+  end
+
+  def test_custom_message_and_data
+    custom_message = 'Error occurred'
+    custom_data = { reason: 'not_found' }
+    nr = NullResult.new(message: custom_message, data: custom_data)
+    assert_equal custom_message, nr.message, 'Custom message mismatch'
+    assert_equal custom_data, nr.data, 'Custom data mismatch'
+  end
+
+  def test_to_s_format
+    custom_message = 'Error occurred'
+    custom_data = { a: 1, b: 2 }
+    nr = NullResult.new(message: custom_message, data: custom_data)
+    expected = "NullResult(message: #{custom_message.inspect}, data: #{custom_data.inspect})"
+    assert_equal expected, nr.to_s, 'String representation does not match expected format'
+  end
+end

data/lib/object_present.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env -S bundle exec ruby
 # frozen_string_literal: true
 
 # encoding=utf-8

data/lib/option_value.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env -S bundle exec ruby
 # frozen_string_literal: true
 
 # encoding=utf-8

data/lib/resize_terminal.rb

@@ -123,8 +123,7 @@ class ResizeTerminalTest < Minitest::Test
       ENV['LINES'] = '24'
       response = "\e[999;999H\e[6n\e[24;#{columns}R".dup
       $stdin.stub(:getch, -> { response.slice!(0) || '' }) do
-        assert_output("\e7\e[r\e[999;999H\e[6n\e8xterm-256color #{columns}x24\n") do
-          # assert_output('', '') do
+        assert_output(/xterm-256color #{columns}x24$/) do
           resize_terminal(require_stdout: false)
         end
       end

data/lib/saved_assets.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env -S bundle exec ruby
 # frozen_string_literal: true
 
 # encoding=utf-8

data/lib/saved_files_matcher.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env -S bundle exec ruby
 # frozen_string_literal: true
 
 # encoding=utf-8