vagrant-vsphere 0.6.0 → 0.7.0

data/lib/vSphere/action.rb

@@ -1,172 +1,172 @@
-require 'vagrant'
-require 'vagrant/action/builder'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      include Vagrant::Action::Builtin
-
-      #Vagrant commands
-      def self.action_destroy
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use Call, IsRunning do |env, b2|
-            if [:result]
-                b2.use PowerOff
-                next
-            end
-          end
-          b.use Destroy
-        end
-      end
-
-      def self.action_provision
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
-            end
-            
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
-                b3.use MessageNotRunning
-                next       
-              end
-              
-              b3.use Provision
-              b3.use SyncFolders 
-            end        
-          end
-        end
-      end
-
-      def self.action_ssh
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
-            end
-            
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
-                b3.use MessageNotRunning
-                next
-              end
-              
-              b3.use SSHExec
-            end
-          end
-        end
-      end
-      
-      def self.action_ssh_run
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
-            end
-
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
-                b3.use MessageNotRunning
-                next
-              end
-              
-              b3.use SSHRun
-            end
-          end
-        end
-      end
-
-      def self.action_up
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use Call, IsCreated do |env, b2|
-            if env[:result]
-              b2.use MessageAlreadyCreated
-              next
-            end
-
-            b2.use Clone 
-          end
-          b.use Call, IsRunning do |env, b2|
-            if !env[:result]
-              b2.use PowerOn
-            end
-          end
-          b.use CloseVSphere 
-          b.use Provision          
-          b.use SyncFolders          
-        end
-      end
-
-      def self.action_halt
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
-            end
-            
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
-                b3.use MessageNotRunning
-                next
-              end
-              
-              b3.use PowerOff
-            end
-          end
-          b.use CloseVSphere
-        end
-      end
-
-      #vSphere specific actions
-      def self.action_get_state
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use GetState
-          b.use CloseVSphere
-        end
-      end
-
-      def self.action_get_ssh_info
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use GetSshInfo
-          b.use CloseVSphere
-        end
-      end
-
-      #autoload
-      action_root = Pathname.new(File.expand_path('../action', __FILE__))
-      autoload :Clone, action_root.join('clone')
-      autoload :CloseVSphere, action_root.join('close_vsphere')
-      autoload :ConnectVSphere, action_root.join('connect_vsphere')
-      autoload :Destroy, action_root.join('destroy')
-      autoload :GetSshInfo, action_root.join('get_ssh_info')
-      autoload :GetState, action_root.join('get_state')
-      autoload :IsCreated, action_root.join('is_created')
-      autoload :IsRunning, action_root.join('is_running')
-      autoload :MessageAlreadyCreated, action_root.join('message_already_created')
-      autoload :MessageNotCreated, action_root.join('message_not_created')
-      autoload :MessageNotRunning, action_root.join('message_not_running')
-      autoload :PowerOff, action_root.join('power_off')
-      autoload :PowerOn, action_root.join('power_on')
-      autoload :SyncFolders, action_root.join('sync_folders')
-    end
-  end
-end
-
+require 'vagrant'
+require 'vagrant/action/builder'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      include Vagrant::Action::Builtin
+
+      #Vagrant commands
+      def self.action_destroy
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use Call, IsRunning do |env, b2|
+            if [:result]
+                b2.use PowerOff
+                next
+            end
+          end
+          b.use Destroy
+        end
+      end
+
+      def self.action_provision
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+            
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                b3.use MessageNotRunning
+                next       
+              end
+              
+              b3.use Provision
+              b3.use SyncFolders 
+            end        
+          end
+        end
+      end
+
+      def self.action_ssh
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+            
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                b3.use MessageNotRunning
+                next
+              end
+              
+              b3.use SSHExec
+            end
+          end
+        end
+      end
+      
+      def self.action_ssh_run
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                b3.use MessageNotRunning
+                next
+              end
+              
+              b3.use SSHRun
+            end
+          end
+        end
+      end
+
+      def self.action_up
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use Call, IsCreated do |env, b2|
+            if env[:result]
+              b2.use MessageAlreadyCreated
+              next
+            end
+
+            b2.use Clone 
+          end
+          b.use Call, IsRunning do |env, b2|
+            if !env[:result]
+              b2.use PowerOn
+            end
+          end
+          b.use CloseVSphere 
+          b.use Provision          
+          b.use SyncFolders          
+        end
+      end
+
+      def self.action_halt
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+            
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                b3.use MessageNotRunning
+                next
+              end
+              
+              b3.use PowerOff
+            end
+          end
+          b.use CloseVSphere
+        end
+      end
+
+      #vSphere specific actions
+      def self.action_get_state
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use GetState
+          b.use CloseVSphere
+        end
+      end
+
+      def self.action_get_ssh_info
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use GetSshInfo
+          b.use CloseVSphere
+        end
+      end
+
+      #autoload
+      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :Clone, action_root.join('clone')
+      autoload :CloseVSphere, action_root.join('close_vsphere')
+      autoload :ConnectVSphere, action_root.join('connect_vsphere')
+      autoload :Destroy, action_root.join('destroy')
+      autoload :GetSshInfo, action_root.join('get_ssh_info')
+      autoload :GetState, action_root.join('get_state')
+      autoload :IsCreated, action_root.join('is_created')
+      autoload :IsRunning, action_root.join('is_running')
+      autoload :MessageAlreadyCreated, action_root.join('message_already_created')
+      autoload :MessageNotCreated, action_root.join('message_not_created')
+      autoload :MessageNotRunning, action_root.join('message_not_running')
+      autoload :PowerOff, action_root.join('power_off')
+      autoload :PowerOn, action_root.join('power_on')
+      autoload :SyncFolders, action_root.join('sync_folders')
+    end
+  end
+end
+

data/lib/vSphere/config.rb

@@ -1,37 +1,37 @@
-require 'vagrant'
-
-module VagrantPlugins
-  module VSphere
-    class Config < Vagrant.plugin('2', :config)
-      attr_accessor :host
-      attr_accessor :insecure
-      attr_accessor :user
-      attr_accessor :password
-      attr_accessor :data_center_name
-      attr_accessor :compute_resource_name
-      attr_accessor :resource_pool_name
-      attr_accessor :clone_from_vm
-      attr_accessor :template_name
-      attr_accessor :name
-      attr_accessor :customization_spec_name
-      attr_accessor :data_store_name
-
-      def validate(machine)
-        errors = _detected_errors
-
-        #TODO: add blank?
-        errors << I18n.t('config.host') if host.nil?
-        errors <<  I18n.t('config.user') if user.nil?
-        errors <<  I18n.t('config.password') if password.nil?
-        errors <<  I18n.t('config.name') if name.nil?
-        errors <<  I18n.t('config.template') if template_name.nil?
-
-        #These are only required if we're cloning from an actual template
-        errors << I18n.t('config.compute_resource') if compute_resource_name.nil? and not clone_from_vm
-        errors << I18n.t('config.resource_pool') if resource_pool_name.nil? and not clone_from_vm
-
-        { 'vSphere Provider' => errors }
-      end
-    end
-  end
-end
+require 'vagrant'
+
+module VagrantPlugins
+  module VSphere
+    class Config < Vagrant.plugin('2', :config)
+      attr_accessor :host
+      attr_accessor :insecure
+      attr_accessor :user
+      attr_accessor :password
+      attr_accessor :data_center_name
+      attr_accessor :compute_resource_name
+      attr_accessor :resource_pool_name
+      attr_accessor :clone_from_vm
+      attr_accessor :template_name
+      attr_accessor :name
+      attr_accessor :customization_spec_name
+      attr_accessor :data_store_name
+      attr_accessor :linked_clone
+
+      def validate(machine)
+        errors = _detected_errors
+
+        # TODO: add blank?
+        errors << I18n.t('config.host') if host.nil?
+        errors <<  I18n.t('config.user') if user.nil?
+        errors <<  I18n.t('config.password') if password.nil?
+        errors <<  I18n.t('config.template') if template_name.nil?
+
+        # These are only required if we're cloning from an actual template
+        errors << I18n.t('config.compute_resource') if compute_resource_name.nil? and not clone_from_vm
+        errors << I18n.t('config.resource_pool') if resource_pool_name.nil? and not clone_from_vm
+
+        { 'vSphere Provider' => errors }
+      end
+    end
+  end
+end

data/lib/vSphere/errors.rb

@@ -1,11 +1,11 @@
-require 'vagrant'
-
-module VagrantPlugins
-  module VSphere
-    module Errors
-      class VSphereError < Vagrant::Errors::VagrantError
-        error_namespace('vsphere.errors')
-      end
-    end
-  end
+require 'vagrant'
+
+module VagrantPlugins
+  module VSphere
+    module Errors
+      class VSphereError < Vagrant::Errors::VagrantError
+        error_namespace('vsphere.errors')
+      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