markdown_exec 2.2.0 → 2.4.0

data/lib/namer.rb

@@ -3,7 +3,6 @@
 
 # encoding=utf-8
 require 'digest'
-# require_relative 'poly'
 
 $pd = false unless defined?($pd)
 
@@ -11,7 +10,9 @@ 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).tap { |ret|
+      pp [__LINE__, 'Hash.pub_name() ->', ret] if $pd
+    }
   end
 end
 
@@ -36,15 +37,8 @@ class String
                 self
               end
 
-    trimmed.gsub(pattern, replacement).tap { |ret| pp [__LINE__, 'String.pub_name() ->', ret] if $pd }
+    trimmed.gsub(pattern, replacement).tap { |ret|
+      pp [__LINE__, 'String.pub_name() ->', ret] if $pd
+    }
   end
 end
-
-# require 'ostruct'
-
-# class BlkS < OpenStruct
-#   # Method to fetch the value associated with the attribute :nickname or :oname
-#   def pub_name
-#     self.nickname || self.oname
-#   end
-# end

data/lib/object_present.rb

@@ -43,7 +43,7 @@ class Object
       when 'FalseClass', 'TrueClass'
         true
       else
-        self && (!respond_to?(:present?) || !present?)
+        self && (!respond_to?(:empty?) || !empty?)
       end
     end
   end

data/lib/option_value.rb

@@ -16,7 +16,7 @@ module MarkdownExec
       return default if value.nil?
 
       case value
-      when String, Integer
+      when String, Integer, Array, Hash
         value
       when TrueClass, FalseClass
         value ? true : false
@@ -64,8 +64,12 @@ if $PROGRAM_NAME == __FILE__
       assert_equal false, MarkdownExec::OptionValue.for_hash(false)
     end
 
-    def test_for_hash_with_empty_value
-      assert_equal 'default', MarkdownExec::OptionValue.for_hash([], 'default')
+    def test_for_hash_with_empty_array
+      assert_equal [], MarkdownExec::OptionValue.for_hash([], 'default')
+    end
+
+    def test_for_hash_with_empty_hash
+      assert_equal({}, MarkdownExec::OptionValue.for_hash({}, 'default'))
     end
 
     def test_for_yaml_with_string

data/lib/poly.rb

@@ -8,7 +8,9 @@ $pd = false
 class Poly
   # attr_reader :table
   def initialize(table = {})
-    @table = table.tap{|ret| pp [__LINE__,'Poly.initialize()','table',table.to_yaml] if $pd }
+    @table = table.tap { |ret|
+      pp [__LINE__, 'Poly.initialize()', 'table', table.to_yaml] if $pd
+    }
   end
 
   def fetch(key, *args)
@@ -20,16 +22,21 @@ class Poly
     elsif block_given?
       yield key_sym
     elsif args.count.positive?
-# binding.irb
+      # binding.irb
       args.first
     else
-binding.irb
+      binding.irb
       raise KeyError, "key not found: #{key}"
-    end.tap{|ret| pp([__LINE__,"Poly.fetch #{key} #{args}",'->',ret]) if $pd }
+    end.tap { |ret|
+      pp([__LINE__, "Poly.fetch #{key} #{args}", '->',
+          ret]) if $pd
+    }
   end
 
   def key?(name)
-    @table.key?(name.to_sym).tap{|ret| pp([__LINE__,"Poly.key? #{name}",'->',ret]) if $pd }
+    @table.key?(name.to_sym).tap { |ret|
+      pp([__LINE__, "Poly.key? #{name}", '->', ret]) if $pd
+    }
   end
 
   def method_missing(name, *args)
@@ -55,12 +62,17 @@ binding.irb
     else
       pt = 'table read'
       @table[name.to_sym]
-    end.tap{|ret| pp([__LINE__,"Poly.method_missing #{name} #{args.map(&:to_s).join(' ')}",pt,'->',ret]) if $pd }
+    end.tap { |ret|
+      pp([__LINE__,
+          "Poly.method_missing #{name} #{args.map(&:to_s).join(' ')}", pt, '->', ret]) if $pd
+    }
   end
 
   def respond_to_missing?(name, include_private = false)
     # name.to_s.end_with?('=') || @table.key?(name.to_sym) || @table.respond_to?(name) || super
-    (name.to_s.end_with?('=') || @table.key?(name.to_sym) || @table.respond_to?(name) || super).tap{|ret| pp([__LINE__,"Poly.respond_to_missing? #{name}",'->',ret]) if $pd }
+    (name.to_s.end_with?('=') || @table.key?(name.to_sym) || @table.respond_to?(name) || super).tap { |ret|
+      pp([__LINE__, "Poly.respond_to_missing? #{name}", '->', ret]) if $pd
+    }
   end
 
   def [](key)
