rbvmomi 1.11.3 → 3.0.0

data/lib/rbvmomi/vim/VirtualMachine.rb

@@ -13,38 +13,36 @@ class RbVmomi::VIM::VirtualMachine
   def disks
     self.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
   end
-  
-  # Get the IP of the guest, but only if it is not stale 
+
+  # Get the IP of the guest, but only if it is not stale
   # @return [String] Current IP reported (as per VMware Tools) or nil
-  def guest_ip 
+  def guest_ip
     g = self.guest
     if g.ipAddress && (g.toolsStatus == "toolsOk" || g.toolsStatus == "toolsOld")
       g.ipAddress
     else
       nil
     end
-  end  
+  end
 
   # Add a layer of delta disks (redo logs) in front of every disk on the VM.
   # This is similar to taking a snapshot and makes the VM a valid target for
   # creating a linked clone.
   #
-  # Background: The API for linked clones is quite strange. We can't create 
+  # Background: The API for linked clones is quite strange. We can't create
   # a linked straight from any VM. The disks of the VM for which we can create a
   # linked clone need to be read-only and thus VC demands that the VM we
   # are cloning from uses delta-disks. Only then it will allow us to
   # share the base disk.
   def add_delta_disk_layer_on_all_disks
-    devices,  = self.collect 'config.hardware.device'
-    disks = devices.grep(RbVmomi::VIM::VirtualDisk)
     spec = update_spec_add_delta_disk_layer_on_all_disks
     self.ReconfigVM_Task(:spec => spec).wait_for_completion
   end
-  
+
   # Updates a passed in spec to perform the task of adding a delta disk layer
   # on top of all disks. Does the same as add_delta_disk_layer_on_all_disks
-  # but instead of issuing the ReconfigVM_Task, it just constructs the 
-  # spec, so that the caller can batch a couple of updates into one 
+  # but instead of issuing the ReconfigVM_Task, it just constructs the
+  # spec, so that the caller can batch a couple of updates into one
   # ReconfigVM_Task.
   def update_spec_add_delta_disk_layer_on_all_disks spec = {}
     devices,  = self.collect 'config.hardware.device'
@@ -73,5 +71,5 @@ class RbVmomi::VIM::VirtualMachine
       spec[:deviceChange] += device_change
     end
     spec
-  end 
+  end
 end

data/lib/rbvmomi/vim.rb

@@ -1,8 +1,6 @@
 # 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'
@@ -28,6 +26,8 @@ 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
+  # @option opts [RbVmomi::SSO] :sso (nil) Use SSO token to login if set
   def self.connect opts
     fail unless opts.is_a? Hash
     fail "host option required" unless opts[:host]
@@ -39,8 +39,7 @@ class VIM < Connection
     opts[:port] ||= (opts[:ssl] ? 443 : 80)
     opts[:path] ||= '/sdk'
     opts[:ns] ||= 'urn:vim25'
-    rev_given = opts[:rev] != nil
-    opts[:rev] = '6.5' unless rev_given
+    opts[:rev] = '6.7' if opts[:rev].nil?
     opts[:debug] = (!ENV['RBVMOMI_DEBUG'].empty? rescue false) unless opts.member? :debug
 
     conn = new(opts).tap do |vim|
@@ -57,17 +56,17 @@ class VIM < Connection
                 vim.serviceContent.sessionManager.LoginBySSPI :base64Token => negotiation.complete_authentication(fault.base64Token)
               end
             end
+        elsif opts[:sso]
+          vim.serviceContent.sessionManager.LoginByToken
         else
-            vim.serviceContent.sessionManager.Login :userName => opts[:user], :password => opts[:password]
+          vim.serviceContent.sessionManager.Login :userName => opts[:user], :password => opts[:password]
         end
       end
-      unless rev_given
-        rev = vim.serviceContent.about.apiVersion
-        vim.rev = [rev, '6.5'].min
-      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 }
+    at_exit { conn.close } if opts.fetch(:close_on_exit, true)
     conn
   end
 

data/lib/rbvmomi.rb

@@ -1,14 +1,16 @@
-# Copyright (c) 2010-2017 VMware, Inc.  All Rights Reserved.
+# Copyright (c) 2010-2019 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
+# RbVmomi is a Ruby interface to the vSphere management interface
 module RbVmomi
-
-# @private
-# @deprecated Use +RbVmomi::VIM.connect+.
-def self.connect opts
-  VIM.connect opts
+  # @private
+  # @deprecated Use +RbVmomi::VIM.connect+.
+  def self.connect(opts)
+    VIM.connect opts
+  end
 end
 
-end
-require 'rbvmomi/connection'
-require 'rbvmomi/vim'
+require_relative 'rbvmomi/connection'
+require_relative 'rbvmomi/sso'
+require_relative 'rbvmomi/version'
+require_relative 'rbvmomi/vim'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rbvmomi
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Rich Lane
 - Christian Dickmann
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -17,161 +17,147 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.25
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
-description: 
+        version: '3.3'
+description:
 email: jrg@vmware.com
 executables:
 - rbvmomish
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
-- CONTRIBUTORS.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- devel/analyze-vim-declarations.rb
-- devel/analyze-xml.rb
-- devel/benchmark.rb
-- devel/collisions.rb
-- devel/merge-internal-vmodl.rb
-- devel/merge-manual-vmodl.rb
-- examples/annotate.rb
-- examples/cached_ovf_deploy.rb
-- examples/clone_vm.rb
-- examples/create_vm-1.9.rb
-- examples/create_vm.rb
-- examples/extraConfig.rb
-- examples/lease_tool.rb
-- examples/logbundle.rb
-- examples/logtail.rb
-- examples/nfs_datastore.rb
-- examples/power.rb
-- examples/readme-1.rb
-- examples/readme-2.rb
-- examples/run.sh
-- examples/screenshot.rb
-- examples/vdf.rb
-- examples/vm_drs_behavior.rb
 - exe/rbvmomish
 - lib/rbvmomi.rb
 - lib/rbvmomi/basic_types.rb
 - lib/rbvmomi/connection.rb
 - lib/rbvmomi/deserialization.rb
 - lib/rbvmomi/fault.rb
+- lib/rbvmomi/optimist.rb
 - lib/rbvmomi/pbm.rb
 - lib/rbvmomi/sms.rb
 - lib/rbvmomi/sms/SmsStorageManager.rb
+- lib/rbvmomi/sso.rb
 - lib/rbvmomi/trivial_soap.rb
-- lib/rbvmomi/trollop.rb
 - lib/rbvmomi/type_loader.rb
 - lib/rbvmomi/utils/admission_control.rb
 - lib/rbvmomi/utils/deploy.rb
@@ -200,13 +186,12 @@ files:
 - lib/rbvmomi/vim/ServiceInstance.rb
 - lib/rbvmomi/vim/Task.rb
 - lib/rbvmomi/vim/VirtualMachine.rb
-- rbvmomi.gemspec
 - vmodl.db
 homepage: https://github.com/vmware/rbvmomi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,16 +199,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ruby interface to the VMware vSphere API
 test_files: []

data/.gitignore

@@ -1,13 +0,0 @@
-*.rbc
-*.swp
-*.swo
-.ruby-version
-.ruby-gemset
-Gemfile.lock
-/.bundle/
-/.yardoc/
-/coverage/
-/doc/
-/pkg/
-/vendor/bundle/
-/vmodl/

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - jruby-1.7.26
-  - jruby-9.1.8.0
-before_install:
-  - gem install bundler

data/.yardopts

@@ -1,6 +0,0 @@
---title "RbVmomi - a Ruby interface to the vSphere API"
---no-private
---readme README.md
-lib/rbvmomi/vim.rb
-lib/rbvmomi/vim/*.rb
-lib/rbvmomi/trollop.rb

data/CONTRIBUTORS.md

@@ -1,42 +0,0 @@
-* Adam Grare <agrare@redhat.com>
-* Anurag Uniyal <auniyal@vmware.com>
-* Benjamin Bytheway <ben.bytheway@imail.org>
-* Christian Dickmann <cdickmann@ubuntu.(none)>
-* Christian Dickmann <cdickmann@vmware.com>
-* Colin O'Byrne and Martin Marinov <cobyrne@vmware.com>
-* Colin O'Byrne and Nick Coelius <cobyrne@vmware.com>
-* Daniel Rife <daniel.rife@rightscale.com>
-* Dominic Cleal <dcleal@redhat.com>
-* Dominic Cleal <dominic@cleal.org>
-* Doug MacEachern <dougm@vmware.com>
-* E Arvidson <earvidso@users.noreply.github.com>
-* Erik Peterson <erik@subwindow.com>
-* Fabio Rapposelli <fabio@rapposelli.org>
-* Giuliano <giuliano@108.bz>
-* Guido Günther <agx@sigxcpu.org>
-* Hari Krishnamurthy <hkrishna@vmware.com>
-* J.R. Garcia <jr@garciaole.com>
-* Jacob Evans <jacob@dekz.net>
-* Justin <justin@labs.epiuse.com>
-* Kevin Menard <nirvdrum@gmail.com>
-* Lalitha Sripada <lsripada@vmware.com>
-* Martin Englund <martin@englund.nu>
-* Nan Liu <nan.liu@gmail.com>
-* Omar Baba <obaba@infinio.com>
-* Puneet Katyal <pkatyal@vmware.com>
-* Randy Robertson <rmrobert@vmware.com>
-* Rich Lane <lanerl@gmail.com>
-* Rich Lane <rlane@club.cc.cmu.edu>
-* Rich Lane <rlane@vmware.com>
-* Scott J. Goldman <scottjg@vmware.com>
-* Shawn Hartsock <hartsock@users.noreply.github.com>
-* Shawn Hartsock <hartsocks@vmware.com>
-* Shawn Hartsock <shawn.hartsock@gmail.com>
-* Soner Sevinc <sevincs@vmware.com>
-* Tom Bortels <bortels@gmail.com>
-* Tu Hoang <rebyn@me.com>
-* administrator <administrator@cdickmann-mbpro.gateway.2wire.net>
-* cdickmann <christian.dickmann@gmail.com>
-* howels <howels@users.noreply.github.com>
-* kumabuchi.kenji <k.kumabuchi+github@gmail.com>
-* thanhngn <thanhngn@users.noreply.github.com>

data/Gemfile

@@ -1,10 +0,0 @@
-# Copyright (c) 2016-2017 VMware, Inc.  All Rights Reserved.
-# SPDX-License-Identifier: MIT
-
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'json', '< 2' if RUBY_VERSION.start_with?('1.')
-gem 'nokogiri', '< 1.6' if RUBY_VERSION.start_with?('1.8.')
-gem 'test-unit', '~> 2.5' if RUBY_VERSION.start_with?('1.8.')

data/Rakefile

@@ -1,16 +0,0 @@
-# Copyright (c) 2010-2017 VMware, Inc.  All Rights Reserved.
-# SPDX-License-Identifier: MIT
-
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'yard'
-
-task(:default => :test)
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/test_*.rb']
-  t.verbose = true
-end
-
-YARD::Rake::YardocTask.new