vmware_web_service 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f5cfe645f59b74bbc745d9b8ca87f3f812ef66825ed97d1ae9e9ff90581f78b
-  data.tar.gz: 4159afd750db2f67f086ee758e92f30b9af934003471f6d0e7f721e352e7c1b1
+  metadata.gz: d6699c3daae381d3beeb4cfe36d566310ae60a79af7b3aa356c80d526c7479dd
+  data.tar.gz: a4bed96d8b73da48abbfe36b7eb1cfa17c9be33dbc3ea6a1a53b519923e34730
 SHA512:
-  metadata.gz: 6e6d105b56f251292a513a69f077fe65636fe54d46df9d92739c008a1d8dbfb4a793edb546bc55f67a8f7fcb2dd53f23aa90cc8234bb5c717d9a569fece53bc4
-  data.tar.gz: fbac5ac0d635a9233fe35195247fdca265e506c4da997f6aa072daad516c160ef9a040b87ab478e6b425b6a0728b7d7674468907abac9df2fb384a748ae81cd4
+  metadata.gz: ca0c9b8e60ce1843dc350bad9a952d61ae27954ce1e3f7523d07795a07be929c7c80fd043d48822b3dd8fd9031a371ec9b0733c664046371286175ba1f3e9193
+  data.tar.gz: 06fcd323fc89cfc7ed4acdc4f0d5df4752af5a6365adab214ff43766a51558f267ec34823de28bebe20b81b29c3602ee707560870a64ed15d040aebd186f8548

data/lib/VMwareWebService/MiqVimDataStore.rb

@@ -317,6 +317,6 @@ class MiqVimDataStore
   end
 
   def encode_path_url(path)
