Move zip file loading into its own class

lib/compliance_engine/data.rb

@@ -92,23 +92,18 @@ def reset_collection
   # @param [String] path The Puppet environment archive file
   # @return [NilClass]
   def open_environment_zip(path)
-    require 'zip/filesystem'
-
-    self.modulepath = path
-
-    Zip::File.open(path) do |zipfile|
-      dir = zipfile.dir
-      file = zipfile.file
-
-      open(ComplianceEngine::EnvironmentLoader.new(path, root: '/'.dup, fileclass: file, dirclass: dir))
-    end
+    environment = ComplianceEngine::EnvironmentLoader::Zip.new(path)
+    self.modulepath = environment.modulepath
+    open(environment)
   end
 
   # Scan a Puppet environment
   # @param [Array<String>] paths The Puppet modulepath components
   # @return [NilClass]
   def open_environment(*paths)
-    open(ComplianceEngine::EnvironmentLoader.new(*paths))
+    environment = ComplianceEngine::EnvironmentLoader.new(*paths)
+    self.modulepath = environment.modulepath
+    open(environment)
   end
 
   # Scan paths for compliance data files

lib/compliance_engine/environment_loader.rb

@@ -6,7 +6,7 @@
 # Load compliance engine data from a Puppet environment
 class ComplianceEngine::EnvironmentLoader
   def initialize(*paths, root: nil, fileclass: File, dirclass: Dir)
-    @modulepath = paths
+    @modulepath ||= paths
     modules = paths.map do |path|
       root ||= path
       dirclass.entries(root)

lib/compliance_engine/environment_loader/zip.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'compliance_engine'
+require 'compliance_engine/environment_loader'
+require 'zip/filesystem'
+
+# Load compliance engine data from a zip file containing a Puppet environment
+class ComplianceEngine::EnvironmentLoader::Zip < ComplianceEngine::EnvironmentLoader
+  def initialize(path, root: '/'.dup)
+    @modulepath = path
+
+    ::Zip::File.open(path) do |zipfile|
+      dir = zipfile.dir
+      file = zipfile.file
+
+      super(path, root: root, fileclass: file, dirclass: dir)
+    end
+  end
+end