@@ -68,7 +80,7 @@ binding.irb
       send("get_#{key}")
     else
       @table[key.to_sym]
-    end.tap{|ret| pp([__LINE__,"Poly.[] #{key}",'->',ret]) if $pd }
+    end.tap { |ret| pp([__LINE__, "Poly.[] #{key}", '->', ret]) if $pd }
   end
 
   def []=(key, value)
@@ -76,7 +88,10 @@ binding.irb
       send("set_#{key}", value)
     else
       @table[key.to_sym] = value
-    end.tap{|ret| pp([__LINE__,"Poly.[]= #{key} #{value}",'->',ret]) if $pd }
+    end.tap { |ret|
+      pp([__LINE__, "Poly.[]= #{key} #{value}", '->',
+          ret]) if $pd
+    }
   end
 
   # for export to Prompt library
@@ -84,18 +99,22 @@ binding.irb
   #   Proc.new { |x| @table.merge x }
   # end
   def merge(*args)
-# pp caller
-# binding.irb
-    @table.merge(*args).tap{|ret| pp([__LINE__,"Poly.merge",'->',ret]) if $pd }
+    # pp caller
+    # binding.irb
+    @table.merge(*args).tap { |ret|
+      pp([__LINE__, "Poly.merge", '->', ret]) if $pd
+    }
   end
 
   # for export to Prompt library
   def to_h
-    @table.tap{|ret| pp([__LINE__,"Poly.to_h",'->',ret]) if $pd }
+    @table.tap { |ret| pp([__LINE__, "Poly.to_h", '->', ret]) if $pd }
   end
 
   def to_yaml
-    @table.to_yaml.tap{|ret| pp([__LINE__,"Poly.to_yaml",'->',ret]) if $pd }
+    @table.to_yaml.tap { |ret|
+      pp([__LINE__, "Poly.to_yaml", '->', ret]) if $pd
+    }
   end
 end
 

data/lib/resize_terminal.rb

@@ -10,60 +10,66 @@ require 'timeout'
 # If so, it sends escape sequences to query the terminal size and reads the response.
 # It then compares the current terminal size with the calculated size and adjusts if necessary.
 # If the terminal emulator is unsupported, it prints an error message.
-def resize_terminal(show_dims: false, show_rectangle: false)
+# 2024-8-23 add require_stdout to allow for testing
+def resize_terminal(show_dims: false, show_rectangle: false,
+                    require_stdout: true)
   # Check if running in an interactive terminal and no arguments are provided
-  if $stdin.tty?
-    begin
-      # Save the current state and send the escape sequence to get the cursor position
-      print "\e7\e[r\e[999;999H\e[6n\e8"
-      $stdout.flush
-
-      # Read the response from the terminal
-      response = String.new
-      Timeout.timeout(5) do
-        loop do
-          char = $stdin.getch
-          response << char
-          break if response.include?('R')
-        end
-      end
+  unless $stdin.tty?
+    warn 'Usage: resize_terminal'
+    return
+  end
 
-      if response.empty?
-        warn "Error: No response received from terminal. Response: #{response.inspect}"
-        return 1
-      end
+  return if require_stdout && !$stdout.tty?
 
