markdown_exec 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e95733b82149c0ae79c429132f53373975961457c9fc6dd6b5f4feed5618d63
-  data.tar.gz: bfc880428a6cb6e3f58f3248972fffdbe2a51449c3e12ee1b4542aee0148fa29
+  metadata.gz: '05862fe57c684d4f2fd510c9bea4b54b9d035837d5865c32810c2c8ad08b76b2'
+  data.tar.gz: 6e9b150d5938c2a297dd34fb45420f1f6fb339c22ce3af59beb65b4b3558b72e
 SHA512:
-  metadata.gz: d24fdac6f00933c9796fe8225c81d35745d2275055b8963b565955a4a9a581e232ddc99e67999e8b00053ecb573ae4e24be8875506d6257b645d4eea74661b40
-  data.tar.gz: 10423e9faec308472a9678b7726c78c5b0be55a702c866e6b4cbe722f6aa6f69cae80ed9a30857f08c60dae792fc70062ebb7a16fd3728d0bc289b9487bc3a98
+  metadata.gz: '020862e33c9713980663eb7840d2a5d3369c0c6cc7a40422fa87313c8206cf1ab287dc26c7f266d8ea25929ea4eabb4e08e5ac37cfcda112b7c8e768a9a73199'
+  data.tar.gz: 3bd45e67c4976d0391bb133650f524db7c6c0bd0550103f4346ffb8ebe9ef7d6aedfd4d78b80cae356772fd699ad55d5d4b6b1ce5b2a2b11762e9a5e0e47d2f1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.0.3] - 2025-05-23
+
+### Changed
+
+- Collect all required blocks when multiple blocks have the same name.
+
 ## [3.0.2] - 2025-05-21
 
 ### Added

data/Gemfile.lock

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

data/docs/dev/block-type-ux-allowed.md

@@ -8,7 +8,7 @@ name: SPECIES
 / automatic block loads first line in output of exec
 ```ux :[document_ux_GENUS]
 allowed: :exec
-exec: echo "Pongo\nHistiophryne psychedelica"
+exec: printf "Pongo\nHistiophryne psychedelica"
 name: GENUS
 ```
 / executed block presents a menu of the allowed list

data/lib/hash_delegator.rb

@@ -1377,11 +1377,13 @@ module MarkdownExec
                         end
 
       if allow_execution
-        execute_required_lines(blockname: selected.pub_name,
-                               erls: { play_bin: play_bin,
-                                       shell: selected.shell },
-                               required_lines: required_lines,
-                               shell: selected.shell)
+        execute_required_lines(
+          blockname: selected.pub_name,
+          erls: { play_bin: play_bin,
+                  shell: selected_shell(selected.shell) },
+          required_lines: required_lines,
+          shell: selected_shell(selected.shell)
+        )
       end
 
       link_state.block_name = nil
@@ -1694,6 +1696,10 @@ module MarkdownExec
       @prior_execution_block = nil
     end
 
+    def selected_shell(shell_name)
+      shell_name.empty? ? shell : shell_name
+    end
+
     # Determines the state of a selected block in the menu based
     #  on the selected option.
     # It categorizes the selected option into either EXIT, BACK,
@@ -2490,7 +2496,7 @@ module MarkdownExec
       if @delegate_object[:save_executed_script]
         write_command_file(blockname: blockname,
                            required_lines: required_lines,
-                           shell: shell)
+                           shell: selected_shell(shell))
       end
       if @dml_block_state
         calc_logged_stdout_filename(block_name: @dml_block_state.block.oname)
@@ -2498,7 +2504,7 @@ module MarkdownExec
       format_and_execute_command(
         code_lines: required_lines,
         erls: erls,
-        shell: shell
+        shell: selected_shell(shell)
       )
       post_execution_process
     end
@@ -2705,7 +2711,7 @@ module MarkdownExec
         formatted_command,
         args: @pass_args,
         erls: erls,
-        shell: shell
+        shell: selected_shell(shell)
       )
       @fout.fout fetch_color(data_sym: :script_execution_tail,
                              color_sym: :script_execution_frame_color)
@@ -2968,8 +2974,8 @@ module MarkdownExec
       else
         iter_blocks_from_nested_files do |btype, fcb|
           case btype
-          when :blocks; yield fcb
-          when :filter; %i[blocks]
+          when :blocks then yield fcb
+          when :filter then %i[blocks]
           end
         end
       end
@@ -3138,7 +3144,10 @@ module MarkdownExec
                                                    opts_block_name)
       return if selected_blocks.empty?
 
-      dependency_map = {}
+      dependency_map = selected_blocks.to_h do |block|
+        [block.id, block.reqs]
+      end
+
       selected_blocks.each do |block|
         mdoc.collect_dependencies(memo: dependency_map, block: block)
       end
@@ -3573,7 +3582,7 @@ module MarkdownExec
             bash_script_lines
           )
         )
-        temp_file.close  # Close the file before chmod and execution
+        temp_file.close # Close the file before chmod and execution
         File.chmod(0o755, temp_file.path)
 
         if @delegate_object[:archive_ad_hoc_scripts]
@@ -3584,8 +3593,7 @@ module MarkdownExec
           `cp #{temp_file.path} #{archive_filename}`
         end
 
-        output = `bash #{temp_file.path}`
-        #### use shell per configuration
+        output = `#{shell} #{temp_file.path}`
 
         CommandResult.new(stdout: output, exit_status: $?.exitstatus)
       end
@@ -3865,7 +3873,7 @@ module MarkdownExec
       elsif sel == MenuOptions::SAVE_SCRIPT
         save_to_file(
           required_lines: required_lines, selected: selected,
-          shell: selected.shell
+          shell: selected_shell(selected.shell)
         )
       end
 
@@ -4201,7 +4209,7 @@ module MarkdownExec
       required_lines:, selected:, shell:
     )
       write_command_file(
-        required_lines: required_lines, blockname: selected.pub_name, shell: shell
+        required_lines: required_lines, blockname: selected.pub_name, shell: selected_shell(shell)
       )
       @fout.fout "File saved: #{@run_state.saved_filespec}"
     end
@@ -4212,7 +4220,7 @@ module MarkdownExec
         saved_asset_format:
           shell_escape_asset_format(
             code_lines: link_state&.inherited_lines,
-            shell: shell
+            shell: selected_shell(shell)
           )
       ).generate_name
     end
@@ -4604,7 +4612,7 @@ module MarkdownExec
       new_lines = []
       command_result = nil
 
-      case as = FCB.act_source(export)
+      case FCB.act_source(export)
       when false, UxActSource::FALSE
         raise 'Should not be reached.'
 

data/lib/markdown_exec/version.rb

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

data/lib/mdoc.rb

@@ -121,7 +121,7 @@ module MarkdownExec
 
       nickname = name_block.pub_name
 
-      dependencies = collect_dependencies(source: nickname)
+      dependencies = collect_dependencies(pubname: nickname)
       # !!t dependencies.count
       all_dependency_names =
         collect_unique_names(dependencies).push(nickname).uniq
@@ -372,6 +372,18 @@ module MarkdownExec
       end.fetch(0, default)
     end
 
+    # Retrieves code blocks by a name.
+    #
+    # @param name [String] The name of the code block to retrieve.
+    # @param default [Hash] The default value to return if the code block is not found.
+    # @return [Hash] The code block as a hash or the default value if not found.
+    #
+    def get_blocks_by_anyname(name)
+      table_not_split.select do |fcb|
+        fcb.is_named?(name)
+      end
+    end
+
     # Checks if a code block should be hidden based on the given options.
     #
     # @param opts [Hash] The options used for hiding code blocks.
@@ -426,13 +438,12 @@ module MarkdownExec
       return memo unless source
       return memo if memo.keys.include? source
 
