marked-conductor 1.0.29 → 1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25fca33d78a755b6ab7b9dc4003d842723ca9b1a5eabb4357f665f91480e08cc
-  data.tar.gz: b75c35f4db0f8d96a8a62e7636ff3f268918f85aa98fd133d30621c16dc58ce1
+  metadata.gz: d0e1ef1b159b7512a91fd58ee494b7536624fea11f575cfe5878351b20509a50
+  data.tar.gz: 6c2133011cc6f684e96ce94595cbb997815ead07dd8893a30f6828d3a8aaa079
 SHA512:
-  metadata.gz: 4bdd6b152729410fbd5f6752672169a41cdeab264f9b21ae8796eced90dcff3334817dd51038f8732ff6e9d5856776872b3d9cdcaf87898a74c405e8ce99a3a7
-  data.tar.gz: f26b8b7c39db572313b95b83fce5ac49cbd950171034a1bc99a092c62cc0104b1d28eb78e3dbdfa4c44bd1f54f90a4c0d79e0ea9173020fcc4e7e1ab1131eb0f
+  metadata.gz: '0088bada15dde89533decf97c43979e36c899de5736782847fc43ddf6edcaf2fe81ac9e0e94c485d9104b41e3040288cd2302609b7d503fa18ebe95bb3945ae4'
+  data.tar.gz: 2ade2bebfdc5db48e06bf3a43eddb102f188a3da21c1bbfe73641d7688133a16214056d30de92b79c4310af9758696d1b3251e40f5f37555a5366c7c696786e0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.0.31
+
+2024-07-29 15:40
+
+#### FIXED
+
+- Nil environment variable failure
+
+### 1.0.30
+
+2024-07-29 11:47
+
 ### 1.0.29
 
 2024-07-28 09:57

data/README.md

@@ -107,6 +107,8 @@ Available conditions are:
 - `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
+- `env:KEY matches VALUE` will test for matching values in a environment key. All string matching operators are available, and `env[KEY]` syntax will also work.
+    - `env contains KEY` tests just for the existence of an environment variable key (can include variables set by Marked).
 - 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

@@ -4,9 +4,20 @@
 require_relative "../lib/conductor"
 require "optparse"
 
+options = {
+  config_file: nil
+}
+
 optparse = OptionParser.new do |opts|
   opts.banner = "Called from Marked 2 as a Custom Pre/Processor"
 
+  opts.on("-c", "--config", "Specify alternate config file") do |file|
+    config = File.expand_path(file)
+    raise "Config file not found" unless File.exist?(config)
+
+    options[:config_file] = file
+  end
+
   opts.on("-v", "--version", "Show version number") do
     puts "conductor v#{Conductor::VERSION}"
     Process.exit 0
@@ -21,6 +32,7 @@ end
 optparse.parse!
 
 config = Conductor::Config.new
+config.config_file = options[:config_file] if options[:config_file]
 res = config.configure
 
 Process.exit 0 unless res

data/lib/conductor/condition.rb

@@ -184,6 +184,11 @@ module Conductor
 
       val2 = val2.to_s.dup.force_encoding("utf-8")
 
+      if val2.bool?
+        res = val2.to_bool == val1.to_bool
+        return operator === :not_equal ? !res : res
+      end
+
       if val1.date?
         if val2.time?
           date1 = val1.to_date
@@ -276,6 +281,26 @@ module Conductor
       operator == :not_equal ? !res : res
     end
 
+    ##
+    ## Test for environment variable
+    ##
+    ## @param      value     [String] The value (test for existence of key if
+    ##                       nil)
+    ## @param      key       [String] The key
+    ## @param      operator  [Symbol] The operator
+    ##
+    ## @return     [Boolean] test result
+    ##
+    def test_env(value, key, operator)
+      env = Env.env.merge(ENV)
+      if key.nil?
+        res = !env[value].nil?
+        return operator == :not_contains ? !res : res
+      end
+
+      return test_string(env[key], value, operator)
+    end
+
     ##
     ## Test for presence of yaml, optionall for
     ##             a key, optionally for a key's value
@@ -391,6 +416,9 @@ module Conductor
       end
 
       case type
+      when /^env(?:ironment)?(?:[:\[\()](.*?)[\]\)]?)?$/i
+        key = Regexp.last_match(1) || nil
+        test_env(value, key, operator)
       when /^include/i
         test_includes(@env[:includes], value, operator) ? true : false
       when /^ext/i

data/lib/conductor/config.rb

@@ -41,8 +41,12 @@ module Conductor
       config_file ||= @config_file
       config_dir = File.dirname(config_file)
       scripts_dir = File.dirname(File.join(config_dir, "scripts"))
+      styles_dir = File.dirname(File.join(config_dir, "css"))
+      js_dir = File.dirname(File.join(config_dir, "js"))
       FileUtils.mkdir_p(config_dir) unless File.directory?(config_dir)
       FileUtils.mkdir_p(scripts_dir) unless File.directory?(scripts_dir)
+      FileUtils.mkdir_p(styles_dir) unless File.directory?(styles_dir)
+      FileUtils.mkdir_p(js_dir) unless File.directory?(js_dir)
       unless File.exist?(config_file)
         File.open(config_file, "w") { |f| f.puts sample_config }
         puts "Sample config created at #{config_file}"

data/lib/conductor/env.rb

@@ -7,7 +7,7 @@ module Conductor
     ## Define @env using Marked environment variables
     ##
     def self.env
-      if ENV["CONDUCTOR_TEST"] == "true"
+      if ENV["CONDUCTOR_TEST"]&.to_bool
         load_test_env
       else
         @env ||= {

data/lib/conductor/version.rb

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

data/src/_README.md

@@ -107,6 +107,8 @@ Available conditions are:
 - `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
+- `env:KEY matches VALUE` will test for matching values in a environment key. All string matching operators are available, and `env[KEY]` syntax will also work.
+    - `env contains KEY` tests just for the existence of an environment variable key (can include variables set by Marked).
 - 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

@@ -23,6 +23,7 @@ fi
 
 PHASE="PREPROCESS"
 STD="BOTH"
+CONFIG=""
 
 while getopts "h?p:o:d" opt; do
   case "$opt" in
@@ -32,6 +33,8 @@ while getopts "h?p:o:d" opt; do
       ;;
     p)  PHASE=$OPTARG
       ;;
+    c)  CMD="$CMD -c \"$OPTARG\""
+      ;;
     o)  STD=$OPTARG
       ;;
     d)

metadata

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