-      # Match the response to extract the terminal dimensions
-      match_data = response.match(/\[(\d+);(\d+)R/)
-      unless match_data
-        warn "Error: Failed to match terminal response pattern. Response: #{response.inspect}"
-        return 1
-      end
+  # Save the current state and send the escape sequence to get the cursor position
+  print "\e7\e[r\e[999;999H\e[6n\e8"
+  $stdout.flush
+
+  # Read the response from the terminal
+  response = String.new
+  Timeout.timeout(5) do
+    loop do
+      char = $stdin.getch
+      response << char
+      break if response.include?('R')
+    end
+  end
 
-      calculated_rows, calculated_columns = match_data.captures.map(&:to_i)
+  if response.empty?
+    warn "Error: No response received from terminal. Response: #{response.inspect}"
+    return 1
+  end
 
-      if ENV['COLUMNS'].to_i == calculated_columns && ENV['LINES'].to_i == calculated_rows
-        puts "#{ENV.fetch('TERM', nil)} #{calculated_columns}x#{calculated_rows}"
-      elsif calculated_columns.positive? && calculated_rows.positive?
-        warn "#{ENV.fetch('COLUMNS', nil)}x#{ENV.fetch('LINES', nil)} -> #{calculated_columns}x#{calculated_rows}" if show_dims
-        system("stty cols #{calculated_columns} rows #{calculated_rows}")
-      else
-        warn "Error: Calculated terminal size is invalid. Columns: #{calculated_columns}, Rows: #{calculated_rows}"
-        return 1
-      end
+  # Match the response to extract the terminal dimensions
+  match_data = response.match(/\[(\d+);(\d+)R/)
+  unless match_data
+    warn "Error: Failed to match terminal response pattern. Response: #{response.inspect}"
+    return 1
+  end
 
-      # Display a text rectangle if the option is enabled
-      display_terminal_rectangle(calculated_columns, calculated_rows) if show_rectangle
-    rescue Timeout::Error
-      warn 'Error: Timeout while reading terminal response. Unsupported terminal emulator.'
-      1
-    rescue StandardError => err
-      warn "Error: #{err.message}. Unsupported terminal emulator."
-      1
-    end
+  calculated_rows, calculated_columns = match_data.captures.map(&:to_i)
+
+  if ENV['COLUMNS'].to_i == calculated_columns && ENV['LINES'].to_i == calculated_rows
+    puts "#{ENV.fetch('TERM', nil)} #{calculated_columns}x#{calculated_rows}"
+  elsif calculated_columns.positive? && calculated_rows.positive?
+    warn "#{ENV.fetch('COLUMNS',
+                      nil)}x#{ENV.fetch('LINES',
+                                        nil)} -> #{calculated_columns}x#{calculated_rows}" if show_dims
+    system("stty cols #{calculated_columns} rows #{calculated_rows}")
   else
-    warn 'Usage: resize_terminal'
+    warn "Error: Calculated terminal size is invalid. Columns: #{calculated_columns}, Rows: #{calculated_rows}"
+    return 1
   end
+
+  # Display a text rectangle if the option is enabled
+  display_terminal_rectangle(calculated_columns,
+                             calculated_rows) if show_rectangle
+rescue Timeout::Error
+  warn 'Error: Timeout while reading terminal response. Unsupported terminal emulator.'
+  1
+rescue StandardError => err
+  warn "Error: #{err.message}. Unsupported terminal emulator."
+  1
 end
 
 # This function draws a rectangle of the given width and height
@@ -119,7 +125,7 @@ class ResizeTerminalTest < Minitest::Test
       $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
-          resize_terminal
+          resize_terminal(require_stdout: false)
         end
       end
     end
@@ -131,8 +137,9 @@ class ResizeTerminalTest < Minitest::Test
       ARGV.replace([])
       $stdin.stub(:getch, -> { '' }) do
         # assert_output(nil, /Error: No response received from terminal/) do
-        assert_output(nil, "Error: Timeout while reading terminal response. Unsupported terminal emulator.\n") do
-          assert_equal 1, resize_terminal
+        assert_output(nil,
+                      "Error: Timeout while reading terminal response. Unsupported terminal emulator.\n") do
+          assert_equal 1, resize_terminal(require_stdout: false)
         end
       end
     end
@@ -144,8 +151,9 @@ class ResizeTerminalTest < Minitest::Test
       ARGV.replace([])
       response = "\e[999;999H\e[6n\e[InvalidResponse".dup
       $stdin.stub(:getch, -> { response.slice!(0) || '' }) do
-        assert_output(nil, /Error: Failed to match terminal response pattern/) do
-          assert_equal 1, resize_terminal
+        assert_output(nil,
+                      /Error: Failed to match terminal response pattern/) do
+          assert_equal 1, resize_terminal(require_stdout: false)
         end
       end
     end
@@ -157,7 +165,7 @@ class ResizeTerminalTest < Minitest::Test
       ARGV.replace([])
       Timeout.stub(:timeout, ->(_) { raise Timeout::Error }) do
         assert_output(nil, /Error: Timeout while reading terminal response/) do
-          assert_equal 1, resize_terminal
+          assert_equal 1, resize_terminal(require_stdout: false)
         end
       end
     end

data/lib/saved_assets.rb

@@ -3,6 +3,7 @@
 
 # encoding=utf-8
 require_relative 'namer'
+require_relative 'object_present'
 
 module MarkdownExec
   # SavedAsset
