vagrant-vsphere 0.7.0 → 0.7.1

data/spec/get_state_spec.rb

@@ -1,54 +1,54 @@
-require 'spec_helper'
-
-describe VagrantPlugins::VSphere::Action::GetState do
-  before :each do
-    @env[:vSphere_connection] = @vim
-  end
-
-  it 'should set state id to not created if machine ID is not set' do
-    call
-
-    @env[:machine_state_id].should be :not_created
-  end
-
-  it 'should set state id to not created if VM is not found' do
-    @env[:machine].stub(:id).and_return(MISSING_UUID)
-
-    call
-
-    @env[:machine_state_id].should be :not_created
-  end
-
-  it 'should set state id to running if machine is powered on' do
-    @env[:machine].stub(:id).and_return(EXISTING_UUID)
-    @vm.runtime.stub(:powerState).and_return(described_class::POWERED_ON)
-
-    call
-
-    @env[:machine_state_id].should be :running
-  end
-
-  it 'should set state id to powered off if machine is powered off' do
-    @env[:machine].stub(:id).and_return(EXISTING_UUID)
-    @vm.runtime.stub(:powerState).and_return(described_class::POWERED_OFF)
-
-    call
-
-    @env[:machine_state_id].should be :poweroff
-  end
-
-  it 'should set state id to powered off if machine is suspended' do
-    @env[:machine].stub(:id).and_return(EXISTING_UUID)
-    @vm.runtime.stub(:powerState).and_return(described_class::SUSPENDED)
-
-    call
-
-    @env[:machine_state_id].should be :poweroff
-  end
-
-  it 'should call the next item in the middleware stack' do
-    call
-
-    @app.should have_received :call
-  end
-end
+require 'spec_helper'
+
+describe VagrantPlugins::VSphere::Action::GetState do
+  before :each do
+    @env[:vSphere_connection] = @vim
+  end
+
+  it 'should set state id to not created if machine ID is not set' do
+    call
+
+    @env[:machine_state_id].should be :not_created
+  end
+
+  it 'should set state id to not created if VM is not found' do
+    @env[:machine].stub(:id).and_return(MISSING_UUID)
+
+    call
+
+    @env[:machine_state_id].should be :not_created
+  end
+
+  it 'should set state id to running if machine is powered on' do
+    @env[:machine].stub(:id).and_return(EXISTING_UUID)
+    @vm.runtime.stub(:powerState).and_return(described_class::POWERED_ON)
+
+    call
+
+    @env[:machine_state_id].should be :running
+  end
+
+  it 'should set state id to powered off if machine is powered off' do
+    @env[:machine].stub(:id).and_return(EXISTING_UUID)
+    @vm.runtime.stub(:powerState).and_return(described_class::POWERED_OFF)
+
+    call
+
+    @env[:machine_state_id].should be :poweroff
+  end
+
+  it 'should set state id to powered off if machine is suspended' do
+    @env[:machine].stub(:id).and_return(EXISTING_UUID)
+    @vm.runtime.stub(:powerState).and_return(described_class::SUSPENDED)
+
+    call
+
+    @env[:machine_state_id].should be :poweroff
+  end
+
+  it 'should call the next item in the middleware stack' do
+    call
+
+    @app.should have_received :call
+  end
+end

data/spec/is_created_spec.rb

@@ -1,29 +1,29 @@
-require 'spec_helper'
-require 'vSphere/action/is_created'
-
-describe VagrantPlugins::VSphere::Action::IsCreated do
-  before :each do
-    @env[:vSphere_connection] = @vim
-  end
-
-  it 'should set result to false if the VM does not exist' do
-    @env[:machine].state.stub(:id).and_return(:running)
-
-    call
-
-    @env[:result].should be true
-  end
-
-  it 'should set result to false if the VM does not exist' do
-    @env[:machine].state.stub(:id).and_return(:not_created)
-
-    call
-
-    @env[:result].should be false
-  end
-
-  it 'should call the next item in the middleware stack' do
-    call
-    @app.should have_received :call
-  end
+require 'spec_helper'
+require 'vSphere/action/is_created'
+
+describe VagrantPlugins::VSphere::Action::IsCreated do
+  before :each do
+    @env[:vSphere_connection] = @vim
+  end
+
+  it 'should set result to false if the VM does not exist' do
+    @env[:machine].state.stub(:id).and_return(:running)
+
+    call
+
+    @env[:result].should be true
+  end
+
+  it 'should set result to false if the VM does not exist' do
+    @env[:machine].state.stub(:id).and_return(:not_created)
+
+    call
+
+    @env[:result].should be false
+  end
+
+  it 'should call the next item in the middleware stack' do
+    call
+    @app.should have_received :call
+  end
 end

data/spec/spec_helper.rb

