markdown_exec 2.0.2 → 2.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece122ac9b2994b3a0ee90b6a6b07f637abd015f45b2275c0bcf740a2fbfb173
-  data.tar.gz: f8c79187fc3f1fb4f8d53750dbb6078cb81ab58c04114bc484cd66ed22f890a5
+  metadata.gz: f8472bfcb1c813c87b1094fa2d9789b48b864e1bb8ab76d0f8ae1001237af3e0
+  data.tar.gz: 2699ed15974d6b89ffc3dea6c172044b4fb427e8a8d5184c25fb0cc7d5ad33ae
 SHA512:
-  metadata.gz: 57246f8b67613bdf55911dcc5274b7bad32b3702c3070ee75f30754ea8a816ebeee42b930bceb363313256b1b5368fd05bf2c1ccfbde545ea934d6b9d66d8e86
-  data.tar.gz: fefcd1ed4b825a81cd9e5bfa79c0c3124550778908ad2200dd6ac9cd5db1ba6c70d2cc4987df05700ba2dd554461fd0b39ba330a32209f2edc7a7ad80cdadff3
+  metadata.gz: 9fbf04758308b522967bb9587eae0ac1d9bb0517697260a228b5c56bf1e2aac582f7aaa5b94aa021d5112a34327865c9535b3aa62fe62e00cd590c541077a6fd
+  data.tar.gz: 2a200effafe807181c6e9bda44e67dcb3978e02333ea61d06d30cb934a5e8bcf4e9f117fddb258cfd0397f833574c2abbb451ab061ff654f654c934f9dddbf65

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.0.3] - 2024-04-15
+
+### Added
+
+- Option to set menu line count to fill console height.
+- Rescue when named block in link block is missing.
+
+### Changed
+
+- Fix handling of variables with spaces in link blocks.
+- Fix substitution for '/' in block names used in file names.
+
 ## [2.0.2] - 2024-02-09
 
 ### Changed

data/Gemfile

@@ -9,7 +9,6 @@ gemspec
 gem 'clipboard'
 gem 'debug'
 gem 'erb'
-# gem 'httparty' # 2024-01-01 for ChatGPI API
 gem 'irb', '>= 1.8.0'
 gem 'mocha', require: false
 gem 'minitest', require: false
@@ -24,6 +23,5 @@ gem 'rubocop-minitest', require: false
 gem 'rubocop-rake', require: false
 gem 'rubocop-rspec', require: false
 gem 'shellwords'
-# gem 'tty-file'
 gem 'uri', '0.12.2'
 gem 'yaml', '~> 0.2.1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (2.0.2)
+    markdown_exec (2.0.3.1)
       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 "2.0.2"
+  echo "2.0.3.1"
 }
 
 _mde() {
@@ -186,4 +186,4 @@ _mde() {
 
 complete -o filenames -o nospace -F _mde mde
 # _mde_echo_version
-# echo "Updated: 2024-02-09 19:26:00 UTC"
+# echo "Updated: 2024-04-18 00:17:10 UTC"

data/examples/linked.md

@@ -5,6 +5,11 @@ pause_after_script_execution: false
 user_must_approve: false
 ```
 
+```link :missing_block
+block: (display_variable)
+eval: true
+```
+
 ```link :link_with_vars_with_spaces
 vars:
   test: "1 2 3"

data/lib/ansi_formatter.rb

@@ -33,11 +33,15 @@ class AnsiFormatter
   def scan_and_process_multiple_substrings(str, substrings, plain_sym, color_sym)
     return string_send_color(str, plain_sym) if substrings.empty? || substrings.any?(&:empty?)
 
+    substring_patterns = substrings.map do |value|
+      [value, Regexp.new(value, Regexp::IGNORECASE)]
+    end
+
     results = []
     remaining_str = str.dup
 
     while remaining_str.length.positive?
-      match_indices = substrings.map { |substring| remaining_str.index(substring) }.compact
+      match_indices = substring_patterns.map { |_, pattern| remaining_str.index(pattern) }.compact
       earliest_match = match_indices.min
 
       if earliest_match
@@ -48,12 +52,12 @@ class AnsiFormatter
         end
 
         # Find which substring has this earliest match
-        matching_substring = substrings.find do |substring|
-          remaining_str.index(substring) == earliest_match
+        matching_substring = substring_patterns.find do |_, pattern|
+          remaining_str.index(pattern) == earliest_match
         end
 
         if matching_substring
-          matching_segment = remaining_str.slice!(0...matching_substring.length)
+          matching_segment = remaining_str.slice!(0...matching_substring[0].length)
           results << string_send_color(matching_segment, color_sym)
         end
       else

data/lib/directory_searcher.rb

@@ -102,7 +102,7 @@ class DirectorySearcher
   # @param include_subdirectories [Boolean] Whether to search in subdirectories.
   # @param filename_glob [String, nil] Glob pattern for file names.
   def initialize(pattern, paths, include_subdirectories: true, filename_glob: '*.[Mm][Dd]') #'*.md'
-    @pattern = pattern
+    @pattern = Regexp.new(pattern, Regexp::IGNORECASE)
     @paths = paths
     @include_subdirectories = include_subdirectories
     @filename_glob = filename_glob

data/lib/hash_delegator.rb

@@ -8,10 +8,11 @@ require 'clipboard'
 require 'fileutils'
 require 'open3'
 require 'optparse'
+require 'ostruct'
 require 'set'
 require 'shellwords'
+require 'tempfile'
 require 'tmpdir'
-# require 'tty-file'
 require 'tty-prompt'
 require 'yaml'
 
@@ -21,6 +22,7 @@ require_relative 'block_label'
 require_relative 'block_types'
 require_relative 'cached_nested_file_reader'
 require_relative 'constants'
+require_relative 'std_out_err_logger'
 require_relative 'directory_searcher'
 require_relative 'exceptions'
 require_relative 'fcb'
@@ -193,18 +195,15 @@ module HashDelegatorSelf
   end
 
   def next_link_state(block_name_from_cli:, was_using_cli:, block_state:, block_name: nil)
-    # &bsp 'next_link_state', block_name_from_cli, was_using_cli, block_state
     # Set block_name based on block_name_from_cli
     block_name = @cli_block_name if block_name_from_cli
-    # &bsp 'block_name:', block_name
 
     # Determine the state of breaker based on was_using_cli and the block type
+    # true only when block_name is nil, block_name_from_cli is false, was_using_cli is true, and the block_state.block[:shell] equals BlockType::BASH. In all other scenarios, breaker is false.
     breaker = !block_name && !block_name_from_cli && was_using_cli && block_state.block[:shell] == BlockType::BASH
-    # &bsp 'breaker:', breaker
 
     # Reset block_name_from_cli if the conditions are not met
     block_name_from_cli ||= false
-    # &bsp 'block_name_from_cli:', block_name_from_cli
 
     [block_name, block_name_from_cli, breaker]
   end
@@ -352,6 +351,20 @@ module CompactionHelpers
   end
 end
 
+module PathUtils
+  # Determines if a given path is absolute or substitutes a placeholder in an expression with the path.
+  # @param path [String] The input path to check or fill in.
+  # @param expression [String] The expression where a wildcard '*' is replaced by the path if it's not absolute.
+  # @return [String] The absolute path or the expression with the wildcard replaced by the path.
+  def self.resolve_path_or_substitute(path, expression)
+    if path.include?('/')
+      path
+    else
+      expression.gsub('*', path)
+    end
+  end
+end
+
 module MarkdownExec
   class DebugHelper
     # Class-level variable to store history of printed messages
@@ -368,7 +381,7 @@ module MarkdownExec
     end
   end
 
-  class HashDelegator
+  class HashDelegatorParent
     attr_accessor :most_recent_loaded_filename, :pass_args, :run_state
 
     extend HashDelegatorSelf
@@ -559,11 +572,11 @@ module MarkdownExec
 
     # private
 
-    def calc_logged_stdout_filename
+    def calc_logged_stdout_filename(block_name:)
       return unless @delegate_object[:saved_stdout_folder]
 
       @delegate_object[:logged_stdout_filename] =
-        SavedAsset.stdout_name(blockname: @delegate_object[:block_name],
+        SavedAsset.stdout_name(blockname: block_name,
                                filename: File.basename(@delegate_object[:filename],
                                                        '.*'),
                                prefix: @delegate_object[:logged_stdout_filename_prefix],
@@ -898,7 +911,7 @@ module MarkdownExec
     # @param selected [FCB] The selected functional code block object.
     def execute_required_lines(required_lines: [], selected: FCB.new)
       write_command_file(required_lines: required_lines, selected: selected) if @delegate_object[:save_executed_script]
-      calc_logged_stdout_filename
+      calc_logged_stdout_filename(block_name: @dml_block_state.block[:oname]) if @dml_block_state
       format_and_execute_command(code_lines: required_lines)
       post_execution_process
     end
@@ -950,7 +963,6 @@ module MarkdownExec
           next_load_file: LoadFile::Reuse
         )
 
-
       elsif selected[:shell] == BlockType::VARS
         debounce_reset
         block_names = []
@@ -972,6 +984,7 @@ module MarkdownExec
                                           selected: selected,
                                           link_state: link_state,
                                           block_source: block_source)
+
       else
         LoadFileLinkState.new(LoadFile::Reuse, link_state)
       end
@@ -1131,43 +1144,46 @@ module MarkdownExec
 
     def link_block_data_eval(link_state, code_lines, selected, link_block_data, block_source:)
       all_code = HashDelegator.code_merge(link_state&.inherited_lines, code_lines)
+      cmd = "#{@delegate_object[:shell]} #{file.path}"
+      output_lines = []
 
-      if link_block_data.fetch(LinkKeys::Exec, false)
-        @run_state.files = Hash.new([])
-        output_lines = []
+      Tempfile.open do |file|
+        file.write(all_code.join("\n"))
+        file.rewind
 
-        Open3.popen3(
-          @delegate_object[:shell],
-          '-c', all_code.join("\n")
-        ) do |stdin, stdout, stderr, _exec_thr|
-          handle_stream(stream: stdout, file_type: ExecutionStreams::StdOut) do |line|
-            output_lines.push(line)
-          end
-          handle_stream(stream: stderr, file_type: ExecutionStreams::StdErr) do |line|
-            output_lines.push(line)
-          end
+        if link_block_data.fetch(LinkKeys::Exec, false)
+          @run_state.files = Hash.new([])
 
-          in_thr = handle_stream(stream: $stdin, file_type: ExecutionStreams::StdIn) do |line|
-            stdin.puts(line)
-          end
+          Open3.popen3(cmd) do |stdin, stdout, stderr, _exec_thr|
+            handle_stream(stream: stdout, file_type: ExecutionStreams::StdOut) do |line|
+              output_lines.push(line)
+            end
+            handle_stream(stream: stderr, file_type: ExecutionStreams::StdErr) do |line|
+              output_lines.push(line)
+            end
 
-          wait_for_stream_processing
-          sleep 0.1
-          in_thr.kill if in_thr&.alive?
-        end
+            in_thr = handle_stream(stream: $stdin, file_type: ExecutionStreams::StdIn) do |line|
+              stdin.puts(line)
+            end
 
-        ## select output_lines that look like assignment or match other specs
-        #
-        output_lines = process_string_array(
-          output_lines,
-          begin_pattern: @delegate_object.fetch(:output_assignment_begin, nil),
-          end_pattern: @delegate_object.fetch(:output_assignment_end, nil),
-          scan1: @delegate_object.fetch(:output_assignment_match, nil),
-          format1: @delegate_object.fetch(:output_assignment_format, nil)
-        )
+            wait_for_stream_processing
+            sleep 0.1
+            in_thr.kill if in_thr&.alive?
+          end
 
-      else
-        output_lines = `#{all_code.join("\n")}`.split("\n")
+          ## select output_lines that look like assignment or match other specs
+          #
+          output_lines = process_string_array(
+            output_lines,
+            begin_pattern: @delegate_object.fetch(:output_assignment_begin, nil),
+            end_pattern: @delegate_object.fetch(:output_assignment_end, nil),
+            scan1: @delegate_object.fetch(:output_assignment_match, nil),
+            format1: @delegate_object.fetch(:output_assignment_format, nil)
+          )
+
+        else
+          output_lines = `#{cmd}`.split("\n")
+        end
       end
 
       HashDelegator.error_handler('all_code eval output_lines is nil', { abort: true }) unless output_lines
@@ -1285,7 +1301,7 @@ module MarkdownExec
       puts format(@delegate_object[:prompt_show_expr_format],
                   { expr: filespec })
       puts @delegate_object[:prompt_enter_filespec]
-      resolve_path_or_substitute(gets.chomp, filespec)
+      PathUtils.resolve_path_or_substitute(gets.chomp, filespec)
     end
 
     # Handle expression with wildcard characters
@@ -1320,11 +1336,34 @@ module MarkdownExec
       }
     end
 
+#     # Loads auto link block.
+#     def load_auto_link_block(all_blocks, link_state, mdoc, block_source:)
+#       block_name = @delegate_object[:document_load_link_block_name]
+#       return unless block_name.present? && @most_recent_loaded_filename != @delegate_object[:filename]
+
+#       block = HashDelegator.block_find(all_blocks, :oname, block_name)
+#       return unless block
+
+#       if block.fetch(:shell, '') != BlockType::LINK
+#         HashDelegator.error_handler('must be Link block type', { abort: true })
+
+#       else
+#         # debounce_reset
+#         push_link_history_and_trigger_load(
+#           link_block_body: block.fetch(:body, ''),
+#           mdoc: mdoc,
+#           selected: block,
+#           link_state: link_state,
+#           block_source: block_source
+#         )
+#       end
+#     end
+
     # Loads auto blocks based on delegate object settings and updates if new filename is detected.
     # Executes a specified block once per filename.
     # @param all_blocks [Array] Array of all block elements.
     # @return [Boolean, nil] True if values were modified, nil otherwise.
-    def load_auto_blocks(all_blocks)
+    def load_auto_opts_block(all_blocks)
       block_name = @delegate_object[:document_load_opts_block_name]
       return unless block_name.present? && @most_recent_loaded_filename != @delegate_object[:filename]
 
@@ -1354,7 +1393,8 @@ module MarkdownExec
 
       # recreate menu with new options
       #
-      all_blocks, mdoc = mdoc_and_blocks_from_nested_files if load_auto_blocks(all_blocks)
+      all_blocks, mdoc = mdoc_and_blocks_from_nested_files if load_auto_opts_block(all_blocks)
+      # load_auto_link_block(all_blocks, link_state, mdoc, block_source: {})
 
       menu_blocks = mdoc.fcbs_per_options(@delegate_object)
       add_menu_chrome_blocks!(menu_blocks: menu_blocks, link_state: link_state)
@@ -1756,18 +1796,6 @@ module MarkdownExec
       end
     end
 
-    # Determines if a given path is absolute or substitutes a placeholder in an expression with the path.
-    # @param path [String] The input path to check or fill in.
-    # @param expression [String] The expression where a wildcard '*' is replaced by the path if it's not absolute.
-    # @return [String] The absolute path or the expression with the wildcard replaced by the path.
-    def resolve_path_or_substitute(path, expression)
-      if path.include?('/')
-        path
-      else
-        expression.gsub('*', path)
-      end
-    end
-
     def runtime_exception(exception_sym, name, items)
       if @delegate_object[exception_sym] != 0
         data = { name: name, detail: items.join(', ') }
@@ -1841,12 +1869,20 @@ module MarkdownExec
           @delegate_object[:block_name] = nil
 
         when :user_choice
-          # puts "? - Select a block to execute (or type #{$texit} to exit):"
-          break if ii_user_choice == :break # into @dml_block_state
-          break if @dml_block_state.block.nil? # no block matched
-
+          if @dml_link_state.block_name.present?
+            # @prior_block_was_link = true
+            @dml_block_state.block = @dml_blocks_in_file.find do |item|
+              item[:oname] == @dml_link_state.block_name
+            end
+            @dml_link_state.block_name = nil
+          else
+            # puts "? - Select a block to execute (or type #{$texit} to exit):"
+            break if ii_user_choice == :break # into @dml_block_state
+            break if @dml_block_state.block.nil? # no block matched
+          end
           # puts "! - Executing block: #{data}"
-          @dml_block_state.block[:oname]
+          # @dml_block_state.block[:oname]
+          @dml_block_state.block&.fetch(:oname, nil)
 
         when :execute_block
           block_name = data
@@ -1888,13 +1924,12 @@ module MarkdownExec
 
               ## order of block name processing: link block, cli, from user
               #
-              @cli_block_name = block_name
               @dml_link_state.block_name, @run_state.block_name_from_cli, cli_break = \
                 HashDelegator.next_link_state(
-                  block_name_from_cli: !@dml_link_state.block_name,
-                  was_using_cli: @dml_now_using_cli,
+                  block_name: @dml_link_state.block_name,
+                  block_name_from_cli: !@dml_link_state.block_name.present?,
                   block_state: @dml_block_state,
-                  block_name: @dml_link_state.block_name
+                  was_using_cli: @dml_now_using_cli
                 )
 
               if !@dml_block_state.block[:block_name_from_ui] && cli_break
@@ -2282,7 +2317,12 @@ module MarkdownExec
                          @delegate_object
                        end
 
-      selection_opts.merge!(per_page: @delegate_object[:select_page_height])
+      sph = @delegate_object[:select_page_height]
+      unless sph.positive?
+        require 'io/console'
+        sph = [IO.console.winsize[0] - 3, 4].max
+      end
+      selection_opts.merge!(per_page: sph)
 
       selected_option = select_option_with_metadata(prompt_title, block_menu,
                                                     selection_opts)
@@ -2331,13 +2371,63 @@ module MarkdownExec
       if save_expr.present?
         save_filespec = save_filespec_from_expression(save_expr)
         File.write(save_filespec, HashDelegator.join_code_lines(link_state&.inherited_lines))
-        # TTY::File.create_file save_filespec, HahDelegator.join_code_lines(link_state&.inherited_lines), force: true
         @delegate_object[:filename]
       else
         link_block_data[LinkKeys::File] || @delegate_object[:filename]
       end
     end
   end
+
+  class HashDelegator < HashDelegatorParent
+    # Cleans a value, handling both Hash and Struct types.
+    # For Structs, the cleaned version is converted to a hash.
+    def self.clean_value(value)
+      case value
+      when Hash
+        clean_hash_recursively(value)
+      when Struct
+        struct_hash = value.to_h # Convert the Struct to a hash
+        cleaned_hash = clean_hash_recursively(struct_hash) # Clean the hash
+        # Return the cleaned hash instead of updating the Struct
+        return cleaned_hash
+      else
+        value
+      end
+    end
+
+    # Recursively cleans the given object (hash or struct) from unwanted values.
+    def self.clean_hash_recursively(obj)
+      obj.each do |key, value|
+        cleaned_value = clean_value(value) # Clean and possibly convert value
+        obj[key] = cleaned_value if value.is_a?(Hash) || value.is_a?(Struct)
+      end
+
+      if obj.is_a?(Hash)
+        obj.select! { |key, value| ![nil, '', [], {}, nil].include?(value) }
+      end
+
+      obj
+    end
+
+    def self.next_link_state(*args, **kwargs, &block)
+      super
+      # result = super
+
+      # @logger ||= StdOutErrLogger.new
+      # @logger.unknown(
+      #   HashDelegator.clean_hash_recursively(
+      #     { "HashDelegator.next_link_state":
+      #         { 'args': args,
+      #           'at': Time.now.strftime('%FT%TZ'),
+      #           'for': /[^\/]+:\d+/.match(caller.first)[0],
+      #           'kwargs': kwargs,
+      #           'return': result } }
+      #   )
+      # )
+
+      # result
+    end
+  end
 end
 
 return if $PROGRAM_NAME != __FILE__
@@ -2348,12 +2438,20 @@ Bundler.require(:default)
 require 'minitest/autorun'
 require 'mocha/minitest'
 
-####
-require_relative 'instance_method_wrapper'
-# MarkdownExec::HashDelegator.prepend(InstanceMethodWrapper)
-# MarkdownExec::HashDelegator.singleton_class.prepend(ClassMethodWrapper)
+require_relative 'std_out_err_logger'
 
 module MarkdownExec
+  class TestHashDelegator0 < Minitest::Test
+    def setup
+      @hd = HashDelegator.new
+    end
+
+    # Test case for empty body
+    def test_next_link_state
+      @hd.next_link_state(block_name_from_cli: nil, was_using_cli: nil, block_state: nil, block_name: nil)
+    end
+  end
+
   class TestHashDelegator < Minitest::Test
     def setup
       @hd = HashDelegator.new
@@ -3194,29 +3292,33 @@ module MarkdownExec
     end
   end
 
-  def test_resolves_absolute_path
-    absolute_path = '/usr/local/bin'
-    assert_equal '/usr/local/bin', resolve_path_or_substitute(absolute_path, 'prefix/*/suffix')
-  end
+  class PathUtilsTest < Minitest::Test
+    def test_absolute_path_returns_unchanged
+      absolute_path = "/usr/local/bin"
+      expression = "path/to/*/directory"
+      assert_equal absolute_path, PathUtils.resolve_path_or_substitute(absolute_path, expression)
+    end
 
-  def test_substitutes_wildcard_with_path
-    path = 'bin'
-    expression = 'prefix/*/suffix'
-    expected_result = 'prefix/bin/suffix'
-    assert_equal expected_result, resolve_path_or_substitute(path, expression)
-  end
+    def test_relative_path_gets_substituted
+      relative_path = "my_folder"
+      expression = "path/to/*/directory"
+      expected_output = "path/to/my_folder/directory"
+      assert_equal expected_output, PathUtils.resolve_path_or_substitute(relative_path, expression)
+    end
 
-  def test_handles_path_with_no_separator_as_is
-    path = 'bin'
-    expression = 'prefix*suffix'
-    expected_result = 'prefixbinsuffix'
-    assert_equal expected_result, resolve_path_or_substitute(path, expression)
-  end
+    def test_path_with_no_slash_substitutes_correctly
+      relative_path = "data"
+      expression = "path/to/*/directory"
+      expected_output = "path/to/data/directory"
+      assert_equal expected_output, PathUtils.resolve_path_or_substitute(relative_path, expression)
+    end
 
-  def test_returns_expression_unchanged_for_empty_path
-    path = ''
-    expression = 'prefix/*/suffix'
-    expected_result = 'prefix/*/suffix'
-    assert_equal expected_result, resolve_path_or_substitute(path, expression)
+    def test_empty_path_substitution
+      empty_path = ""
+      expression = "path/to/*/directory"
+      expected_output = "path/to//directory"
+      assert_equal expected_output, PathUtils.resolve_path_or_substitute(empty_path, expression)
+    end
   end
+
 end # module MarkdownExec

data/lib/input_sequencer.rb

@@ -34,7 +34,8 @@ class InputSequencer
       prior_block_was_link: next_state.prior_block_was_link.nil? ? current.prior_block_was_link : next_state.prior_block_was_link
     )
   rescue
