compliance_engine 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44cfaff67ac82f027fdab7db4b4b66b268ded7849821d8b9a8593caa6e3c7d67
-  data.tar.gz: c4992a17de18bd49ebbe72e9bec2f56598460e4e20aeb04b50386bf014af8283
+  metadata.gz: dbd845dda86bd56f683bf88d248f27af366046126a0bf112486555f56b3e0eb0
+  data.tar.gz: 5be3bd18377c0b6d2dd49c3d0ab69f53becde97bace7fc9c5a257b96b490560e
 SHA512:
-  metadata.gz: ce7186407c8ab23404b1b1a075509df73c6ba026587c901d14c8849c1c4f6490a88a7f89a4a575e327f276f39b97ce2ca10fb107fdcb275f1affeac0bf884fbf
-  data.tar.gz: 5ed4621f0623213d00987271328f15177157249e563bc7c0036b6009c339b6579aba8e65971a9a0d9e22020b4af31a31ac4abd92305598a532133b92c6aa51cb
+  metadata.gz: 3724f3a4924117858fc1064f46dfef8354d19ae29c45d3d3947b48c7e924b68bf2c0d640db0fe19bfa1f566efc91b768296ec60e21309208ae551d628bda70e4
+  data.tar.gz: c390e3a1e3d95830ad328068aa47c1de4cda0018d86fefbe906d3675956013343b8abd823db9154b0fe637d11d2f1a7584f8dd9b025b2924ba01084c1571fd8c

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 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
+
 ### 0.1.3 / 2025-05-20
 * Add dependency on observer gem (#47)
 * Add Ruby 3.4 to testing matrix

data/compliance_engine.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deep_merge', '~> 1.2'
   spec.add_dependency 'irb', '~> 1.14'
   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')
@@ -39,9 +41,9 @@ class ComplianceEngine::ModuleLoader
     }.flatten
     # Using .each here to make mocking with rspec easier.
     globs.each do |glob|
-      dirclass.glob(glob).each do |file|
-        key = if Object.const_defined?(:Zip) && file.is_a?(Zip::Entry)
-                File.join(file.zipfile.to_s, '.', file.to_s)
+      dirclass.glob(glob).sort.each do |file|
+        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.3'
+  VERSION = '0.1.5'
 
   # 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.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Steven Pritchard
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -56,16 +55,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 +99,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description:
 email:
 - steve@sicura.us
 executables:
@@ -134,9 +138,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.3
+  changelog_uri: https://github.com/simp/rubygem-simp-compliance_engine/releases/tag/0.1.5
   bug_tracker_uri: https://github.com/simp/rubygem-simp-compliance_engine/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +154,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: []