@@ -1,98 +1,98 @@
-require 'rbvmomi'
-require 'vSphere/errors'
-require 'vSphere/action'
-require 'vSphere/action/connect_vsphere'
-require 'vSphere/action/close_vsphere'
-require 'vSphere/action/is_created'
-require 'vSphere/action/get_state'
-require 'vSphere/action/get_ssh_info'
-require 'vSphere/action/clone'
-require 'vSphere/action/message_already_created'
-require 'vSphere/action/message_not_created'
-require 'vSphere/action/destroy'
-require 'vSphere/action/power_off'
-
-VIM = RbVmomi::VIM
-
-EXISTING_UUID = 'existing_uuid'
-MISSING_UUID = 'missing_uuid'
-NEW_UUID = 'new_uuid'
-TEMPLATE = 'template'
-NAME = 'vm'
-IP_ADDRESS = '127.0.0.1'
-
-RSpec.configure do |config|
-  config.before(:each) do
-    def call
-      described_class.new(@app, @env).call(@env)
-    end
-
-    provider_config = double(
-        :host => 'testhost.com',
-        :user => 'testuser',
-        :password => 'testpassword',
-        :data_center_name => nil,
-        :compute_resource_name => 'testcomputeresource',
-        :resource_pool_name => 'testresourcepool',
-        :template_name => TEMPLATE,
-        :name => NAME,
-        :insecure => true,
-        :validate => [],
-        :customization_spec_name => nil,
-        :data_store_name => nil,
-        :clone_from_vm => nil,
-        :linked_clone => nil)
-    vm_config = double(
-      :vm => double('config_vm', :synced_folders => [], :provisioners => [], :networks => [[:private_network, {:ip => '0.0.0.0'}]]),
-      :validate => []
-    )
-    @app = double 'app', :call => true
-    @machine = double 'machine',
-                      :provider_config => provider_config,
-                      :config => vm_config,
-                      :state => double('state', :id => nil),
-                      :communicate => double('communicator', :ready? => true),
-                      :ssh_info => {},
-                      :id => nil,
-                      :id= => nil
-    @env = {
-        :machine => @machine,
-        :ui => double('ui', :info => nil)
-    }
-
-    @vm = double('vm',
-                 :runtime => double('runtime', :powerState => nil),
-                 :guest => double('guest', :ipAddress => IP_ADDRESS),
-                 :Destroy_Task => double('result', :wait_for_completion => nil),
-                 :PowerOffVM_Task => double('result', :wait_for_completion => nil),
-                 :PowerOnVM_Task => double('result', :wait_for_completion => nil))
-
-    vm_folder = double('vm_folder')
-    vm_folder.stub(:findByUuid).with(EXISTING_UUID).and_return(@vm)
-    vm_folder.stub(:findByUuid).with(MISSING_UUID).and_return(nil)
-    vm_folder.stub(:findByUuid).with(nil).and_return(nil)
-
-    @data_center = double('data_center',
-                          :vmFolder => vm_folder,
-                          :find_compute_resource => double('compute resource', :resourcePool => double('pools', :find => {})))
-
-    @template = double('template_vm',
-                       :parent => @data_center,
-                       :CloneVM_Task => double('result',
-                                                :wait_for_completion => double('new_vm', :config => double('config', :uuid => NEW_UUID))))
-
-    @data_center.stub(:find_vm).with(TEMPLATE).and_return(@template)
-
-    service_instance = double 'service_instance', :find_datacenter => @data_center
-    @ip = double 'ip', :ipAddress= => nil 
-    customization_spec = double 'customization spec', :nicSettingMap => [double('nic setting', :adapter => double('adapter', :ip => @ip))]
-    customization_spec.stub(:clone).and_return(customization_spec)
-    customization_spec_manager = double 'customization spec manager', :GetCustomizationSpec => double('spec info', :spec => customization_spec)
-    service_content = double 'service content', :customizationSpecManager => customization_spec_manager
-    @vim = double 'vim', :serviceInstance => service_instance, :close => true, :serviceContent => service_content
-
-    VIM.stub(:connect).and_return(@vim)
-    VIM.stub(:VirtualMachineRelocateSpec).and_return({})
-    VIM.stub(:VirtualMachineCloneSpec).and_return({})
-  end
-end
+require 'rbvmomi'
+require 'vSphere/errors'
+require 'vSphere/action'
+require 'vSphere/action/connect_vsphere'
+require 'vSphere/action/close_vsphere'
+require 'vSphere/action/is_created'
+require 'vSphere/action/get_state'
+require 'vSphere/action/get_ssh_info'
+require 'vSphere/action/clone'
+require 'vSphere/action/message_already_created'
+require 'vSphere/action/message_not_created'
+require 'vSphere/action/destroy'
+require 'vSphere/action/power_off'
+
+VIM = RbVmomi::VIM
+
+EXISTING_UUID = 'existing_uuid'
+MISSING_UUID = 'missing_uuid'
+NEW_UUID = 'new_uuid'
+TEMPLATE = 'template'
+NAME = 'vm'
+IP_ADDRESS = '127.0.0.1'
+
+RSpec.configure do |config|
+  config.before(:each) do
+    def call
+      described_class.new(@app, @env).call(@env)
+    end
+
+    provider_config = double(
+        :host => 'testhost.com',
+        :user => 'testuser',
+        :password => 'testpassword',
+        :data_center_name => nil,
+        :compute_resource_name => 'testcomputeresource',
+        :resource_pool_name => 'testresourcepool',
+        :template_name => TEMPLATE,
+        :name => NAME,
+        :insecure => true,
+        :validate => [],
+        :customization_spec_name => nil,
+        :data_store_name => nil,
+        :clone_from_vm => nil,
+        :linked_clone => nil)
+    vm_config = double(
+      :vm => double('config_vm', :synced_folders => [], :provisioners => [], :networks => [[:private_network, {:ip => '0.0.0.0'}]]),
+      :validate => []
+    )
+    @app = double 'app', :call => true
+    @machine = double 'machine',
+                      :provider_config => provider_config,
+                      :config => vm_config,
+                      :state => double('state', :id => nil),
+                      :communicate => double('communicator', :ready? => true),
+                      :ssh_info => {},
+                      :id => nil,
+                      :id= => nil
+    @env = {
+        :machine => @machine,
+        :ui => double('ui', :info => nil)
+    }
+
+    @vm = double('vm',
+                 :runtime => double('runtime', :powerState => nil),
+                 :guest => double('guest', :ipAddress => IP_ADDRESS),
+                 :Destroy_Task => double('result', :wait_for_completion => nil),
+                 :PowerOffVM_Task => double('result', :wait_for_completion => nil),
+                 :PowerOnVM_Task => double('result', :wait_for_completion => nil))
+
+    vm_folder = double('vm_folder')
+    vm_folder.stub(:findByUuid).with(EXISTING_UUID).and_return(@vm)
+    vm_folder.stub(:findByUuid).with(MISSING_UUID).and_return(nil)
+    vm_folder.stub(:findByUuid).with(nil).and_return(nil)
+
+    @data_center = double('data_center',
+                          :vmFolder => vm_folder,
+                          :find_compute_resource => double('compute resource', :resourcePool => double('pools', :find => {})))
+
+    @template = double('template_vm',
+                       :parent => @data_center,
+                       :CloneVM_Task => double('result',
+                                                :wait_for_completion => double('new_vm', :config => double('config', :uuid => NEW_UUID))))
+
+    @data_center.stub(:find_vm).with(TEMPLATE).and_return(@template)
+
+    service_instance = double 'service_instance', :find_datacenter => @data_center
+    @ip = double 'ip', :ipAddress= => nil 
+    customization_spec = double 'customization spec', :nicSettingMap => [double('nic setting', :adapter => double('adapter', :ip => @ip))]
+    customization_spec.stub(:clone).and_return(customization_spec)
+    customization_spec_manager = double 'customization spec manager', :GetCustomizationSpec => double('spec info', :spec => customization_spec)
+    service_content = double 'service content', :customizationSpecManager => customization_spec_manager
+    @vim = double 'vim', :serviceInstance => service_instance, :close => true, :serviceContent => service_content
+
+    VIM.stub(:connect).and_return(@vim)
+    VIM.stub(:VirtualMachineRelocateSpec).and_return({})
+    VIM.stub(:VirtualMachineCloneSpec).and_return({})
+  end
+end

