knife-vcair 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5fb6ce00fc091f2234646d471b17580de7f7597
-  data.tar.gz: f16f1691a223cd4ee3928a2f91b1b1c8e42e2e8c
+  metadata.gz: 1525a06d5e0976066743fd906e4f2e8d98135364
+  data.tar.gz: 9b2d01074f45eb7d7ca85cfe24106948c73bca42
 SHA512:
-  metadata.gz: d46cd5af03fb0f55e725fb599c155d67d0a1cb678103e979ef1f01a032a9e5a60420823355792622960f302be327d67aa9906325626a826f9d44a19cea43b3b0
-  data.tar.gz: f7a032cc18dd22499b2c6727e5957ec451ec3dbd3c72f690e292a1c198410acc11ed6eae8c367c0f2391314fb47e7067fd0db617374cc02da33f92e85cbfa82a
+  metadata.gz: 9a95297fb2957943dc720a4a001b8ecd514bbe7284542c97e751870b82b9864a13233c48469bae7f0648d768689cdd77bac89e67b5cd0f9b69cc68b7e9d68976
+  data.tar.gz: e933bea1030853ce3b436061494b228cc18c6c515f94322039a7312ba1f72c4c2975825a6d0ca64bbd79368b9d95c46807b93df9ff41b9434985c5178f915d92

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.0
+* pinned version of fog to < 2.x in anticipation of release
+* added better exception handling for looking up vCloud Air templates / images
+
 ## 0.8.0
 * added better exception handling for looking up vCloud Air networks, including adding ability to specify the network by ID instead of name
 

data/knife-vcair.gemspec

@@ -19,14 +19,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fog", ">= 1.23"
-  s.add_dependency "knife-cloud", ">= 1.0.1"
+  s.add_dependency "fog",           "~> 1.33"
+  s.add_dependency "knife-cloud",   ">= 1.0.1"
   s.add_dependency "knife-windows", ">= 0.8.3"
+  s.add_dependency "em-winrm", "~> 0.7.0"
 
-  s.add_development_dependency 'chef', '>= 11.16.2', '< 12'
+  s.add_development_dependency 'chef'
   s.add_development_dependency 'rspec',         '~> 2.14'
   s.add_development_dependency 'rake',          '~> 10.1'
-  s.add_development_dependency 'guard-rspec', ["~> 4.2"]
+  s.add_development_dependency 'guard-rspec',   '~> 4.2'
   s.add_development_dependency 'activesupport'
 
   %w(rspec-core rspec-expectations rspec-mocks rspec_junit_formatter).each { |gem|

data/lib/chef/knife/vcair_helpers.rb

@@ -55,11 +55,27 @@ class Chef
         end
 
         def template
+          return @template if @template
+
           # TODO: find by catalog item ID and/or NAME
           # TODO: add option to search just public and/or private catalogs
-          @template ||= org.catalogs.map do |cat|
-            cat.catalog_items.get_by_name(config_value(:image))
-          end.compact.first
+          Chef::Log.debug("Searching catalogs for image #{config_value(:image)}...")
+          org.catalogs.each do |catalog|
+            Chef::Log.debug("Searching catalog #{catalog.name}...")
+
+            images = catalog.catalog_items
+            @template = images.find { |image| image.name == config_value(:image) }
+
+            if @template.nil?
+              Chef::Log.debug("Image not found in catalog #{catalog.name} - possible images: #{images.map(&:name).join(', ')}")
+            else
+              Chef::Log.debug("Image #{@template.name} (#{template.id}) found in catalog #{catalog.name} - search complete.")
+              break
+            end
+          end
+
+          raise "Unable to locate image #{config_value(:image)} in any catalog" if @template.nil?
+          @template
         end
 
         def vapp

data/lib/knife-vcair/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Vcair
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcair
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Matt Ray
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.33'
 - !ruby/object:Gem::Dependency
   name: knife-cloud
   requirement: !ruby/object:Gem::Requirement
@@ -56,26 +56,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.3
+- !ruby/object:Gem::Dependency
+  name: em-winrm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.16.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.16.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement