lib/markdown_exec.rb in markdown_exec-0.2.0 vs lib/markdown_exec.rb in markdown_exec-0.2.1

@@ -121,32 +121,39 @@
           else
             ## new block
             #
 
             lm = line.match(/^`{3,}([^`\s]*) *(.*)$/)
-
             do1 = false
             if opts[:bash_only]
               do1 = true if lm && (lm[1] == 'bash')
-            elsif opts[:exclude_expect_blocks]
-              do1 = true unless lm && (lm[1] == 'expect')
             else
               do1 = true
+              do1 = !(lm && (lm[1] == 'expect')) if opts[:exclude_expect_blocks]
+
+              #             if do1 && opts[:exclude_matching_block_names]
+              # puts " MW a4"
+              # puts " MW a4 #{(lm[2].match %r{^:\(.+\)$})}"
+              #               do1 = !(lm && (lm[2].match %r{^:\(.+\)$}))
+              #             end
             end
 
+            in_block = true
             if do1 && (!opts[:title_match] || (lm && lm[2] && lm[2].match(opts[:title_match])))
               current = []
-              in_block = true
               block_title = (lm && lm[2])
             end
-
           end
         elsif current
           current += [line.chomp]
         end
       end
       blocks.tap { |ret| puts "list_blocks_in_file() ret: #{ret.inspect}" if $pdebug }
+      # blocks.map do |block|
+      #   next if opts[:exclude_matching_block_names] && block[:name].match(%r{^\(.+\)$})
+      #   block
+      # end.compact.tap { |ret| puts "list_blocks_in_file() ret: #{ret.inspect}" if $pdebug }
     end
 
     def list_files_per_options(options)
       default_filename = 'README.md'
       default_folder = '.'
@@ -182,10 +189,19 @@
 
     def list_markdown_files_in_folder
       Dir.glob(File.join(options[:folder], '*.md'))
     end
 
+    def list_named_blocks_in_file(call_options = {}, &options_block)
+      opts = optsmerge call_options, options_block
+      list_blocks_in_file(opts).map do |block|
+        next if opts[:exclude_matching_block_names] && block[:name].match(/^\(.+\)$/)
+
+        block
+      end.compact.tap { |ret| puts "list_named_blocks_in_file() ret: #{ret.inspect}" if $pdebug }
+    end
+
     def code(table, block)
       all = [block[:name]] + recursively_required(table, block[:reqs])
       all.reverse.map do |req|
         get_block_by_name(table, req).fetch(:body, '')
       end
@@ -215,11 +231,21 @@
     end
 
     def make_block_labels(call_options = {})
       opts = options.merge(call_options)
       list_blocks_in_file(opts).map do |block|
+        # next if opts[:exclude_matching_block_names] && block[:name].match(%r{^:\(.+\)$})
+
         make_block_label block, opts
+      end.compact.tap { |ret| puts "make_block_labels() ret: #{ret.inspect}" if $pdebug }
+    end
+
+    def option_exclude_blocks(opts, blocks)
+      if opts[:exclude_matching_block_names]
+        blocks.reject { |block| block[:name].match(/^\(.+\)$/) }
+      else
+        blocks
       end
     end
 
     def optsmerge(call_options = {}, options_block = nil)
       class_call_options = options.merge(call_options || {})
@@ -276,11 +302,11 @@
 
       option_parser = OptionParser.new do |opts|
         executable_name = File.basename($PROGRAM_NAME)
         opts.banner = [
           "#{MarkdownExec::APP_NAME} - #{MarkdownExec::APP_DESC} (#{MarkdownExec::VERSION})",
-          "Usage: #{executable_name} [options]"
+          "Usage: #{executable_name} [filename or path] [options]"
         ].join("\n")
 
         ## menu top: items appear in reverse order added
         #
         opts.on('--config PATH', 'Read configuration file') do |value|
@@ -291,11 +317,11 @@
         #
         opts.on('-f RELATIVE', '--filename', 'Name of document') do |value|
           options[:filename] = value
         end
 
-        opts.on('-p PATH', '--folder', 'Path to documents') do |value|
+        opts.on('-p PATH', '--path', 'Path to documents') do |value|
           options[:folder] = value
         end
 
         opts.on('--list-blocks', 'List blocks') do |_value|
           options[:list_blocks] = true
@@ -326,21 +352,30 @@
           fout options.to_yaml
         end
       end
       option_parser.load # filename defaults to basename of the program without suffix in a directory ~/.options
       option_parser.environment # env defaults to the basename of the program.
-      option_parser.parse! # (into: options)
+      rest = option_parser.parse! # (into: options)
       options_finalize.call options
 
+      if rest.fetch(0, nil)&.present?
+        if Dir.exist?(rest[0])
+          options[:folder] = rest[0]
+        elsif File.exist?(rest[0])
+          options[:filename] = rest[0]
+        end
+      end
+
       ## process
       #
       options.merge!(
         {
           approve: true,
           bash: true,
           display: true,
           exclude_expect_blocks: true,
+          exclude_matching_block_names: true,
           execute: true,
           prompt: 'Execute',
           struct: true
         }
       )
@@ -373,12 +408,18 @@
       blocks = list_blocks_in_file(opts.merge(struct: true))
 
       prompt = TTY::Prompt.new(interrupt: :exit)
       pt = "#{opts.fetch(:prompt, nil) || 'Pick one'}:"
 
+      # blocks.map do |block|
+      #   next if opts[:exclude_matching_block_names] && block[:name].match(%r{^\(.+\)$})
+      #   block
+      # end.compact.tap { |ret| puts "list_blocks_in_file() ret: #{ret.inspect}" if $pdebug }
+
       blocks.each { |block| block.merge! label: make_block_label(block, opts) }
-      block_labels = blocks.map { |block| block[:label] }
+      # block_labels = blocks.map { |block| block[:label] }
+      block_labels = option_exclude_blocks(opts, blocks).map { |block| block[:label] }
 
       if opts[:preview_options]
         select_per_page = 3
         block_labels.each do |bn|
           fout " - #{bn}"
@@ -404,11 +445,9 @@
       allow = prompt.yes? 'Process?' if opts[:approve]
 
       selected = get_block_by_name blocks, sel
       if allow && opts[:execute]
 
-        ## process in script, to handle line continuations
-        #
         cmd2 = cbs.flatten.join("\n")
 
         Open3.popen3(cmd2) do |stdin, stdout, stderr|
           stdin.close_write
           begin