hiera-eyaml 4.1.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b91da5b4af241a026ec3aa896bcfd15f9dc6fef98cb34ce9e914a82909446ef
-  data.tar.gz: 5bbefd8470a02dce5f2c7b72710ddeed7ca4b5b08498b8c5bebf723fee607b60
+  metadata.gz: e2577211244aa5ae7a4702accf5c85ccaf652631cc8e83fb1cecd11aa0a6e4de
+  data.tar.gz: c399d35a8687cea60ec1a969776163b1b3fe4cd0a53614243154979c4306b104
 SHA512:
-  metadata.gz: b467938cd57dde4f5b9ae926d386d18707273c153729c279786f249543d7e46bcdc666f4db32e8120fac44a80e5845a12e863edd3f91ee39c7c23bbbadaa3c8a
-  data.tar.gz: 29763852256aee1a4b902d3963742613af410e15277182f73851af80a5b39a704f2d8a4d73f44143e4e364808507ae40dfd3cdd04ad8e4b8d3ec8c51596c7145
+  metadata.gz: 5a2efe12d2603a60cd2d0c3a2931ed1c4b3b9150e65604c20765ba12d34fcf66f87f0f2f48738cc3f07604b0ee65a618eb9797e93b6a46d5df5e248c893ed84e
+  data.tar.gz: 69eaedaf4cd15cd26233177a508bfc0e780557639374618c78d3b1c2ff6b081000a5c9bcca0072c020da9eaefcd309ef45c67d094769e47901cb938d63772d16

data/.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.1
+      - name: Install Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: '3.3'
       - name: Build gem
         run: gem build --strict --verbose *.gemspec
       - name: Publish gem to rubygems.org

data/.github/workflows/test.yml

@@ -1,3 +1,4 @@
+---
 name: Test
 
 on:
@@ -13,7 +14,7 @@ jobs:
   rubocop:
     env:
       BUNDLE_WITHOUT: release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Install Ruby ${{ matrix.ruby }}
@@ -24,7 +25,7 @@ jobs:
       - name: Run Rubocop
         run: bundle exec rake rubocop
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -33,28 +34,35 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
           - jruby-9.4
-        puppet:
-          - "~> 8.0"
-          - "~> 7.24"
-          - "https://github.com/puppetlabs/puppet.git#main"
+        openvox:
+          - "~> 8"
+          - "~> 7"
+          - "https://github.com/OpenVoxProject/puppet.git#main"
         exclude:
           - ruby: "3.0"
-            puppet: "~> 8.0"
+            openvox: "~> 8"
+          - ruby: "2.7"
+            openvox: "~> 8"
+
+          - ruby: "3.0"
+            openvox: "https://github.com/openvoxlabs/puppet.git#main"
           - ruby: "2.7"
-            puppet: "~> 8.0"
+            openvox: "https://github.com/openvoxlabs/puppet.git#main"
 
           - ruby: "3.0"
-            puppet: "https://github.com/puppetlabs/puppet.git#main"
+            openvox: "https://github.com/openvoxproject/puppet.git#main"
           - ruby: "2.7"
-            puppet: "https://github.com/puppetlabs/puppet.git#main"
+            openvox: "https://github.com/openvoxproject/puppet.git#main"
+
     env:
-      PUPPET_VERSION: ${{ matrix.puppet }}
+      OPENVOX_VERSION: ${{ matrix.openvox }}
       COVERAGE: ${{ matrix.coverage }}
-    name: "Ruby ${{ matrix.ruby }} - Puppet ${{ matrix.puppet }}"
+    name: "Ruby ${{ matrix.ruby }} - OpenVox ${{ matrix.openvox }}"
     steps:
       - name: Enable coverage reporting on Ruby 3.1
-        if: matrix.puppet == '~> 7.24' && matrix.ruby == '3.1'
+        if: matrix.openvox == '~> 7.24' && matrix.ruby == '3.1'
         run: echo 'COVERAGE=yes' >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Install expect
@@ -64,6 +72,8 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+      - name: Display Ruby environment
+        run: bundle env
       - name: spec tests
         run: bundle exec rake features
       - name: Verify gem builds

data/.rubocop.yml

@@ -6,3 +6,6 @@ inherit_gem:
 
 Metrics:
   Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2024-05-02 19:12:37 UTC using RuboCop version 1.62.1.
+# `rubocop --auto-gen-config --no-auto-gen-timestamp`
+# using RuboCop version 1.75.8.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,14 +13,6 @@ Layout/CommentIndentation:
   Exclude:
     - 'lib/hiera/backend/eyaml/subcommands/help.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: space, compact, no_space
-Layout/SpaceInsideParens:
-  Exclude:
-    - 'lib/hiera/backend/eyaml/logginghelper.rb'
-
 # Offense count: 1
 Lint/DuplicateMethods:
   Exclude:
@@ -45,23 +37,6 @@ Lint/RescueException:
   Exclude:
     - 'lib/hiera/backend/eyaml/subcommand.rb'
 
-# Offense count: 1
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'lib/hiera/backend/eyaml_backend.rb'
-
-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
-Lint/UselessAssignment:
-  Exclude:
-    - 'features/support/env.rb'
-    - 'lib/hiera/backend/eyaml/plugins.rb'
-    - 'lib/hiera/backend/eyaml/subcommand.rb'
-    - 'lib/hiera/backend/eyaml/subcommands/unknown_command.rb'
-    - 'lib/hiera/backend/eyaml/subcommands/version.rb'
-    - 'lib/hiera/backend/eyaml/utils.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AutoCorrect.
@@ -74,7 +49,7 @@ Lint/UselessMethodDefinition:
 # Configuration parameters: AutoCorrect, CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
-    - 'lib/hiera/backend/eyaml/parser/token.rb'
+    - 'features/support/env.rb'
 
 # Offense count: 1
 Naming/AccessorMethodName:
@@ -94,6 +69,7 @@ Naming/ClassAndModuleCamelCase:
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
+    - 'Rakefile.rb'
     - 'lib/hiera/backend/eyaml/CLI.rb'
 
 # Offense count: 3
@@ -106,8 +82,9 @@ Naming/HeredocDelimiterNaming:
     - 'lib/hiera/backend/eyaml/subcommands/unknown_command.rb'
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, AllowedPatterns.
+# Configuration parameters: EnforcedStyle, AllowedPatterns, ForbiddenIdentifiers, ForbiddenPatterns.
 # SupportedStyles: snake_case, camelCase
+# ForbiddenIdentifiers: __id__, __send__
 Naming/MethodName:
   Exclude:
     - 'lib/hiera/backend/eyaml/encryptors/pkcs7.rb'
@@ -122,18 +99,11 @@ Naming/MethodParameterName:
 # Offense count: 1
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'lib/hiera/backend/eyaml/utils.rb'
 
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/Casecmp:
-  Exclude:
-    - 'lib/hiera/backend/eyaml/highlinehelper.rb'
-    - 'lib/hiera/backend/eyaml/utils.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/Detect:
@@ -175,14 +145,13 @@ Security/YAMLLoad:
     - 'features/step_definitions/decrypt_steps.rb'
     - 'lib/hiera/backend/eyaml_backend.rb'
 
-# Offense count: 9
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, conditionals
 Style/AndOr:
   Exclude:
     - 'lib/hiera/backend/eyaml/encryptors/pkcs7.rb'
-    - 'lib/hiera/backend/eyaml/highlinehelper.rb'
     - 'lib/hiera/backend/eyaml/logginghelper.rb'
     - 'lib/hiera/backend/eyaml/subcommand.rb'
     - 'lib/hiera/backend/eyaml_backend.rb'
@@ -226,7 +195,7 @@ Style/EnvHome:
 
 # Offense count: 10
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
   EnforcedStyle: unannotated
@@ -254,20 +223,10 @@ Style/IdenticalConditionalBranches:
     - 'lib/hiera/backend/eyaml/subcommands/decrypt.rb'
     - 'lib/hiera/backend/eyaml/subcommands/edit.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/hiera/backend/eyaml/encryptors/pkcs7.rb'
-    - 'lib/hiera/backend/eyaml/parser/encrypted_tokens.rb'
-
-# Offense count: 2
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: nonzero?
-Style/IfWithBooleanLiteralBranches:
+Style/MapIntoArray:
   Exclude:
-    - 'lib/hiera/backend/eyaml/highlinehelper.rb'
     - 'lib/hiera/backend/eyaml_backend.rb'
 
 # Offense count: 1
@@ -408,9 +367,9 @@ Style/ZeroLengthPredicate:
   Exclude:
     - 'lib/hiera/backend/eyaml/parser/parser.rb'
 
-# Offense count: 11
+# Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 194

data/CHANGELOG.md

@@ -2,7 +2,32 @@
 
 All notable changes to this project will be documented in this file.
 
-## [v4.1.0](https://github.com/voxpupuli/hiera-eyaml/tree/v4.1.0) (2024-05-10)
+## [v4.3.0](https://github.com/voxpupuli/hiera-eyaml/tree/v4.3.0) (2025-06-05)
+
+[Full Changelog](https://github.com/voxpupuli/hiera-eyaml/compare/v4.2.0...v4.3.0)
+
+**Implemented enhancements:**
+
+- CI: Replace puppet with openvox [\#390](https://github.com/voxpupuli/hiera-eyaml/pull/390) ([bastelfreak](https://github.com/bastelfreak))
+- Add Ruby 3.3 to CI matrix [\#386](https://github.com/voxpupuli/hiera-eyaml/pull/386) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- voxpupuli-rubocop: Update 2.8.0-\>3.1.0 [\#393](https://github.com/voxpupuli/hiera-eyaml/pull/393) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v4.2.0](https://github.com/voxpupuli/hiera-eyaml/tree/v4.2.0) (2024-10-21)
+
+[Full Changelog](https://github.com/voxpupuli/hiera-eyaml/compare/v4.1.0...v4.2.0)
+
+**Implemented enhancements:**
+
+- highline: Allow 3.x [\#385](https://github.com/voxpupuli/hiera-eyaml/pull/385) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- voxpupuli-rubocop: Fix version pinning, update 2.6-\>2.8 [\#384](https://github.com/voxpupuli/hiera-eyaml/pull/384) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v4.1.0](https://github.com/voxpupuli/hiera-eyaml/tree/v4.1.0) (2024-05-13)
 
 [Full Changelog](https://github.com/voxpupuli/hiera-eyaml/compare/v4.0.0...v4.1.0)
 

data/Gemfile

@@ -21,7 +21,7 @@ group :development do
   gem 'aruba', '~> 2.2'
   gem 'cucumber', '~> 9.2'
   gem 'hiera-eyaml-plaintext'
-  gem 'puppet', *location_for(ENV['PUPPET_VERSION']) if ENV['PUPPET_VERSION']
+  gem 'openvox', *location_for(ENV['OPENVOX_VERSION']) if ENV['OPENVOX_VERSION']
 end
 
 group :release do

data/Rakefile

@@ -26,7 +26,7 @@ end
 # https://stackoverflow.com/questions/6473419/using-simplecov-to-display-cucumber-code-coverage
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = %w[--format progress] # Any valid command line option can go here.
+  t.cucumber_opts = %w[--format progress --strict] # Any valid command line option can go here.
 end
 
 begin

data/hiera-eyaml.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'highline', '~> 2.1'
-  gem.add_runtime_dependency 'optimist', '~> 3.1'
+  gem.add_dependency 'highline', '>= 2.1', '< 4'
+  gem.add_dependency 'optimist', '~> 3.1'
 
   gem.add_development_dependency 'rake', '~> 13.2', '>= 13.2.1'
   gem.add_development_dependency 'rspec-expectations', '~> 3.13'
-  gem.add_development_dependency 'voxpupuli-rubocop', '2.6.0'
+  gem.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
 
   gem.required_ruby_version = '>= 2.7', ' < 4'
 end

data/lib/hiera/backend/eyaml/highlinehelper.rb

@@ -10,11 +10,7 @@ class Hiera
 
         def self.confirm?(message)
           result = ask("#{message} (y/N): ")
-          if result.downcase == 'y' or result.downcase == 'yes'
-            true
-          else
-            false
-          end
+          %w[y yes].include?(result.downcase) || false
         end
       end
     end

data/lib/hiera/backend/eyaml/logginghelper.rb

@@ -50,7 +50,7 @@ class Hiera
           if hiera?
             Hiera.send(hiera_loglevel, message) if threshold.nil? or Eyaml.verbosity_level > threshold
           elsif threshold.nil? or Eyaml.verbosity_level > threshold
-            STDERR.puts self.colorize( message, cli_color )
+            STDERR.puts self.colorize(message, cli_color)
           end
         end
 

data/lib/hiera/backend/eyaml/parser/encrypted_tokens.rb

@@ -146,9 +146,7 @@ class Hiera
 
           def create_token(string)
             md = @regex.match(string)
-            if EncToken.encrypt_unchanged == false && !md[1].nil? && (md[3] == EncToken.tokens_map[md[1]])
-              return EncToken.plain_text_value(:string, md[3], md[2], string, md[1])
-            end
+            return EncToken.plain_text_value(:string, md[3], md[2], string, md[1]) if EncToken.encrypt_unchanged == false && !md[1].nil? && (md[3] == EncToken.tokens_map[md[1]])
 
             EncToken.decrypted_value(:string, md[3], md[2], string, md[1])
           end
@@ -161,9 +159,7 @@ class Hiera
 
           def create_token(string)
             md = @regex.match(string)
-            if EncToken.encrypt_unchanged == false && !md[2].nil? && (md[4] == EncToken.tokens_map[md[2]])
-              return EncToken.plain_text_value(:string, md[4], md[3], string, md[2])
-            end
+            return EncToken.plain_text_value(:string, md[4], md[3], string, md[2]) if EncToken.encrypt_unchanged == false && !md[2].nil? && (md[4] == EncToken.tokens_map[md[2]])
 
             EncToken.decrypted_value(:block, md[4], md[3], string, md[2], md[1])
           end

data/lib/hiera/backend/eyaml/parser/token.rb

@@ -5,7 +5,6 @@ class Hiera
         class TokenType
           attr_reader :regex
 
-          @regex
           def create_token(_string)
             raise 'Abstract method called'
           end
@@ -37,7 +36,7 @@ class Hiera
 
         class NonMatchToken < Token
           def initialize(non_match)
-            super(non_match)
+            super
           end
 
           def to_encrypted(_args = {})

data/lib/hiera/backend/eyaml/plugins.rb

@@ -37,7 +37,6 @@ class Hiera
               dependency = spec.dependencies.find { |d| d.name == 'hiera-eyaml' }
               next if dependency && !dependency.requirement.satisfied_by?(this_version)
 
-              file = nil
               file = if gem_version >= Gem::Version.new('1.8.0')
                        spec.matches_for_glob('**/eyaml_init.rb').first
                      else

data/lib/hiera/backend/eyaml/subcommand.rb

@@ -86,7 +86,7 @@ class Hiera
         def self.find(commandname = 'unknown_command')
           begin
             require "hiera/backend/eyaml/subcommands/#{commandname.downcase}"
-          rescue Exception => e
+          rescue Exception
             require 'hiera/backend/eyaml/subcommands/unknown_command'
             return Hiera::Backend::Eyaml::Subcommands::UnknownCommand
           end

data/lib/hiera/backend/eyaml/subcommands/unknown_command.rb

@@ -20,7 +20,6 @@ class Hiera
           end
 
           def self.execute
-            subcommands = Eyaml.subcommands
             puts <<~EOS
               Unknown subcommand#{': ' + Eyaml.subcommand if Eyaml.subcommand}
 

data/lib/hiera/backend/eyaml/subcommands/version.rb

@@ -15,8 +15,6 @@ class Hiera
           end
 
           def self.execute
-            plugin_versions = {}
-
             Eyaml::LoggingHelper.info "hiera-eyaml (core): #{Eyaml::VERSION}"
 
             Plugins.plugins.each do |plugin|

data/lib/hiera/backend/eyaml/utils.rb

@@ -60,7 +60,7 @@ class Hiera
           return string if orig_encoding == Encoding::UTF_8
 
           string.dup.force_encoding(Encoding::UTF_8)
-        rescue EncodingError => e
+        rescue EncodingError
           warn "Unable to encode to \"Encoding::UTF_8\" using the original \"#{orig_encoding}\""
           string
         end

data/lib/hiera/backend/eyaml.rb

@@ -1,7 +1,7 @@
 class Hiera
   module Backend
     module Eyaml
-      VERSION = '4.1.0'
+      VERSION = '4.3.0'
       DESCRIPTION = 'Hiera-eyaml is a backend for Hiera which provides OpenSSL encryption/decryption for Hiera properties'
 
       class RecoverableError < StandardError

data/lib/hiera/backend/eyaml_backend.rb

@@ -105,7 +105,7 @@ class Hiera
       end
 
       def encrypted?(data)
-        /.*ENC\[.*\]/.match?(data) ? true : false
+        /.*ENC\[.*\]/.match?(data) || false
       end
 
       def parse_answer(data, scope, extra_data = {})

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Vox Pupuli
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +82,16 @@ dependencies:
   name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.1.0
 description: Hiera backend for decrypting encrypted yaml properties
 email: voxpupuli@groups.io
 executables:
@@ -140,7 +146,7 @@ homepage: https://github.com/voxpupuli/hiera-eyaml/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: OpenSSL Encryption backend for Hiera
 test_files: []