marked-conductor 1.0.24 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69dbd324dd85fed4c343563e7431920138a99d4968b8aa8af99ba7fcd5c82087
-  data.tar.gz: ae2eb1f5251187fb67498139dae2d73b6fbce62778f2ef0197a01cb57561fe2c
+  metadata.gz: 580473330204caa4600148bf8ed0a29662b82b75f47443f71430d374eaff3b37
+  data.tar.gz: cb938a20bdd2e13cb001961b45f32a3003a323853867d880826a8cc7a4eaf48c
 SHA512:
-  metadata.gz: 055a623d15c8bb843b97d6f1931342cab64ec596564f812ffb1b473a85dba9547f7091149619952baacc2d5c9b17e44597f9625aa5b7f2818b72c10760b51a66
-  data.tar.gz: 4f998b8b19bca44f0f08ded4ad89f043802f62e4770d692b9b779c93aa8a52e6cd519fc675716f7b7c1dabaff66fbdbf4eea6611f224ac5db7cc61d7e22d704c
+  metadata.gz: c19b9f0b8485847b1ebc00d7e295c6344aeed0b1ba098e6d66742ad57118e6072d37e796a2ee6cd3b25715a74d1da026738e79874cd62cdbb7f68229cb985259
+  data.tar.gz: 9da479816110281f22948875946f12beb2f7883311c702a41bce6133eea877fa26751c321ac6a9c1aaa80c43e78338733d4366af656d7dc59f2d31ab243854fe

data/.irbrc

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "irb/completion"
-require_relative "lib/conductor"
+IRB.conf[:AUTO_INDENT] = true
 
-include Conductor # standard:disable all
+require "irb/completion"
+# require_relative "lib/conductor"
 
-IRB.conf[:AUTO_INDENT] = true
+# include Conductor # standard:disable all
 
 require "awesome_print"
 AwesomePrint.irb!

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+### 1.0.26
+
+2024-07-24 13:49
+
+#### FIXED
+
+- Don't recognize YAML closing line as settext header
+
+### 1.0.25
+
+2024-07-22 12:36
+
+#### NEW
+
+- `includes contains [file|path]` testing against included files
+
+#### IMPROVED
+
+- Better env variable handling
+
+#### FIXED
+
+- Inserting comment when YAML exists breaks YAML
+- Ensure newline after MMD metadata
+- Error in ensure_h1 if no headers exist
+
 ### 1.0.24
 
 2024-07-18 11:32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marked-conductor (1.0.8)
+    marked-conductor (1.0.25)
       chronic (~> 0.10.2)
       tty-which (~> 0.5.0)
 
@@ -83,6 +83,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
+  x86_64-darwin-20
 
 DEPENDENCIES
   awesome_print (~> 1.9.2)

data/README.md

@@ -104,6 +104,9 @@ Available conditions are:
     - If both the YAML key value and the test value are numbers, you can use operators `greater than` (`>`), `less than` (`<`), `equal`/`is` (`=`/`==`), and `is not equal`/`not equals` (`!=`/`!==`). Numbers will be interpreted as floats.
     - If the YAML value is a boolean, you can test with `is true` or `is not true` (or `is false`)
 - `mmd` or `meta` will test for MultiMarkdown metadata using the same formatting as `yaml` above.
+- `includes` are files included in the document with special syntax (Marked, IA Writer, etc.)
+    - `includes contain file` or `includes not contains file` will test all included files for filename matches
+    - `includes contain path` or `includes not contains path` will test all included files for fragment matches anywhere in the path
 - The following keywords act as a catchall and can be used as the last track in the config to act on any documents that aren't matched by preceding rules:
     - `any`
     - `else`

data/bin/conductor

@@ -130,6 +130,7 @@ end
 
 if res.nil?
   warn "No conditions satisfied"
+  # puts Conductor::Env
   puts "NOCUSTOM"
 else
   if res == Conductor.original_input

data/lib/conductor/array.rb

@@ -8,4 +8,30 @@ class ::Array
   def symbolize_keys
     map { |h| h.symbolize_keys }
   end
+
+  def shell_join
+    map { |p| Shellwords.join(p) }
+  end
+
+  def includes_file?(filename)
+    inc = false
+    each do |path|
+      if path.join =~ /#{Regexp.escape(filename)}$/i
+        inc = true
+        break
+      end
+    end
+    inc
+  end
+
+  def includes_frag?(frag)
+    inc = false
+    each do |path|
+      if path.join =~ /#{Regexp.escape(frag)}/i
+        inc = true
+        break
+      end
+    end
+    inc
+  end
 end

data/lib/conductor/condition.rb

@@ -111,8 +111,9 @@ module Conductor
         return ["#{type}#{m[3]}", nil, op]
       end
 
-      res = condition.match(/^(?<val1>.*?)(?:(?: +(?<op>(?:is|does)(?: not)?(?: an?|type(?: of)?|equals?(?: to))?|!?==?|[gl]t|(?:greater|less)(?: than)?|<|>|(?:starts|ends) with|(?:ha(?:s|ve) )?(?:prefix|suffix)|has|contains?|includes?) +)(?<val2>.*?))?$/i)
-      [res["val1"], res["val2"], operator_to_symbol(res["op"])]
+      res = condition.match(/(?i)^(?<val1>.*?)(?:(?:\s+(?<bool>(?:is|does)?\s*(?:not)?\s*)(?<op>(?:an?|type(?:\sof)?|equals?(?:\sto))?|[!*$]?==?|[gl]t|(?:greater|less)(?:\sthan)?|<|>|(?:starts|ends) with|(?:ha(?:s|ve)\s)?(?:prefix|suffix)|(?:contains?|includes?)\s+(?:file|path)|has|contains?|includes?|match(?:es)?)\s+)(?<val2>.*?))?$/)
+      operator = res["bool"] ? "#{res["bool"]}#{res["op"]}" : res["op"]
+      [res["val1"], res["val2"], operator_to_symbol(operator)]
     end
 
     ##
@@ -140,6 +141,28 @@ module Conductor
       operator == :type_of ? res : !res
     end
 
+    ##
+    ## Test for includes
+    ##
+    ## @param      includes  [Array] array of included files
+    ## @param      val      value to test against
+    ## @param      operator  The operator
+    ##
+    def test_includes(includes, val, operator)
+      case operator
+      when :not_includes_file
+        !includes.includes_file?(val)
+      when :not_includes_path
+        !includes.includes_frag?(val)
+      when :includes_file
+        includes.includes_file?(val)
+      when :includes_path
+        includes.includes_frag?(val)
+      else
+        false
+      end
+    end
+
     ##
     ## Compare a string based on operator
     ##
@@ -353,6 +376,8 @@ module Conductor
       end
 
       case type
+      when /^include/i
+        test_includes(@env[:includes], value, operator) ? true : false
       when /^ext/i
         test_string(@env[:ext], value, operator) ? true : false
       when /^tree/i
@@ -386,6 +411,16 @@ module Conductor
         :gt
       when /(lt|less( than)?|<|(?:is )?before)/i
         :lt
+      when /not (ha(?:s|ve)|contains?|includes?) +file/i
+        :not_includes_file
+      when /not (ha(?:s|ve)|contains?|includes?) +path/i
+        :not_includes_path
+      when /(ha(?:s|ve)|contains?|includes?|\*=) +file/i
+        :includes_file
+      when /(ha(?:s|ve)|contains?|includes?|\*=) +path/i
+        :includes_path
+      when /(ha(?:s|ve)|contains|includes|match(es)?|\*=)/i
+        :contains
       when /not (ha(?:s|ve)|contains|includes|match(es)?)/i
         :not_contains
       when /(ha(?:s|ve)|contains|includes|match(es)?|\*=)/i

data/lib/conductor/env.rb

@@ -14,7 +14,7 @@ module Conductor
           home: ENV["HOME"],
           css_path: ENV["MARKED_CSS_PATH"],
           ext: ENV["MARKED_EXT"],
-          includes: Shellwords.shellsplit(ENV["MARKED_INCLUDES"]),
+          includes: ENV["MARKED_INCLUDES"].split(/,/).map { |s| Shellwords.shellsplit(s) },
           origin: ENV["MARKED_ORIGIN"],
           filepath: ENV["MARKED_PATH"],
           filename: File.basename(ENV["MARKED_PATH"]),
@@ -56,7 +56,7 @@ module Conductor
         "MARKED_CSS_PATH" => @env[:css_path],
         "MARKED_EXT" => @env[:ext],
         "MARKED_ORIGIN" => @env[:origin],
-        "MARKED_INCLUDES" => Shellwords.join(@env[:includes]),
+        "MARKED_INCLUDES" => @env[:includes].shell_join.join(","),
         "MARKED_PATH" => @env[:filepath],
         "MARKED_PHASE" => @env[:phase],
         "OUTLINE" => @env[:outline],

data/lib/conductor/filter.rb

@@ -205,6 +205,8 @@ class ::String
       inject_after_meta(out)
     when :h1
       split(/\n/).insert(first_h1 + 1, out).join("\n")
+    when :h2
+      split(/\n/).insert(first_h2 + 1, out).join("\n")
     else
       "#{self}\n#{out}"
     end
@@ -300,18 +302,22 @@ class ::String
     when :yaml
       add_yaml(key, value)
     when :mmd
-      add_mmd(key, value)
+      add_mmd(key, value).ensure_mmd_meta_newline
     else # comment or none
       add_comment(key, value)
     end
   end
 
+  def ensure_mmd_meta_newline
+    split(/\n/).insert(meta_insert_point, "\n\n").join("\n")
+  end
+
   def add_yaml(key, value)
     sub(/^---.*?\n(---|\.\.\.)/m) do
       m = Regexp.last_match
       yaml = YAML.load(m[0])
-      yaml[key] = value
-      "#{YAML.dump(yaml)}\n---\n"
+      yaml[key.gsub(/ /, "_")] = value
+      "#{YAML.dump(yaml)}---\n"
     end
   end
 
@@ -330,7 +336,7 @@ class ::String
     else
       lines = split(/\n/)
       lines.insert(meta_insert_point, "#{key}: #{value}")
-      lines.join("\n")
+      lines.join("\n") + "\n"
     end
   end
 
@@ -347,7 +353,7 @@ class ::String
       sub(/ *#{key}: .*?$/, "#{key}: #{value}")
     else
       lines = split(/\n/)
-      lines.insert(meta_insert_point, "<!--\n#{key}: #{value}\n-->")
+      lines.insert(meta_insert_point + 1, "<!--\n#{key}: #{value}\n-->")
       lines.join("\n")
     end
   end
@@ -399,7 +405,7 @@ class ::String
   ## @return [String] content with headers updated
   ##
   def normalize_headers
-    gsub(/^(\S.*)\n([=-]+)\n/) do
+    gsub(/^(?<=\n\n)(\S.*)\n([=-]+)\n/) do
       m = Regexp.last_match
       case m[2]
       when /\=/
@@ -426,6 +432,8 @@ class ::String
     return self if headers.select { |h| h[1].chars == 1 }.count.positive?
 
     lowest_header = headers.min_by { |h| h[1].chars }
+    return self if lowest_header.nil?
+
     level = lowest_header[1].chars
 
     sub(/#{Regexp.escape(lowest_header[0])}/, "# #{lowest_header[2].strip}").decrease_headers(level)

data/lib/conductor/string.rb

@@ -11,12 +11,18 @@ class ::String
     split(/(\W)/).map(&:capitalize).join
   end
 
+  def split_list
+    split(/,/).map { |s| Shellwords.shellsplit(s) }
+  end
+
   def normalize_position
     case self
     when /^(be|s|t)/
       :start
     when /h1/
       :h1
+    when /h2/
+      :h2
     else
       :end
     end

data/lib/conductor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Conductor
-  VERSION = '1.0.24'
+  VERSION = '1.0.26'
 end

data/src/_README.md

@@ -104,6 +104,9 @@ Available conditions are:
     - If both the YAML key value and the test value are numbers, you can use operators `greater than` (`>`), `less than` (`<`), `equal`/`is` (`=`/`==`), and `is not equal`/`not equals` (`!=`/`!==`). Numbers will be interpreted as floats.
     - If the YAML value is a boolean, you can test with `is true` or `is not true` (or `is false`)
 - `mmd` or `meta` will test for MultiMarkdown metadata using the same formatting as `yaml` above.
+- `includes` are files included in the document with special syntax (Marked, IA Writer, etc.)
+    - `includes contain file` or `includes not contains file` will test all included files for filename matches
+    - `includes contain path` or `includes not contains path` will test all included files for fragment matches anywhere in the path
 - The following keywords act as a catchall and can be used as the last track in the config to act on any documents that aren't matched by preceding rules:
     - `any`
     - `else`

data/test.sh

@@ -67,7 +67,7 @@ export MARKED_EXT="$EXTENSION"
 export MARKED_CSS_PATH="/Applications/Marked 2.app/Contents/Resources/swiss.css"
 export PATH="$PATH:$(dirname "$FILE")"
 export MARKED_PATH="$FILE"
-export MARKED_INCLUDES="/Applications/Marked 2.app/Contents/Resources/tocstyle.css"
+export MARKED_INCLUDES='"/Applications/Marked 2.app/Contents/Resources/tocstyle.css","/Applications/Marked 2.app/Contents/Resources/javascript/main.js"'
 export MARKED_PHASE="$PHASE"
 
 if [[ $STD =~ ^(STD)?E ]]; then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.26
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print