manageiq-smartstate 0.5.5 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd8eb1fbab5fe0cf25e935e7173c43f6cb928b36
-  data.tar.gz: 6254ef672dd4700f40da31c1b4c98d79b7217510
+  metadata.gz: 9339962d9971082ef3464c0a0a2f20d6b2366636
+  data.tar.gz: 0a1b72d88811858835e05d7e1468259318c96768
 SHA512:
-  metadata.gz: eaa532b372c70837dfaf164ba463374a6235291e5517385469be72d95e6fc60dd3cdb957ac32d1f7ecdb14f87a372785bbe196a10a43d995129906203d38de89
-  data.tar.gz: bba8041436423755f0a234c566168a7831159da571605638290789a3f9e7246fdda6e75912a2bc9d3b50f1ef236fed74094c284369357a3fc4c2184326642951
+  metadata.gz: 07ac4b7630d00c02654eaea1f9c8a33aa155a4a6e770ada1e1cc5c9aec5dfb0d4622b2fdd3ec0c9202c4fa596c8c3ab1607f2415017596e09d82eeabd3bcca75
+  data.tar.gz: e0884bd02ece3f99f637140e2cec0f805ff08d784fee5f86c6b1f7336e630b32af6b6852d04b950f1a1c78b4648703d6fa45defbb1a28f1bb8a83118c08b6ad4

data/README.md

@@ -1,10 +1,9 @@
 # ManageIQ::Smartstate
 
 [![Gem Version](https://badge.fury.io/rb/manageiq-smartstate.svg)](http://badge.fury.io/rb/manageiq-smartstate)
-[![Build Status](https://travis-ci.org/ManageIQ/manageiq-smartstate.svg)](https://travis-ci.org/ManageIQ/manageiq-smartstate)
+[![Build Status](https://travis-ci.com/ManageIQ/manageiq-smartstate.svg)](https://travis-ci.com/ManageIQ/manageiq-smartstate)
 [![Code Climate](https://codeclimate.com/github/ManageIQ/manageiq-smartstate.svg)](https://codeclimate.com/github/ManageIQ/manageiq-smartstate)
 [![Test Coverage](https://codeclimate.com/github/ManageIQ/manageiq-smartstate/badges/coverage.svg)](https://codeclimate.com/github/ManageIQ/manageiq-smartstate/coverage)
-[![Dependency Status](https://gemnasium.com/ManageIQ/manageiq-smartstate.svg)](https://gemnasium.com/ManageIQ/manageiq-smartstate)
 [![Security](https://hakiri.io/github/ManageIQ/manageiq-smartstate/master.svg)](https://hakiri.io/github/ManageIQ/manageiq-smartstate/master)
 
 [![Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ManageIQ/manageiq-smartstate?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

data/lib/MiqVm/MiqRhevmVm.rb

@@ -42,7 +42,7 @@ class MiqRhevmVm < MiqVm
     disks = @rhevm.collect_vm_disks(@rhevmVm)
     disks.each_with_index do |disk, idx|
       $log.debug "MiqRhevmVm#getCfg: disk = #{disk.inspect}"
-      storage_domain = disk.storage_domains.first
+      storage_domain = disk.storage_domains&.first
       if storage_domain.nil?
         $log.info("Disk <#{disk.name}> is skipped due to unassigned storage domain")
         next

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackImage.rb

@@ -1,4 +1,4 @@
-require 'util/miq_tempfile'
+require 'miq_tempfile'
 require_relative '../../MiqVm/MiqVm'
 require_relative 'MiqOpenStackCommon'
 

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackInstance.rb

@@ -1,4 +1,4 @@
-require 'util/miq_tempfile'
+require 'miq_tempfile'
 require_relative '../../MiqVm/MiqVm'
 require_relative 'MiqOpenStackCommon'
 

data/lib/fs/modules/LinuxMount.rb

@@ -321,9 +321,9 @@ module LinuxMount
     #
     no_more_links = false
     until no_more_links
-      filesys, link_ptr = getFsPathBase(link_ptr)
-      if filesys.fileSymLink?(link_ptr)
-        symlink = getSymLink(filesys, linkptr)
+      filesys, tmp_link_ptr = getFsPathBase(link_ptr)
+      if filesys.fileSymLink?(tmp_link_ptr)
+        symlink = getSymLink(filesys, tmp_link_ptr)
         link_ptr = symlink[0, 1] == '/' ? symlink : File.join(File.dirname(link_ptr), symlink)
       else
         no_more_links = true

data/lib/fs/ntfs/data_run.rb

@@ -282,7 +282,7 @@ module NTFS
 
       @runSpec.each_slice(2) do |lcn, len|
         total_clusters += len
-        next unless total_clusters > start_vcn
+        next unless lcn && len && total_clusters > start_vcn
 
         start = lcn + (vcn - (total_clusters - len))
         count = len - (start - lcn)

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.5.5".freeze
+    VERSION = "0.5.10".freeze
   end
 end

data/lib/metadata/VmConfig/VmConfig.rb

@@ -498,7 +498,7 @@ class VmConfig
   end
 
   def rhevm_disk_file_entry(disk)
-    storage_id = disk.storage_domains.first&.id
+    storage_id = disk.storage_domains&.first&.id
     disk_id = disk.image_id || disk.id
     full_path = storage_id && File.join('/dev', storage_id, disk_id)
     {:path => full_path, :name => disk_id, :size => disk.actual_size.to_i}
@@ -550,7 +550,7 @@ class VmConfig
         elsif miqvm.rhevmVm
           disks = miqvm.rhevm.collect_vm_disks(miqvm.rhevmVm)
           disks.each do |disk|
-            storage_id = disk.storage_domains.first&.id
+            storage_id = disk.storage_domains&.first&.id
             disk_id = disk.image_id || disk.id
             full_path = storage_id && File.join('/dev', storage_id, disk_id)
             d = {:path => full_path, :name => disk.name.to_s, :size => disk.actual_size.to_i}

data/lib/metadata/util/find_class_methods.rb

@@ -15,8 +15,9 @@ module FindClassMethods
 
     ra = []
     find(@search_path, glob_depth(glob)) do |p|
-      p = check_file(p, glob, flags)
-      p && block_given? ? yield(p) : ra << p
+      if (p = check_file(p, glob, flags))
+        block_given? ? yield(p) : ra << p
+      end
     end
     ra.sort_by(&:downcase)
   end
@@ -70,7 +71,7 @@ module FindClassMethods
     return [] unless @fs.fileExists?(directory) && @fs.fileDirectory?(directory)
 
     files = @fs.dirEntries(directory)
-    files.difference([".", ".."])
+    files -= [".", ".."]
     files.sort!
     files.reverse_each
   rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG

data/lib/metadata/util/md5deep.rb

@@ -72,13 +72,14 @@ class MD5deep
 
   def process_each_glob_file(file_name)
     FindClassMethods.glob(file_name, @fs) do |f|
-      # Passing "startDir" as the first parameter is a work-around for issues
-      # when scanning Win VMs from Linux where the path returned from dirGlob
-      # do not include the drive letter.
+      # Prepending @drive_letter to the file is a work-around for issues
+      # when scanning Win VMs from Linux where the path returned from glob
+      # does not include the drive letter.
+      f = File.join(@drive_letter, f)
       processFile(File.dirname(f), File.basename(f), @xml.root)
     end
   rescue => err
-    $log.info "scan_glob: Exception #{err} rescued"
+    $log.error "process_each_glob_file: Exception #{err} rescued"
     $log.debug err.backtrace.join("\n")
   end
 
@@ -98,7 +99,7 @@ class MD5deep
 
   def processDir(path, x, xmlNode)
     if x != "." && x != ".."
-      currFile = File.join(@drive_letter, path, x)
+      currFile = File.join(path, x)
 
       begin
         if File.directory?(currFile)
@@ -117,7 +118,7 @@ class MD5deep
 
   def process_dir_as_file(path, x, xml_node)
     if x != "." && x != ".."
-      curr_dir = File.join(@drive_letter, path, x)
+      curr_dir = File.join(path, x)
       if isDir?(curr_dir)
         xml_file_node = xml_node.add_element("file", "name" => x, "fqname" => curr_dir)
         stat_hash = {}
@@ -129,7 +130,7 @@ class MD5deep
 
   def processFile(path, x, xmlNode)
     if (@opts.exclude.include?(x) == false) && x[0..0] != "$"
-      currFile = File.join(@drive_letter, path, x)
+      currFile = File.join(path, x)
 
       begin
         #       unless File.directory?(currFile) then
@@ -226,10 +227,15 @@ class MD5deep
       # Create hash for requested digests
       digest = create_digest_hash
 
-      fileName.seek(0, IO::SEEK_SET)
-      # Loop over each digest and add the file contents
-      while buf = fileName.read(10240000)
-        digest.each_pair { |_k, v| v << buf }
+      begin
+        fileName.seek(0, IO::SEEK_SET)
+        # Loop over each digest and add the file contents
+        while (buf = fileName.read(10_240_000))
+          digest.each_pair { |_k, v| v << buf }
+        end
+      rescue => err
+        $log.error "Error #{err} reading file to calculate digest"
+        $log.debug err.backtrace.join("\n")
       end
     end
 

data/lib/miq_tempfile.rb

@@ -0,0 +1,15 @@
+require 'delegate'
+require 'tempfile'
+
+class MiqTempfile < DelegateClass(Tempfile)
+  # TODO: share this definition with appliance console code.
+  MIQ_TMP_DIR = '/var/www/miq_tmp'.freeze
+
+  def initialize(basename, *options)
+    if File.directory?(MIQ_TMP_DIR)
+      super(Tempfile.new(basename, MIQ_TMP_DIR, *options))
+    else
+      super(Tempfile.new(basename, *options))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.10
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
@@ -483,7 +483,6 @@ files:
 - lib/fs/xfs/short_form_directory_entry.rb
 - lib/fs/xfs/short_form_header.rb
 - lib/fs/xfs/superblock.rb
-- lib/lib/tasks/azure.rake
 - lib/manageiq-smartstate.rb
 - lib/manageiq/smartstate.rb
 - lib/manageiq/smartstate/util.rb
@@ -539,6 +538,8 @@ files:
 - lib/metadata/util/win32/remote-registry.rb
 - lib/metadata/util/win32/system_path_win.rb
 - lib/metadata/util/win32/versioninfo.rb
+- lib/miq_tempfile.rb
+- lib/tasks/azure.rake
 - log/.gitkeep
 - manageiq-smartstate.gemspec
 homepage: https://github.com/ManageIQ/manageiq-smartstate