data/vSphere.gemspec

@@ -1,28 +1,29 @@
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'vSphere/version'
-
-Gem::Specification.new do |s|
-  s.name = 'vagrant-vsphere'
-  s.version = VagrantPlugins::VSphere::VERSION
-  s.authors = ['Andrew Grauch']
-  s.email = ['andrew.grauch@nsidc.org']
-  s.homepage = ''
-  s.license = 'MIT'
-  s.summary = 'VMWare vSphere provider'
-  s.description = 'Enables Vagrant to manage machines with VMWare vSphere.'
-  
-  # force the use of Nokogiri 1.5.10 to prevent conflicts with older versions of zlib
-  s.add_dependency 'nokogiri', '1.5.10'
-  s.add_dependency 'rbvmomi'
-  s.add_dependency 'i18n', '~> 0.6.4'
-
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec-core'
-  s.add_development_dependency 'rspec-expectations'
-  s.add_development_dependency 'rspec-mocks'
-  
-  s.files = `git ls-files`.split($/)
-  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
-  s.require_path = 'lib'
-end
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'vSphere/version'
+
+Gem::Specification.new do |s|
+  s.name = 'vagrant-vsphere'
+  s.version = VagrantPlugins::VSphere::VERSION
+  s.authors = ['Andrew Grauch']
+  s.email = ['andrew.grauch@nsidc.org']
+  s.homepage = ''
+  s.license = 'MIT'
+  s.summary = 'VMWare vSphere provider'
+  s.description = 'Enables Vagrant to manage machines with VMWare vSphere.'
+
+  # force the use of Nokogiri 1.5.10 to prevent conflicts with older versions of zlib
+  s.add_dependency 'nokogiri', '~>1.5.10'
+  # force the use of rbvmomi 1.6.x to get around this issue: https://github.com/vmware/rbvmomi/pull/32
+  s.add_dependency 'rbvmomi', '~> 1.6.0'
+  s.add_dependency 'i18n', '~> 0.6.4'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec-core'
+  s.add_development_dependency 'rspec-expectations'
+  s.add_development_dependency 'rspec-mocks'
+
+  s.files = `git ls-files`.split($/)
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.require_path = 'lib'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.10
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.10
 - !ruby/object:Gem::Dependency
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -182,12 +182,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -20572808865558022
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -20572808865558022
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23