-    binding.irb
+    pp $!, $@
+    exit 1
   end
 
   # Generates the next menu state based on provided attributes.
@@ -75,11 +76,14 @@ class InputSequencer
 
       if now_menu.display_menu
         exit_when_bq_empty = false
-
         run_yield :display_menu, &block
 
         choice = run_yield :user_choice, &block
 
+        if choice.nil?
+          raise "Block not recognized."
+          break
+        end
         break if run_yield(:exit?, choice&.downcase, &block) # Exit loop and method to terminate the app
 
         next_state = run_yield :execute_block, choice, &block
@@ -115,7 +119,8 @@ class InputSequencer
       now_menu = InputSequencer.merge_link_state(now_menu, next_menu)
     end
   rescue
-    binding.irb
+    pp $!, $@
+    exit 1
   end
 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 = '2.0.2'
+  VERSION = '2.0.3.1'
 end

data/lib/markdown_exec.rb

@@ -10,7 +10,6 @@ require 'open3'
 require 'optparse'
 require 'shellwords'
 require 'tmpdir'
-# require 'tty-file'
 require 'tty-prompt'
 require 'yaml'
 

data/lib/menu.src.yml

@@ -99,6 +99,12 @@
   :opt_name: display_level_xbase_prefix
   :procname: val_as_str
 
