jekyll_plugin_support 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c20bec384d298ac931d132f59dbcaf621e9f55440954dc8c6579b1c9131df62e
-  data.tar.gz: 4cfd22137529da35c52f788ab70ec81fe9457d6b533ec5bc70f653b22791db0e
+  metadata.gz: 89c80e46269ce8e9476f0758550b2d0acb48bd9462ffe0e6d957c436d1c98d2d
+  data.tar.gz: 920e92f0c86d0884193650af1039790df087edc158b529537d37c1fa1d04e680
 SHA512:
-  metadata.gz: eafd8b44d05e23011bd30a2bb3bab69befb3cd90b520585d4cf05d164b1b2c76a5218cdd0bdbf3bc7ba6f9a25e789f171403f3553d2cb68d13e0c54346d69b5e
-  data.tar.gz: 1beb29113474e1d501d5394b90288f7e46047e846b868df80f1a5afe9287ae7eece17e7d00e95e9443b7d3b2a69d6d93d9c27d0f6d81d1f4d2f0afba8ae152fe
+  metadata.gz: 1d0045d9f09b3b76c8306073d50c06b1f93fd4c7914a08ce24a826d75ffa033c84660710d8822ea25f18e5585cb94232e7634d68f7b4822aee311865768fc028
+  data.tar.gz: 779da912b97c957c69f8829265c7ad2ad213c6ccf286acae65d87e13a03c24d23e32eea85d22edd9c93aa4084f07732178325f9e7cb7bbb5484859b8e2f8ca79

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 3.1.1 / 2025-09-13
+
+* Now looks up Windows environment variables (surrounded by `%` characters).
+  An error is generated for undefined variables.
+
+
 ## 3.1.0 / 2025-06-10
 
 * Added attribute `order` and method `field` to support `jekyll_outline`.

data/README.md

@@ -71,6 +71,24 @@ Jekyll plugin tags created from `jekyll_plugin_support` framework automatically
 
 ## Installation
 
+### If You Need Windows Environment Variable Expansion
+
+This only works if Jekyll is running on a Windows / WSL machine.
+If you have a Mac, ignore the rest of this section, however be sure
+not to try to include a file whose name contains two percent characters.
+
+If a %WindowsStyleEnvironmentVariable% is detected in the `url` parameter,
+`wslvar` is called.
+If your WSL installation is old it might not have the `wslvar` command
+
+The wslvar utility is part of the wslu package, a collection of useful utilities that come with WSL.
+The most straightforward fix is to reinstall it.
+
+```shell
+$ sudo apt update
+$ sudo apt install wslu
+```
+
 ### For A Jekyll Website
 
 `Jekyll_plugin_support` is packaged as a Ruby gem.

data/lib/helper/jekyll_plugin_helper_class.rb

@@ -5,10 +5,10 @@ require 'yaml'
 module JekyllSupport
   # Class methods for JekyllPluginHelper
   class JekyllPluginHelper
-    # Expand an environment variable reference
+    # Expand an environment variable reference; first expand bash environment variables, then expand windows environment vars
     def self.expand_env(str, logger = nil, die_if_undefined: false)
-      str&.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}/) do
-        envar = Regexp.last_match(1)
+      x = str&.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}/) do
+        envar = Regexp.last_match 1
         unless ENV.key? envar
           msg = "jekyll_plugin_support error: environment variable #{envar} is undefined"
           raise JekyllPluginSupportError, msg.red, [] if die_if_undefined
@@ -21,6 +21,26 @@ module JekyllSupport
         end
         ENV.fetch(envar, nil)
       end
+      # Only expand %VAR% if x is not nil and contains a %
+      if x&.include?('%')
+        x.gsub(/%([a-zA-Z_][a-zA-Z0-9_]*)%|{\g<1>}/) do
+          envar = Regexp.last_match 1
+          value = `wslvar #{envar} &2> /dev/null`.chomp
+          unless value
+            msg = "jekyll_plugin_support error: Windows environment variable %#{envar}% is undefined"
+            raise JekyllPluginSupportError, msg.red, [] if die_if_undefined
+
+            if logger
+              logger.warn msg
+            else
+              puts msg.red
+            end
+          end
+          value
+        end
+      else
+        x
+      end
     end
 
     def self.generate_message(klass, tag_name, version)

data/lib/jekyll_plugin_support/version.rb

@@ -1,3 +1,3 @@
 module JekyllPluginSupportVersion
-  VERSION = '3.1.0'.freeze unless defined?(VERSION)
+  VERSION = '3.1.1'.freeze unless defined?(VERSION)
 end

data/spec/status_persistence.txt

@@ -1,6 +1,9 @@
 example_id                                       | status | run_time        |
 ------------------------------------------------ | ------ | --------------- |
-./spec/jekyll_plugin_helper_options_spec.rb[1:1] | passed | 0.00559 seconds |
-./spec/jekyll_plugin_helper_options_spec.rb[1:2] | passed | 0.00583 seconds |
-./spec/jekyll_plugin_helper_options_spec.rb[1:3] | passed | 0.00543 seconds |
-./spec/jekyll_plugin_helper_options_spec.rb[1:4] | passed | 0.00157 seconds |
+./spec/custom_error_spec.rb[1:1]                 | failed | 0.00772 seconds |
+./spec/custom_error_spec.rb[2:1]                 | passed | 0.0011 seconds  |
+./spec/jekyll_plugin_helper_options_spec.rb[1:1] | failed | 0.00005 seconds |
+./spec/jekyll_plugin_helper_options_spec.rb[1:2] | failed | 0.00003 seconds |
+./spec/jekyll_plugin_helper_options_spec.rb[1:3] | failed | 0.00003 seconds |
+./spec/jekyll_plugin_helper_options_spec.rb[1:4] | failed | 0.00003 seconds |
+./spec/liquid_variable_parsing_spec.rb[1:1]      | failed | 0.00003 seconds |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_plugin_support
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Mike Slinn
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Provides a framework for writing and testing Jekyll plugins
 test_files: