vagrant-vsphere 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6a998abddfc897331166c554cdf8d183f7b029e
-  data.tar.gz: 09f61f95926013c19c700da9f8d3092c2ce4917b
+  metadata.gz: 8d45a1640a54cc4ac0664e27c68354033c93ffa4
+  data.tar.gz: 8d9c88fd620a038420beba0d12387206e55ebcda
 SHA512:
-  metadata.gz: 94e891a7470aad8f85918786bd86309688fedbf31b8adce022d3b2092a9cd0f8fa6084bcd6edfa93ef70bb79fccc6ba2aaa857ebf2ca41f14f6c3687fad6350a
-  data.tar.gz: d5451cd10b3afeb95c30d3c697c9563b51a26667a8b8f2fc0d982ed6e356fcd7d6b1c4a4efe0538c0b1c0c1758fafbf8b74848ff5d04c17949fad1d1171a19e1
+  metadata.gz: 2fb7ae63b09ecef5e1f7997bbe392aa4e43b147fc1164ff2587b225a3ca4ae65acfbdd8d63f69f1c32fefee3fb8e4da876f004156645e9d857870314c5b03bd1
+  data.tar.gz: c88435f3e28890dbf622cbfef423d3e88bf4d3dcac5c051cd87cd2740bda09c64b7581d25e8f4522f527d0e9c4d9a390760a6b121359f1f21c859550a33cb7b4

data/Gemfile

@@ -7,10 +7,7 @@ group :development do
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
 
-  if RUBY_VERSION < "2.0.0" then
-    puts "Found old ruby #{RUBY_VERSION}, using old vagrant (v1.4.3)"
-    gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.4.3'
-  else
-    gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
-  end
+ruby "2.0.0"
+gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.5.0'
+
 end

data/README.md

@@ -1,12 +1,12 @@
 # Vagrant vSphere Provider
 
-This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds a [vSphere](http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc_50%2Fright-pane.html)
+This is a [Vagrant](http://www.vagrantup.com) 1.5+ plugin that adds a [vSphere](http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc_50%2Fright-pane.html)
 provider to Vagrant, allowing Vagrant to control and provision machines using VMware. New machines are created from virtual machines or templates which must be configured prior to using using this provider.
 
 This provider is built on top of the [RbVmomi](https://github.com/vmware/rbvmomi) Ruby interface to the vSphere API.
 
 ## Requirements
-* Vagrant 1.2+
+* Vagrant 1.5+
 * VMware + vSphere API
 * Ruby 1.9+
 * libxml2, libxml2-dev, libxslt, libxslt-dev
@@ -159,6 +159,8 @@ This is useful if running Vagrant from multiple directories or if multiple machi
   * fixes no error messages [#58 leth:no-error-message](https://github.com/nsidc/vagrant-vsphere/pull/58)
   * fixes typo [#57 targetx007](https://github.com/nsidc/vagrant-vsphere/pull/57)
   * fixes additional no error messages
+* 0.8.3
+  * Fixed "No error message" on rbvmomi method calls. [#74: mkuzmin:rbvmomi-error-messages](https://github.com/nsidc/vagrant-vsphere/pull/74)
 
 
 

data/lib/vSphere/action/clone.rb

@@ -39,8 +39,7 @@ module VagrantPlugins
           rescue Errors::VSphereError => e
             raise
           rescue Exception => e
-            puts e.message
-            raise Errors::VSphereError, :message => e.message
+            raise Errors::VSphereError.new, e.message
           end
 
           #TODO: handle interrupted status in the environment, should the vm be destroyed?
@@ -107,23 +106,22 @@ module VagrantPlugins
               template.ReconfigVM_Task(:spec => spec).wait_for_completion
             end
 
-            RbVmomi::VIM.VirtualMachineRelocateSpec(:diskMoveType => :moveChildMostDiskBacking)
+            location = RbVmomi::VIM.VirtualMachineRelocateSpec(:diskMoveType => :moveChildMostDiskBacking)
           else
             location = RbVmomi::VIM.VirtualMachineRelocateSpec
-            location[:pool] = get_resource_pool(connection, machine) unless config.clone_from_vm
 
             datastore = get_datastore connection, machine
             location[:datastore] = datastore unless datastore.nil?
-
-            location
           end
+          location[:pool] = get_resource_pool(connection, machine) unless config.clone_from_vm
+          location
         end
 
         def get_name(machine, config)
           return config.name unless config.name.nil?
 
           prefix = "#{machine.name}"
-          prefix.gsub!(/[^-a-z0-9_]/i, "")
+          prefix.gsub!(/[^-a-z0-9_\.]/i, "")
           # milliseconds + random number suffix to allow for simultaneous `vagrant up` of the same box in different dirs
           prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
         end

data/lib/vSphere/action/close_vsphere.rb

@@ -15,9 +15,7 @@ module VagrantPlugins
           rescue Errors::VSphereError => e
             raise
           rescue Exception => e
-            puts e
-            #raise a properly namespaced error for Vagrant
-            raise Errors::VSphereError, :message => e.message
+            raise Errors::VSphereError.new, e.message
           end
         end
       end

data/lib/vSphere/action/connect_vsphere.rb

@@ -17,11 +17,10 @@ module VagrantPlugins
               insecure: config.insecure, proxyHost: config.proxy_host,
               proxyPort: config.proxy_port
             @app.call env
-          rescue VSphere::Errors::VSphereError => e
+          rescue Errors::VSphereError => e
             raise
           rescue Exception => e
-            puts e.backtrace
-            raise VagrantPlugins::VSphere::Errors::VSphereError, :message => e.message
+            raise Errors::VSphereError.new, e.message
           end
         end
       end

data/lib/vSphere/action/destroy.rb

@@ -31,7 +31,7 @@ module VagrantPlugins
           rescue Errors::VSphereError => e
             raise
           rescue Exception => e
-            raise Errors::VSphereError, :message => e.message
+            raise Errors::VSphereError.new, e.message
           end
         end
       end

data/lib/vSphere/util/vim_helpers.rb

@@ -5,7 +5,7 @@ module VagrantPlugins
     module Util
       module VimHelpers
         def get_datacenter(connection, machine)
-          connection.serviceInstance.find_datacenter(machine.provider_config.data_center_name) or fail Errors::VSphereError, :message => I18n.t('vsphere.errors.missing_datacenter')
+          connection.serviceInstance.find_datacenter(machine.provider_config.data_center_name) or fail Errors::VSphereError, :missing_datacenter
         end
 
         def get_vm_by_uuid(connection, machine)
@@ -13,23 +13,23 @@ module VagrantPlugins
         end
 
         def get_resource_pool(connection, machine)
-          cr = get_datacenter(connection, machine).find_compute_resource(machine.provider_config.compute_resource_name) or fail Errors::VSphereError, :message => I18n.t('vsphere.errors.missing_compute_resource')
-          cr.resourcePool.find(machine.provider_config.resource_pool_name) or fail Errors::VSphereError, :message => I18n.t('vsphere.errors.missing_resource_pool')
+          cr = get_datacenter(connection, machine).find_compute_resource(machine.provider_config.compute_resource_name) or fail Errors::VSphereError, :missing_compute_resource
+          cr.resourcePool.find(machine.provider_config.resource_pool_name) or fail Errors::VSphereError, :missing_resource_pool
         end
 
         def get_customization_spec_info_by_name(connection, machine)
           name = machine.provider_config.customization_spec_name
           return if name.nil? || name.empty?
 
-          manager = connection.serviceContent.customizationSpecManager or fail Errors::VSphereError, :message => I18n.t('vsphere.errors.null_configuration_spec_manager') if manager.nil?
-          spec = manager.GetCustomizationSpec(:name => name) or fail Errors::VSphereError, :message => I18n.t('vsphere.errors.missing_configuration_spec') if spec.nil?
+          manager = connection.serviceContent.customizationSpecManager or fail Errors::VSphereError, :null_configuration_spec_manager if manager.nil?
+          spec = manager.GetCustomizationSpec(:name => name) or fail Errors::VSphereError, :missing_configuration_spec if spec.nil?
         end
 
         def get_datastore(connection, machine)
           name = machine.provider_config.data_store_name
           return if name.nil? || name.empty?
 
-          get_datacenter(connection, machine).find_datastore name or fail Errors::VSphereError, :message => I18n.t('vsphere.errors.missing_datastore')
+          get_datacenter(connection, machine).find_datastore name or fail Errors::VSphereError, :missing_datastore
         end
       end
     end

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.8.2'
+    VERSION = '0.8.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: VMWare vSphere provider