inspec-reporter-flex 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3a407e8d18f6b3322ae80be9966b218b3e7c74afe5ba7cebf50b2888f2121a
-  data.tar.gz: 272924c807526f524a99805f2d6ffc2999d1fd8f6cfe138ee63baa56efaf4a20
+  metadata.gz: a70f1ad5110657323aa557b7876f254052aa80e5e82d0dc2d1bd1fa62e5ee097
+  data.tar.gz: af696adb163985a265cc85fb0d6da9213f316ad33cc377d3211814abf7d62f25
 SHA512:
-  metadata.gz: b59accab7656b4a910ad433b862d822d0bd7cb518f965c808ed93fed7288f54c8d8b7716cebca723afe9c7bb49df4a4eb30634b5dcc6c7f4f7691bb9c9a37cff
-  data.tar.gz: 77667735300b220f165cc89aa14835d3f2ace950c6801d8674e3f25e2cc96413a28634a3c643f7c998e5825aafdf88670e123fb190807ffa6d80b25a624fa6dc
+  metadata.gz: 309b3ee73a2884b4155de09cf5708f62d1fe98241d3a34c41ab051394a42391385af2dbf0acbd899707a3c6cf165967409bd8462d92dba4261de3f0c4503876c
+  data.tar.gz: 056d903d087b8ca2ac21204d766a0c72547b563dac3d9908ae515ed8b369c7fdadcbd1467cc177e723d112ca09c85d5f54278f1c39c4019f67829492e5d0e3c8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.1.2
+
+- Fix lookup of `scan_time` ERB helper
+- Refactor template handling
+
 ## v0.1.1
 
 - Add configurability via environment variable

data/lib/inspec-reporter-flex/mixin/erb_helpers.rb

@@ -1,10 +1,12 @@
 module InspecPlugins::FlexReporter
   module ErbHelpers
-    # Return latest start time of the scan
+    # Return approximate time of the scan
     #
-    # @return [DateTime] Timestamp of the last scan in the profile
+    # @return [DateTime] Timestamp of the first scan in the profile
     def scan_time
-      DateTime.strptime(report[:profiles].last[:controls].last[:results].last[:start_time])
+      scan_time = report[:profiles].detect { |p| p[:controls].detect { |c| c[:results].detect { |r| !r.empty? } } }.dig(:controls, 0, :results, 0, :start_time)
+
+      DateTime.strptime(scan_time)
     end
 
     # Execute a remote command.

data/lib/inspec-reporter-flex/mixin/file_resolver.rb

@@ -1,11 +1,11 @@
 module InspecPlugins::FlexReporter
   module FileResolver
-    # Resolve the absolute path for a file in order absolute path/gem bundled file/relative.
+    # Resolve the full path for a file in order absolute path/gem bundled file/relative.
     #
     # @param [String] name Name or path of a file to resolve
     # @return [String] Absolute path to the file, if any
     # @raise [IOError] if file not found
-    def resolve_path(name)
+    def full_path(name)
       if absolute_path?(name)
         name
       elsif relative_path?(name)

data/lib/inspec-reporter-flex/reporter.rb

@@ -10,12 +10,11 @@ module InspecPlugins::FlexReporter
 
     ENV_PREFIX = "INSPEC_REPORTER_FLEX_".freeze
 
-    attr_writer :config, :env, :inspec_config, :logger
+    attr_writer :config, :env, :inspec_config, :logger, :template_contents
 
     # Render report
     def render
-      template_file = resolve_path(config["template_file"])
-      template = ERB.new(File.read(template_file))
+      template = ERB.new(template_contents)
 
       # Use JSON Reporter base's `report` to have pre-processed data
       mushy_report = Hashie::Mash.new(report)
@@ -54,6 +53,14 @@ module InspecPlugins::FlexReporter
 
     private
 
+    # Read contents of requested template.
+    #
+    # @return [String] ERB Template
+    # @raise [IOError]
+    def template_contents
+      @template_contents ||= File.read full_path(config["template_file"])
+    end
+
     # Initialize configuration with defaults and Plugin config.
     #
     # @return [Hash] Configuration data after merge

data/lib/inspec-reporter-flex/version.rb

@@ -1,5 +1,5 @@
 module InspecPlugins
   module FlexReporter
-    VERSION = "0.1.1".freeze
+    VERSION = "0.1.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-reporter-flex
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Thomas Heinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump