ruby_aem 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db17bd379da3f56cab010d2bd3616f83d3919154
-  data.tar.gz: e704e3e0f154f4b05b3dc4c7925b85568f223c8f
+  metadata.gz: ec1f486b8608c93169df3761902f6a78d8b32294
+  data.tar.gz: 3efe5f1035113b3d5275ddb038775a87c24ad892
 SHA512:
-  metadata.gz: 4a21e7768885f40c4560919b2e902cce0a01f290297833d391c54f57e34c17b9a8410add7f1f0dcfff8168b187bdfff43b809d85bf97dca6e801144ef9613121
-  data.tar.gz: 33614eb491d78330eb0173d295f4a02d060031c2e6d7fd41e8beeef99991716f61437b2c70af522b8b69297612b121b39cf6ff606418396e81c41eadfcda8bc7
+  metadata.gz: 8d510b3d2618a1a04142b9917b25024f36ca6530dabcf8bf3ba30c8a36693b2f38b217afd817a39f0059bbb2aa69eb8126866bc24426fab3a4207e5b2e698ad1
+  data.tar.gz: 7e0478248e3a339aabcfc1d113fd8649a45629ebde886477b285752953e9ded3eff2d12f2f1e1a91e59153dd582c75d7a57d25d6121a2aa89ae8d8f6dbfbcf92

data/conf/spec.yaml

@@ -52,6 +52,16 @@ aem:
         404:
           handler: simple_false
           message: 'CRXDE is disabled'
+    get_packages:
+      api: crx
+      operation: postPackageService
+      params:
+        required:
+          cmd: ls
+      responses:
+        200:
+          handler: xml_package_list
+          message: 'All packages list retrieved successfully'
 bundle:
   responses:
     404:

data/lib/ruby_aem/client.rb

@@ -89,9 +89,7 @@ module RubyAem
       # if there is no value in optional param spec,
       # then only add optional param that is set in call parameters
       if !value
-        if call_params.key? key.to_sym
-          params[-1][key.to_sym] = call_params[key.to_sym]
-        end
+        params[-1][key.to_sym] = call_params[key.to_sym] if call_params.key? key.to_sym
       # if value is provided in optional param spec,
       # then apply variable interpolation the same way as required param
       elsif value.class == String

data/lib/ruby_aem/handlers/json.rb

@@ -104,9 +104,7 @@ module RubyAem
 
       agent_names = []
       json.each_key do |key|
-        if (!key.start_with? 'jcr:') && (!key.start_with? 'rep:')
-          agent_names.push(key)
-        end
+        agent_names.push(key) if (!key.start_with? 'jcr:') && (!key.start_with? 'rep:')
       end
 
       message = response_spec['message'] % call_params

data/lib/ruby_aem/resources/aem.rb

@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'nori'
 require 'retries'
 require 'ruby_aem/error'
 
 module RubyAem
+  #  AEM resources
   module Resources
     # AEM class contains API calls related to managing the AEM instance itself.
     class Aem
@@ -85,13 +87,13 @@ module RubyAem
           begin
             result = get_login_page
             if result.response.body !~ /QUICKSTART_HOMEPAGE/
-              puts format('Retrieve login page attempt #%d: %s but not ready yet', retries_count, result.message)
+              puts format('Retrieve login page attempt #%<retries_count>d: %<message>s but not ready yet', retries_count: retries_count, message: result.message)
               raise StandardError.new(result.message)
             else
-              puts format('Retrieve login page attempt #%d: %s and ready', retries_count, result.message)
+              puts format('Retrieve login page attempt #%<retries_count>d: %<message>s and ready', retries_count: retries_count, message: result.message)
             end
           rescue RubyAem::Error => err
-            puts format('Retrieve login page attempt #%d: %s', retries_count, err.message)
+            puts format('Retrieve login page attempt #%<retries_count>d: %<message>s', retries_count: retries_count, message: err.message)
             raise StandardError.new(err.message)
           end
         }
@@ -134,13 +136,13 @@ module RubyAem
               end
             }
             if is_ok == false
-              puts format('Retrieve AEM Health Check attempt #%d: %s but not ok yet', retries_count, result.message)
+              puts format('Retrieve AEM Health Check attempt #%<retries_count>d: %<message>s but not ok yet', retries_count: retries_count, message: result.message)
               raise StandardError.new(result.message)
             else