-      block = get_block_by_anyname(source)
-      # if block.nil? || block.keys.nil? || block.keys.empty?
-      if block.nil?
+      blocks = get_blocks_by_anyname(source)
+      if blocks.empty?
         raise "Named code block `#{source}` not found. (@#{__LINE__})"
       end
 
-      memo[source] = block.reqs
+      memo[source] = blocks.map(&:reqs).flatten(1)
       return memo unless memo[source]&.count&.positive?
 
       memo[source].each do |req|
@@ -447,21 +458,31 @@ module MarkdownExec
     # @param source [String] The name of the initial source block.
     # @param memo [Hash] A memoization hash to store resolved dependencies.
     # @return [Hash] A hash mapping sources to their respective dependencies.
-    def collect_dependencies(block: nil, memo: {}, source: nil)
+    def collect_dependencies(block: nil, memo: {}, pubname: nil)
       if block.nil?
-        return memo unless source
+        return memo unless pubname
 
-        block = get_block_by_anyname(source)
-        if block.nil? || block.instance_of?(Hash)
-          raise "Named code block `#{source}` not found. (@#{__LINE__})"
+        blocks = get_blocks_by_anyname(pubname)
+        if blocks.empty?
+          raise "Named code block `#{pubname}` not found. (@#{__LINE__})"
         end
+      else
+        blocks = [block]
       end
-      return memo unless block.reqs
+      blocks.each do |block|
+        memo[block.id] = []
+      end
+      return memo unless blocks.count.positive?
+
+      required_blocks = blocks.map(&:reqs).flatten(1)
+      return memo unless required_blocks.count.positive?
 
-      memo[block.id] = block.reqs
+      blocks.each do |block|
+        memo[block.id] = required_blocks
+      end
 
-      block.reqs.each do |req|
-        collect_dependencies(source: req, memo: memo) unless memo.key?(req)
+      required_blocks.each do |req|
+        collect_dependencies(pubname: req, memo: memo)
       end
 
       memo
@@ -519,19 +540,19 @@ if $PROGRAM_NAME == __FILE__
       ### must raise error
       def test_collect_dependencies_with_nonexistent_source
         assert_raises(RuntimeError) do
-          @mdoc.collect_dependencies(source: 'nonexistent')
+          @mdoc.collect_dependencies(pubname: 'nonexistent')
         end
       end if false
 
       def test_collect_dependencies_with_valid_source
-        @mdoc.stubs(:get_block_by_anyname)
-             .with('source1').returns(OpenStruct.new(id: 'source1',
-                                                     reqs: ['source2']))
-        @mdoc.stubs(:get_block_by_anyname)
-             .with('source2').returns(OpenStruct.new(id: 'source2', reqs: []))
+        @mdoc.stubs(:get_blocks_by_anyname)
+             .with('source1').returns([OpenStruct.new(id: 'source1',
+                                                      reqs: ['source2'])])
+        @mdoc.stubs(:get_blocks_by_anyname)
+             .with('source2').returns([OpenStruct.new(id: 'source2', reqs: [])])
 
         expected = { 'source1' => ['source2'], 'source2' => [] }
-        assert_equal expected, @mdoc.collect_dependencies(source: 'source1')
+        assert_equal expected, @mdoc.collect_dependencies(pubname: 'source1')
       end
     end
 
@@ -609,7 +630,7 @@ if $PROGRAM_NAME == __FILE__
         result = @doc.recursively_required_hash('block3')
         assert_equal ({ 'block3' => ['block1'],
                         'block1' => ['block2'],
-                        'block2' => nil }),
+                        'block2' => [nil] }),
                      result
 
         result_no_reqs = @doc.recursively_required_hash(nil)

data/lib/ww.rb

@@ -77,6 +77,10 @@ def ww0(*objs,
     file.puts(formatted_message)
   end
 
+  def wwb
+    binding.irb if $debug
+  end
+
   # return the last item in the list, as the label is usually first
   objs.last
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard