ruby_aem 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f303b354d0690fed55e2662645fa0a850c4a9339
-  data.tar.gz: 9078d5a5d90cc0bf23b86d2fc733a5eeebab6c98
+  metadata.gz: c092ee28f6083d9e3d033e1b56f52bd949606db3
+  data.tar.gz: 3c4441408e7b1fe71005c9d4467ee187448eb8a5
 SHA512:
-  metadata.gz: 574e2f1b7d63003e9297512e981ba63de9aa3b6d6c734f47d068dc84dba95b8e84cc6ed9b776d2a12ab2e9b5b8f252b1a68dbe564708c9b35b814937d39c5482
-  data.tar.gz: d8e2bb24520e5e43fcd13121d198200f05de01bac3b5778983185a6a8cf1921db0fff8c10a357fdea2e918adca269ead86558fca706fd0c4c45f0d055047cf4b
+  metadata.gz: 1befff3fd95f9fa2c7ede3907b75bd8a58ae46ba6544d452afe44247876ef390ce77571de647affc367b6ba5fd195fcbe8ec2025d150c130040e9387eeb59240
+  data.tar.gz: df25f0909f4e50af2b6667f793b7d28ab50f5a84af0be8cfcc952c97c8e550d2b26ce994ae97e2fce66b4663ba4b33d64957ce57a02bcdd61998c2663a883ae3

data/conf/spec.yaml

@@ -31,6 +31,15 @@ aem:
         200:
           handler: json_agents
           message: 'Retrieved agents on %{run_mode}'
+    get_install_status:
+      api: crx
+      operation: getInstallStatus
+      params:
+        required:
+      responses:
+        200:
+          handler: simple
+          message: 'Install status retrieved successfully'
 bundle:
   responses:
     404:

data/lib/ruby_aem/client.rb

@@ -56,7 +56,7 @@ module RubyAem
 
       params = []
       required_params = action_spec['params']['required'] || {}
-      required_params.each { |_key, value|
+      required_params.each_value { |value|
         params.push(value % call_params)
       }
       params.push({})

data/lib/ruby_aem/handlers/json.rb

@@ -66,7 +66,7 @@ module RubyAem
       json = JSON.parse(response.body)
 
       filter = []
-      json.each do |key, _value|
+      json.each_key do |key|
         filter.push(json[key]['root']) unless json[key]['root'].nil?
       end
 
@@ -103,7 +103,7 @@ module RubyAem
       json = JSON.parse(response.body)
 
       agent_names = []
-      json.each do |key, _value|
+      json.each_key do |key|
         if (!key.start_with? 'jcr:') && (!key.start_with? 'rep:')
           agent_names.push(key)
         end

data/lib/ruby_aem/resources/aem.rb

@@ -148,6 +148,56 @@ module RubyAem
         @call_params[:run_mode] = run_mode
         @client.call(self.class, __callee__.to_s, @call_params)
       end
+
+      # Retrieve AEM install status.
+      #
+      # @return RubyAem::Result
+      def get_install_status
+        @client.call(self.class, __callee__.to_s, @call_params)
+      end
+
+      # Retrieve AEM install status with retries until its status is finished
+      #
+      # @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 get_install_status_wait_until_finished(
+        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 = 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
+            result = get_install_status
+            item_count = result.response.body.status.item_count
+            if result.response.body.status.finished == true && item_count.zero?
+              puts format('Retrieve AEM install status attempt #%d: %s and finished', retries_count, result.message)
+            else
+              puts format('Retrieve AEM install status attempt #%d: %s but not finished yet, still installing %d package(s)', retries_count, result.message, item_count)
+              raise StandardError.new(result.message)
+            end
+          rescue RubyAem::Error => err
+            puts format('Retrieve AEM install status attempt #%d: %s', retries_count, err.message)
+            raise StandardError.new(err.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.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Shine Solutions
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement