rbvmomi2 3.0.0 → 3.0.1

data/lib/rbvmomi/vim/HostSystem.rb

@@ -1,177 +1,180 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
 module RbVmomi
 
-class VIM::HostSystem
-  def esxcli
-    @cached_esxcli ||= VIM::EsxcliNamespace.root(self)
-  end
+  class VIM::HostSystem
+    def esxcli
+      @cached_esxcli ||= VIM::EsxcliNamespace.root(self)
+    end
 
-  def dtm
-    @cached_dtm ||= begin
-        RetrieveDynamicTypeManager()
-      rescue VIM::MethodNotFound
-        if summary.config.product.version >= '4.1.0'
-          if summary.config.product.version < '5.0.0' and direct?
-            VIM::InternalDynamicTypeManager(_connection, 'ha-dynamic-type-manager')
+    def dtm
+      @cached_dtm ||= begin
+          RetrieveDynamicTypeManager()
+        rescue VIM::MethodNotFound
+          if summary.config.product.version >= '4.1.0'
+            if summary.config.product.version < '5.0.0' and direct?
+              VIM::InternalDynamicTypeManager(_connection, 'ha-dynamic-type-manager')
+            else
+              raise 'esxcli not supported through VC before 5.0.0'
+            end
           else
-            raise "esxcli not supported through VC before 5.0.0"
+            raise 'esxcli not supported before 4.1.0'
           end
-        else
-          raise "esxcli not supported before 4.1.0"
         end
-      end
-  end
+    end
 
-  def dti
-    @cached_dti ||= dtm.DynamicTypeMgrQueryTypeInfo
-  end
+    def dti
+      @cached_dti ||= dtm.DynamicTypeMgrQueryTypeInfo
+    end
 
-  def create_dynamic_managed_object inst
-    wsdlName = dti.managedTypeInfo.find { |x| x.name == inst.moType }.wsdlName
-    _connection.type(wsdlName).new(_connection, inst.id)
-  end
+    def create_dynamic_managed_object inst
+      wsdlName = dti.managedTypeInfo.find { |x| x.name == inst.moType }.wsdlName
+      _connection.type(wsdlName).new(_connection, inst.id)
+    end
 
-  def cli_info_fetcher
-    # XXX there can be more than one
-    return @cached_cli_info_fetcher if @cached_cli_info_fetcher
-    inst = dtm.DynamicTypeMgrQueryMoInstances.find { |x| x.moType == 'vim.CLIInfo' }
-    @cached_cli_info_fetcher = create_dynamic_managed_object inst
-  end
+    def cli_info_fetcher
+      # XXX there can be more than one
+      return @cached_cli_info_fetcher if @cached_cli_info_fetcher
 
-  def mme
-    @cached_mme ||= RetrieveManagedMethodExecuter()
-  end
+      inst = dtm.DynamicTypeMgrQueryMoInstances.find { |x| x.moType == 'vim.CLIInfo' }
+      @cached_cli_info_fetcher = create_dynamic_managed_object inst
+    end
 
-  def direct?
-    @ref == 'ha-host'
-  end
-end
+    def mme
+      @cached_mme ||= RetrieveManagedMethodExecuter()
+    end
 
-class VIM::EsxcliNamespace
-  ESXCLI_PREFIX = 'vim.EsxCLI.'
-
-  attr_reader :name, :parent, :host, :type, :instance, :type_info, :namespaces, :commands
-
-  def self.root host
-    type_hash = host.dti.toRbvmomiTypeHash
-    VIM.loader.add_types type_hash
-    all_instances = host.dtm.DynamicTypeMgrQueryMoInstances
-    instances = Hash[all_instances.select { |x| x.moType.start_with? ESXCLI_PREFIX }.
-                                   map { |x| [x.moType,x.id] }]
-    type_infos = Hash[host.dti.managedTypeInfo.map { |x| [x.name,x] }]
-    new('root', nil, host).tap do |root|
-      instances.each do |type,instance|
-        path = type.split('.')[2..-1]
-        ns = path.inject(root) { |b,v| b.namespaces[v] }
-        ns.realize type, instance, type_infos[type]
-      end
+    def direct?
+      @ref == 'ha-host'
     end
   end
 
-  def initialize name, parent, host
-    @name = name
-    @parent = parent
-    @host = host
-    @type = nil
-    @instance = nil
-    @type_info = nil
-    @namespaces = Hash.new { |h,k| h[k] = self.class.new k, self, host }
-    @commands = {}
-    @cached_cli_info = nil
-  end
+  class VIM::EsxcliNamespace
+    ESXCLI_PREFIX = 'vim.EsxCLI.'
 
-  def realize type, instance, type_info
-    fail if @type or @instance
-    @type = type
-    @instance = instance
-    @type_info = type_info
-    @type_info.method.each do |method_type_info|
-      name = method_type_info.name
-      @commands[name] = VIM::EsxcliCommand.new self, method_type_info
+    attr_reader :name, :parent, :host, :type, :instance, :type_info, :namespaces, :commands
+
+    def self.root host
+      type_hash = host.dti.toRbvmomiTypeHash
+      VIM.loader.add_types type_hash
+      all_instances = host.dtm.DynamicTypeMgrQueryMoInstances
+      instances = Hash[all_instances.select { |x| x.moType.start_with? ESXCLI_PREFIX }.
+                                     map { |x| [x.moType, x.id] }]
+      type_infos = Hash[host.dti.managedTypeInfo.map { |x| [x.name, x] }]
+      new('root', nil, host).tap do |root|
+        instances.each do |type, instance|
+          path = type.split('.')[2..-1]
+          ns = path.inject(root) { |b, v| b.namespaces[v] }
+          ns.realize type, instance, type_infos[type]
+        end
+      end
     end
-  end
 
-  def type_name
-    if @type then @type
-    elsif @parent then "#{@parent.type_name}.#{@name}"
-    else 'vim.EsxCLI'
+    def initialize name, parent, host
+      @name = name
+      @parent = parent
+      @host = host
+      @type = nil
+      @instance = nil
+      @type_info = nil
+      @namespaces = Hash.new { |h, k| h[k] = self.class.new k, self, host }
+      @commands = {}
+      @cached_cli_info = nil
     end
-  end
 
-  def cli_info
-    @cached_cli_info ||=
-      if @host.direct?
-        @host.cli_info_fetcher.VimCLIInfoFetchCLIInfo(:typeName => type_name)
-      else
-        @host.mme.execute(@host.cli_info_fetcher._ref,
-                          "vim.CLIInfo.FetchCLIInfo", :typeName => type_name)
-      end
-  end
+    def realize type, instance, type_info
+      raise if @type or @instance
 
-  def obj
-    conn = @host._connection
-    conn.type(@type_info.wsdlName).new(conn, @instance)
-  end
+      @type = type
+      @instance = instance
+      @type_info = type_info
+      @type_info.method.each do |method_type_info|
+        name = method_type_info.name
+        @commands[name] = VIM::EsxcliCommand.new self, method_type_info
+      end
+    end
 
-  def method_missing(name, *args)
-    name = name.to_s
-    if @namespaces.member? name and args.empty?
-      @namespaces[name]
-    elsif @commands.member? name
-      @commands[name].call(*args)
-    else
-      raise NoMethodError
+    def type_name
+      if @type then @type
+      elsif @parent then "#{@parent.type_name}.#{@name}"
+      else 'vim.EsxCLI'
+      end
     end
-  end
 
-  def pretty_print q
-    q.text @name
-    q.text ' '
-    q.group 2 do
-      q.text '{'
-      q.breakable
-      items = (@namespaces.values+@commands.values).sort_by(&:name)
-      q.seplist items, nil, :each do |v|
-        if v.is_a? VIM::EsxcliNamespace
-          q.pp v
+    def cli_info
+      @cached_cli_info ||=
+        if @host.direct?
+          @host.cli_info_fetcher.VimCLIInfoFetchCLIInfo(typeName: type_name)
         else
-          q.text v.name
+          @host.mme.execute(@host.cli_info_fetcher._ref,
+                            'vim.CLIInfo.FetchCLIInfo', typeName: type_name)
         end
+    end
+
+    def obj
+      conn = @host._connection
+      conn.type(@type_info.wsdlName).new(conn, @instance)
+    end
+
+    def method_missing(name, *args)
+      name = name.to_s
+      if @namespaces.member? name and args.empty?
+        @namespaces[name]
+      elsif @commands.member? name
+        @commands[name].call(*args)
+      else
+        raise NoMethodError
       end
     end
-    q.breakable
-    q.text '}'
+
+    def pretty_print q
+      q.text @name
+      q.text ' '
+      q.group 2 do
+        q.text '{'
+        q.breakable
+        items = (@namespaces.values+@commands.values).sort_by(&:name)
+        q.seplist items, nil, :each do |v|
+          if v.is_a? VIM::EsxcliNamespace
+            q.pp v
+          else
+            q.text v.name
+          end
+        end
+      end
+      q.breakable
+      q.text '}'
+    end
   end
-end
 
-class VIM::EsxcliCommand
-  attr_reader :ns, :type_info, :cli_info
+  class VIM::EsxcliCommand
+    attr_reader :ns, :type_info, :cli_info
 
-  def initialize ns, type_info
-    @ns = ns
-    @type_info = type_info
-    @cached_cli_info = nil
-  end
+    def initialize ns, type_info
+      @ns = ns
+      @type_info = type_info
+      @cached_cli_info = nil
+    end
 
-  def name
-    @type_info.name
-  end
+    def name
+      @type_info.name
+    end
 
-  def cli_info
-    @cached_cli_info ||= @ns.cli_info.method.find { |x| x.name == @type_info.name }
-  end
+    def cli_info
+      @cached_cli_info ||= @ns.cli_info.method.find { |x| x.name == @type_info.name }
+    end
 
-  def call args={}
-    if @ns.host.direct?
-      @ns.obj._call @type_info.wsdlName, args
-    else
-      real_args = Set.new(type_info.paramTypeInfo.map(&:name))
-      args = args.reject { |k,v| !real_args.member?(k.to_s) }
-      @ns.host.mme.execute(@ns.obj._ref, "#{@ns.type_name}.#{@type_info.name}", args)
+    def call args={}
+      if @ns.host.direct?
+        @ns.obj._call @type_info.wsdlName, args
+      else
+        real_args = Set.new(type_info.paramTypeInfo.map(&:name))
+        args = args.reject { |k, v| !real_args.member?(k.to_s) }
+        @ns.host.mme.execute(@ns.obj._ref, "#{@ns.type_name}.#{@type_info.name}", args)
+      end
     end
   end
-end
 
 end

data/lib/rbvmomi/vim/ManagedEntity.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -7,35 +8,35 @@ class RbVmomi::VIM::ManagedEntity
   def path
     self.class.paths([self])[self]
   end
-  
+
   # Retrieve the ancestors of a list of entries.
   # @return [Hash] Object-indexed hash of ancestors of entities, starting with the root.
   def self.paths objs
     filterSpec = RbVmomi::VIM.PropertyFilterSpec(
-      :objectSet => objs.map do |obj|
+      objectSet: objs.map do |obj|
         RbVmomi::VIM.ObjectSpec(
-          :obj => obj,
-          :selectSet => [
+          obj: obj,
+          selectSet: [
             RbVmomi::VIM.TraversalSpec(
-              :name => "tsME",
-              :type => 'ManagedEntity',
-              :path => 'parent',
-              :skip => false,
-              :selectSet => [
-                RbVmomi::VIM.SelectionSpec(:name => "tsME")
+              name: 'tsME',
+              type: 'ManagedEntity',
+              path: 'parent',
+              skip: false,
+              selectSet: [
+                RbVmomi::VIM.SelectionSpec(name: 'tsME')
               ]
             )
           ]
         )
       end,
-      :propSet => [{
-        :pathSet => %w(name parent),
-        :type => 'ManagedEntity'
+      propSet: [{
+        pathSet: %w(name parent),
+        type: 'ManagedEntity'
       }]
     )
 
     propCollector = objs.first._connection.propertyCollector
-    result = propCollector.RetrieveProperties(:specSet => [filterSpec])
+    result = propCollector.RetrieveProperties(specSet: [filterSpec])
 
     Hash[objs.map do |obj|
       tree = {}

data/lib/rbvmomi/vim/ManagedObject.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -11,13 +12,13 @@ class RbVmomi::VIM::ManagedObject
   # @todo Pass the current property values to the block.
   def wait_until *pathSet, &b
     all = pathSet.empty?
-    filter = _connection.propertyCollector.CreateFilter :spec => {
-      :propSet => [{ :type => self.class.wsdl_name, :all => all, :pathSet => pathSet }],
-      :objectSet => [{ :obj => self }],
-    }, :partialUpdates => false
+    filter = _connection.propertyCollector.CreateFilter spec: {
+      propSet: [{ type: self.class.wsdl_name, all: all, pathSet: pathSet }],
+      objectSet: [{ obj: self }],
+    }, partialUpdates: false
     ver = ''
     loop do
-      result = _connection.propertyCollector.WaitForUpdates(:version => ver)
+      result = _connection.propertyCollector.WaitForUpdates(version: ver)
       ver = result.version
       if x = b.call
         return x
@@ -32,13 +33,13 @@ class RbVmomi::VIM::ManagedObject
   # @return [Hash] Hash from property paths to values.
   def collect! *pathSet
     spec = {
-      :objectSet => [{ :obj => self }],
-      :propSet => [{
-        :pathSet => pathSet,
-        :type => self.class.wsdl_name
+      objectSet: [{ obj: self }],
+      propSet: [{
+        pathSet: pathSet,
+        type: self.class.wsdl_name
       }]
     }
-    ret = _connection.propertyCollector.RetrieveProperties(:specSet => [spec])
+    ret = _connection.propertyCollector.RetrieveProperties(specSet: [spec])
     if ret && ret.length > 0
       ret[0].to_hash
     else

data/lib/rbvmomi/vim/ObjectContent.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -18,7 +19,8 @@ class RbVmomi::VIM::ObjectContent
   def to_hash_uncached
     h = {}
     propSet.each do |x|
-      fail if h.member? x.name
+      raise if h.member? x.name
+
       h[x.name] = x.val
     end
     h

data/lib/rbvmomi/vim/ObjectUpdate.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -18,7 +19,8 @@ class RbVmomi::VIM::ObjectUpdate
   def to_hash_uncached
     h = {}
     changeSet.each do |x|
-      fail if h.member? x.name
+      raise if h.member? x.name
+
       h[x.name] = x.val
     end
     h

data/lib/rbvmomi/vim/OvfManager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -5,7 +6,7 @@
 #       then set the +CURL+ environment variable to point to it.
 # @todo Use an HTTP library instead of executing +curl+.
 class RbVmomi::VIM::OvfManager
-  CURLBIN = ENV['CURL'] || "curl" #@private
+  CURLBIN = ENV['CURL'] || 'curl' #@private
 
   # Deploy an OVF.
   #
@@ -21,36 +22,34 @@ class RbVmomi::VIM::OvfManager
   # @option opts [Hash]               :propertyMappings Property mappings.
   # @option opts [String]             :deploymentOption Deployment option key.
   def deployOVF opts
-    opts = { :networkMappings => {},
-             :propertyMappings => {},
-             :diskProvisioning => :thin }.merge opts
+    opts = { networkMappings: {},
+             propertyMappings: {},
+             diskProvisioning: :thin }.merge opts
 
     %w(uri vmName vmFolder host resourcePool datastore).each do |k|
-      fail "parameter #{k} required" unless opts[k.to_sym]
+      raise "parameter #{k} required" unless opts[k.to_sym]
     end
 
     ovfImportSpec = RbVmomi::VIM::OvfCreateImportSpecParams(
-      :hostSystem => opts[:host],
-      :locale => "US",
-      :entityName => opts[:vmName],
-      :deploymentOption => opts[:deploymentOption] || "",
-      :networkMapping => opts[:networkMappings].map{|from, to| RbVmomi::VIM::OvfNetworkMapping(:name => from, :network => to)},
-      :propertyMapping => opts[:propertyMappings].to_a,
-      :diskProvisioning => opts[:diskProvisioning]
+      hostSystem: opts[:host],
+      locale: 'US',
+      entityName: opts[:vmName],
+      deploymentOption: opts[:deploymentOption] || '',
+      networkMapping: opts[:networkMappings].map{ |from, to| RbVmomi::VIM::OvfNetworkMapping(name: from, network: to) },
+      propertyMapping: opts[:propertyMappings].to_a,
+      diskProvisioning: opts[:diskProvisioning]
     )
 
     result = CreateImportSpec(
-      :ovfDescriptor => open(opts[:uri]).read,
-      :resourcePool => opts[:resourcePool],
-      :datastore => opts[:datastore],
-      :cisp => ovfImportSpec
+      ovfDescriptor: open(opts[:uri]).read,
+      resourcePool: opts[:resourcePool],
+      datastore: opts[:datastore],
+      cisp: ovfImportSpec
     )
 
     raise result.error[0].localizedMessage if result.error && !result.error.empty?
 
-    if result.warning
-      result.warning.each{|x| puts "OVF Warning: #{x.localizedMessage.chomp}" }
-    end
+    result.warning.each{ |x| puts "OVF Warning: #{x.localizedMessage.chomp}" } if result.warning
 
     importSpec = result.importSpec
     if importSpec && importSpec.instantiationOst && importSpec.instantiationOst.child
@@ -60,20 +59,19 @@ class RbVmomi::VIM::OvfManager
         end
       end
     end
-    
-    nfcLease = opts[:resourcePool].ImportVApp(:spec => importSpec,
-                                              :folder => opts[:vmFolder],
-                                              :host => opts[:host])
 
-    nfcLease.wait_until(:state) { nfcLease.state != "initializing" }
-    raise nfcLease.error if nfcLease.state == "error"
+    nfcLease = opts[:resourcePool].ImportVApp(spec: importSpec,
+                                              folder: opts[:vmFolder],
+                                              host: opts[:host])
+
+    nfcLease.wait_until(:state) { nfcLease.state != 'initializing' }
+    raise nfcLease.error if nfcLease.state == 'error'
+
     begin
-      nfcLease.HttpNfcLeaseProgress(:percent => 5)
+      nfcLease.HttpNfcLeaseProgress(percent: 5)
       timeout, = nfcLease.collect 'info.leaseTimeout'
       puts "DEBUG: Timeout: #{timeout}"
-      if timeout < 4 * 60
-        puts "WARNING: OVF upload NFC lease timeout less than 4 minutes"
-      end
+      puts 'WARNING: OVF upload NFC lease timeout less than 4 minutes' if timeout < 4 * 60
       progress = 5.0
       result.fileItem.each do |fileItem|
         leaseInfo, leaseState, leaseError = nfcLease.collect 'info', 'state', 'error'
@@ -88,33 +86,26 @@ class RbVmomi::VIM::OvfManager
           leaseInfo, leaseState, leaseError = nfcLease.collect 'info', 'state', 'error'
           i += 1
         end
-        if leaseState != "ready"
-          raise "NFC lease is no longer ready: #{leaseState}: #{leaseError}"
-        end
-        if leaseInfo == nil
-          raise "NFC lease disappeared?"
-        end
-        deviceUrl = leaseInfo.deviceUrl.find{|x| x.importKey == fileItem.deviceId}
-        if !deviceUrl
-          raise "Couldn't find deviceURL for device '#{fileItem.deviceId}'"
-        end
+        raise "NFC lease is no longer ready: #{leaseState}: #{leaseError}" if leaseState != 'ready'
+        raise 'NFC lease disappeared?' if leaseInfo == nil
+
+        deviceUrl = leaseInfo.deviceUrl.find{ |x| x.importKey == fileItem.deviceId }
+        raise "Couldn't find deviceURL for device '#{fileItem.deviceId}'" if !deviceUrl
 
         ovfFilename = opts[:uri].to_s
         tmp = ovfFilename.split(/\//)
         tmp.pop
         tmp << fileItem.path
-        filename = tmp.join("/")
+        filename = tmp.join('/')
 
         # If filename doesn't have a URI scheme, we're considering it a local file
-        if URI(filename).scheme.nil?
-          filename = "file://" + filename
-        end
+        filename = 'file://' + filename if URI(filename).scheme.nil?
 
-        method = fileItem.create ? "PUT" : "POST"
+        method = fileItem.create ? 'PUT' : 'POST'
 
         keepAliveThread = Thread.new do
           while true
-            nfcLease.HttpNfcLeaseProgress(:percent => progress.to_i)
+            nfcLease.HttpNfcLeaseProgress(percent: progress.to_i)
             sleep 1 * 60
           end
         end
@@ -132,24 +123,26 @@ class RbVmomi::VIM::OvfManager
           i += 1
         end while i <= 5 && !ip
         raise "Couldn't get host's IP address" unless ip
-        href = deviceUrl.url.gsub("*", ip)
+
+        href = deviceUrl.url.gsub('*', ip)
         downloadCmd = "#{CURLBIN} -L '#{URI::escape(filename)}'"
         uploadCmd = "#{CURLBIN} -Ss -X #{method} --insecure -T - -H 'Content-Type: application/x-vnd.vmware-streamVmdk' '#{URI::escape(href)}'"
         # Previously we used to append "-H 'Content-Length: #{fileItem.size}'"
-        # to the uploadCmd. It is not clear to me why, but that leads to 
+        # to the uploadCmd. It is not clear to me why, but that leads to
         # trucation of the uploaded disk. Without this option curl can't tell
         # the progress, but who cares
-        system("#{downloadCmd} | #{uploadCmd}", :out => "/dev/null")
-        
+        system("#{downloadCmd} | #{uploadCmd}", out: '/dev/null')
+
         keepAliveThread.kill
         keepAliveThread.join
-        
+
         progress += (90.0 / result.fileItem.length)
-        nfcLease.HttpNfcLeaseProgress(:percent => progress.to_i)
+        nfcLease.HttpNfcLeaseProgress(percent: progress.to_i)
       end
 
-      nfcLease.HttpNfcLeaseProgress(:percent => 100)
-      raise nfcLease.error if nfcLease.state == "error"
+      nfcLease.HttpNfcLeaseProgress(percent: 100)
+      raise nfcLease.error if nfcLease.state == 'error'
+
       i = 1
       vm = nil
       begin
@@ -173,14 +166,14 @@ class RbVmomi::VIM::OvfManager
       i = 0
       begin
         nfcLease.HttpNfcLeaseComplete
-        puts "HttpNfcLeaseComplete succeeded"
+        puts 'HttpNfcLeaseComplete succeeded'
       rescue RbVmomi::VIM::InvalidState
-        puts "HttpNfcLeaseComplete already finished.."
+        puts 'HttpNfcLeaseComplete already finished..'
       rescue Exception => e
         puts "HttpNfcLeaseComplete failed at iteration #{i} with exception: #{e}"
         i += 1
         retry if i < 3
-        puts "Giving up HttpNfcLeaseComplete.."
+        puts 'Giving up HttpNfcLeaseComplete..'
       end
       vm
     end
@@ -188,7 +181,7 @@ class RbVmomi::VIM::OvfManager
     (nfcLease.HttpNfcLeaseAbort rescue nil) if nfcLease
     raise
   end
-  
+
   def _handle_ost ost, opts = {}
     ost = Nokogiri::XML(ost)
     if opts[:vservice] == ['com.vmware.vim.vsm:extension_vservice']

data/lib/rbvmomi/vim/PerfCounterInfo.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
 # Copyright (c) 2012-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE