rbvmomi 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b526e5ee6da6e08fe08687ac7f36e375d51b374f08fe5c4e187cbba09ac93b
-  data.tar.gz: b31ae074a872d51395f31a392ddaadf084e838bb81c419f25a41d8cc799050dd
+  metadata.gz: 954401ddca3b6efabc4879ff009428998c3ea39b2ec270ec71e4182fa5d06590
+  data.tar.gz: f368fc8acffbeb51f140eabec67859b228c779704eb402e6d5891222eee792b0
 SHA512:
-  metadata.gz: ece802dd9fb3c6c0eab113cb4a6a5942ec2e879e32355870d69259af3f1b17219b6d29f7d42321fb42eb82768181802a5bf70530bedcc4472815ec85412c66bc
-  data.tar.gz: 31a654bd9c7805d2512179af1bf9d810600640e5d2aef5408f35c0f0eb320e6cfede361af5e6f5a8888e3205f0b6ffaa1870e706e3e3fa9de1d441ebc830e2da
+  metadata.gz: 9a98e486560b2b5f3559c5c8394325ed216b2b679b46f360f4e2bce6b4355293f8aae4a250104d4014de9bf8e2d47581e7a17fdadc4ecdf66700294f3ceb57b0
+  data.tar.gz: d633d2a3d4c7acbc2eb17fe13c41fcded11a6c172d20dca6062dde281d6fc4a462fa32456d706b35ea1965434f4715fc3e07cc600eae95c8aaadd4f51d6a28cd

data/lib/rbvmomi/version.rb

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: MIT
 
 module RbVmomi
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/lib/rbvmomi/vim.rb

@@ -28,6 +28,7 @@ class VIM < Connection
   # @option opts [String]  :path (/sdk) SDK endpoint path.
   # @option opts [Boolean] :debug (false) If true, print SOAP traffic to stderr.
   # @option opts [String]  :operation_id If set, use for operationID
+  # @option opts [Boolean] :close_on_exit (true) If true, will close connection with at_exit
   def self.connect opts
     fail unless opts.is_a? Hash
     fail "host option required" unless opts[:host]
@@ -64,7 +65,7 @@ class VIM < Connection
       vim.rev = [rev, opts[:rev]].min { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }
     end
 
-    at_exit { conn.close }
+    at_exit { conn.close } if opts.fetch(:close_on_exit, true)
     conn
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbvmomi
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Rich Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -134,7 +134,6 @@ files:
 - README.md
 - exe/rbvmomish
 - lib/rbvmomi.rb
-- lib/rbvmomi/#vim.rb#
 - lib/rbvmomi/basic_types.rb
 - lib/rbvmomi/connection.rb
 - lib/rbvmomi/deserialization.rb
@@ -192,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby interface to the VMware vSphere API

data/lib/rbvmomi/#vim.rb#

@@ -1,155 +0,0 @@
-# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
-# SPDX-License-Identifier: MIT
-
-require 'rbvmomi'
-
-# Win32::SSPI is part of core on Windows
-begin
-  require 'win32/sspi'
-rescue LoadError
-end
-WIN32 = (defined? Win32::SSPI)
-
-module RbVmomi
-
-# A connection to one vSphere SDK endpoint.
-# @see #serviceInstance
-class VIM < Connection
-  # Connect to a vSphere SDK endpoint
-  #
-  # @param [Hash] opts The options hash.
-  # @option opts [String]  :host Host to connect to.
-  # @option opts [Numeric] :port (443) Port to connect to.
-  # @option opts [Boolean] :ssl (true) Whether to use SSL.
-  # @option opts [Boolean] :insecure (false) If true, ignore SSL certificate errors.
-  # @option opts [String]  :cookie If set, use cookie to connect instead of user/password
-  # @option opts [String]  :user (root) Username.
-  # @option opts [String]  :password Password.
-  # @option opts [String]  :path (/sdk) SDK endpoint path.
-  # @option opts [Boolean] :debug (false) If true, print SOAP traffic to stderr.
-  # @option opts [String]  :operation_id If set, use for operationID
-  def self.connect opts
-    fail unless opts.is_a? Hash
-    fail "host option required" unless opts[:host]
-    opts[:cookie] ||= nil
-    opts[:user] ||= (WIN32 ? ENV['USERNAME'].dup : 'root')
-    opts[:password] ||= ''
-    opts[:ssl] = true unless opts.member? :ssl or opts[:"no-ssl"]
-    opts[:insecure] ||= false
-    opts[:port] ||= (opts[:ssl] ? 443 : 80)
-    opts[:path] ||= '/sdk'
-    opts[:ns] ||= 'urn:vim25'
-    opts[:rev] = '6.5' if opts[:rev].nil?
-    opts[:debug] = (!ENV['RBVMOMI_DEBUG'].empty? rescue false) unless opts.member? :debug
-
-    conn = new(opts).tap do |vim|
-      unless opts[:cookie]
-        if WIN32 && opts[:password] == ''
-            # Attempt login by SSPI if no password specified on Windows
-            negotiation = Win32::SSPI::NegotiateAuth.new opts[:user], ENV['USERDOMAIN'].dup
-            begin
-              vim.serviceContent.sessionManager.LoginBySSPI :base64Token => negotiation.get_initial_token
-            rescue RbVmomi::Fault => fault
-              if !fault.fault.is_a?(RbVmomi::VIM::SSPIChallenge)
-                raise
-              else
-                vim.serviceContent.sessionManager.LoginBySSPI :base64Token => negotiation.complete_authentication(fault.base64Token)
-              end
-            end
-        else
-            vim.serviceContent.sessionManager.Login :userName => opts[:user], :password => opts[:password]
-        end
-      end
-      rev = vim.serviceContent.about.apiVersion
-      vim.rev = [rev, opts[:rev]].min { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }
-    end
-
-    at_exit { conn.close }
-    conn
-  end
-
-  def close
-    serviceContent.sessionManager.Logout
-  rescue RbVmomi::Fault => e
-    $stderr.puts(e.message) if debug
-  ensure
-    self.cookie = nil
-    super
-  end
-
-  def rev= x
-    super
-    @serviceContent = nil
-  end
-
-  # Return the ServiceInstance
-  #
-  # The ServiceInstance is the root of the vSphere inventory.
-  # @see http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.ServiceInstance.html
-  def serviceInstance
-    VIM::ServiceInstance self, 'ServiceInstance'
-  end
-
-  # Alias to serviceInstance.RetrieveServiceContent
-  def serviceContent
-    @serviceContent ||= serviceInstance.RetrieveServiceContent
-  end
-
-  # Alias to serviceContent.rootFolder
-  def rootFolder
-    serviceContent.rootFolder
-  end
-
-  alias root rootFolder
-
-  # Alias to serviceContent.propertyCollector
-  def propertyCollector
-    serviceContent.propertyCollector
-  end
-
-  # Alias to serviceContent.searchIndex
-  def searchIndex
-    serviceContent.searchIndex
-  end
-
-  # @private
-  def pretty_print pp
-    pp.text "VIM(#{@opts[:host]})"
-  end
-
-  def instanceUuid
-    serviceContent.about.instanceUuid
-  end
-
-  def get_log_lines logKey, lines=5, start=nil, host=nil
-    diagMgr = self.serviceContent.diagnosticManager
-    if !start
-      log = diagMgr.BrowseDiagnosticLog(:host => host, :key => logKey, :start => 999999999)
-      lineEnd = log.lineEnd
-      start = lineEnd - lines
-    end
-    start = start < 0 ? 0 : start
-    log = diagMgr.BrowseDiagnosticLog(:host => host, :key => logKey, :start => start)
-    if log.lineText.size > 0
-      [log.lineText.slice(-lines, log.lineText.size), log.lineEnd]
-    else
-      [log.lineText, log.lineEnd]
-    end
-  end
-
-  def get_log_keys host=nil
-    diagMgr = self.serviceContent.diagnosticManager
-    keys = []
-    diagMgr.QueryDescriptions(:host => host).each do |desc|
-      keys << "#{desc.key}"
-    end
-    keys
-  end
-
-  add_extension_dir File.join(File.dirname(__FILE__), "vim")
-  (ENV['RBVMOMI_VIM_EXTENSION_PATH']||'').split(':').each { |dir| add_extension_dir dir }
-
-  load_vmodl(ENV['VMODL'] || File.join(File.dirname(__FILE__), "../../vmodl.db"))
-end
-
-end