manageiq-smartstate 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4e0ae5df27aeb31c51bf3cd62249be2b2a53d8
-  data.tar.gz: d8dc954b070111eb849bf9c0b1af5c2e01b5ee7d
+  metadata.gz: 00a7fd279564b332f1a1d404da7cd92cd41d9827
+  data.tar.gz: 4e458d0d28103d49b69edc730c38bf3ca1fe9a01
 SHA512:
-  metadata.gz: e59d6441ae21c768e7b25e046dd66395638d21845a4b8465a7c19b0c15a04c43aeaa7a7b0820d483a81562c77726f894a2b82fd39e59ac36e5391e734a3cb66c
-  data.tar.gz: fef77f29b8e8f2409c0320ea7463d8cd1ccb55fcb31b9cfcad3e187f300b784999b0d94736617b8084db7ea337a30185f08a4183e5bcdf8b73ad6270a5bf8e2c
+  metadata.gz: 11c5b3bed6d746d0631bed97dc25fff334c845446b33553c467913c2cd404d1dc1ba26cc4ee7118de535ce08592d6ff143102d9d036106af8426ea0a2c538825
+  data.tar.gz: 3b6392fed96603ef12de4214a004bf9a36c5cda4e40064452d43c6e8bc1841bbc22f359f6bf9aed6e97e62600bc1c5afa6849931fdd035e59c04bddc1381c3f7

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.3.4".freeze
+    VERSION = "0.3.5".freeze
   end
 end

data/lib/metadata/util/md5deep.rb

@@ -126,37 +126,40 @@ class MD5deep
 
       begin
         #       unless File.directory?(currFile) then
-        unless isDir?(currFile)
-          # File we have an exclusion list and the current file is in it, skip to the next file
-          @fullFileCount += 1
-          fh = fileOpen(currFile)
-
-          xmlFileNode = xmlNode.add_element("file", "name" => x, "fqname" => currFile)
-          statHash = {}
-          statHash.merge!(getFileStats(fh))
-          statHash.merge!(calculate_digest(fh))
-          xmlFileNode.add_attributes(statHash)
-
-          ext = File.extname(currFile).downcase
-          if @opts.winVerList.include?(ext)
-            if @opts.versioninfo || @opts.imports
-              peHdr = PEheader.new(fh) rescue nil
-              unless peHdr.nil?
-                xmlFileNode.add_element("versioninfo", peHdr.versioninfo) if @opts.versioninfo && !peHdr.versioninfo.blank?
-                xmlFileNode.add_element("libraries", "imports" => peHdr.getImportList) if @opts.imports && !peHdr.imports.blank?
-              end
-            end
-          end
-
-          getFileContents(fh, xmlFileNode) if @opts.contents == true
-          fh.close
+        return if isDir?(currFile)
+
+        # File we have an exclusion list and the current file is in it, skip to the next file
+        @fullFileCount += 1
+        fh = fileOpen(currFile)
+
+        xmlFileNode = xmlNode.add_element("file", "name" => x, "fqname" => currFile)
+        statHash = {}
+        statHash.merge!(getFileStats(fh))
+        statHash.merge!(calculate_digest(fh))
+        xmlFileNode.add_attributes(statHash)
+
+        ext = File.extname(currFile).downcase
+        if @opts.winVerList.include?(ext)
+          pe_hdr = PEheader.new(fh) rescue nil
+          process_pe_header(pe_hdr, xmlFileNode) unless pe_hdr.nil?
         end
+
+        getFileContents(fh, xmlFileNode) if @opts.contents == true
+        fh.close
       rescue Errno::EACCES, RuntimeError, SystemCallError
         fh.close if fh.kind_of?(File) && !fh.closed?
       end
     end
   end
 
+  def process_pe_header(pe_hdr, xml_file_node)
+    xml_file_node.add_element("versioninfo", pe_hdr.versioninfo) if @opts.versioninfo && pe_hdr.versioninfo.present?
+    xml_file_node.add_element("libraries", "imports" => pe_hdr.getImportList) if @opts.imports && pe_hdr.imports.present?
+  rescue TypeError => err
+    $log.info "processFile: TypeError handling PEheader; skipping PEheader info"
+    $log.debug err.backtrace.join("\n")
+  end
+
   def isDir?(currFile)
     if @fs
       @fs.fileDirectory?(currFile)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest