vagrant-vsphere 0.19.0 → 0.19.1

data/spec/connect_vsphere_spec.rb

@@ -6,14 +6,14 @@ describe VagrantPlugins::VSphere::Action::ConnectVSphere do
   end
 
   it 'should connect to vSphere' do
-    expect(VIM).to have_received(:connect).with({
-      :host => @env[:machine].provider_config.host,
-      :user => @env[:machine].provider_config.user,
-      :password => @env[:machine].provider_config.password,
-      :insecure => @env[:machine].provider_config.insecure,
-      :proxyHost => @env[:machine].provider_config.proxy_host,
-      :proxyPort => @env[:machine].provider_config.proxy_port,
-    })
+    expect(VIM).to have_received(:connect).with(
+      host: @env[:machine].provider_config.host,
+      user: @env[:machine].provider_config.user,
+      password: @env[:machine].provider_config.password,
+      insecure: @env[:machine].provider_config.insecure,
+      proxyHost: @env[:machine].provider_config.proxy_host,
+      proxyPort: @env[:machine].provider_config.proxy_port
+    )
   end
 
   it 'should add the vSphere connection to the environment' do

data/spec/get_ssh_info_spec.rb

@@ -8,7 +8,7 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
   it 'should set the ssh info to nil if machine ID is not set' do
     call
 
-    expect(@env.has_key?(:machine_ssh_info)).to be true
+    expect(@env.key?(:machine_ssh_info)).to be true
     expect(@env[:machine_ssh_info]).to be nil
   end
 
@@ -17,7 +17,7 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
 
     call
 
-    expect(@env.has_key?(:machine_ssh_info)).to be true
+    expect(@env.key?(:machine_ssh_info)).to be true
     expect(@env[:machine_ssh_info]).to be nil
   end
 

data/spec/spec_helper.rb

@@ -23,7 +23,6 @@ NAME = 'vm'
 IP_ADDRESS = '127.0.0.1'
 
 RSpec.configure do |config|
-
   # removes deprecation warnings.
   # http://stackoverflow.com/questions/20275510/how-to-avoid-deprecation-warning-for-stub-chain-in-rspec-3-0/20296359#20296359
   config.mock_with :rspec do |c|
@@ -36,111 +35,108 @@ RSpec.configure do |config|
     end
 
     provider_config = double(
-        :host => 'testhost.com',
-        :user => 'testuser',
-        :password => 'testpassword',
-        :data_center_name => nil,
-        :compute_resource_name => 'testcomputeresource',
-        :resource_pool_name => 'testresourcepool',
-        :vm_base_path => nil,
-        :template_name => TEMPLATE,
-        :name => NAME,
-        :insecure => true,
-        :validate => [],
-        :customization_spec_name => nil,
-        :data_store_name => nil,
-        :clone_from_vm => nil,
-        :linked_clone => nil,
-        :proxy_host => nil,
-        :proxy_port => nil,
-        :vlan => nil,
-        :memory_mb => nil,
-        :cpu_count => nil,
-        :mac => nil)
+        host: 'testhost.com',
+        user: 'testuser',
+        password: 'testpassword',
+        data_center_name: nil,
+        compute_resource_name: 'testcomputeresource',
+        resource_pool_name: 'testresourcepool',
+        vm_base_path: nil,
+        template_name: TEMPLATE,
+        name: NAME,
+        insecure: true,
+        validate: [],
+        customization_spec_name: nil,
+        data_store_name: nil,
+        clone_from_vm: nil,
+        linked_clone: nil,
+        proxy_host: nil,
+        proxy_port: nil,
+        vlan: nil,
+        memory_mb: nil,
+        cpu_count: nil,
+        mac: nil)
     vm_config = double(
-      :vm => double('config_vm',
-                    :box => nil,
-                    :synced_folders => [],
-                    :provisioners => [],
-                    :hostname => nil,
-                    :communicator => nil,
-                    :networks => [[:private_network, {:ip => '0.0.0.0'}]],
-                    :graceful_halt_timeout => 0.1),
-      :validate => []
+      vm: double('config_vm',
+                 box: nil,
+                 synced_folders: [],
+                 provisioners: [],
+                 hostname: nil,
+                 communicator: nil,
+                 networks: [[:private_network, { ip: '0.0.0.0' }]],
+                 graceful_halt_timeout: 0.1),
+      validate: []
     )
