manageiq-smartstate 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f122bf39b0869a07d9112992d17ace268846c161
-  data.tar.gz: 81497211b17140cf02bae4890da6ee495c6d5c3b
+  metadata.gz: 7a58411f04e6cb4f1f7465257a437c3e744a62c4
+  data.tar.gz: 223bf74877fb849f828ca38150ff29b31a44442a
 SHA512:
-  metadata.gz: 25ce67a6278c3cb741e291afdaf8da88771e6ce0d07bf453ff6ae2daf5557aa95573679c77c41c4d304e32e0a384878e14dbf6c59c308dc0b8f198ae94113aba
-  data.tar.gz: 9407613a050a3559a527e3f583513b6dff0c463367bb42ac1535ffbf8da32dd1977dd9bcbdde220bfde48606d7512cb1b5679015a538d9435bc3181edce06781
+  metadata.gz: f5a796988cb5966c6ba97c0de8e91601a65039a0f5f7d39fd8a4043019705363ff6daa8420563acf551c55da09a26e2f394ddda610ab84139a62bb4a3b028ca2
+  data.tar.gz: 6560d6d1386c9a206832cd697131364af6e602ca90b4873c5a223dfcf407d855ac9308b704f8906af660ba2ebdff86be8a8d3bce1300ad01da7ed1d2e3ee13e5

data/.travis.yml

@@ -2,9 +2,8 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.3.4
-  - 2.4.1
-before_install: gem install bundler -v 1.14.4
+  - 2.3.1
+  - 2.4.2
 after_script: bundle exec codeclimate-test-reporter
 notifications:
   webhooks:

data/lib/MiqVm/miq_azure_vm.rb

@@ -22,9 +22,9 @@ class MiqAzureVm < MiqVm
       os_disk = vm_obj.properties.storage_profile.os_disk
       if vm_obj.managed_disk?
         #
-        # Use the EVM SNAPSHOT Added by the Provider
+        # Use the Smartstate SNAPSHOT Added by the Provider
         #
-        @disk_name = os_disk.name + "__EVM__SSA__SNAPSHOT"
+        raise ArgumentError, "MiqAzureVm: missing required arg :snapshot for Managed Disk" unless (@disk_name = args[:snapshot])
       else
         #
         # Non-Managed Disk Snapshot handling

data/lib/VolumeManager/VolMgrPlatformSupport.rb

@@ -1,18 +1,11 @@
-require 'sys-uname'
-
 class VolMgrPlatformSupport
   def initialize(cfgFile, ost)
     $log.debug "Initializing VolMgrPlatformSupport" if $log
     @cfgFile = cfgFile
     @ost = ost
 
-    if Sys::Platform::OS == :windows
-      require "VolumeManager/VolMgrPlatformSupportWin"
-      extend VolMgrPlatformSupportWin
-    else
-      require "VolumeManager/VolMgrPlatformSupportLinux"
-      extend VolMgrPlatformSupportLinux
-    end
+    require "VolumeManager/VolMgrPlatformSupportLinux"
+    extend VolMgrPlatformSupportLinux
     init
   end # def initialize
 end # class VolMgrPlatformSupport

data/lib/disk/modules/MiqLargeFile.rb

@@ -1,23 +1,17 @@
 require 'sys-uname'
 require 'util/miq-system'
 
-if Sys::Platform::IMPL == :linux
-  if MiqSystem.arch == :x86_64
-    require 'linux_block_device'
-    require 'disk/modules/RawBlockIO'
-  end
+if Sys::Platform::IMPL == :linux && MiqSystem.arch == :x86_64
+  require 'linux_block_device'
+  require 'disk/modules/RawBlockIO'
 end
 
 module MiqLargeFile
   def self.open(file_name, flags)
-    case Sys::Platform::OS
-    when :unix
-      if Sys::Platform::IMPL == :linux
-        return(RawBlockIO.new(file_name, flags)) if MiqLargeFileStat.new(file_name).blockdev?
-      end
-      return(MiqLargeFileOther.new(file_name, flags))
+    if Sys::Platform::IMPL == :linux && MiqLargeFileStat.new(file_name).blockdev?
+      RawBlockIO.new(file_name, flags)
     else
-      return(MiqLargeFileOther.new(file_name, flags))
+      MiqLargeFileOther.new(file_name, flags)
     end
   end
 

data/lib/fs/MiqFS/modules/Ext4.rb

@@ -5,6 +5,8 @@ require 'fs/ext4/superblock'
 require 'fs/ext4/directory_entry'
 require 'fs/ext4/directory'
 
+require 'fs/MiqFsError'
+
 # Ext4 file system interface to MiqFS.
 module Ext4
   # Default directory cache size.
@@ -225,6 +227,10 @@ module Ext4
     begin
       dirObj = ifs_getDir(dir, miqfs)
       dirEnt = dirObj.nil? ? nil : dirObj.findEntry(fname)
+
+    rescue MiqFsDirectoryNotFound => err
+      dirEnt = nil
+
     rescue RuntimeError => err
       $log.error err.message.to_s if $log
       dirEnt = nil
@@ -268,7 +274,7 @@ module Ext4
     names.shift
 
     dir = ifs_getDirR(names, miqfs)
-    raise "Directory '#{p}' not found" if dir.nil?
+    raise MiqFsDirectoryNotFound, p if dir.nil?
     dir
   end
 

data/lib/fs/MiqFS/modules/RealFS.rb

@@ -1,15 +1,12 @@
+require 'sys-uname'
+
 module RealFS
   attr_reader :guestOS
 
   def fs_init
-    case Sys::Platform::IMPL
-    when :mswin, :mingw
-      self.fsType = "NTFS"
-      @guestOS = "Windows"
-    when :linux
+    if Sys::Platform::IMPL == :linux
       self.fsType = `df -lT / | tail -1 | awk '{ print $2 }'`
       @guestOS = "Linux"
-    when :macosx
     end
   end
 

data/lib/fs/MiqFsError.rb

@@ -0,0 +1,11 @@
+class MiqFsError < RuntimeError
+end
+
+class MiqFsDirectoryNotFound < MiqFsError
+  attr_accessor :dir
+
+  def initialize(dir)
+    super
+    @dir = dir
+  end
+end

data/lib/fs/iso9660/boot_sector.rb

@@ -1,5 +1,6 @@
 require 'fs/iso9660/util'
 
+require 'sys-uname'
 require 'binary_struct'
 require 'util/miq-unicode'
 

data/lib/fs/iso9660/rock_ridge.rb

@@ -1,5 +1,3 @@
-require 'sys-uname'
-
 require 'binary_struct'
 require 'util/miq-unicode'
 

data/lib/fs/modules/WinMount.rb

@@ -1,4 +1,3 @@
-require 'sys-uname'
 require 'fs/MiqFS/MiqFS'
 require 'metadata/util/win32/boot_info_win'
 
@@ -65,13 +64,10 @@ module WinMount
   private
 
   def normalizePath(p)
-    if Sys::Platform::OS == :unix
-      return p if p[1..1] == ':' # fully qualified path
-      p = p.slice(1..-1) if p[0, 1] == '/'
-      # On Linux, protect the drive letter with a '/', then remove it.
-      return File.expand_path(p, '/' + @cwd).slice(1..-1)
-    end
-    File.expand_path(p, @cwd)
+    return p if p[1..1] == ':' # fully qualified path
+    p = p.slice(1..-1) if p[0, 1] == '/'
+    # On Linux, protect the drive letter with a '/', then remove it.
+    File.expand_path(p, '/' + @cwd).slice(1..-1)
   end
 
   #

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.2.2".freeze
+    VERSION = "0.2.3".freeze
   end
 end

data/lib/metadata/MIQExtract/test/full_extract_test.rb

@@ -5,6 +5,7 @@ $log = Logger.new(File.expand_path("../../../../log/#{File.basename(__FILE__, ".
 
 require 'metadata/MIQExtract/MIQExtract'
 require 'util/miq-process'
+require 'sys-uname'
 
 PROFILE_INIT = false
 PROFILE_EXTRACT = false

data/lib/metadata/VMMount/VMPlatformMount.rb

@@ -1,18 +1,11 @@
-require 'sys-uname'
-
 class VMPlatformMount
   def initialize(dInfo, ost)
     $log.debug "Initializing VMPlatformMount" if $log
     @dInfo = dInfo
     @ost = ost
 
-    if Sys::Platform::OS == :windows
-      require "metadata/VMMount/VMPlatformMountWin"
-      extend VMPlatformMountWin
-    else
-      require "metadata/VMMount/VMPlatformMountLinux"
-      extend VMPlatformMountLinux
-    end
+    require "metadata/VMMount/VMPlatformMountLinux"
+    extend VMPlatformMountLinux
     init
   end # def initialize
 end # class VMPlatformMount

data/lib/metadata/VmConfig/xmlConfig.rb

@@ -8,6 +8,7 @@ module XmlConfig
 
     xml_data = nil
     unless File.file?(filename)
+      require 'sys-uname'
       if Sys::Platform::IMPL == :linux
         begin
           # First check to see if the command is available

data/manageiq-smartstate.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "azure-armrest"
+  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"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: binary_struct
   requirement: !ruby/object:Gem::Requirement
@@ -311,7 +311,6 @@ files:
 - lib/VolumeManager/MiqVolumeManager.rb
 - lib/VolumeManager/VolMgrPlatformSupport.rb
 - lib/VolumeManager/VolMgrPlatformSupportLinux.rb
-- lib/VolumeManager/VolMgrPlatformSupportWin.rb
 - lib/VolumeManager/test/blockDevTest.rb
 - lib/VolumeManager/test/ldm.rb
 - lib/blackbox/VmBlackBox.rb
@@ -399,6 +398,7 @@ files:
 - lib/fs/MiqFS/modules/XFSProbe.rb
 - lib/fs/MiqFS/modules/ZFSProbe.rb
 - lib/fs/MiqFS/test.rb
+- lib/fs/MiqFsError.rb
 - lib/fs/MiqFsUtil.rb
 - lib/fs/MiqMountManager.rb
 - lib/fs/MiqNativeMountManager.rb
@@ -524,7 +524,6 @@ files:
 - lib/metadata/VMMount/VMMount.rb
 - lib/metadata/VMMount/VMPlatformMount.rb
 - lib/metadata/VMMount/VMPlatformMountLinux.rb
-- lib/metadata/VMMount/VMPlatformMountWin.rb
 - lib/metadata/VmConfig/GetNativeCfg.rb
 - lib/metadata/VmConfig/VmConfig.rb
 - lib/metadata/VmConfig/cfgConfig.rb
@@ -584,7 +583,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: ManageIQ SmartState Analysis

data/lib/VolumeManager/VolMgrPlatformSupportWin.rb

@@ -1,17 +0,0 @@
-module VolMgrPlatformSupportWin
-  def init
-    true
-  end
-
-  def setDiskFlags(_dInfo)
-    true
-  end
-
-  def preMount
-    true
-  end
-
-  def postMount
-    true
-  end
-end # module VolMgrPlatformSupportWin

data/lib/metadata/VMMount/VMPlatformMountWin.rb

@@ -1,13 +0,0 @@
-module VMPlatformMountWin
-  def init
-    true
-  end
-
-  def preMount
-    true
-  end
-
-  def postMount
-    true
-  end
-end # module VMPlatformMountWin