ruby_aem 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aeb1fe97514d136bf71c865801a2fd01ee6171d
-  data.tar.gz: 239284f42251a5b5bf498217be67a8ec79ce4589
+  metadata.gz: f1040bfc91374ad32876e37979e14d127f15863e
+  data.tar.gz: f2bdb8461462ac3cba13faba6be57d76e8b347bd
 SHA512:
-  metadata.gz: b9349cc5c4baeeaef1ee58a3e6b7af79b09d178ce0d3c2c724702d1b398424bdb32b8ffc66b2edabe105acdb3474dd434d1346ba5e744d1fa3aba770fa2f7c23
-  data.tar.gz: ae96390118a070803f81ff2e519d6ff45b27e8a126082055644628ef472053bd6559fb1e8bc26a83e754cb5e40d20d43fcd3e4e1e6e8186bbf97cfc4b28d6d4a
+  metadata.gz: a34f54ded219719ab4b1d4def2d1e46d6a7b3b7b558411175b43084cd6e698015d71ca10bac899e001efcd6941327ba3690e29ed715a5c0a5b95c826c2492ef1
+  data.tar.gz: b401b22dd6476051f1053b690c1d5e85f4e3d5e82bab9ffcc183a2fb0ee99dd77531a77f4aa01ac23664b8b5d5e9dc07e72b94d009db2ed6525394a0eafc5354

data/lib/ruby_aem/resources/aem.rb

@@ -58,6 +58,11 @@ module RubyAem
         opts[:_retries][:base_sleep_seconds] ||= 2
         opts[:_retries][:max_sleep_seconds] ||= 2
 
+        # ensure integer retries setting (Puppet 3 passes numeric string)
+        opts[:_retries][:max_tries] = opts[:_retries][:max_tries].to_i
+        opts[:_retries][:base_sleep_seconds] = opts[:_retries][:base_sleep_seconds].to_i
+        opts[:_retries][:max_sleep_seconds] = opts[:_retries][:max_sleep_seconds].to_i
+
         result = nil
         with_retries(:max_tries => opts[:_retries][:max_tries], :base_sleep_seconds => opts[:_retries][:base_sleep_seconds], :max_sleep_seconds => opts[:_retries][:max_sleep_seconds]) { |retries_count|
           begin

data/lib/ruby_aem/resources/package.rb

@@ -208,6 +208,11 @@ module RubyAem
         opts[:_retries][:base_sleep_seconds] ||= 2
         opts[:_retries][:max_sleep_seconds] ||= 2
 
+        # ensure integer retries setting (Puppet 3 passes numeric string)
+        opts[:_retries][:max_tries] = opts[:_retries][:max_tries].to_i
+        opts[:_retries][:base_sleep_seconds] = opts[:_retries][:base_sleep_seconds].to_i
+        opts[:_retries][:max_sleep_seconds] = opts[:_retries][:max_sleep_seconds].to_i
+
         result = upload(file_path, opts)
         with_retries(:max_tries => opts[:_retries][:max_tries], :base_sleep_seconds => opts[:_retries][:base_sleep_seconds], :max_sleep_seconds => opts[:_retries][:max_sleep_seconds]) { |retries_count|
           check_result = is_uploaded()
@@ -237,6 +242,11 @@ module RubyAem
         opts[:_retries][:base_sleep_seconds] ||= 2
         opts[:_retries][:max_sleep_seconds] ||= 2
 
+        # ensure integer retries setting (Puppet 3 passes numeric string)
+        opts[:_retries][:max_tries] = opts[:_retries][:max_tries].to_i
+        opts[:_retries][:base_sleep_seconds] = opts[:_retries][:base_sleep_seconds].to_i
+        opts[:_retries][:max_sleep_seconds] = opts[:_retries][:max_sleep_seconds].to_i
+
         result = install()
         with_retries(:max_tries => opts[:_retries][:max_tries], :base_sleep_seconds => opts[:_retries][:base_sleep_seconds], :max_sleep_seconds => opts[:_retries][:max_sleep_seconds]) { |retries_count|
           check_result = is_installed()
@@ -248,6 +258,40 @@ module RubyAem
         result
       end
 
+      # Delete the package and wait until the package status states it is not uploaded.
+      #
+      # @param opts optional parameters:
+      # - _retries: retries library's options (http://www.rubydoc.info/gems/retries/0.0.5#Usage), restricted to max_trie, base_sleep_seconds, max_sleep_seconds
+      # @return RubyAem::Result
+      def delete_wait_until_ready(
+        opts = {
+          _retries: {
+            max_tries: 30,
+            base_sleep_seconds: 2,
+            max_sleep_seconds: 2
+          }
+        })
+        opts[:_retries] ||= {}
+        opts[:_retries][:max_tries] ||= 30
+        opts[:_retries][:base_sleep_seconds] ||= 2
+        opts[:_retries][:max_sleep_seconds] ||= 2
+
+        # ensure integer retries setting (Puppet 3 passes numeric string)
+        opts[:_retries][:max_tries] = opts[:_retries][:max_tries].to_i
+        opts[:_retries][:base_sleep_seconds] = opts[:_retries][:base_sleep_seconds].to_i
+        opts[:_retries][:max_sleep_seconds] = opts[:_retries][:max_sleep_seconds].to_i
+
+        result = delete()
+        with_retries(:max_tries => opts[:_retries][:max_tries], :base_sleep_seconds => opts[:_retries][:base_sleep_seconds], :max_sleep_seconds => opts[:_retries][:max_sleep_seconds]) { |retries_count|
+          check_result = is_uploaded()
+          puts 'Delete check #%d: %s - %s' % [retries_count, !check_result.data, check_result.message]
+          if check_result.data == true
+            raise StandardError.new(check_result.message)
+          end
+        }
+        result
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Shine Solutions
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri