markdown_exec 1.3.9 → 1.4.1

data/lib/mdoc.rb

@@ -25,6 +25,44 @@ module MarkdownExec
       @table = table
     end
 
+    def collect_block_code_cann(fcb)
+      body = fcb[:body].join("\n")
+      xcall = fcb[:cann][1..-2]
+      mstdin = xcall.match(/<(?<type>\$)?(?<name>[A-Za-z_\-.\w]+)/)
+      mstdout = xcall.match(/>(?<type>\$)?(?<name>[A-Za-z_\-.\w]+)/)
+
+      yqcmd = if mstdin[:type]
+                "echo \"$#{mstdin[:name]}\" | yq '#{body}'"
+              else
+                "yq e '#{body}' '#{mstdin[:name]}'"
+              end
+      if mstdout[:type]
+        "export #{mstdout[:name]}=$(#{yqcmd})"
+      else
+        "#{yqcmd} > '#{mstdout[:name]}'"
+      end
+    end
+
+    def collect_block_code_shell(fcb)
+      # write named variables to block at top of script
+      #
+      fcb[:body].join(' ').split.compact.map do |key|
+        format(opts[:block_type_port_set_format], { key: key, value: ENV.fetch(key, nil) })
+      end
+    end
+
+    def collect_block_code_stdout(fcb)
+      stdout = fcb[:stdout]
+      body = fcb[:body].join("\n")
+      if stdout[:type]
+        %(export #{stdout[:name]}=$(cat <<"EOF"\n#{body}\nEOF\n))
+      else
+        "cat > '#{stdout[:name]}' <<\"EOF\"\n" \
+          "#{body}\n" \
+          "EOF\n"
+      end
+    end
+
     # Retrieves code blocks that are required by a specified code block.
     #
     # @param name [String] The name of the code block to start the retrieval from.
@@ -56,49 +94,18 @@ module MarkdownExec
     # @param name [String] The name of the code block to start the collection from.
     # @return [Array<String>] An array of strings containing the collected code blocks.
     #
-    def collect_recursively_required_code(name)
+    def collect_recursively_required_code(name, opts: {})
       code = collect_wrapped_blocks(
         blocks = collect_recursively_required_blocks(name)
       ).map do |fcb|
-        body = fcb[:body].join("\n")
-
         if fcb[:cann]
-          xcall = fcb[:cann][1..-2]
-          mstdin = xcall.match(/<(?<type>\$)?(?<name>[A-Za-z_\-.\w]+)/)
-          mstdout = xcall.match(/>(?<type>\$)?(?<name>[A-Za-z_\-.\w]+)/)
-
-          yqcmd = if mstdin[:type]
-                    "echo \"$#{mstdin[:name]}\" | yq '#{body}'"
-                  else
-                    "yq e '#{body}' '#{mstdin[:name]}'"
-                  end
-          if mstdout[:type]
-            "export #{mstdout[:name]}=$(#{yqcmd})"
-          else
-            "#{yqcmd} > '#{mstdout[:name]}'"
-          end
+          collect_block_code_cann(fcb)
         elsif fcb[:stdout]
-          stdout = fcb[:stdout]
-          body = fcb[:body].join("\n")
-          if stdout[:type]
-            %(export #{stdout[:name]}=$(cat <<"EOF"\n#{body}\nEOF\n))
-          else
-            "cat > '#{stdout[:name]}' <<\"EOF\"\n" \
-              "#{body}\n" \
-              "EOF\n"
-          end
-        # elsif fcb[:shell] == 'opts' || fcb[:shell] == 'vars'
-        elsif [BLOCK_TYPE_OPTS, BLOCK_TYPE_VARS].include? fcb[:shell]
+          collect_block_code_stdout(fcb)
+        elsif [BLOCK_TYPE_LINK, BLOCK_TYPE_OPTS, BLOCK_TYPE_VARS].include? fcb[:shell]
           nil
         elsif fcb[:shell] == BLOCK_TYPE_PORT
-          ### if opts[:block_type_include_vars_set_format].present?
-            # write named variables to block at top of script
-            #
-            fcb[:body].join(' ').split(' ').compact.map do |key|
-              # format(opts[:block_type_include_vars_set_format],
-              format(': ${%{key}:=%{value}}', { key: key, value: ENV[key] })
-            end
-          ### end
+          collect_block_code_shell(fcb)
         else
           fcb[:body]
         end
@@ -285,29 +292,25 @@ if $PROGRAM_NAME == __FILE__
 
       def test_collect_wrapped_blocks
         # Test case 1: blocks with wraps
-        block = OpenStruct.new(oname: 'block1')
+        OpenStruct.new(oname: 'block1')
 
         assert_equal(%w[{wrap1} a],
                      @mdoc.collect_wrapped_blocks(
                        [OpenStruct.new(oname: 'a',
-                          wraps: ['{wrap1}'])]
-                     ).map do |block|
-                       block.oname
-                     end)
+                                       wraps: ['{wrap1}'])]
+                     ).map(&:oname))
 
         assert_equal(%w[{wrap2-before} {wrap2} b {wrap2-after}],
                      @mdoc.collect_wrapped_blocks(
                        [OpenStruct.new(oname: 'b',
-                          wraps: ['{wrap2}'])]
-                     ).map do |block|
-                       block.oname
-                     end)
+                                       wraps: ['{wrap2}'])]
+                     ).map(&:oname))
 
         assert_equal(%w[{wrap2-before} {wrap2} {wrap3-before} {wrap3} c {wrap3-after} {wrap2-after}],
                      @mdoc.collect_wrapped_blocks(
-                       [OpenStruct.new( oname: 'c',
-                          wraps: %w[{wrap2} {wrap3}] )]
-                     ).map { |block| block.oname })
+                       [OpenStruct.new(oname: 'c',
+                                       wraps: %w[{wrap2} {wrap3}])]
+                     ).map(&:oname))
 
         # Test case 2: blocks with no wraps
         blocks = @mdoc.collect_wrapped_blocks([])
@@ -316,9 +319,8 @@ if $PROGRAM_NAME == __FILE__
         # Test case 3: blocks with missing wraps
         assert_equal(
           %w[block4],
-          @mdoc.collect_wrapped_blocks([OpenStruct.new(oname: 'block4', wraps: ['wrap4'])]).map do |block|
-            block.oname
-          end
+          @mdoc.collect_wrapped_blocks([OpenStruct.new(oname: 'block4',
+                                                       wraps: ['wrap4'])]).map(&:oname)
         )
       end
     end

data/lib/menu.src.yml

@@ -51,6 +51,10 @@
   :env_var: MDE_BLOCK_STDOUT_SCAN
   :opt_name: block_stdout_scan
   :procname: val_as_str
+- :default: ": ${%{key}:=%{value}}"
+  :env_var: MDE_BLOCK_TYPE_PORT_SET_FORMAT
+  :opt_name: block_type_port_set_format
+  :procname: val_as_str
 - :arg_name: PATH
   :default: "."
   :description: Read configuration file
@@ -129,10 +133,14 @@
   :env_var: MDE_HIDE_BLOCKS_BY_NAME
   :opt_name: hide_blocks_by_name
   :procname: val_as_bool
-- :default: ","
+- :default: "|"
   :env_var: MDE_HISTORY_DOCUMENT_SEPARATOR
   :opt_name: history_document_separator
   :procname: val_as_str
+- :default: "&"
+  :env_var: MDE_HISTORY_PROPERTY_SEPARATOR
+  :opt_name: history_property_separator
+  :procname: val_as_str
 - :default: "^ *@import (.+)$"
   :env_var: MDE_IMPORT_PATTERN
   :opt_name: import_pattern
@@ -244,6 +252,16 @@
   :env_var: MDE_MENU_LINK_COLOR
   :opt_name: menu_link_color
   :procname: val_as_str
+- :default: "* Back"
+  :description: Text for Back option
+  :env_var: MDE_MENU_OPTION_BACK_NAME
+  :opt_name: menu_option_back_name
+  :procname: val_as_str
+- :default: "* Exit"
+  :description: Text for Exit option
+  :env_var: MDE_MENU_OPTION_EXIT_NAME
+  :opt_name: menu_option_exit_name
+  :procname: val_as_str
 - :default: blue
   :description: Color of menu opts
   :env_var: MDE_MENU_OPTS_COLOR

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (1.3.9)
+# MDE - Markdown Executor (1.4.1)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -52,6 +52,10 @@
   :env_var: MDE_BLOCK_STDOUT_SCAN
   :opt_name: block_stdout_scan
   :procname: val_as_str
+- :default: ": ${%{key}:=%{value}}"
+  :env_var: MDE_BLOCK_TYPE_PORT_SET_FORMAT
+  :opt_name: block_type_port_set_format
+  :procname: val_as_str
 - :arg_name: PATH
   :default: "."
   :description: Read configuration file
@@ -130,10 +134,14 @@
   :env_var: MDE_HIDE_BLOCKS_BY_NAME
   :opt_name: hide_blocks_by_name
   :procname: val_as_bool
-- :default: ","
+- :default: "|"
   :env_var: MDE_HISTORY_DOCUMENT_SEPARATOR
   :opt_name: history_document_separator
   :procname: val_as_str
+- :default: "&"
+  :env_var: MDE_HISTORY_PROPERTY_SEPARATOR
+  :opt_name: history_property_separator
+  :procname: val_as_str
 - :default: "^ *@import (.+)$"
   :env_var: MDE_IMPORT_PATTERN
   :opt_name: import_pattern
@@ -245,6 +253,16 @@
   :env_var: MDE_MENU_LINK_COLOR
   :opt_name: menu_link_color
   :procname: val_as_str
+- :default: "* Back"
+  :description: Text for Back option
+  :env_var: MDE_MENU_OPTION_BACK_NAME
+  :opt_name: menu_option_back_name
+  :procname: val_as_str
+- :default: "* Exit"
+  :description: Text for Exit option
+  :env_var: MDE_MENU_OPTION_EXIT_NAME
+  :opt_name: menu_option_exit_name
+  :procname: val_as_str
 - :default: blue
   :description: Color of menu opts
   :env_var: MDE_MENU_OPTS_COLOR

data/lib/method_sorter.rb

@@ -0,0 +1,76 @@
+require 'ripper'
+require 'parser/current'
+
+class MethodSorter
+  def initialize(file_path)
+    @file_path = file_path
+  end
+
+  def sort
+    file_contents = File.read(@file_path)
+
+    ast = Parser::CurrentRuby.parse(file_contents)
+
+    # Find the class node
+    class_node = ast.children.find { |node| node.type == :class }
+
+    method_nodes = []
+
+    # Look for method def nodes within each child node 
+    class_node.children.compact.each do |child|
+      if child.type == :begin
+        method_nodes += child.children.select {|n| n.type == :def}
+      end
+    end
+
+    # Sort and process method nodes
+    # class_node = ast.children.find { |node| node.type == :class }
+    # unless class_node
+    #   puts "No class node found in #{@file_path}"
+    #   return
+    # end
+
+    # method_nodes = class_node.children.compact.select { |node| 
+    #   node.type == :def
+    # }    
+
+    sorted_methods = method_nodes.sort_by{ |n| n.children[0].to_s }
+    ripper = Ripper.sexp(file_contents)
+    lines = ripper.each_with_index.map{|sexp, index| [sexp, index] }
+    
+    method_ranges = get_method_ranges(lines, method_nodes)
+    
+    result = replace_method_ranges(lines, method_ranges, sorted_methods)
+    
+    puts result.compact.select{|v|v.is_a? String}.join("\n")
+    # File.write(@file_path, result.join)
+  end
+
+  private
+  
+  def get_method_ranges(lines, method_nodes)
+    method_nodes.map do |method_node|
+      start_line = method_node.loc.line - 1
+      end_line = start_line
+      
+      while end_line < lines.size && lines[end_line][0] !~ /^end/
+        end_line += 1
+      end
+      
+      (start_line..end_line)
+    end
+  end
+  
+  def replace_method_ranges(lines, ranges, sorted_methods)
+    result = lines.dup
+    
+    ranges.each_with_index do |range, index|
+      result[range] = sorted_methods[index].loc.expression.source.split("\n") 
+    end
+    
+    result
+  end
+end
+
+sorter = MethodSorter.new(ARGV[0])
+sorter.sort

data/lib/sort_yaml_gpt4.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+def sort_yaml(input_yaml)
+  # Parse the input YAML
+  data = YAML.load(input_yaml)
+
+  # Ensure data is an array of hashes
+  unless data.is_a?(Array) && data.all? { |item| item.is_a?(Hash) }
+    raise ArgumentError, 'Input YAML must be an array of hashes.'
+  end
+
+  # Sort items by 'opt_name' values
+  sorted_data = data.sort_by do |item|
+    (item[:opt_name] || item[:long_name] || item[:short_name]).to_s
+  end
+
+  # Sort keys in each item
+  sorted_data.each do |item|
+    item.replace(item.sort.to_h)
+  end
+
+  # Convert the sorted data back to YAML and write to stdout
+  puts YAML.dump(sorted_data).gsub("\n-", "\n\n-")
+end
+
+# Read YAML from stdin
+input_yaml = $stdin.read
+
+# Call the function with input YAML
+sort_yaml(input_yaml)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.1
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-29 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -91,6 +91,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".pryrc"
 - ".reek"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -105,6 +106,7 @@ files:
 - assets/output_of_execution.png
 - assets/select_a_block.png
 - assets/select_a_file.png
+- bin/bmde
 - bin/colorize_env_vars.sh
 - bin/console
 - bin/mde
@@ -118,6 +120,7 @@ files:
 - examples/infile_config.md
 - examples/linked1.md
 - examples/linked2.md
+- examples/linked3.md
 - examples/opts.md
 - examples/pass-through.md
 - examples/plant.md
@@ -138,6 +141,7 @@ files:
 - lib/mdoc.rb
 - lib/menu.src.yml
 - lib/menu.yml
+- lib/method_sorter.rb
 - lib/object_present.rb
 - lib/option_value.rb
 - lib/regexp.rb
@@ -145,6 +149,7 @@ files:
 - lib/saved_assets.rb
 - lib/saved_files_matcher.rb
 - lib/shared.rb
+- lib/sort_yaml_gpt4.rb
 - lib/tap.rb
 homepage: https://rubygems.org/gems/markdown_exec
 licenses: