kettle-jem 7.1.28 → 7.1.30

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.28
+  version: 7.1.30
 platform: ruby
 authors:
 - Peter H. Boling
@@ -86,7 +86,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.8
+        version: 7.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.8
+        version: 7.1.10
 - !ruby/object:Gem::Dependency
   name: ast-merge
   requirement: !ruby/object:Gem::Requirement
@@ -157,26 +157,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.8
-- !ruby/object:Gem::Dependency
-  name: commonmarker-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: dotenv-merge
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +206,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -236,27 +216,27 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: kettle-gha-pins
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +286,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: 0.1.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -316,27 +296,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.11
-- !ruby/object:Gem::Dependency
-  name: kramdown-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.1.8
+        version: 0.1.17
 - !ruby/object:Gem::Dependency
   name: markdown-merge
   requirement: !ruby/object:Gem::Requirement
@@ -676,7 +636,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -686,7 +646,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -696,7 +656,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -706,7 +666,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.25
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -716,7 +676,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -726,7 +686,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -750,7 +710,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -760,7 +720,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -770,7 +730,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -780,7 +740,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -825,6 +785,7 @@ files:
 - lib/kettle/jem/rakelib/prepare.rake
 - lib/kettle/jem/rakelib/selftest.rake
 - lib/kettle/jem/rakelib/template.rake
+- lib/kettle/jem/relative_paths.rb
 - lib/kettle/jem/tasks.rb
 - lib/kettle/jem/tasks/install_task.rb
 - lib/kettle/jem/tasks/prepare_task.rb
@@ -880,7 +841,6 @@ files:
 - lib/kettle/jem/templates/.github/workflows/templating.yml.example
 - lib/kettle/jem/templates/.github/workflows/truffle.yml.example
 - lib/kettle/jem/templates/.github/workflows/truffleruby-22.3.yml.example
-- lib/kettle/jem/templates/.github/workflows/truffleruby-23.0.yml.example
 - lib/kettle/jem/templates/.github/workflows/truffleruby-23.1.yml.example
 - lib/kettle/jem/templates/.github/workflows/truffleruby-24.2.yml.example
 - lib/kettle/jem/templates/.github/workflows/truffleruby-25.0.yml.example
@@ -926,6 +886,7 @@ files:
 - lib/kettle/jem/templates/Rakefile.example
 - lib/kettle/jem/templates/SECURITY.md.example
 - lib/kettle/jem/templates/bin/setup.example
+- lib/kettle/jem/templates/bin/turbo_tests2.example
 - lib/kettle/jem/templates/certs/pboling.pem.example
 - lib/kettle/jem/templates/gem.gemspec.example
 - lib/kettle/jem/templates/gemfiles/modular/benchmark/r4/v0.5.gemfile.example
@@ -946,7 +907,6 @@ files:
 - lib/kettle/jem/templates/gemfiles/modular/erb/r4/v5.0.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/erb/vHEAD.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/json/truffleruby_22_3.gemfile.example
-- lib/kettle/jem/templates/gemfiles/modular/json/truffleruby_23_0.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/json/truffleruby_23_1.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/mutex_m/r2.4/v0.1.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/mutex_m/r2/v0.3.gemfile.example
@@ -954,6 +914,7 @@ files:
 - lib/kettle/jem/templates/gemfiles/modular/mutex_m/r4/v0.3.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/mutex_m/vHEAD.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/optional.gemfile.example
+- lib/kettle/jem/templates/gemfiles/modular/ostruct/r4/v0.6.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/recording/r2.3/recording.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/recording/r2.4/recording.gemfile.example
 - lib/kettle/jem/templates/gemfiles/modular/recording/r2.5/recording.gemfile.example
@@ -1016,10 +977,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.28
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.28/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.30
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.30/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.28
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.30
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/kettle-jem
@@ -1050,7 +1011,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.20
 specification_version: 4
 summary: "\U0001F52E Gem templating engine using AST-based merging and configurable
   token resolution."

data/lib/kettle/jem/templates/.github/workflows/truffleruby-23.0.yml.example

@@ -1,92 +0,0 @@
-name: TruffleRuby 23.0
-
-permissions:
-  contents: read
-
-env:
-  K_SOUP_COV_DO: false
-
-on:
-  push:
-    branches:
-      - 'main'
-      - '*-stable'
-    tags:
-      - '!*' # Do not execute on tags
-  pull_request:
-    branches:
-      - '*'
-  # Allow manually triggering the workflow.
-  workflow_dispatch:
-
-# Cancels all previous workflow runs for the same branch that have not yet completed.
-concurrency:
-  # The concurrency group contains the workflow name and the branch name.
-  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  test:
-    if: "(github.event_name != 'push' || (!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]'))) && (github.event_name != 'pull_request' || startsWith(github.head_ref, 'engines/') || startsWith(github.head_ref, 'truffleruby/') || startsWith(github.head_ref, 'feature/release'))"
-    name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}
-    runs-on: ubuntu-22.04
-    continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
-    env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
-      BUNDLE_GEMFILE: ${{ github.workspace }}/Appraisal.root.gemfile
-    strategy:
-      matrix:
-        include:
-          # NOTE: truffleruby does not support upgrading rubygems.
-          # truffleruby-23.0 (targets Ruby 3.0 compatibility)
-          - ruby: "truffleruby-23.0"
-            appraisal: "ruby-3-0"
-            exec_cmd: "{KJ|CI:EXEC_CMD}"
-            rubygems: default
-            bundler: default
-            experimental: true
-
-    steps:
-      - name: Checkout
-        if: ${{ !env.ACT }}
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          persist-credentials: false
-
-      - name: Setup Ruby & RubyGems
-        if: ${{ !env.ACT }}
-        uses: appraisal-rb/setup-ruby-flash@925395edf973d2dc0a629919f407f3547a03d4b5 # v2.1 compatibility bundle installation
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          rubygems: ${{ matrix.rubygems }}
-          bundler: ${{ matrix.bundler }}
-          bundler-cache: true
-          manual-compatibility-bundle: true
-          gem-install-retries: 7
-
-      - name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
-        id: bundleAppraisalAttempt1
-        if: ${{ !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
-        # Continue to the next step on failure
-        continue-on-error: true
-
-      # Effectively an automatic retry of the previous step.
-      - name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
-        id: bundleAppraisalAttempt2
-        # If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
-        if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} install
-
-      - name: Restore RSpec status log
-        if: "${{!env.ACT}}"
-        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: .rspec_status
-          key: rspec-status-truffleruby-23.0-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-${{github.run_id}}-${{github.run_attempt}}
-          restore-keys: |
-            rspec-status-truffleruby-23.0-${{matrix.ruby}}-${{matrix.appraisal}}-${{hashFiles('**/Gemfile.lock','Appraisal.root.gemfile','gemfiles/**/*.gemfile')}}-
-            rspec-status-truffleruby-23.0-${{matrix.ruby}}-${{matrix.appraisal}}-
-
-      - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
-        if: ${{ !env.ACT }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

data/lib/kettle/jem/templates/gemfiles/modular/json/truffleruby_23_0.gemfile.example

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-if RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION.start_with?("23.0")
-  # TruffleRuby 23.0 ships the json default gem from its emulated MRI Ruby.
-  gem "json", "= 2.6.1"
-end