manageiq-smartstate 0.6.1 → 0.8.1

data/lib/fs/iso9660/boot_sector.rb

@@ -1,11 +1,12 @@
 require 'fs/iso9660/util'
-
 require 'sys-uname'
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 module Iso9660
   class BootSector
+    using ManageIQ::UnicodeString
+
     # Universal Volume Descriptor ID.
     DESCRIPTOR_ID = "CD001"
 

data/lib/fs/iso9660/directory_entry.rb

@@ -1,10 +1,11 @@
 require 'fs/iso9660/util'
 require 'fs/iso9660/rock_ridge'
-
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 module Iso9660
+  using ManageIQ::UnicodeString
+
   # FlagBits: FB_
   FB_HIDDEN     = 0x01  # 0 if not hidden.
   FB_DIRECTORY  = 0x02  # 0 if file.

data/lib/fs/iso9660/rock_ridge.rb

@@ -1,7 +1,9 @@
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 module Iso9660
+  using ManageIQ::UnicodeString
+
   # SUSP extensions are present if the first two characters of the SUA of
   # the first directory entry are "SP". After SUSP is identified, if the
   # first two characters of any directory entry's SUA are "RR" a Rock Ridge

data/lib/fs/ntfs/attrib_attribute_list.rb

@@ -1,8 +1,10 @@
 require 'fs/ntfs/utils'
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   #
   # ATTR_LIST_ENTRY - Attribute: Attribute list (0x20).
   #

data/lib/fs/ntfs/attrib_file_name.rb

@@ -1,10 +1,12 @@
 require 'fs/ntfs/utils'
 require 'util/win32/nt_util'
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'fs/ntfs/attrib_standard_information'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   #
   # FILE_NAME_ATTR - Attribute: Filename (0x30)
   #

data/lib/fs/ntfs/attrib_header.rb

@@ -1,9 +1,11 @@
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'fs/ntfs/utils'
 require 'fs/ntfs/attrib_type'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   # Standard attribute header.
   # Each attribute begins with one of these.
   STANDARD_ATTRIBUTE_HEADER = BinaryStruct.new([

data/lib/fs/ntfs/attrib_index_root.rb

@@ -1,10 +1,12 @@
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'fs/ntfs/index_node_header'
 require 'fs/ntfs/directory_index_node'
 require 'fs/ntfs/index_record_header'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   #
   # INDEX_ROOT - Attribute: Index root (0x90).
   #

data/lib/fs/ntfs/attrib_volume_name.rb

@@ -1,6 +1,8 @@
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   #
   # VOLUME_NAME - Attribute: Volume name (0x60).
   #

data/lib/manageiq/smartstate/util.rb

@@ -13,6 +13,24 @@ module ManageIQ
       rescue
         return uri_path
       end
+
+      def self.base24_decode(byte_array)
+        digits = %w(B C D F G H J K M P Q R T V W X Y 2 3 4 6 7 8 9)
+        out = " " * 29
+        out.length.downto(0) do |i|
+          if i.modulo(6) == 0
+            out[i, 1] = "-"
+          else
+            map_index = 0
+            15.downto(0) do |j|
+              byte_value = (map_index << 8) | byte_array[j]
+              byte_array[j], map_index = byte_value.divmod(24)
+              out[i, 1] = digits[map_index]
+            end
+          end
+        end
+        out[1..-1]
+      end
     end
   end
 end

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.6.1".freeze
+    VERSION = "0.8.1".freeze
   end
 end

data/lib/metadata/MIQExtract/MIQExtract.rb

@@ -16,7 +16,6 @@ require 'metadata/ScanProfile/VmScanProfiles'
 require 'VMwareWebService/MiqVim'
 require 'OpenStackExtract/MiqOpenStackVm/MiqOpenStackImage'
 require 'OpenStackExtract/MiqOpenStackVm/MiqOpenStackInstance'
-require 'VMwareWebService/MiqVimBroker'
 
 class MIQExtract
   attr_reader :systemFsMsg, :systemFs, :vm
@@ -126,7 +125,7 @@ class MIQExtract
 
   def extract(category, &blk)
     xml = nil
-    Array.wrap(category).each do |c|
+    Array.wrap(category.presence).each do |c|
       c = c.downcase
       xml = case c
             when "accounts" then getAccounts(c)

data/lib/metadata/VmConfig/GetNativeCfg.rb

@@ -1,12 +1,10 @@
 require 'util/miq-xml'
-require 'util/runcmd'
 require 'metadata/VmConfig/VmConfig'
+require 'awesome_spawn'
 
 class GetNativeCfg
-  LSHW = "lshw"
-
   def self.new
-    lshwXml = MiqUtil.runcmd("#{LSHW} -xml")
+    lshwXml = AwesomeSpawn.run!("lshw", :params => ["-xml"], :combined_output => true).output
     nodeHash = Hash.new { |h, k| h[k] = [] }
     doc = MiqXml.load(lshwXml)
     doc.find_match("//node").each { |n| nodeHash[n.attributes["id"].split(':', 2)[0]] << n }

data/lib/metadata/VmConfig/VmConfig.rb

@@ -1,13 +1,14 @@
 require 'pathname'
 require 'metadata/VMMount/VMMount'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'util/miq-xml'
 require 'VMwareWebService/MiqVimInventory'
 require 'timeout'
 require 'util/miq-extensions'
-require 'VMwareWebService/MiqVimBroker'
 
 class VmConfig
+  using ManageIQ::UnicodeString
+
   attr_reader :configFile
 
   def initialize(filename)
@@ -412,7 +413,7 @@ class VmConfig
       require 'VMwareWebService/MiqVim'
 
       password_decrypt = ManageIQ::Password.decrypt(ems_host['password'])
-      hostVim = MiqVim.new(ems_host['host'], ems_host['user'], password_decrypt)
+      hostVim = MiqVim.new(:server => ems_host['host'], :username => ems_host['user'], :password => password_decrypt)
       $log.info "#{conn_reason}: Connection to [#{ems_display_text}] completed for VM:[#{vmCfgFile}] in [#{Time.now - st}] seconds"
       return hostVim
     rescue Timeout::Error => err
@@ -430,7 +431,7 @@ class VmConfig
 
     password_decrypt = ManageIQ::Password.decrypt(ems['password'])
     $log.debug "resolve_path_names: emsHost = #{ems['host']}, emsUser = #{ems['user']}" if $log
-    vi = MiqVimInventory.new(ems['host'], ems['user'], password_decrypt)
+    vi = MiqVimInventory.new(:server => ems['host'], :username => ems['user'], :password => password_decrypt)
     return getDsName(filename, vi)
 
   rescue

data/lib/metadata/VmConfig/cfgConfig.rb

@@ -1,4 +1,8 @@
+require 'miq_unicode'
+
 module CfgConfig
+  using ManageIQ::UnicodeString
+
   def convert(filename)
     @convertText = ""
     $log.debug "Processing Windows Configuration file [#{filename}]"

data/lib/metadata/VmConfig/xmlConfig.rb

@@ -1,5 +1,5 @@
 require 'util/miq-xml'
-require 'util/runcmd'
+require 'awesome_spawn'
 
 module XmlConfig
   def convert(filename)
@@ -12,9 +12,9 @@ module XmlConfig
       if Sys::Platform::IMPL == :linux
         begin
           # First check to see if the command is available
-          MiqUtil.runcmd("virsh list")
+          AwesomeSpawn.run!("virsh", :params => ["list"])
           begin
-            xml_data = MiqUtil.runcmd("virsh dumpxml #{File.basename(filename, ".*")}")
+            xml_data = AwesomeSpawn.run!("virsh", :params => ["dumpxml", File.basename(filename, ".*")], :combined_output => true).output
           rescue => err
             $log.error "#{err}\n#{err.backtrace.join("\n")}"
           end

data/lib/metadata/linux/MiqRpmPackages.rb

@@ -1,11 +1,13 @@
 require 'binary_struct'
 require 'util/miq-hash_struct'
 require 'db/MiqBdb/MiqBdb'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 # RPM Specification located at: http://jrpm.sourceforge.net/rpmspec/index.html
 
 class MiqRpmPackages
+  using ManageIQ::UnicodeString
+
   #
   # The data types we support.
   #

data/lib/metadata/util/win32/Win32Accounts.rb

@@ -1,9 +1,11 @@
 # encoding: US-ASCII
 
 require 'util/miq-xml'
-require 'enumerator'
+require 'miq_unicode'
 
 module MiqWin32
+  using ManageIQ::UnicodeString
+
   class Accounts
     attr_reader :users, :groups
 

data/lib/metadata/util/win32/Win32EventLog.rb

@@ -19,13 +19,15 @@ require 'digest/md5'
 
 # Common utilities.
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'util/miq-xml'
 require 'util/miq-exception'
 
 require 'metadata/util/event_log_filter'
 
 class Win32EventLog
+  using ManageIQ::UnicodeString
+
   # Standard file log names
   SYSTEM_LOGS = %w(Application System Security)
   BUFFER_READ_SIZE = 10485760  # 10 MB buffer

data/lib/metadata/util/win32/Win32Software.rb

@@ -251,11 +251,13 @@ module MiqWin32
     end
 
     def self.DecodeProductKey(product_key)
-      return if product_key.blank? || product_key.length < 67
-      y = []; product_key.split(",")[52..67].each { |b| y << b.hex }
-      return MIQEncode.base24Decode(y)
+      parts = product_key.to_s.split(",")
+      return if parts.length < 67
+
+      ManageIQ::Smartstate::Util.base24_decode(parts[52..67].map(&:hex))
     rescue => err
       $log.error "MIQ(DecodeProductKey): [#{err}]"
+      nil
     end
 
     private

data/lib/metadata/util/win32/fleece_hives.rb

@@ -1,7 +1,6 @@
 require 'util/miq-xml'
 require 'digest/md5'
 require 'metadata/util/win32/remote-registry'
-require 'enumerator'
 require 'util/miq-encode'
 
 class FleeceHives
@@ -92,14 +91,6 @@ class FleeceHives
     xmlCol
   end
 
-  def self.DecodeProductKey(product_key)
-    return if product_key.blank? || product_key.length < 67
-    y = []; product_key.split(",")[52..67].each { |b| y << b.hex }
-    return MIQEncode.base24Decode(y)
-  rescue => err
-    $log.error "MIQ(OS-DecodeProductKey): [#{err}]"
-  end
-
   def self.collectProductKeys(_xml, xmlCol, regHnd)
     prodKeys = MIQRexml.findElement("software/productkeys", xmlCol.root)
     regHnd.digitalProductKeys.each do |e|

data/lib/metadata/util/win32/ms-registry.rb

@@ -1,8 +1,7 @@
 # encoding: US-ASCII
 
 require 'binary_struct'
-require 'util/miq-unicode'
-require 'enumerator'
+require 'miq_unicode'
 require 'util/miq-xml'
 require 'util/xml/xml_hash'
 
@@ -13,6 +12,8 @@ DEBUG_LOG_PERFORMANCE = false
 DEBUG_FILE_READS = false
 
 class MSRegHive
+  using ManageIQ::UnicodeString
+
   attr_reader :fileLoadTime, :fileParseTime, :digitalProductKeys, :xmlNode
 
   # Size of the HBIN data (as well as initiale REGF) segments

data/lib/metadata/util/win32/peheader.rb

@@ -1,9 +1,8 @@
 # encoding: US-ASCII
 
 require 'stringio'
-
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 # Notes:
 #       The peheader object member 'icons' is an array of icons in the file. Sub 0 is the application
@@ -12,6 +11,8 @@ require 'util/miq-unicode'
 #       to open them and display each resolution contained in the icon (if more than one).
 
 class PEheader
+  using ManageIQ::UnicodeString
+
   IMAGE_NT_SIGNATURE = "PE\0\0"
   IMAGE_DOS_SIGNATURE = "MZ"
 

data/lib/metadata/util/win32/system_path_win.rb

@@ -1,5 +1,3 @@
-require 'enumerator'
-
 module Win32
   class SystemPath
     # BCD WMI Provider Enumerations (values)

data/lib/miq_unicode.rb

@@ -0,0 +1,45 @@
+module ManageIQ
+  module UnicodeString
+    refine String do
+      def UnicodeToUtf8
+        dup.UnicodeToUtf8!
+      end
+
+      def UnicodeToUtf8!
+        force_encoding("UTF-16LE").encode!("UTF-8")
+      end
+
+      def Utf8ToUnicode
+        dup.Utf8ToUnicode!
+      end
+
+      def Utf8ToUnicode!
+        force_encoding("UTF-8").encode!("UTF-16LE")
+      end
+
+      def AsciiToUtf8
+        dup.AsciiToUtf8!
+      end
+
+      def AsciiToUtf8!
+        force_encoding("ISO-8859-1").encode!("UTF-8")
+      end
+
+      def Utf8ToAscii
+        dup.Utf8ToAscii!
+      end
+
+      def Utf8ToAscii!
+        force_encoding("UTF-8").encode!("ISO-8859-1")
+      end
+
+      def Ucs2ToAscii
+        dup.Ucs2ToAscii!
+      end
+
+      def Ucs2ToAscii!
+        force_encoding("UTF-16LE").encode!("ISO-8859-1")
+      end
+    end
+  end
+end

data/manageiq-smartstate.gemspec

@@ -21,25 +21,26 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
+  spec.add_dependency "awesome_spawn",      "~> 1.5"
   spec.add_dependency "azure-armrest",      "~> 0.9"
   spec.add_dependency "binary_struct",      "~> 2.1"
   spec.add_dependency "iniparse"
   spec.add_dependency "linux_block_device", "~>0.2.1"
-  spec.add_dependency "manageiq-password",  "~>0.3"
+  spec.add_dependency "manageiq-password",  "< 2"
   spec.add_dependency "memory_buffer",      ">=0.1.0"
   spec.add_dependency "rufus-lru",          "~>1.0.3"
   spec.add_dependency "sys-uname",          "~>1.2.1"
   spec.add_dependency "uuidtools",          "~>2.1"
-  spec.add_dependency "vmware_web_service", "~>2.0"
+  spec.add_dependency "vmware_web_service", "~>3.0"
 
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "camcorder"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
+  spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "camcorder"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "vcr", "~>3.0.2"
   spec.add_development_dependency "webmock", "~>2.3.1"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
-
 end