@@ -25,16 +26,15 @@ module MarkdownExec
     # @param ftime [String] the time format (default: DEFAULT_FTIME)
     # @param exts [String] the extension to append (default: '.sh')
     def initialize(
-      saved_asset_format:, filename: nil, prefix: nil, time: nil, blockname: nil,
-      ftime: DEFAULT_FTIME, exts: nil,
-      mark: nil, join_str: nil
+      saved_asset_format:, blockname: nil, exts: nil,
+      filename: nil, ftime: DEFAULT_FTIME, join_str: nil,
+      mark: nil, prefix: nil, time: nil
     )
-      @filename = filename ? filename.pub_name : '*' # [String] the name of the file
-      @prefix = prefix || '*' # [String] the prefix to use
-      @time = time ? time.strftime(ftime) : '*' # [Time] the time object for formatting
-      @blockname = blockname ? blockname.pub_name : '*' # [String] the block name to include
-      # @ftime = ftime # [String] the time format (default: DEFAULT_FTIME)
-      @exts = exts || '.*' # [String] the extension to append (default: '.sh')
+      @filename = filename.present? ? filename.pub_name : '*'
+      @prefix = prefix || '*'
+      @time = time ? time.strftime(ftime) : '*'
+      @blockname = blockname ? blockname.pub_name : '*'
+      @exts = exts || '.*'
       @mark = mark || MARK_STR
       @join_str = join_str || JOIN_STR
       @saved_asset_format = saved_asset_format
@@ -64,6 +64,9 @@ return if $PROGRAM_NAME != __FILE__
 
 require 'minitest/autorun'
 
+SAVED_ASSET_FORMAT = '%{prefix}%{join}%{time}%{join}%{filename}%{join}' \
+                     '%{mark}%{join}%{blockname}%{join}%{exts}'
+
 class SavedAssetTest < Minitest::Test
   def test_script_name_with_special_characters_in_blockname
     filename = 'sample.txt'
@@ -71,10 +74,11 @@ class SavedAssetTest < Minitest::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
-    )
+    expected_name = 'test_2023-01-01-12-00-00_sample_txt_~_block_1_2_.*'
+    assert_equal expected_name, MarkdownExec::SavedAsset.new(
+      blockname: blockname, filename: filename, prefix: prefix,
+      saved_asset_format: SAVED_ASSET_FORMAT, time: time
+    ).generate_name
   end
 
   def test_stdout_name_with_special_characters_in_blockname
@@ -83,10 +87,11 @@ class SavedAssetTest < Minitest::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.out.txt'
-    assert_equal expected_name, MarkdownExec::SavedAsset.stdout_name(
+    expected_name = 'test_2023-01-01-12-00-00_sample_txt_~_block_1_2_.*'
+    assert_equal expected_name, MarkdownExec::SavedAsset.new(
+      saved_asset_format: SAVED_ASSET_FORMAT,
       filename: filename, prefix: prefix, time: time, blockname: blockname
-    )
+    ).generate_name
   end
 
   def test_wildcard_name_with_all_parameters
@@ -94,11 +99,12 @@ class SavedAssetTest < Minitest::Test
     prefix = 'test'
     time = Time.new(2023, 1, 1, 12, 0, 0)
     blockname = 'block/1:2'
-    expected_wildcard = 'test_2023-01-01-12-00-00_sample_txt_,_block_1_2.sh'
+    expected_wildcard = 'test_2023-01-01-12-00-00_sample_txt_~_block_1_2_.*'
 
-    assert_equal expected_wildcard, MarkdownExec::SavedAsset.wildcard_name(
+    assert_equal expected_wildcard, MarkdownExec::SavedAsset.new(
+      saved_asset_format: SAVED_ASSET_FORMAT,
       filename: filename, prefix: prefix, time: time, blockname: blockname
-    )
+    ).generate_name
   end
 
   def test_wildcard_name_with_missing_time
@@ -106,11 +112,12 @@ class SavedAssetTest < Minitest::Test
     prefix = 'test'
     time = nil
     blockname = 'block/1:2'
-    expected_wildcard = 'test_*_sample_txt_,_block_1_2.sh'
+    expected_wildcard = 'test_*_sample_txt_~_block_1_2_.*'
 
-    assert_equal expected_wildcard, MarkdownExec::SavedAsset.wildcard_name(
+    assert_equal expected_wildcard, MarkdownExec::SavedAsset.new(
+      saved_asset_format: SAVED_ASSET_FORMAT,
       filename: filename, prefix: prefix, time: time, blockname: blockname
-    )
+    ).generate_name
   end
 
   def test_wildcard_name_with_missing_filename
@@ -118,11 +125,12 @@ class SavedAssetTest < Minitest::Test
     prefix = 'test'
     time = Time.new(2023, 1, 1, 12, 0, 0)
     blockname = 'block/1:2'
-    expected_wildcard = 'test_2023-01-01-12-00-00_*_,_block_1_2.sh'
+    expected_wildcard = 'test_2023-01-01-12-00-00_*_~_block_1_2_.*'
 
-    assert_equal expected_wildcard, MarkdownExec::SavedAsset.wildcard_name(
+    assert_equal expected_wildcard, MarkdownExec::SavedAsset.new(
+      saved_asset_format: SAVED_ASSET_FORMAT,
       filename: filename, prefix: prefix, time: time, blockname: blockname
-    )
+    ).generate_name
   end
 
   def test_wildcard_name_with_missing_prefix
@@ -130,11 +138,12 @@ class SavedAssetTest < Minitest::Test
     prefix = nil
     time = Time.new(2023, 1, 1, 12, 0, 0)
     blockname = 'block/1:2'
-    expected_wildcard = '*_2023-01-01-12-00-00_sample_txt_,_block_1_2.sh'
+    expected_wildcard = '*_2023-01-01-12-00-00_sample_txt_~_block_1_2_.*'
 
-    assert_equal expected_wildcard, MarkdownExec::SavedAsset.wildcard_name(
+    assert_equal expected_wildcard, MarkdownExec::SavedAsset.new(
+      saved_asset_format: SAVED_ASSET_FORMAT,
       filename: filename, prefix: prefix, time: time, blockname: blockname
-    )
+    ).generate_name
   end
 
   def test_wildcard_name_with_missing_blockname
@@ -142,11 +151,12 @@ class SavedAssetTest < Minitest::Test
     prefix = 'test'
     time = Time.new(2023, 1, 1, 12, 0, 0)
     blockname = nil
-    expected_wildcard = 'test_2023-01-01-12-00-00_sample_txt_,_*.sh'
+    expected_wildcard = 'test_2023-01-01-12-00-00_sample_txt_~_*_.*'
 
-    assert_equal expected_wildcard, MarkdownExec::SavedAsset.wildcard_name(
+    assert_equal expected_wildcard, MarkdownExec::SavedAsset.new(
+      saved_asset_format: SAVED_ASSET_FORMAT,
       filename: filename, prefix: prefix, time: time, blockname: blockname
-    )
+    ).generate_name
   end
 
   def test_wildcard_name_with_all_missing
@@ -154,10 +164,11 @@ class SavedAssetTest < Minitest::Test
     prefix = nil
     time = nil
     blockname = nil
-    expected_wildcard = '*_*_*_,_*.sh'
+    expected_wildcard = '*_*_*_~_*_.*'
 
-    assert_equal expected_wildcard, MarkdownExec::SavedAsset.wildcard_name(
+    assert_equal expected_wildcard, MarkdownExec::SavedAsset.new(
+      saved_asset_format: SAVED_ASSET_FORMAT,
       filename: filename, prefix: prefix, time: time, blockname: blockname
-    )
+    ).generate_name
   end
 end

data/lib/saved_files_matcher.rb

@@ -45,15 +45,18 @@ if $PROGRAM_NAME == __FILE__
     end
 
     def test_list_all
-      assert_kind_of Array, MarkdownExec::SavedFilesMatcher.list_all(@folder, @glob)
+      assert_kind_of Array,
+                     MarkdownExec::SavedFilesMatcher.list_all(@folder, @glob)
     end
 
     def test_most_recent
-      assert_match(/\.md$/, MarkdownExec::SavedFilesMatcher.most_recent(@folder, @glob))
+      assert_match(/\.md$/,
+                   MarkdownExec::SavedFilesMatcher.most_recent(@folder, @glob))
     end
 
     def test_most_recent_list
-      result = MarkdownExec::SavedFilesMatcher.most_recent_list(@folder, @glob, 5)
+      result = MarkdownExec::SavedFilesMatcher.most_recent_list(@folder, @glob,
+                                                                5)
       assert_kind_of Array, result
       assert_operator result.size, :<=, 16
     end

data/lib/streams_out.rb

@@ -11,7 +11,13 @@ class StreamsOut
   end
 
   def append_stream_line(stream, line)
-    @streams << { stream: stream, line: line, timestamp: Time.now }
+    @streams << OpenStruct.new(stream: stream, line: line, timestamp: Time.now)
+  end
+
+  def stream_lines(stream)
+    @streams.select do |v|
+      v[:stream] == stream
+    end.map(&:line)
   end
 
   def write_execution_output_to_file(filespec)