compliance_engine 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd52dc5252f71f8f6e615c4859281f88a6393d381cb666969466439a4dc0563b
-  data.tar.gz: 927c8037a0614f3c894af779638db8e9ac944820c3312c67d94d763c18335737
+  metadata.gz: 9cf000d354045bd026560c6973a78b8939d7e1afbcabcfceea28514c9cad4cb2
+  data.tar.gz: 4d2bc0af35450a9304c54894935898438a220f4a9dd2ec3cf27fd4464fdc85f1
 SHA512:
-  metadata.gz: 3583185fc8b18843c146359356d03cdb994c87e0d6ffbff91c5f414a2a13f6e191d071594bade8f170be627eb1ba8eb3cdd7bd7ea862316cb6a5c004a773d166
-  data.tar.gz: 398cbe2115807d72a45d8b110c237953658926b00130b27f70d2d6f12c032b40e2e91c02571ff0c1483bba2b2aadebce9130f216f6e966af48fc6dfc87f999b6
+  metadata.gz: 46feb241ff9d68a5664992212a4b5b30852359e94a9b97b4d9adc26189fa18a8112e3c2ee3ff7b8eeacd717b315a1d38535e7f2a44266c88cc029559529d5d5e
+  data.tar.gz: 894d7860b229bf92db40bf7ca4583d1119da1b047b04899e99c2a3054e3c195770fddd0eb524312577acd678da3b7b5c4ffe3288c5a342efe83ac3bf536b5bb6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.1.6 / 2026-01-08
+* Add Ruby 4.0 support (#77)
+
+### 0.1.5 / 2026-01-08
+* Add rubyzip 3.x support (#69)
+
 ### 0.1.4 / 2025-06-04
 * Use OpenVox in the dev container (#50)
 * Sort glob entries to avoid more GHA test failures

data/compliance_engine.gemspec

@@ -26,8 +26,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'deep_merge', '~> 1.2'
   spec.add_dependency 'irb', '~> 1.14'
+  spec.add_dependency 'logger', '>= 1.4', '< 2.0'
   spec.add_dependency 'observer', '~> 0.1'
-  spec.add_dependency 'rubyzip', '~> 2.3'
+  spec.add_dependency 'rubyzip', '>= 2.3', '< 4'
   spec.add_dependency 'semantic_puppet', '~> 1.1'
   spec.add_dependency 'thor', '~> 1.3'
 end

data/lib/compliance_engine/data.rb

@@ -137,12 +137,7 @@ class ComplianceEngine::Data
       end
 
       if fileclass.file?(path)
-        key = if Object.const_defined?(:Zip) && path.is_a?(Zip::Entry)
-                File.join(path.zipfile.to_s, '.', path.to_s)
-              else
-                path.to_s
-              end
-        update(path, key: key, fileclass: fileclass)
+        update(path, key: path.to_s, fileclass: fileclass)
         next
       end
 

data/lib/compliance_engine/environment_loader/zip.rb

@@ -18,7 +18,7 @@ class ComplianceEngine::EnvironmentLoader::Zip < ComplianceEngine::EnvironmentLo
       dir = zipfile.dir
       file = zipfile.file
 
-      super(root, fileclass: file, dirclass: dir)
+      super(root, fileclass: file, dirclass: dir, zipfile_path: path)
     end
   end
 end

data/lib/compliance_engine/environment_loader.rb

@@ -10,9 +10,11 @@ class ComplianceEngine::EnvironmentLoader
   # @param paths [Array] the paths to search for Puppet modules
   # @param fileclass [File] the class to use for file operations (default: `File`)
   # @param dirclass [Dir] the class to use for directory operations (default: `Dir`)
-  def initialize(*paths, fileclass: File, dirclass: Dir)
+  # @param zipfile_path [String, nil] the path to the zip file if loading from a zip archive
+  def initialize(*paths, fileclass: File, dirclass: Dir, zipfile_path: nil)
     raise ArgumentError, 'No paths specified' if paths.empty?
     @modulepath ||= paths
+    @zipfile_path = zipfile_path
     modules = paths.map do |path|
       dirclass.entries(path)
               .grep(%r{\A[a-z][a-z0-9_]*\Z})
@@ -23,8 +25,8 @@ class ComplianceEngine::EnvironmentLoader
       []
     end
     modules.flatten!
-    @modules = modules.map { |path| ComplianceEngine::ModuleLoader.new(path, fileclass: fileclass, dirclass: dirclass) }
+    @modules = modules.map { |path| ComplianceEngine::ModuleLoader.new(path, fileclass: fileclass, dirclass: dirclass, zipfile_path: @zipfile_path) }
   end
 
-  attr_reader :modulepath, :modules
+  attr_reader :modulepath, :modules, :zipfile_path
 end

data/lib/compliance_engine/module_loader.rb

@@ -11,12 +11,14 @@ class ComplianceEngine::ModuleLoader
   # @param path [String] the path to the Puppet module
   # @param fileclass [File] the class to use for file operations (default: `File`)
   # @param dirclass [Dir] the class to use for directory operations (default: `Dir`)
-  def initialize(path, fileclass: File, dirclass: Dir)
+  # @param zipfile_path [String, nil] the path to the zip file if loading from a zip archive
+  def initialize(path, fileclass: File, dirclass: Dir, zipfile_path: nil)
     raise ComplianceEngine::Error, "#{path} is not a directory" unless fileclass.directory?(path)
 
     @name = nil
     @version = nil
     @files = []
+    @zipfile_path = zipfile_path
 
     # Read the Puppet module's metadata.json
     metadata_json = File.join(path.to_s, 'metadata.json')
@@ -40,8 +42,8 @@ class ComplianceEngine::ModuleLoader
     # Using .each here to make mocking with rspec easier.
     globs.each do |glob|
       dirclass.glob(glob).sort.each do |file|
-        key = if Object.const_defined?(:Zip) && file.is_a?(Zip::Entry)
-                File.join(file.zipfile.to_s, '.', file.to_s)
+        key = if @zipfile_path
+                File.join(@zipfile_path, '.', file.to_s)
               else
                 file.to_s
               end
@@ -57,5 +59,5 @@ class ComplianceEngine::ModuleLoader
     end
   end
 
-  attr_reader :name, :version, :files
+  attr_reader :name, :version, :files, :zipfile_path
 end

data/lib/compliance_engine/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ComplianceEngine
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 
   # Handle supported compliance data versions
   class Version

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: compliance_engine
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Steven Pritchard
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -38,6 +37,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: observer
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +75,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: semantic_puppet
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +119,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description:
 email:
 - steve@sicura.us
 executables:
@@ -134,9 +158,8 @@ licenses:
 metadata:
   homepage_uri: https://simp-project.com/docs/sce/
   source_code_uri: https://github.com/simp/rubygem-simp-compliance_engine
-  changelog_uri: https://github.com/simp/rubygem-simp-compliance_engine/releases/tag/0.1.4
+  changelog_uri: https://github.com/simp/rubygem-simp-compliance_engine/releases/tag/0.1.6
   bug_tracker_uri: https://github.com/simp/rubygem-simp-compliance_engine/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Parser for Sicura Compliance Engine data
 test_files: []