-    @app = double 'app', :call => true
+    @app = double 'app', call: true
     @machine = double 'machine',
                       :provider_config => provider_config,
                       :config => vm_config,
-                      :state => double('state', :id => nil),
+                      :state => double('state', id: nil),
                       :communicate => double('communicator', :ready? => true),
                       :ssh_info => {},
                       :data_dir => Pathname.new(''),
                       :id => nil,
                       :id= => nil,
-                      :guest => double('guest', :capability => nil)
-
+                      :guest => double('guest', capability: nil)
 
     @env = {
-        :machine => @machine,
-        :ui => double('ui', :info => nil, :output => nil)
+      machine: @machine,
+      ui: double('ui', info: nil, output: 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))
+                 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)
 
-
     @child_resource_pool = double('testresourcepool')
-    @root_resource_pool = double('pools', :find => @child_resource_pool)
+    @root_resource_pool = double('pools', find: @child_resource_pool)
 
     @compute_resource = RbVmomi::VIM::ComputeResource.new(nil, nil)
     @compute_resource.stub(:resourcePool).and_return(@root_resource_pool)
 
-    @host_folder = double('hostFolder', :childEntity => double('childEntity', :find => @compute_resource))
+    @host_folder = double('hostFolder', childEntity: double('childEntity', find: @compute_resource))
 
     @data_center = double('data_center',
-                          :vmFolder => vm_folder,
-                          :pretty_path => "data_center/#{vm_folder}",
-                          :find_compute_resource => @compute_resource,
-                          :hostFolder => @host_folder)
+                          vmFolder: vm_folder,
+                          pretty_path: "data_center/#{vm_folder}",
+                          find_compute_resource: @compute_resource,
+                          hostFolder: @host_folder)
 
     @device = RbVmomi::VIM::VirtualEthernetCard.new
     @device.stub(:backing).and_return(RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo.new)
 
     @virtual_hardware = double('virtual_hardware',
-                               :device => [@device])
+                               device: [@device])
     @template_config = double('template_config',
-                              :hardware => @virtual_hardware)
+                              hardware: @virtual_hardware)
 
     @template = double('template_vm',
-                       :parent => @data_center,
-                       :pretty_path => "#{@data_center.pretty_path}/template_vm",
-                       :CloneVM_Task => double('result',
-                                               :wait_for_completion => double('new_vm', :config => double('config', :uuid => NEW_UUID))),
-                       :config => @template_config)
+                       parent: @data_center,
+                       pretty_path: "#{@data_center.pretty_path}/template_vm",
+                       CloneVM_Task: double('result',
+                                            wait_for_completion: double('new_vm', config: double('config', uuid: NEW_UUID))),
+                       config: @template_config)
 
     @data_center.stub(:find_vm).with(TEMPLATE).and_return(@template)
 
-    service_instance = double 'service_instance', :find_datacenter => @data_center
+    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 = 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
+    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) do |location, powerOn, template| { :location => location[:location] } end
-
+    VIM.stub(:VirtualMachineCloneSpec) { |location, _powerOn, _template| { location: location[:location] } }
   end
 end

data/vSphere.gemspec

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'vSphere/version'
 
 Gem::Specification.new do |s|
@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-core'
   s.add_development_dependency 'rspec-expectations'
   s.add_development_dependency 'rspec-mocks'
+  s.add_development_dependency 'rubocop', '~> 0.28'
 
-  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.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.executables = s.files.grep(/^bin\//) { |f| File.basename(f) }
+  s.test_files = s.files.grep(/^(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.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Andrew Grauch
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.28'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.28'
 description: Enables Vagrant to manage machines with VMWare vSphere.
 email:
 - andrew.grauch@nsidc.org
@@ -117,7 +131,11 @@ extra_rdoc_files: []
 files:
 - .bumpversion.cfg
 - .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
 - .travis.yml
+- CHANGELOG.md
+- DEVELOPMENT.md
 - Gemfile
 - LICENSE.txt
 - README.md