markdown_exec 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca4576a97f3d528e52f331941144d91970a5dd6477d60a6270de464e47475cb
-  data.tar.gz: 2c16498793d375c37d4b07c55500e76b63f1ab9dd37cdbbc83dedbeced288d5c
+  metadata.gz: '05862fe57c684d4f2fd510c9bea4b54b9d035837d5865c32810c2c8ad08b76b2'
+  data.tar.gz: 6e9b150d5938c2a297dd34fb45420f1f6fb339c22ce3af59beb65b4b3558b72e
 SHA512:
-  metadata.gz: d90b01f7fa224697dc393a70fea22cd3083a200e32f52d9bead14e08d83a45d86d2ed00d5a90995c14401a28b850fb92ca0fb2682e91977671cd393924635ce5
-  data.tar.gz: 7272c814fe69625754c7e6c0dcddd2bd21d602636eb089593080f4f26ae0863cbe2915fcfa470058677420781a8d57f13a7e5f52348bcf280738779238871197
+  metadata.gz: '020862e33c9713980663eb7840d2a5d3369c0c6cc7a40422fa87313c8206cf1ab287dc26c7f266d8ea25929ea4eabb4e08e5ac37cfcda112b7c8e768a9a73199'
+  data.tar.gz: 3bd45e67c4976d0391bb133650f524db7c6c0bd0550103f4346ffb8ebe9ef7d6aedfd4d78b80cae356772fd699ad55d5d4b6b1ce5b2a2b11762e9a5e0e47d2f1

data/Gemfile.lock

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

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,9 +3144,9 @@ module MarkdownExec
                                                    opts_block_name)
       return if selected_blocks.empty?
 
-      dependency_map = selected_blocks.map do |block|
+      dependency_map = selected_blocks.to_h do |block|
         [block.id, block.reqs]
-      end.to_h
+      end
 
       selected_blocks.each do |block|
         mdoc.collect_dependencies(memo: dependency_map, block: block)
@@ -3576,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]
@@ -3587,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
@@ -3868,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
 
@@ -4204,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
@@ -4215,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
@@ -4607,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.3'
+  VERSION = '3.0.4'
 end

data/lib/mdoc.rb

@@ -469,6 +469,9 @@ module MarkdownExec
       else
         blocks = [block]
       end
+      blocks.each do |block|
+        memo[block.id] = []
+      end
       return memo unless blocks.count.positive?
 
       required_blocks = blocks.map(&:reqs).flatten(1)
@@ -542,11 +545,11 @@ if $PROGRAM_NAME == __FILE__
       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(pubname: 'source1')
@@ -627,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)

metadata

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