-    URI.encode(path, /[^#{URI::PATTERN::UNRESERVED}]/)
+    URI::DEFAULT_PARSER.escape(path, /[^#{URI::PATTERN::UNRESERVED}]/o)
   end
 end # module MiqVimDataStore

data/lib/VMwareWebService/VixDiskLib/VixDiskLib.rb

@@ -100,7 +100,7 @@ class VixDiskLib
 
     my_env["LD_LIBRARY_PATH"] = (my_env["LD_LIBRARY_PATH"].to_s.split(':') << VIXDISKLIB_PATH).compact.join(":")
     raise VixDiskLibError, "VixDiskLib.connect() failed: No logger defined" unless logger
-    my_env["LOG_FILE"] = logger.logdev.filename.to_s if logger.logdev.kind_of?(Logger::LogDevice)
+    my_env["LOG_FILE"] = logger.logdev.filename.to_s if logger.try(:logdev).kind_of?(Logger::LogDevice)
 
     my_env
   end

data/lib/VMwareWebService/VixDiskLib/vdl_wrapper.rb

@@ -2,27 +2,27 @@ require 'drb/drb'
 require 'sync'
 require 'ffi-vix_disk_lib/api_wrapper'
 require 'VMwareWebService/VimTypes'
-require 'VMwareWebService/logging'
+require 'VMwareWebService/VixDiskLib/VixDiskLib'
 require 'time'
 
 VixDiskLibApi = FFI::VixDiskLib::ApiWrapper
 class VdlWrapper
   extend FFI::VixDiskLib::ApiWrapper
   include DRb::DRbUndumped
-  include VMwareWebService::Logging
 
   @initialized       = false
   @server_disk_count = 0
   @vddk              = nil
+  @logger            = Logger.new($stdout)
 
   def self.server(server)
     return unless @vddk.nil?
     @vddk = server
   end
 
-  @info_log  = ->(s) { logger.info "VMware(VixDiskLib): #{s}" }
-  @warn_log  = ->(s) { logger.warn "VMware(VixDiskLib): #{s}" }
-  @error_log = ->(s) { logger.error "VMware(VixDiskLib): #{s}" }
+  @info_log  = ->(s) { @logger.info "VMware(VixDiskLib): #{s}" }
+  @warn_log  = ->(s) { @logger.warn "VMware(VixDiskLib): #{s}" }
+  @error_log = ->(s) { @logger.error "VMware(VixDiskLib): #{s}" }
 
   def self.init
     return if @initialized
@@ -32,10 +32,10 @@ class VdlWrapper
   end
 
   def self.dumpDisks(server_name)
-    logger.warn "*** Open VdlDisks for server #{server_name}"
+    @logger.warn "*** Open VdlDisks for server #{server_name}"
     @connection.dumpDisks unless @connection.nil? || @connection.serverName != server_name
     @vddk.running = true
-    logger.warn "*** Open VdlDisks end"
+    @logger.warn "*** Open VdlDisks end"
   end
 
   def self.inc_server_disk_count
@@ -51,7 +51,7 @@ class VdlWrapper
   end
 
   def self.connect(connect_parms)
-    logger.info "VdlWrapper.connect: #{connect_parms[:server_name]}"
+    @logger.info "VdlWrapper.connect: #{connect_parms[:server_name]}"
     raise VixDiskLibError, "VixDiskLib is not initialized" unless @initialized
     raise VixDiskLibError, "Already connected to #{@connection.serverName}" if @connection
     @connection = VdlConnection.new(connect_parms, @vddk)
@@ -59,7 +59,7 @@ class VdlWrapper
   end
 
   def self.__disconnect__(conn_obj)
-    logger.info "VdlWrapper.__disconnect__: #{conn_obj.serverName}"
+    @logger.info "VdlWrapper.__disconnect__: #{conn_obj.serverName}"
     raise VixDiskLibError, "VixDiskLib is not initialized" unless @initialized
     FFI::VixDiskLib::API.disconnect(conn_obj.vdl_connection)
     @connection = nil
@@ -74,7 +74,7 @@ class VdlWrapper
     # the DRb service (this process) to segfault during the exit sequence.
     #
     # super
-    logger.info "VixDiskLib has exited cleanly"
+    @logger.info "VixDiskLib has exited cleanly"
     @vddk.running = true
     @vddk.shutdown = true
     @initialized = nil
@@ -84,13 +84,15 @@ end # class VixDiskLib
 class VdlConnection
   include DRb::DRbUndumped
 
-  attr_reader :vdl_connection, :serverName, :vddk
+  attr_reader :logger, :vdl_connection, :serverName, :vddk
 
   MAX_DISK_WARN = 9
 
   def initialize(connect_parms, vddk)
     @serverName     = connect_parms[:server_name]
-    logger.info "VdlConnection.initialize: #{@serverName}"
+    @logger         = Logger.new($stdout)
+
+    @logger.info "VdlConnection.initialize: #{@serverName}"
     @vdl_connection  = VixDiskLibApi.connect(connect_parms)
     @disks           = []
     @disk_lock       = Sync.new
@@ -171,13 +173,13 @@ end # class VdlConnection
 
 class VdlDisk
   include DRb::DRbUndumped
-  include VMwareWebService::Logging
 
-  attr_reader :path, :flags, :handle, :sectorSize, :timeStamp, :info
+  attr_reader :logger, :path, :flags, :handle, :sectorSize, :timeStamp, :info
 
   MIN_SECTORS_TO_CACHE = 64
 
   def initialize(conn_obj, path, flags)
+    @logger = Logger.new($stdout)
     @time_stamp = Time.now
     logger.debug { "VdlDisk.new <#{object_id}>: opening #{path}" }
     @connection = conn_obj

data/lib/VMwareWebService/logging.rb

@@ -1,3 +1,6 @@
+require "active_support"
+require "active_support/concern"
+
 module VMwareWebService
   class << self
     attr_writer :logger
@@ -9,8 +12,16 @@ module VMwareWebService
   end
 
   module Logging
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def logger
+        VMwareWebService.logger
+      end
+    end
+
     def logger
-      VMwareWebService.logger
+      self.class.logger
     end
   end
 end

data/lib/VMwareWebService/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - ManageIQ Developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2023-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,7 +163,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.21.2
 description: A ruby interface to Vmware Web Services SDK
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -4412,7 +4412,7 @@ homepage: https://github.com/ManageIQ/vmware_web_service
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -4420,15 +4420,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: A ruby interface to Vmware Web Services SDK
 test_files: []