kitchen-vcair 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 795c6c4ab44475c53e864812dace3e69c6177437
-  data.tar.gz: 776badc46e81d8e63d8b641ddeb92b9e96083403
+  metadata.gz: b9852e4b43cfd48b40f2b5f42fb41f655a484603
+  data.tar.gz: 6239cfe713bb9d91c233c9501e794bf1543e3f00
 SHA512:
-  metadata.gz: 9fe2794583e98129127a580ed9534d2f39d1cd3b8fbac14f87216a56af918cafc5e0f615c3df85e45f062bab92d6838953bd28cb294e2ebc59065de7d6cdb9fe
-  data.tar.gz: 2bf503afddd35f11b00c875ff4eff1f423dd6dcdebe677352941182a50619405bc7fa211f8b90633c12983f23593c849abe91a427d1efe5a894627cfaa804edb
+  metadata.gz: 6c3e7f61e50db260c41582403e35f05ace418d3a4a3f6d029f5444635fbf9dcadfe1180ff76d14d841fdb9f923f26fe0584b0204ce6e948b3702558226db6ec2
+  data.tar.gz: a09009ce8a1ad502a160aac0e77e6975171f7e3c8762f4e5ddeb15ab471ab7492c556659d42d39a8aa7dc1b95cc787d1f119eb07f71a3437d0341d4ae7879ad4

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+cache: bundler
+sudo: false
+rvm:
+  - 2.0.0
+  - 2.1
+  - 2.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # kitchen-vcair Changelog
 
+## Release: 1.1.0 / 2015-12-17
+* [pr#2](https://github.com/chef-partners/kitchen-vcair/pull/2) Added better
+  error handling to resource fetchers for when the configured resource
+  (image, network, catalog, etc.) does not exist.
+
 ## Release: 1.0.0 / 2015-08-21
 * Initial public release
 * Refactor by Chef Partner Engineering to match style of other VMware plugins

data/README.md

@@ -186,3 +186,5 @@ We'd love to hear from you if this doesn't perform in the manner you expect. Ple
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+

data/Rakefile

@@ -0,0 +1,8 @@
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:style)
+
+task default: [ :spec, :style ]

data/kitchen-vcair.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'test-kitchen', '~> 1.4', '>= 1.4.1'
   spec.add_dependency 'fog',          '~> 1.33'
 
-  spec.add_development_dependency 'bundler',   '~> 1.7'
   spec.add_development_dependency 'rake',      '~> 10.0'
   spec.add_development_dependency 'rspec',     '~> 3.2'
   spec.add_development_dependency 'rubocop',   '~> 0.33'

data/lib/kitchen/driver/vcair.rb

@@ -191,35 +191,47 @@ module Kitchen
       end
 
       def image
-        if config[:image_id]
-          catalog.catalog_items.get(config[:image_id])
-        else
-          catalog.catalog_items.get_by_name(config[:image_name])
-        end
+        image = if config[:image_id]
+                  catalog.catalog_items.get(config[:image_id])
+                else
+                  catalog.catalog_items.get_by_name(config[:image_name])
+                end
+
+        raise 'Unable to find image - check your image_id or image_name' if image.nil?
+        image
       end
 
       def catalog
-        if config[:catalog_id]
-          org.catalogs.get(config[:catalog_id])
-        else
-          org.catalogs.get_by_name(config[:catalog_name])
-        end
+        catalog = if config[:catalog_id]
+                    org.catalogs.get(config[:catalog_id])
+                  else
+                    org.catalogs.get_by_name(config[:catalog_name])
+                  end
+
+        raise 'Unable to find catalog - check your catalog_id or catalog_name' if catalog.nil?
+        catalog
       end
 
       def vdc
-        if config[:vdc_id]
-          org.vdcs.get(config[:vdc_id])
-        else
-          org.vdcs.get_by_name(config[:vdc_name])
-        end
+        vdc = if config[:vdc_id]
+                org.vdcs.get(config[:vdc_id])
+              else
+                org.vdcs.get_by_name(config[:vdc_name])
+              end
+
+        raise 'Unable to find VDC - check your vdc_id or vdc_name' if vdc.nil?
+        vdc
       end
 
       def network
-        if config[:network_id]
-          org.networks.get(config[:network_id])
-        else
-          org.networks.get_by_name(config[:network_name])
-        end
+        network = if config[:network_id]
+                    org.networks.get(config[:network_id])
+                  else
+                    org.networks.get_by_name(config[:network_name])
+                  end
+
+        raise 'Unable to find network - check your network_id or network_name' if network.nil?
+        network
       end
 
       def node_description

data/lib/kitchen/driver/vcair_version.rb

@@ -20,6 +20,6 @@
 
 module Kitchen
   module Driver
-    VCAIR_VERSION = '1.0.0'
+    VCAIR_VERSION = '1.1.0'
   end
 end

data/spec/vcair_spec.rb

@@ -313,6 +313,7 @@ describe Kitchen::Driver::Vcair do
   describe '#image' do
     let(:catalog)       { double('catalog') }
     let(:catalog_items) { double('catalog_items') }
+    let(:image)         { double('image') }
 
     before do
       allow(driver).to receive(:catalog).and_return(catalog)
@@ -326,8 +327,8 @@ describe Kitchen::Driver::Vcair do
       end
 
       it 'fetches the catalog item by ID' do
-        expect(catalog_items).to receive(:get).with(1)
-        driver.image
+        expect(catalog_items).to receive(:get).with(1).and_return(image)
+        expect(driver.image).to eq(image)
       end
     end
 
@@ -338,8 +339,20 @@ describe Kitchen::Driver::Vcair do
       end
 
       it 'fetches the catalog item by name' do
-        expect(catalog_items).to receive(:get_by_name).with('image name')
-        driver.image
+        expect(catalog_items).to receive(:get_by_name).with('image name').and_return(image)
+        expect(driver.image).to eq(image)
+      end
+    end
+
+    context 'when no image is returned' do
+      before do
+        config[:image_id] = 1
+        config[:image_name] = nil
+      end
+
+      it 'raises an exception' do
+        expect(catalog_items).to receive(:get).with(1).and_return(nil)
+        expect { driver.image }.to raise_error(RuntimeError)
       end
     end
   end
@@ -347,6 +360,7 @@ describe Kitchen::Driver::Vcair do
   describe '#catalog' do
     let(:org)      { double('org') }
     let(:catalogs) { double('catalogs') }
+    let(:catalog)  { double('catalog') }
 
     before do
       allow(driver).to receive(:org).and_return(org)
@@ -360,8 +374,8 @@ describe Kitchen::Driver::Vcair do
       end
 
       it 'fetches the catalog by ID' do
-        expect(catalogs).to receive(:get).with(1)
-        driver.catalog
+        expect(catalogs).to receive(:get).with(1).and_return(catalog)
+        expect(driver.catalog).to eq(catalog)
       end
     end
 
@@ -372,8 +386,20 @@ describe Kitchen::Driver::Vcair do
       end
 
       it 'fetches the catalog by name' do
-        expect(catalogs).to receive(:get_by_name).with('catalog name')
-        driver.catalog
+        expect(catalogs).to receive(:get_by_name).with('catalog name').and_return(catalog)
+        expect(driver.catalog).to eq(catalog)
+      end
+    end
+
+    context 'when no catalog is returned' do
+      before do
+        config[:catalog_id] = 1
+        config[:catalog_name] = nil
+      end
+
+      it 'raises an exception' do
+        expect(catalogs).to receive(:get).with(1).and_return(nil)
+        expect { driver.catalog }.to raise_error(RuntimeError)
       end
     end
   end
@@ -381,6 +407,7 @@ describe Kitchen::Driver::Vcair do
   describe '#vdc' do
     let(:org)  { double('org') }
     let(:vdcs) { double('vdcs') }
+    let(:vdc)  { double('vdc') }
 
     before do
       allow(driver).to receive(:org).and_return(org)
@@ -394,8 +421,8 @@ describe Kitchen::Driver::Vcair do
       end
 
       it 'fetches the vdc by ID' do
-        expect(vdcs).to receive(:get).with(1)
-        driver.vdc
+        expect(vdcs).to receive(:get).with(1).and_return(vdc)
+        expect(driver.vdc).to eq(vdc)
       end
     end
 
@@ -406,8 +433,20 @@ describe Kitchen::Driver::Vcair do
       end
 
       it 'fetches the vdc by name' do
-        expect(vdcs).to receive(:get_by_name).with('vdc name')
-        driver.vdc
+        expect(vdcs).to receive(:get_by_name).with('vdc name').and_return(vdc)
+        expect(driver.vdc).to eq(vdc)
+      end
+    end
+
+    context 'when no vdc is returned' do
+      before do
+        config[:vdc_id] = 1
+        config[:vdc_name] = nil
+      end
+
+      it 'raises an exception' do
+        expect(vdcs).to receive(:get).with(1).and_return(nil)
+        expect { driver.vdc }.to raise_error(RuntimeError)
       end
     end
   end
@@ -415,6 +454,7 @@ describe Kitchen::Driver::Vcair do
   describe '#network' do
     let(:org)      { double('org') }
     let(:networks) { double('networks') }
+    let(:network)  { double('network') }
 
     before do
       allow(driver).to receive(:org).and_return(org)
@@ -428,8 +468,8 @@ describe Kitchen::Driver::Vcair do
       end
 
       it 'fetches the network by ID' do
-        expect(networks).to receive(:get).with(1)
-        driver.network
+        expect(networks).to receive(:get).with(1).and_return(network)
+        expect(driver.network).to eq(network)
       end
     end
 
@@ -440,8 +480,20 @@ describe Kitchen::Driver::Vcair do
       end
 
       it 'fetches the network by name' do
-        expect(networks).to receive(:get_by_name).with('network name')
-        driver.network
+        expect(networks).to receive(:get_by_name).with('network name').and_return(network)
+        expect(driver.network).to eq(network)
+      end
+    end
+
+    context 'when no network is returned' do
+      before do
+        config[:network_id] = 1
+        config[:network_name] = nil
+      end
+
+      it 'raises an exception' do
+        expect(networks).to receive(:get).with(1).and_return(nil)
+        expect { driver.network }.to raise_error(RuntimeError)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcair
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chef Partner Engineering
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -46,20 +46,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.33'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,10 +112,12 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
 - examples/VIDEOS.md
 - examples/windows_customization.bat
 - kitchen-vcair.gemspec
@@ -157,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen vCloud Air driver built on Fog