+# - :default: "(document_link)"
+#   :description: Name of Link block to load with the document
+#   :env_var: MDE_DOCUMENT_LOAD_LINK_BLOCK_NAME
+#   :opt_name: document_load_link_block_name
+#   :procname: val_as_str
+
 - :default: "(document_options)"
   :description: Name of Opts block to load with the document
   :env_var: MDE_DOCUMENT_LOAD_OPTS_BLOCK_NAME
@@ -108,7 +114,6 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump @delegate_object
-  :env_var: MDE_DUMP_DELEGATE_OBJECT
   :long_name: dump-dump-delegate-object
   :opt_name: dump_delegate_object
   :procname: val_as_bool
@@ -116,7 +121,6 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump BlocksInFile (stage 1)
-  :env_var: MDE_DUMP_BLOCKS_IN_FILE
   :long_name: dump-blocks-in-file
   :opt_name: dump_blocks_in_file
   :procname: val_as_bool
@@ -124,7 +128,6 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited block_names
-  :env_var: MDE_DUMP_INHERITED_BLOCK_NAMES
   :long_name: dump-dump-inherited-block_names
   :opt_name: dump_inherited_block_names
   :procname: val_as_bool
@@ -132,7 +135,6 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited dependencies
-  :env_var: MDE_DUMP_INHERITED_DEPENDENCIES
   :long_name: dump-dump-inherited-dependencies
   :opt_name: dump_inherited_dependencies
   :procname: val_as_bool
@@ -140,7 +142,6 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited lines
-  :env_var: MDE_DUMP_INHERITED_LINES
   :long_name: dump-dump-inherited-lines
   :opt_name: dump_inherited_lines
   :procname: val_as_bool
@@ -148,7 +149,6 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump MenuBlocks (stage 2)
-  :env_var: MDE_DUMP_MENU_BLOCKS
   :long_name: dump-menu-blocks
   :opt_name: dump_menu_blocks
   :procname: val_as_bool
@@ -156,7 +156,6 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump selected block
-  :env_var: MDE_DUMP_SELECTED_BLOCK
   :long_name: dump-selected-block
   :opt_name: dump_selected_block
   :procname: val_as_bool
@@ -206,35 +205,30 @@
   :opt_name: exclude_expect_blocks
   :procname: val_as_bool
 
+# - :default: >
+#   osascript scripts/applescript/mde.applescript "%{batch_index}" "%{home}" " %{started_at} - %{document_filename} - %{block_name} " "%{script_filespec}" "%{output_filespec}"
 - :default: >
     osascript -e '
-        tell application "iTerm"
-            tell application "System Events"
-                tell application "Finder"
-                    set {posx, posy, screenWidth, screenHeight} to bounds of window of desktop
-                end tell
-                tell application process "Finder"
-                    set {missing value, menubarHeight} to the size of menu bar 1
-                end tell
-            end tell
-
-            set winHeight to (screenHeight * 2 / 3)
-            set winWidth to (screenWidth * 2 / 3)
-            set xoff to menubarHeight * %{batch_index}
-            set yoff to xoff mod (screenHeight - winHeight)
-            
-            create window with default profile
-            tell the first window
-                set bounds to {xoff, yoff, xoff + winWidth, yoff + winHeight}
-                tell the current session
-                    write text "s=\"%{script_filespec}\""
-                    write text "o=\"%{output_filespec}\""
-                    write text "cd \"%{home}\""
-                    write text "echo -ne \"\\033]; %{started_at} - %{document_filename} - %{block_name} \\007\""
-                    write text "\"$s\" | tee -a \"$o\""
-                end tell
-            end tell
-        end tell'
+      on run argv
+          set batch_index to "%{batch_index}"
+          set home to "%{home}"
+          set output_filespec to "%{output_filespec}"
+          set script_filespec to "%{script_filespec}"
+          set title to " %{started_at} - %{document_filename} - %{block_name} "
+
+          tell application "iTerm"
+              create window with default profile
+              tell the first window
+                  tell the current session
+                      write text "s=" & quoted form of script_filespec & ""
+                      write text "o=" & quoted form of output_filespec & ""
+                      write text "cd " & quoted form of home & ""
+                      write text "echo -ne \"\\033]; " & title & " \\007\""
+                      write text "\"$s\" 2>&1 | tee -a \"$o\""
+                  end tell
+              end tell
+          end tell
+      end run'
   :description: execute_command_format
   :env_var: MDE_EXECUTE_COMMAND_FORMAT
   :opt_name: execute_command_format
@@ -247,7 +241,7 @@
   :procname: val_as_str
 
 - :arg_name: BOOL
-  :default: true
+  :default: false
   :description: Execute script in own window
   :env_var: MDE_EXECUTE_IN_OWN_WINDOW
   :opt_name: execute_in_own_window
@@ -301,7 +295,7 @@
 
 - :arg_name: FIND
   :default: ''
-  :description: Find in documents
+  :description: Find argument in documents
   :long_name: find
   :procname: find
   :short_name: "?"
@@ -1056,8 +1050,8 @@
   :opt_name: select_by_shell_regex
   :procname: val_as_str
 
-- :default: 36
-  :description: 'Maximum # of rows in select list'
+- :default: 0
+  :description: 'Maximum # of rows in select list. Detects current limit if not specified.'
   :env_var: MDE_SELECT_PAGE_HEIGHT
   :opt_name: select_page_height
   :procname: val_as_int

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (2.0.2)
+# MDE - Markdown Executor (2.0.3.1)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -91,49 +91,42 @@
 - :arg_name: BOOL
   :default: false
   :description: Dump @delegate_object
-  :env_var: MDE_DUMP_DELEGATE_OBJECT
   :long_name: dump-dump-delegate-object
   :opt_name: dump_delegate_object
   :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump BlocksInFile (stage 1)
-  :env_var: MDE_DUMP_BLOCKS_IN_FILE
   :long_name: dump-blocks-in-file
   :opt_name: dump_blocks_in_file
   :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited block_names
-  :env_var: MDE_DUMP_INHERITED_BLOCK_NAMES
   :long_name: dump-dump-inherited-block_names
   :opt_name: dump_inherited_block_names
   :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited dependencies
-  :env_var: MDE_DUMP_INHERITED_DEPENDENCIES
   :long_name: dump-dump-inherited-dependencies
   :opt_name: dump_inherited_dependencies
   :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited lines
-  :env_var: MDE_DUMP_INHERITED_LINES
   :long_name: dump-dump-inherited-lines
   :opt_name: dump_inherited_lines
   :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump MenuBlocks (stage 2)
-  :env_var: MDE_DUMP_MENU_BLOCKS
   :long_name: dump-menu-blocks
   :opt_name: dump_menu_blocks
   :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump selected block
-  :env_var: MDE_DUMP_SELECTED_BLOCK
   :long_name: dump-selected-block
   :opt_name: dump_selected_block
   :procname: val_as_bool
@@ -177,21 +170,28 @@
   :env_var: MDE_EXCLUDE_EXPECT_BLOCKS
   :opt_name: exclude_expect_blocks
   :procname: val_as_bool
-- :default: "osascript -e '\n    tell application \"iTerm\"\n        tell application
-    \"System Events\"\n            tell application \"Finder\"\n                set
-    {posx, posy, screenWidth, screenHeight} to bounds of window of desktop\n            end
-    tell\n            tell application process \"Finder\"\n                set {missing
-    value, menubarHeight} to the size of menu bar 1\n            end tell\n        end
-    tell\n\n        set winHeight to (screenHeight * 2 / 3)\n        set winWidth
-    to (screenWidth * 2 / 3)\n        set xoff to menubarHeight * %{batch_index}\n
-    \       set yoff to xoff mod (screenHeight - winHeight)\n        \n        create
-    window with default profile\n        tell the first window\n            set bounds
-    to {xoff, yoff, xoff + winWidth, yoff + winHeight}\n            tell the current
-    session\n                write text \"s=\\\"%{script_filespec}\\\"\"\n                write
-    text \"o=\\\"%{output_filespec}\\\"\"\n                write text \"cd \\\"%{home}\\\"\"\n
-    \               write text \"echo -ne \\\"\\\\033]; %{started_at} - %{document_filename}
-    - %{block_name} \\\\007\\\"\"\n                write text \"\\\"$s\\\" | tee -a
-    \\\"$o\\\"\"\n            end tell\n        end tell\n    end tell'\n"
+- :default: |
+    osascript -e '
+      on run argv
+          set batch_index to "%{batch_index}"
+          set home to "%{home}"
+          set output_filespec to "%{output_filespec}"
+          set script_filespec to "%{script_filespec}"
+          set title to " %{started_at} - %{document_filename} - %{block_name} "
+
+          tell application "iTerm"
+              create window with default profile
+              tell the first window
+                  tell the current session
+                      write text "s=" & quoted form of script_filespec & ""
+                      write text "o=" & quoted form of output_filespec & ""
+                      write text "cd " & quoted form of home & ""
+                      write text "echo -ne \"\\033]; " & title & " \\007\""
+                      write text "\"$s\" 2>&1 | tee -a \"$o\""
+                  end tell
+              end tell
+          end tell
+      end run'
   :description: execute_command_format
   :env_var: MDE_EXECUTE_COMMAND_FORMAT
   :opt_name: execute_command_format
@@ -202,7 +202,7 @@
   :opt_name: execute_command_title_time_format
   :procname: val_as_str
 - :arg_name: BOOL
-  :default: true
+  :default: false
   :description: Execute script in own window
   :env_var: MDE_EXECUTE_IN_OWN_WINDOW
   :opt_name: execute_in_own_window
@@ -249,7 +249,7 @@
   :short_name: f
 - :arg_name: FIND
   :default: ''
-  :description: Find in documents
+  :description: Find argument in documents
   :long_name: find
   :procname: find
   :short_name: "?"
@@ -901,8 +901,8 @@
   :env_var: MDE_SELECT_BY_SHELL_REGEX
   :opt_name: select_by_shell_regex
   :procname: val_as_str
-- :default: 36
-  :description: 'Maximum # of rows in select list'
+- :default: 0
+  :description: 'Maximum # of rows in select list. Detects current limit if not specified.'
   :env_var: MDE_SELECT_PAGE_HEIGHT
   :opt_name: select_page_height
   :procname: val_as_int

data/lib/saved_assets.rb

@@ -19,43 +19,45 @@ module MarkdownExec
     # Generates a formatted script name based on the provided parameters.
     def self.script_name(filename:, prefix:, time:, blockname:, ftime: DEFAULT_FTIME, join_str: '_', pattern: FNR11, replace: FNR12, exts: '.sh')
       fne = filename.gsub(pattern, replace)
-      "#{[prefix, time.strftime(ftime), fne, ',', blockname].join(join_str)}#{exts}"
+      bne = blockname.gsub(pattern, replace)
+      "#{[prefix, time.strftime(ftime), fne, ',', bne].join(join_str)}#{exts}"
     end
 
     # Generates a formatted stdout name based on the provided parameters.
     def self.stdout_name(filename:, prefix:, time:, blockname:, ftime: DEFAULT_FTIME, join_str: '_', pattern: FNR11, replace: FNR12, exts: '.out.txt')
       fne = filename.gsub(pattern, replace)
-      "#{[prefix, time.strftime(ftime), fne, ',', blockname].join(join_str)}#{exts}"
+      bne = blockname.gsub(pattern, replace)
+      "#{[prefix, time.strftime(ftime), fne, ',', bne].join(join_str)}#{exts}"
     end
   end
 end
 
-if $PROGRAM_NAME == __FILE__
-  require 'minitest/autorun'
+return if $PROGRAM_NAME != __FILE__
 
-  class SavedAssetTest < Minitest::Test
-    def test_script_name
-      filename = 'sample.txt'
-      prefix = 'test'
-      time = Time.new(2023, 1, 1, 12, 0, 0) # Sample date-time for consistency in testing
-      blockname = 'block1'
+require 'minitest/autorun'
 
-      expected_name = 'test_2023-01-01-12-00-00_sample.txt_,_block1.sh'
-      assert_equal expected_name,
-                   MarkdownExec::SavedAsset.script_name(filename: filename, prefix: prefix, time: time,
-                                                        blockname: blockname)
-    end
+class SavedAssetTest < Minitest::Test
+  def test_script_name_with_special_characters_in_blockname
+    filename = 'sample.txt'
+    prefix = 'test'
+    time = Time.new(2023, 1, 1, 12, 0, 0)
+    blockname = 'block/1:2'
+
+    expected_name = 'test_2023-01-01-12-00-00_sample.txt_,_block_1_2.sh'
+    assert_equal expected_name, MarkdownExec::SavedAsset.script_name(
+      filename: filename, prefix: prefix, time: time, blockname: blockname
+    )
+  end
 
-    def test_stdout_name
-      filename = 'sample.txt'
-      prefix = 'test'
-      time = Time.new(2023, 1, 1, 12, 0, 0)
-      blockname = 'block1'
+  def test_stdout_name_with_special_characters_in_blockname
+    filename = 'sample.txt'
+    prefix = 'test'
+    time = Time.new(2023, 1, 1, 12, 0, 0)
+    blockname = 'block/1:2'
 
-      expected_name = 'test_2023-01-01-12-00-00_sample.txt_,_block1.out.txt'
-      assert_equal expected_name,
-                   MarkdownExec::SavedAsset.stdout_name(filename: filename, prefix: prefix, time: time,
-                                                        blockname: blockname)
-    end
+    expected_name = 'test_2023-01-01-12-00-00_sample.txt_,_block_1_2.out.txt'
+    assert_equal expected_name, MarkdownExec::SavedAsset.stdout_name(
+      filename: filename, prefix: prefix, time: time, blockname: blockname
+    )
   end
 end

data/lib/std_out_err_logger.rb

@@ -0,0 +1,121 @@
+#!/usr/bin/env -S bundle exec ruby
+# frozen_string_literal: true
+
+# encoding=utf-8
+require 'logger'
+
+# Logger::LogDevice is used by Logger, the parent class of StdOutErrLogger
+class Logger::LogDevice
+  # remove header
+  def add_log_header(file); end
+end
+
+# Custom logger to direct info to stdout and warn and above to stderr
+#
+class StdOutErrLogger < Logger
+  attr_reader :file
+
+  # def initialize(file = nil)
+  def initialize(file = "#{__dir__}/../tmp/hash_delegator_next_link_state.yaml")
+    @file = file
+    super(file || STDOUT)
+    self.formatter = proc do |severity, datetime, progname, msg|
+      "#{msg}\n"
+    end
+  end
+
+  def add(severity, message = nil, progname = nil, &block)
+    message = (message || block&.call || progname) if message.nil?
+    message = "- #{message.to_json}\n"
+    ### message = message.join("\n") if message.is_a? Array
+    out = format_message(format_severity(severity), Time.now, progname, message)
+    if severity == Logger::UNKNOWN # does not follow spec, outputs to stderr for IO
+      # $stderr.puts(out)
+      super
+    elsif severity >= Logger::WARN
+      if @file
+        super
+      else
+        $stderr.puts(out)
+      end
+    else
+      if @file
+        super
+      else
+        $stdout.puts(out)
+      end
+    end
+  end
+end
+
+return if $PROGRAM_NAME != __FILE__
+
+require 'minitest/autorun'
+
+class StdOutErrLoggerTest < Minitest::Test
+  # Redirect STDOUT and STDERR to capture them for assertions
+  def setup
+    @original_stdout = $stdout
+    @original_stderr = $stderr
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+  end
+
+  def teardown
+    $stdout = @original_stdout
+    $stderr = @original_stderr
+  end
+
+  def test_initialize_without_file
+    logger = StdOutErrLogger.new
+    assert_nil logger.file
+    assert_equal Logger::DEBUG, logger.level
+  end
+
+  def test_initialize_with_file
+    Tempfile.open do |file|
+      logger = StdOutErrLogger.new(file.path)
+      assert_equal file.path, logger.file
+    end
+  end
+
+  def test_logging_info
+    logger = StdOutErrLogger.new
+    logger.info("Info message")
+    assert_equal "Info message\n", $stdout.string
+    assert_empty $stderr.string
+  end
+
+  def test_logging_warning
+    logger = StdOutErrLogger.new
+    logger.warn("Warning message")
+    assert_empty $stdout.string
+    assert_equal "Warning message\n", $stderr.string
+  end
+
+  def test_logging_error
+    logger = StdOutErrLogger.new
+    logger.error("Error message")
+    assert_empty $stdout.string
+    assert_equal "Error message\n", $stderr.string
+  end
+
+  def test_logging_with_array
+    logger = StdOutErrLogger.new
+    logger.info(["Message line 1", "Message line 2"])
+    assert_equal "Message line 1\nMessage line 2\n", $stdout.string
+  end
+
+  def test_logging_with_block
+    logger = StdOutErrLogger.new
+    logger.info { "Block message" }
+    assert_equal "Block message\n", $stdout.string
+  end
+
+  def test_logging_unknown_severity
+    logger = StdOutErrLogger.new
+    logger.add(Logger::UNKNOWN, "Unknown severity message")
+    assert_empty $stdout.string
+    assert_equal "Unknown severity message\n", $stderr.string
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3.1
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-09 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -169,6 +169,7 @@ files:
 - lib/saved_assets.rb
 - lib/saved_files_matcher.rb
 - lib/shared.rb
+- lib/std_out_err_logger.rb
 - lib/string_util.rb
 - lib/tap.rb
 homepage: https://rubygems.org/gems/markdown_exec