poise-languages 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a246857fd31c0cf4787253270c166b5093090e39
-  data.tar.gz: 7026c170387e885343071f282efab2bce450ae0b
+  metadata.gz: ebe6739da8a1f2c03a97f96eda50c35d148ca8ef
+  data.tar.gz: 82677b413f32981926ba7c95fd5b55e922cb8b57
 SHA512:
-  metadata.gz: c8dff6c5c9d497b825cf3741d7d2fdb60efb6b5afa9b847dde104f2074d4d34a3b63b54ba2c575e1ec08b401ff446f7242b99183fa96efeb4a62add3b8b6daaf
-  data.tar.gz: 9c5d5994987986e48970e3f36d234a3fab8dcb10f8b139fb9e9afce0d7133cb7ba8ce2c86814522515ad1881114240eec368be7dc931de51ba76be8cf0881796
+  metadata.gz: b71717b3045efff8151eecf1587e1b67ba70393484ba17f88f30b0edb5b4def1949e06c692de8640b87bfc2fb4fc7ebe6af601c7925a1342fef65aa67e68630e
+  data.tar.gz: c97f65a1e7fbe88980358bd4ae06772ccab45247fca4a4b6820e8b8e10f43b7435b201e9d259f0bc0c03e7c9dcc19d92b618cb27ba94edba18f75ca32a7f3d86

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.0.1
+
+* Don't error on `Chef::Decorator::Lazy` proxy objects for `candidate_version`.
+* Retry system and SCL package installs because transient network failures.
+
 ## v2.0.0
 
 * Backwards-incompatible change to SCL management to comply with their new repo

data/lib/poise_languages/scl/resource.rb

@@ -116,6 +116,7 @@ module PoiseLanguages
             # important when they happen. If this breaks your prod infra, I'm
             # sorry :-(
             action :upgrade
+            retries 5
           end
         end
       end
@@ -132,6 +133,7 @@ module PoiseLanguages
       def install_scl_package(action)
         package new_resource.package_name do
           action action
+          retries 5
           version new_resource.version
         end
       end
@@ -139,6 +141,7 @@ module PoiseLanguages
       def install_scl_devel_package(action)
         package new_resource.dev_package do
           action action
+          retries 5
           version new_resource.version
         end
       end

data/lib/poise_languages/system/resource.rb

@@ -140,6 +140,7 @@ module PoiseLanguages
               r.version(version)
               r.action(action)
               r.declared_type = :package
+              r.retries(5)
             end
           end
         else
@@ -147,6 +148,7 @@ module PoiseLanguages
             r.version(packages.values)
             r.action(action)
             r.declared_type = :package
+            r.retries(5)
           end]
         end
       end
@@ -189,7 +191,10 @@ module PoiseLanguages
           define_method(:load_current_resource) do
             super().tap do |_|
               each_package do |package_name, new_version, current_version, candidate_version|
-                unless candidate_version && candidate_version.start_with?(version)
+                # In Chef 12.14+, candidate_version is a Chef::Decorator::Lazy object
+                # so we need the nil? check to see if the object being proxied is
+                # nil (i.e. there is no version).
+                unless candidate_version && (!candidate_version.nil?) && candidate_version.start_with?(version)
                   raise PoiseLanguages::Error.new("Package #{package_name} would install #{candidate_version}, which does not match #{version.empty? ? version.inspect : version}. Please set the package_name or package_version provider options.")
                 end
               end

data/lib/poise_languages/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseLanguages
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-languages
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite