jekyll_flexible_include 2.0.27 → 2.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f3e7b3a00f5c61ca7a1a811076e3658e1455bc4b9a846095dff44cbac849a3
-  data.tar.gz: 3393282c6df4d789b490bc2b93259c1ab19b12135ef2e374d5e075ce669d19de
+  metadata.gz: 2232e1912080dc0efb93181db15ea44d82e34666e1b2a35f0ca30efb71133d85
+  data.tar.gz: 59bc09d732f17d23738757d0d3b3a86d861571d1c08bc4475b21359b101265f2
 SHA512:
-  metadata.gz: a06435f6b338f5391c301401e62109fd75ee8f0099cb8a8eb39f64a49a1c7d76d36ad46b9916347535dbd068625ce69b9eeef6e1e8a73bb9f8b6e96f16118e7a
-  data.tar.gz: c80358ed148a45ce66b0cef6baabc9c2db5cc36d5d6745c620b56100426bfccd55d470933bdbc63c3bdbbb0c39e0389dc1b34bab74ca13c18821ffa1132d0486
+  metadata.gz: 6dcf67360d05ae77803faed7c033770e8338e1b5f7dca2d56f10ed7109c275941e01699f33892ebc41f5ca19cf266cc40e036c5aef715978c1397f6938c16721
+  data.tar.gz: f667fba38d554f321bdbe14f49e3b41cadae38b906d32180d5b94ac19fad435734119ae1bb9061ce1c56cd59aa268516e8660015a28be469ba5cc1f201adbef1