-              puts format('Retrieve AEM Health Check attempt #%d: %s and ok', retries_count, result.message)
+              puts format('Retrieve AEM Health Check attempt #%<retries_count>d: %<message>s and ok', retries_count: retries_count, message: result.message)
             end
           rescue RubyAem::Error => err
-            puts format('Retrieve AEM Health Check attempt #%d: %s', retries_count, err.message)
+            puts format('Retrieve AEM Health Check attempt #%<retries_count>d: %<message>s', retries_count: retries_count, message: err.message)
             raise StandardError.new(err.message)
           end
         }
@@ -193,18 +195,44 @@ module RubyAem
             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)
+              puts format('Retrieve AEM install status attempt #%<retries_count>d: %<message>s and finished', retries_count: retries_count, message: 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)
+              puts format('Retrieve AEM install status attempt #%<retries_count>d: %<message>s but not finished yet, still installing %<item_count>d package(s)', retries_count: retries_count, message: result.message, item_count: 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)
+            puts format('Retrieve AEM install status attempt #%<retries_count>d: %<message>s', retries_count: retries_count, message: err.message)
             raise StandardError.new(err.message)
           end
         }
         result
       end
+
+      # Get a list of all packages available on AEM instance.
+      # The list of packages are returned as result data.
+      # Example:
+      # {
+      #    "group"          => "shinesolutions",
+      #    "name"           => "aem-password-reset-content",
+      #    "version"        => "1.0.1",
+      #    "downloadName"   => "aem-password-reset-content-1.0.1.zip",
+      #    "size"           => "23579",
+      #    "created"        => "Tue, 4   Apr 2017 13:38:35   +1000",
+      #    "createdBy"      => "root",
+      #    "lastModified"   => nil,
+      #    "lastModifiedBy" => "null",
+      #    "lastUnpacked"   => "Wed, 18   Apr 2018 22:57:01   +1000",
+      #    "lastUnpackedBy" => "admin"
+      # }
+      #
+      # @return RubyAem::Result
+      def get_packages
+        result = @client.call(self.class, __callee__.to_s, @call_params)
+        packages = Nori.new.parse(result.data.to_s)['packages']['package']
+        result_copy = RubyAem::Result.new(result.message, result.response)
+        result_copy.data = packages
+        result_copy
+      end
     end
   end
 end

data/lib/ruby_aem/resources/package.rb

@@ -315,10 +315,8 @@ module RubyAem
         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
-          puts format('Upload check #%d: %s - %s', retries_count, check_result.data, check_result.message)
-          if check_result.data == false
-            raise StandardError.new(check_result.message)
-          end
+          puts format('Upload check #%<retries_count>d: %<check_result_data>s - %<check_result_message>s', retries_count: retries_count, check_result_data: check_result.data, check_result_message: check_result.message)
+          raise StandardError.new(check_result.message) if check_result.data == false
         }
         result
       end
@@ -350,10 +348,8 @@ module RubyAem
         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
-          puts format('Install check #%d: %s - %s', retries_count, check_result.data, check_result.message)
-          if check_result.data == false
-            raise StandardError.new(check_result.message)
-          end
+          puts format('Install check #%<retries_count>d: %<check_result_data>s - %<check_result_message>s', retries_count: retries_count, check_result_data: check_result.data, check_result_message: check_result.message)
+          raise StandardError.new(check_result.message) if check_result.data == false
         }
         result
       end
@@ -385,10 +381,8 @@ module RubyAem
         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 format('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
+          puts format('Delete check #%<retries_count>d: %<check_result_data>s - %<check_result_message>s', retries_count: retries_count, check_result_data: !check_result.data, check_result_message: check_result.message)
+          raise StandardError.new(check_result.message) if check_result.data == true
         }
         result
       end
@@ -420,10 +414,8 @@ module RubyAem
         result = build
         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_built
-          puts format('Build check #%d: %s - %s', retries_count, check_result.data, check_result.message)
-          if check_result.data == false
-            raise StandardError.new(check_result.message)
-          end
+          puts format('Build check #%<retries_count>d: %<check_result_data>s - %<check_result_message>s', retries_count: retries_count, check_result_data: check_result.data, check_result_message: check_result.message)
+          raise StandardError.new(check_result.message) if check_result.data == false
         }
         result
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Shine Solutions
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: nori
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement