vagrant-vsphere 0.7.0 → 0.7.1

data/lib/vSphere/errors.rb

@@ -1,11 +1,14 @@
-require 'vagrant'
-
-module VagrantPlugins
-  module VSphere
-    module Errors
-      class VSphereError < Vagrant::Errors::VagrantError
-        error_namespace('vsphere.errors')
-      end
-    end
-  end
-end
+require 'vagrant'
+
+module VagrantPlugins
+  module VSphere
+    module Errors
+      class VSphereError < Vagrant::Errors::VagrantError
+        error_namespace('vsphere.errors')
+      end
+      class RsyncError < VSphereError
+        error_key(:rsync_error)
+      end
+    end
+  end
+end

data/lib/vSphere/plugin.rb

@@ -1,30 +1,30 @@
-require 'vagrant'
-
-module VagrantPlugins
-  module VSphere
-    class Plugin < Vagrant.plugin('2')
-      name 'vsphere'
-      description 'Allows Vagrant to manage machines with VMWare vSphere'
-
-      config(:vsphere, :provider) do
-        require_relative 'config'
-        Config
-      end
-
-      provider(:vsphere) do
-        # TODO: add logging
-        setup_i18n
-
-        # Return the provider
-        require_relative 'provider'
-        Provider
-      end
-
-
-      def self.setup_i18n
-        I18n.load_path << File.expand_path('locales/en.yml', VSphere.source_root)
-        I18n.reload!
-      end
-    end
-  end
+require 'vagrant'
+
+module VagrantPlugins
+  module VSphere
+    class Plugin < Vagrant.plugin('2')
+      name 'vsphere'
+      description 'Allows Vagrant to manage machines with VMWare vSphere'
+
+      config(:vsphere, :provider) do
+        require_relative 'config'
+        Config
+      end
+
+      provider(:vsphere) do
+        # TODO: add logging
+        setup_i18n
+
+        # Return the provider
+        require_relative 'provider'
+        Provider
+      end
+
+
+      def self.setup_i18n
+        I18n.load_path << File.expand_path('locales/en.yml', VSphere.source_root)
+        I18n.reload!
+      end
+    end
+  end
 end

data/lib/vSphere/provider.rb

@@ -1,39 +1,39 @@
-require 'vagrant'
-
-module VagrantPlugins
-  module VSphere
-    class Provider < Vagrant.plugin('2', :provider)
-      def initialize(machine)
-        @machine = machine
-      end
-
-      def action(name)
-        action_method = "action_#{name}"
-        return Action.send(action_method) if Action.respond_to?(action_method)
-        nil
-      end
-
-      def ssh_info
-        env = @machine.action('get_ssh_info')
-        env[:machine_ssh_info]
-      end
-
-      def state
-        env = @machine.action('get_state')
-
-        state_id = env[:machine_state_id]
-
-        short = "vagrant_vsphere.states.short_#{state_id}"
-        long  = "vagrant_vsphere.states.long_#{state_id}"
-
-        # Return the MachineState object
-        Vagrant::MachineState.new(state_id, short, long)
-      end
-
-      def to_s
-        id = @machine.id.nil? ? 'new' : @machine.id
-        "vSphere (#{id})"
-      end
-    end
-  end
+require 'vagrant'
+
+module VagrantPlugins
+  module VSphere
+    class Provider < Vagrant.plugin('2', :provider)
+      def initialize(machine)
+        @machine = machine
+      end
+
+      def action(name)
+        action_method = "action_#{name}"
+        return Action.send(action_method) if Action.respond_to?(action_method)
+        nil
+      end
+
+      def ssh_info
+        env = @machine.action('get_ssh_info')
+        env[:machine_ssh_info]
+      end
+
+      def state
+        env = @machine.action('get_state')
+
+        state_id = env[:machine_state_id]
+
+        short = "vagrant_vsphere.states.short_#{state_id}"
+        long  = "vagrant_vsphere.states.long_#{state_id}"
+
+        # Return the MachineState object
+        Vagrant::MachineState.new(state_id, short, long)
+      end
+
+      def to_s
+        id = @machine.id.nil? ? 'new' : @machine.id
+        "vSphere (#{id})"
+      end
+    end
+  end
 end

data/lib/vSphere/util/machine_helpers.rb

@@ -1,15 +1,15 @@
-module VagrantPlugins
-  module VSphere
-    module Util
-      module MachineHelpers
-        def wait_for_ssh(env)
-          env[:ui].info(I18n.t("vsphere.waiting_for_ssh"))
-          while true                        
-            break if env[:machine].communicate.ready?
-            sleep 5
-          end  
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module VSphere
+    module Util
+      module MachineHelpers
+        def wait_for_ssh(env)
+          env[:ui].info(I18n.t("vsphere.waiting_for_ssh"))
+          while true                        
+            break if env[:machine].communicate.ready?
+            sleep 5
+          end  
+        end
+      end
+    end
+  end
+end

data/lib/vSphere/util/vim_helpers.rb

@@ -1,37 +1,37 @@
-require 'rbvmomi'
-
-module VagrantPlugins
-  module VSphere
-    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('errors.missing_datacenter')
-        end
-
-        def get_vm_by_uuid(connection, machine)
-          get_datacenter(connection, machine).vmFolder.findByUuid machine.id
-        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('errors.missing_compute_resource')
-          cr.resourcePool.find(machine.provider_config.resource_pool_name) or fail Errors::VSphereError, :message => I18n.t('errors.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('errors.null_configuration_spec_manager') if manager.nil?            
-          spec = manager.GetCustomizationSpec(:name => name) or fail Errors::VSphereError, :message => I18n.t('errors.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('errors.missing_datastore')
-        end
-      end
-    end
-  end
-end
+require 'rbvmomi'
+
+module VagrantPlugins
+  module VSphere
+    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')
+        end
+
+        def get_vm_by_uuid(connection, machine)
+          get_datacenter(connection, machine).vmFolder.findByUuid machine.id
+        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')
+        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?
+        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')
+        end
+      end
+    end
+  end
+end

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
-module VagrantPlugins
-  module VSphere
-    VERSION = '0.7.0'
-  end
-end
+module VagrantPlugins
+  module VSphere
+    VERSION = '0.7.1'
+  end
+end

data/lib/vagrant-vsphere.rb

@@ -1,18 +1,18 @@
-require 'pathname'
-
-require 'vSphere/plugin'
-
-module VagrantPlugins
-  module VSphere
-    lib_path = Pathname.new(File.expand_path('../vSphere', __FILE__))
-    autoload :Action, lib_path.join('action')
-    autoload :Errors, lib_path.join('errors')
-
-    # This returns the path to the source of this plugin.
-    #
-    # @return [Pathname]
-    def self.source_root
-      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
-    end
-  end
+require 'pathname'
+
+require 'vSphere/plugin'
+
+module VagrantPlugins
+  module VSphere
+    lib_path = Pathname.new(File.expand_path('../vSphere', __FILE__))
+    autoload :Action, lib_path.join('action')
+    autoload :Errors, lib_path.join('errors')
+
+    # This returns the path to the source of this plugin.
+    #
+    # @return [Pathname]
+    def self.source_root
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+    end
+  end
 end

data/locales/en.yml

@@ -1,65 +1,66 @@
-en:
-  vsphere:
-    creating_cloned_vm: |-
-      Calling vSphere CloneVM with the following settings:
-    vm_clone_success: |-
-      New virtual machine successfully cloned and started
-    destroy_vm: |-
-      Calling vShpere Destroy
-    power_off_vm: |-
-      Calling vSphere PowerOff
-    power_on_vm: |-
-      Calling vSphere PowerOn
-    vm_already_created: |-
-      The VM is already created
-    vm_not_created: |-
-      The VM has not been created
-    vm_not_running: |-
-      The VM is not running
-    waiting_for_ssh: |-
-      Waiting for SSH to become available...
-    rsync_folder: |-
-      Rsyncing folder: %{hostpath} => %{guestpath}
-  errors:
-    missing_template: |-
-      Configured template/source VM could not be found
-    missing_datacenter: |-
-      Configured data center not found
-    missing_compute_resource: |-
-      Configured compute resource not found
-    missing_resource_pool: |-
-      Configured resource pool not found
-    null_configuration_spec_manager: |-
-      Configuration spec manager not configured in the ServiceInstance
-    missing_configuration_spec: |-
-      Configured configuration spec not found
-    missing_datastore: |-
-      Configured data store not found 
-    rsync_error: |-
-      There was an error when attemping to rsync a share folder.
-      Please inspect the error message below for more info.
-
-      Host path: %{hostpath}
-      Guest path: %{guestpath}
-      Error: %{stderr}
-    too_many_private_networks: |-
-      There a more private networks configured than can be assigned to the customization spec
-    rsync_not_found: |-
-      Warning! Folder sync disabled because the rsync binary is
-      missing. Make sure rsync is installed and the binary can
-      be found in PATH.
-  config:
-    host: |-
-      Configuration must specify a vSphere host
-    user: |-
-      Configuration must specify a vSphere user
-    password: |-
-      Configuration must specify a vSphere password
-    name: |-
-      Configuration must specify a VM name
-    template: |-
-      Configuration must specify a template name
-    compute_resource: |-
-      Configuration must specify a compute resource name
-    resource_pool: |-
-      Configuration must specify a resource pool name
+en:
+  vsphere:
+    creating_cloned_vm: |-
+      Calling vSphere CloneVM with the following settings:
+    vm_clone_success: |-
+      New virtual machine successfully cloned and started
+    destroy_vm: |-
+      Calling vShpere Destroy
+    power_off_vm: |-
+      Calling vSphere PowerOff
+    power_on_vm: |-
+      Calling vSphere PowerOn
+    vm_already_created: |-
+      The VM is already created
+    vm_not_created: |-
+      The VM has not been created
+    vm_not_running: |-
+      The VM is not running
+    waiting_for_ssh: |-
+      Waiting for SSH to become available...
+    rsync_folder: |-
+      Rsyncing folder: %{hostpath} => %{guestpath}
+
+    errors:
+      missing_template: |-
+        Configured template/source VM could not be found
+      missing_datacenter: |-
+        Configured data center not found
+      missing_compute_resource: |-
+        Configured compute resource not found
+      missing_resource_pool: |-
+        Configured resource pool not found
+      null_configuration_spec_manager: |-
+        Configuration spec manager not configured in the ServiceInstance
+      missing_configuration_spec: |-
+        Configured configuration spec not found
+      missing_datastore: |-
+        Configured data store not found
+      rsync_error: |-
+        There was an error when attemping to rsync a share folder.
+        Please inspect the error message below for more info.
+
+        Host path: %{hostpath}
+        Guest path: %{guestpath}
+        Error: %{stderr}
+      too_many_private_networks: |-
+        There a more private networks configured than can be assigned to the customization spec
+      rsync_not_found: |-
+        Warning! Folder sync disabled because the rsync binary is
+        missing. Make sure rsync is installed and the binary can
+        be found in PATH.
+    config:
+      host: |-
+        Configuration must specify a vSphere host
+      user: |-
+        Configuration must specify a vSphere user
+      password: |-
+        Configuration must specify a vSphere password
+      name: |-
+        Configuration must specify a VM name
+      template: |-
+        Configuration must specify a template name
+      compute_resource: |-
+        Configuration must specify a compute resource name
+      resource_pool: |-
+        Configuration must specify a resource pool name