data/.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   # - rubocop-jekyll
   - rubocop-md
   - rubocop-performance

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 2.0.29 / 2026-07-11
+
+* Modified `bin/setup` to allow Rugged 1.9x which requires `libgpg-error-dev`
+  library under Ubuntu. `--with-ssh`. See
+  https://www.mslinn.com/git/4400-rugged.html for rugged installation
+  instructions.
+
+## 2.0.28 / 2025-11-18
+
+* Added new dependency, [`benchmark`](https://github.com/ruby/benchmark),
+  because it will no longer be automatically included starting from Ruby 3.5.0.
+* Windows env vars are only parsed for the `file` parameter.
+
+
 ## 2.0.27 / 2025-09-25
 
 * Handle evaluation of Windows-style env var on a non-Windows machine #16

data/README.md

@@ -168,19 +168,20 @@ time to enumerate the files.
 
 ## Restricting Arbitrary Processes
 
-By default, `flexible_include` can execute any command.
-You can disable that by setting the environment variable `DISABLE_FLEXIBLE_INCLUDE`
-to any non-empty value.
+By default, `flexible_include` can execute any command.  You can disable that by
+setting the environment variable `DISABLE_FLEXIBLE_INCLUDE` to any non-empty
+value.
 
 ```shell
 export DISABLE_FLEXIBLE_INCLUDE=true
 ```
 
-If a potential command execution is intercepted,
-a big red message will appear on the generated web page that says
-`Arbitrary command execution denied by DISABLE_FLEXIBLE_INCLUDE value.`,
-and a red error message will be logged on the console that says something like:
-`ERROR FlexibleInclude: _posts/2020/2020-10-03-jekyll-plugins.html - Arbitrary command execution denied by DISABLE_FLEXIBLE_INCLUDE value.`
+If a potential command execution is intercepted, a big red message will appear
+on the generated web page that says `Arbitrary command execution denied by
+DISABLE_FLEXIBLE_INCLUDE value.`, and a red error message will be logged on the
+console that says something like: `ERROR FlexibleInclude:
+_posts/2020/2020-10-03-jekyll-plugins.html - Arbitrary command execution denied
+by DISABLE_FLEXIBLE_INCLUDE value.`
 
 
 ## Installation
@@ -212,7 +213,7 @@ and a red error message will be logged on the console that says something like:
 5. Install the `jekyll_flexible_include` Ruby gem and mark it as a dependency of your project:
 
    ```shell
-   $ bundle
+   $ bundle install
    ```
 
 ### CSS and Assets

data/jekyll_flexible_include_plugin.gemspec

@@ -35,8 +35,10 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.test_files = spec.files.grep(%r!^(test|spec|features)/!)
   spec.version = JekyllFlexibleIncludePluginVersion::VERSION
 
+  spec.add_dependency 'benchmark' # no longer automatically included starting from Ruby 3.5.0
+  spec.add_dependency 'jekyll_draft'
   spec.add_dependency 'jekyll_from_to_until',  '>= 1.0.5'
   spec.add_dependency 'jekyll_plugin_support', '>= 3.1.1'
-  spec.add_dependency 'jekyll-sass-converter', '= 2.2.0'
+  spec.add_dependency 'jekyll-sass-converter', '>=3.1.0'
   spec.add_dependency 'rugged'
 end

data/lib/flexible_include/version.rb

@@ -1,3 +1,3 @@
 module JekyllFlexibleIncludePluginVersion
-  VERSION = '2.0.27'.freeze
+  VERSION = '2.0.29'.freeze
 end

data/lib/flexible_include.rb

@@ -37,7 +37,10 @@ module FlexibleInclude
     # Look for *nix version of @path if Windows expansion did not yield a file that exists
     def render_impl
       setup
-      @path = ::JekyllSupport::JekyllPluginHelper.expand_env @filename, @logger
+      # First expand bash environment variables ($VAR or ${VAR})
+      path = ::JekyllSupport::JekyllPluginHelper.env_var_expand_bash(@filename, @logger)
+      # Then expand Windows environment variables (%VAR%) for file paths
+      @path = ::JekyllSupport::JekyllPluginHelper.env_var_expand_windows(path, @logger)
       linux_path = `wslpath '#{@path}' 2>/dev/null`.chomp
       @path = linux_path if !File.exist?(@path) && File.exist?(linux_path)
       handle_path_types

data/spec/{flexible_include_spec.rb → flexible_include/flexible_include_spec.rb}

@@ -1,8 +1,8 @@
 require 'jekyll_plugin_support'
-require_relative '../lib/flexible_include'
+require_relative '../../lib/flexible_include'
 
-RSpec.describe(FlexibleInclude) do
-  it 'controls access to files' do
+RSpec.describe(FlexibleInclude::FlexibleInclude) do
+  it 'controls access to files', skip: 'Uses old ParseContext which might be helpful' do
     ENV['FLEXIBLE_INCLUDE_PATHS'] = '~/.*:spec/.*'
 
     described_class.send(:new, 'my_tag', '', Liquid::ParseContext.new)
@@ -11,9 +11,11 @@ RSpec.describe(FlexibleInclude) do
 
     expect(described_class.access_allowed('~/.mem_settings.yaml')).to be_truthy
 
-    home_file = JekyllPluginHelper.expand_env '$HOME/.mem_settings.yaml'
-    expect(described_class.access_allowed(home_file)).to be_truthy
-
     expect(described_class.access_allowed('/asdf')).to be_falsey
   end
+
+  it 'controls access to git content' do
+    home_file = JekyllSupport::JekyllPluginHelper.expand_env '$HOME/.mem_settings.yaml'
+    expect(described_class.access_allowed(home_file)).to be_truthy
+  end
 end

data/spec/git_file_reader_spec.rb

@@ -2,7 +2,7 @@ require 'jekyll_plugin_support'
 require_relative '../lib/git_file_reader'
 
 RSpec.describe(GitFileReader) do
-  it 'reads a file at a tag' do
+  it 'reads a file at a tag', skip: 'unfinished' do
     content = described_class.new('.').blob_at('v2.0.20', 'README.md').content
     expect(content).to include('Added `highlight` regex option')
 

data/spec/status_persistence.txt

@@ -0,0 +1,8 @@
+example_id                                            | status  | run_time        |
+----------------------------------------------------- | ------- | --------------- |
+./spec/flexible_include/flexible_include_spec.rb[1:1] | pending | 0.00001 seconds |
+./spec/flexible_include/flexible_include_spec.rb[1:2] | passed  | 0.00125 seconds |
+./spec/git_file_reader_spec.rb[1:1]                   | pending | 0.00006 seconds |
+./spec/git_file_reader_spec.rb[1:2]                   | passed  | 0.03572 seconds |
+./spec/git_file_reader_spec.rb[1:3]                   | passed  | 0.01804 seconds |
+./spec/git_file_reader_spec.rb[1:4]                   | passed  | 0.01657 seconds |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_flexible_include
 version: !ruby/object:Gem::Version
-  version: 2.0.27
+  version: 2.0.29
 platform: ruby
 authors:
 - Mike Slinn
@@ -11,6 +11,34 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jekyll_draft
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll_from_to_until
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +71,16 @@ dependencies:
   name: jekyll-sass-converter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -89,9 +117,10 @@ files:
 - lib/flexible_include_class.rb
 - lib/flexible_include_private_methods.rb
 - lib/git_file_reader.rb
-- spec/flexible_include_spec.rb
+- spec/flexible_include/flexible_include_spec.rb
 - spec/git_file_reader_spec.rb
 - spec/spec_helper.rb
+- spec/status_persistence.txt
 homepage: https://www.mslinn.com/jekyll_plugins/jekyll_flexible_include.html
 licenses:
 - MIT
@@ -119,12 +148,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Jekyll plugin supports various ways to include content into the generated
   site.
 test_files:
-- spec/flexible_include_spec.rb
+- spec/flexible_include/flexible_include_spec.rb
 - spec/git_file_reader_spec.rb
 - spec/spec_helper.rb
+- spec/status_persistence.txt
 ...