marked-conductor 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf6b7790e8d6823663584d5e4db749ea42ecc7d2515ebe14c8b5d7eb475e52d
-  data.tar.gz: bbfd235d53a4af3875bf24c7b77795797a8317c2aac37d255fdc7ac04430fbea
+  metadata.gz: 684cf7a82ae4cce7240617f832ce52572b0373e578aaff487fbc50b47e2f5afd
+  data.tar.gz: a6c5a9db2ee07216abd703f9ca833e4f83110b19eeba0ad993327ad2ef963623
 SHA512:
-  metadata.gz: 7f702032d3a40695083dd5494ac89a4a1701b551bd0a562337c818e7f65620bdb1ca0c7575a4ad80cd696e0aa079e9f66ca9022b47d62bc965c1878bc5d2de81
-  data.tar.gz: c44ea2a058bbac4331886524ecb8755c425490c7b04375409cac34a2a092d99eca49880e17e73191318d641d9039c58f76ef249b5d6c4f807de91780aa91f6ee
+  metadata.gz: e47df55cfed559207ddf931b2c08b98cae32709534d2b612b6b94afd3bee3b79342a7c4dc558ca4eefc77a6e894c0e8d37bb09358275fa260c2ccaffac480235
+  data.tar.gz: 077e24abc630b9588671e2eb8b3af7736f88299063e76b5176b84b681690c81eb89532057121a795ce2c50fcf34ad3c4356f298064186e156c778f2f9fdb7184

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+### 1.0.6
+
+2024-04-26 11:17
+
+#### FIXED
+
+- Always wait for STDIN or Marked will crash. Still possible to use $file in script/command values
+- More string encoding fixes
+- "path contains" was returning $PATH instead of the filepath
+
+### 1.0.5
+
+2024-04-25 17:00
+
+#### FIXED
+
+- First-run config creating directory instead of file
+- Frozen string/encoding issue on string comparisons
+
 ### 1.0.3
 
 2024-04-25 14:32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marked-conductor (0.1.0)
+    marked-conductor (1.0.5)
       chronic (~> 0.10.2)
       tty-which (~> 0.5.0)
 

data/README.md

@@ -38,7 +38,7 @@ The top level key in the YAML file is `tracks:`. This is an array of hashes, eac
 
 A simple config would look like:
 
-```
+```yaml
 tracks:
   - condition: yaml includes comments
     script: blog-processor
@@ -52,7 +52,7 @@ Instead of a `script` or `command`, a track can contain another `tracks` key, in
  
 For example, the following functions the same as `condition: phase is pre AND tree contains .obsidian AND (extension is md or extension is markdown)`:
 
-```
+```yaml
 tracks:
   - condition: phase is pre
     tracks:
@@ -70,7 +70,7 @@ Available conditions are:
 
 - `extension` (or `ext`): This will test the extension of the file, e.g. `ext is md` or `ext contains task`
 - `tree contains ...`: This will test whether a given file or directory exists in any of the parent folders of the current file, starting with the current directory of the file. Example: `tree contains .obsidian` would test whether there was an `.obsidian` directory in any of the directories above the file (indicating it's within an Obsidian vault)
-- `path`: This tests just the path itself, allowing conditions like `path contains _drafts` or `path does not contain _posts`.
+- `path`: This tests just the path to the file itself, allowing conditions like `path contains _drafts` or `path does not contain _posts`.
 - `phase`: Tests whether Marked is in Preprocessor or Processor phase, allowing conditions like `phase is preprocess` or `phase is process` (which can be shortened to `pre` and `pro`).
 - `text`: This tests for any string match within the text of the document being processed. This can be used with operators `starts with`, `ends with`, or `contains`, e.g. `text contains @taskpaper` or `text does not contain <!--more-->`. 
     - If the test value is surrounded by forward slashes, it will be treated as a regular expression. Regexes are always flagged as case insensitive. Use it like `text contains /@\w+/`.
@@ -114,6 +114,12 @@ All of the [capabilities and requirements](https://marked2app.com/help/Custom_Pr
 
 A script run by Conductor already knows it has the right type of file with the expected data and path, so your script can focus on just processing one file type. It's recommended to separate all of that logic you may already have written out into separate scripts and let Conductor handle the forking based on various criteria.
 
+## Tips
+
+- You can see what condition matched in Marked by opening <b>Help->Show Custom Processor Log</b> and checking the STDERR output.
+- To run [a custom processor for Bear](https://brettterpstra.com/2023/10/08/marked-and-bear/), use the condition `text contains /source: *bear/`
+- To run a custom processor for Obsidian, use the condition `tree contains .obsidian`
+
 ## Testing
 
 In order to test from the command line, you'll need certain environment variables set. This can be done by exporting the following variables with your own definitions, or by running conductor with all of the variables preceding the command, e.g. `$ MARKED_ORIGIN=/path/to/markdown_file.md [...] conductor`.

data/bin/conductor

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require_relative '../lib/conductor'
+require 'optparse'
 
 # raise 'No input on STDIN' unless Conductor.stdin
 
@@ -9,6 +10,8 @@ include Conductor
 
 config = Config.new
 
+stdin = Conductor.stdin
+
 def conduct(tracks, res = nil, condition = nil)
   tracks.each do |track|
     cond = Condition.new(track[:condition])
@@ -41,6 +44,23 @@ def conduct(tracks, res = nil, condition = nil)
   [res, condition]
 end
 
+options = {}
+optparse = OptionParser.new do|opts|
+  opts.banner = "Called from Marked 2 as a Custom Pre/Processor"
+
+  opts.on('-v', '--version', 'Show version number') do
+    puts "conductor v#{Conductor::VERSION}"
+    Process.exit 0
+  end
+
+  opts.on('-h', '--help', 'Display this screen') do
+    puts opts
+    exit
+  end
+end
+
+optparse.parse!
+
 tracks = config.tracks
 res, condition = conduct(tracks)
 

data/lib/conductor/condition.rb

@@ -85,6 +85,8 @@ module Conductor
 
       return operator == :not_equal if val1.nil?
 
+      val2 = val2.force_encoding('utf-8')
+
       if val1.date?
         if val2.time?
           date1 = val1.to_date
@@ -112,22 +114,22 @@ module Conductor
              else
                Regexp.escape(val2)
              end
-
+      val1 = val1.dup.to_s.force_encoding('utf-8')
       case operator
       when :contains
-        val1.to_s =~ /#{val2}/i
+        val1 =~ /#{val2}/i
       when :not_starts_with
-        val1.to_s !~ /^#{val2}/i
+        val1 !~ /^#{val2}/i
       when :not_ends_with
-        val1.to_s !~ /#{val2}$/i
+        val1 !~ /#{val2}$/i
       when :starts_with
-        val1.to_s =~ /^#{val2}/i
+        val1 =~ /^#{val2}/i
       when :ends_with
-        val1.to_s =~ /#{val2}$/i
+        val1 =~ /#{val2}$/i
       when :equal
-        val1.to_s =~ /^#{val2}$/i
+        val1 =~ /^#{val2}$/i
       when :not_equal
-        val1.to_s !~ /^#{val2}$/i
+        val1 !~ /^#{val2}$/i
       else
         false
       end
@@ -148,7 +150,7 @@ module Conductor
     end
 
     def test_truthy(value1, value2, operator)
-      return false unless value2.bool?
+      return false unless value2&.bool?
 
       value2 = value2.to_bool if value2.is_a?(String)
 
@@ -175,21 +177,25 @@ module Conductor
       when /^tree/i
         test_tree(@env[:origin], value, operator)
       when /^(path|dir)/i
-        test_string(@env[:origin], value, operator) ? true : false
+        test_string(@env[:filepath], value, operator) ? true : false
       when /^phase/i
         test_string(@env[:phase], value, :starts_with) ? true : false
       when /^text/i
-        test_string(IO.read(@env[:filepath]), value, operator) ? true : false
+        puts IO.read(@env[:filepath]).force_encoding('utf-8')
+        test_string(IO.read(@env[:filepath]).force_encoding('utf-8'), value, operator) ? true : false
       when /^(yaml|headers|frontmatter)(?::(.*?))?$/i
         m = Regexp.last_match
         content = IO.read(@env[:filepath]).force_encoding('utf-8')
-        return false unless content =~ /^---/
+        return false unless content =~ /^---/m
 
         yaml = YAML.safe_load(content.split(/^(?:---|\.\.\.)/)[1])
 
         return false unless yaml
+
         if m[2]
           value1 = yaml[m[2]]
+          return false if value1.nil?
+
           value1 = value1.join(',') if value1.is_a?(Array)
           if %i[type_of not_type_of].include?(operator)
             test_type(value1, value, operator)

data/lib/conductor/env.rb

@@ -28,8 +28,8 @@ module Conductor
         css_path: '/Applications/Marked 2.app/Contents/Resources/swiss.css',
         ext: 'md',
         includes: [],
-        origin: '/Users/ttscoff/Dropbox/Writing/brettterpstra.com/_drafts/',
-        filepath: '/Users/ttscoff/Dropbox/Writing/brettterpstra.com/_drafts/marked-2-and-obsidian.md',
+        origin: '/Users/ttscoff/Desktop/Code/marked-conductor/',
+        filepath: '/Users/ttscoff/Desktop/Code/marked-conductor/README.md',
         phase: 'PREPROCESS',
         outline: 'NONE',
         path: '/Developer/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/ttscoff/Dropbox/Writing/brettterpstra.com/_drafts/'

data/lib/conductor/string.rb

@@ -14,19 +14,19 @@ class ::String
   end
 
   def date?
-    match(/^\d{4}-\d{2}-\d{2}/) ? true : false
+    dup.force_encoding('utf-8').match(/^\d{4}-\d{2}-\d{2}/) ? true : false
   end
 
   def time?
-    match(/ \d{1,2}(:\d\d)? *([ap]m)?/i)
+    dup.force_encoding('utf-8').match(/ \d{1,2}(:\d\d)? *([ap]m)?/i)
   end
 
   def to_date
-    Chronic.parse(self)
+    Chronic.parse(self.dup.force_encoding('utf-8'))
   end
 
   def strip_time
-    sub(/ \d{1,2}(:\d\d)? *([ap]m)?/i, '')
+    dup.force_encoding('utf-8').sub(/ \d{1,2}(:\d\d)? *([ap]m)?/i, '')
   end
 
   def to_day(time = :end)
@@ -39,7 +39,7 @@ class ::String
   end
 
   def bool?
-    match(/^(?:y(?:es)?|no?|t(?:rue)?|f(?:alse)?)$/) ? true : false
+    dup.force_encoding('utf-8').match(/^(?:y(?:es)?|no?|t(?:rue)?|f(?:alse)?)$/) ? true : false
   end
 
   def to_bool!

data/lib/conductor/version.rb

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

data/lib/conductor.rb

@@ -7,6 +7,7 @@ require 'fcntl'
 require 'time'
 require 'chronic'
 require 'fileutils'
+require_relative 'conductor/version'
 require_relative 'conductor/env'
 require_relative 'conductor/config'
 require_relative 'conductor/hash'
@@ -20,7 +21,8 @@ require_relative 'conductor/condition'
 module Conductor
   class << self
     def stdin
-      @stdin ||= $stdin.read.strip.force_encoding('utf-8') if $stdin.stat.size.positive? || $stdin.fcntl(Fcntl::F_GETFL, 0).zero?
+      warn 'input on STDIN required' unless $stdin.stat.size.positive? || $stdin.fcntl(Fcntl::F_GETFL, 0).zero?
+      @stdin ||= $stdin.read.strip.force_encoding('utf-8')
     end
   end
 end

data/src/_README.md

@@ -38,7 +38,7 @@ The top level key in the YAML file is `tracks:`. This is an array of hashes, eac
 
 A simple config would look like:
 
-```
+```yaml
 tracks:
   - condition: yaml includes comments
     script: blog-processor
@@ -52,7 +52,7 @@ Instead of a `script` or `command`, a track can contain another `tracks` key, in
  
 For example, the following functions the same as `condition: phase is pre AND tree contains .obsidian AND (extension is md or extension is markdown)`:
 
-```
+```yaml
 tracks:
   - condition: phase is pre
     tracks:
@@ -70,7 +70,7 @@ Available conditions are:
 
 - `extension` (or `ext`): This will test the extension of the file, e.g. `ext is md` or `ext contains task`
 - `tree contains ...`: This will test whether a given file or directory exists in any of the parent folders of the current file, starting with the current directory of the file. Example: `tree contains .obsidian` would test whether there was an `.obsidian` directory in any of the directories above the file (indicating it's within an Obsidian vault)
-- `path`: This tests just the path itself, allowing conditions like `path contains _drafts` or `path does not contain _posts`.
+- `path`: This tests just the path to the file itself, allowing conditions like `path contains _drafts` or `path does not contain _posts`.
 - `phase`: Tests whether Marked is in Preprocessor or Processor phase, allowing conditions like `phase is preprocess` or `phase is process` (which can be shortened to `pre` and `pro`).
 - `text`: This tests for any string match within the text of the document being processed. This can be used with operators `starts with`, `ends with`, or `contains`, e.g. `text contains @taskpaper` or `text does not contain <!--more-->`. 
     - If the test value is surrounded by forward slashes, it will be treated as a regular expression. Regexes are always flagged as case insensitive. Use it like `text contains /@\w+/`.
@@ -114,6 +114,12 @@ All of the [capabilities and requirements](https://marked2app.com/help/Custom_Pr
 
 A script run by Conductor already knows it has the right type of file with the expected data and path, so your script can focus on just processing one file type. It's recommended to separate all of that logic you may already have written out into separate scripts and let Conductor handle the forking based on various criteria.
 
+## Tips
+
+- You can see what condition matched in Marked by opening <b>Help->Show Custom Processor Log</b> and checking the STDERR output.
+- To run [a custom processor for Bear](https://brettterpstra.com/2023/10/08/marked-and-bear/), use the condition `text contains /source: *bear/`
+- To run a custom processor for Obsidian, use the condition `tree contains .obsidian`
+
 ## Testing
 
 In order to test from the command line, you'll need certain environment variables set. This can be done by exporting the following variables with your own definitions, or by running conductor with all of the variables preceding the command, e.g. `$ MARKED_ORIGIN=/path/to/markdown_file.md [...] conductor`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry