ruby_aem 3.16.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e163b2535b6bf8c1150ab433cc30eea44963fb393e4cab0c20cb7e5856bedb3e
-  data.tar.gz: 138f80a74043b903db658cf4ed578d07b822573663208f2503f244284491e34e
+  metadata.gz: 538155af1ac911c997632a8e2eaeb3bafaf6a76de3411149703c818e894cce99
+  data.tar.gz: 924f0979becab02b071cab7687e2f29c9a9d0ff800b0a53c944a1fb34082e558
 SHA512:
-  metadata.gz: 119882c158cffde4e3e30796646c33ddc1ae295397d358acb80f2e7a4d14fee97f0ceba9a5126329dd4f3287996206c310539585020dcb9927bc0bfec8630425
-  data.tar.gz: '0761659ff3981afd25e9b9a800781392ddcd3b4adb6830bfc303beaeb13aa39c0cb527b1be617db796497675a8d55f65c4fa2d70c23134b5a89eb255e6d6f3a7'
+  metadata.gz: d63a8b1ef4052bf8db88ddbb59eed544475636c631c37a435e5519d698493a013c3470c4abd730e15414e0e683faeaf6a5ae41babb13c8c745a9227381d0bd2a
+  data.tar.gz: 16b6b5b2a9c156a217c185553cd45808eacdd2488aefeef2ad175889ec631b637eceb3b723e208aaf6daf74bb2b14a6faf6f5eeea01a90fd0fd1d70f680fbb97

data/conf/gem.yaml

@@ -1 +1,2 @@
-version: 3.16.1
+---
+version: 4.0.2

data/conf/spec.yaml

@@ -354,6 +354,7 @@ flushagent:
           jcrcontent_jcrdescription: '%{description}'
           jcrcontent_slingresource_type: cq/replication/components/agent
           jcrcontent_transport_uri: '%{dest_base_url}/dispatcher/invalidate.cache'
+          jcrcontent_alias_update: '%{alias_update}'
           jcrcontent_log_level: '%{log_level}'
           jcrcontent_no_versioning: true
           jcrcontent_protocol_http_headers:
@@ -983,6 +984,7 @@ replicationagent:
           jcrcontent_retry_delay: '%{retry_delay}'
           jcrcontent_cqtemplate: /libs/cq/replication/templates/agent
           jcrcontent_enabled: true
+          jcrcontent_ssl: '%{ssl}'
       responses:
         200:
           handler: simple

data/lib/ruby_aem/client.rb

@@ -73,9 +73,7 @@ module RubyAem
         method = RubyAem::Swagger.operation_to_method(operation)
         data, status_code, headers = api.send("#{method}_with_http_info", *params)
         response = RubyAem::Response.new(status_code, data, headers)
-      rescue SwaggerAemClient::ApiError => e
-        response = RubyAem::Response.new(e.code, e.response_body, e.response_headers)
-      rescue SwaggerAemOsgiClient::ApiError => e
+      rescue SwaggerAemClient::ApiError, SwaggerAemOsgiClient::ApiError => e
         response = RubyAem::Response.new(e.code, e.response_body, e.response_headers)
       end
       handle(response, responses_spec, call_params)
@@ -94,7 +92,7 @@ module RubyAem
         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
+      elsif value.instance_of?(String)
         case value
         when '__FILE_PACKAGE__'
           file_path = "#{call_params[:file_path]}/#{call_params[:package_name]}-#{call_params[:package_version]}.zip"
@@ -106,12 +104,12 @@ module RubyAem
           file_path = call_params[:file_path_private_key]
         end
 
-        if !file_path.nil?
+        if file_path.nil?
+          params[-1][key.to_sym] = value % call_params
+        else
           File.open(file_path.to_s, 'r') { |file|
             params[-1][key.to_sym] = file
           }
-        else
-          params[-1][key.to_sym] = value % call_params
         end
       else
         params[-1][key.to_sym] = value

data/lib/ruby_aem/handlers/html.rb

@@ -23,6 +23,7 @@ module RubyAem
   # dependency.
   module Handlers
     include REXML
+
     # Parse authorizable ID from response body data.
     # This is used to get the authorizable ID of a newly created user/group.
     #

data/lib/ruby_aem/resources/aem.rb

@@ -28,8 +28,7 @@ module RubyAem
       # @return new RubyAem::Resources::Aem instance
       def initialize(client)
         @client = client
-        @call_params = {
-        }
+        @call_params = {}
       end
 
       # Retrieve AEM login page.
@@ -96,11 +95,11 @@ module RubyAem
         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_login_page
-            if result.response.body !~ /QUICKSTART_HOMEPAGE/
+            if result.response.body =~ /QUICKSTART_HOMEPAGE/
+              puts format('Retrieve login page attempt #%<retries_count>d: %<message>s and ready', retries_count: retries_count, message: result.message)
+            else
               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 #%<retries_count>d: %<message>s and ready', retries_count: retries_count, message: result.message)
             end
           rescue RubyAem::Error => e
             puts format('Retrieve login page attempt #%<retries_count>d: %<message>s', retries_count: retries_count, message: e.message)

data/lib/ruby_aem/resources/aem_configmgr.rb

@@ -26,8 +26,7 @@ module RubyAem
       # @return new RubyAem::Resources::Aem instance
       def initialize(client)
         @client = client
-        @call_params = {
-        }
+        @call_params = {}
       end
 
       # Connect to AEM /system/console/configMgr to collect

data/lib/ruby_aem/resources/flush_agent.rb

@@ -37,6 +37,7 @@ module RubyAem
       # @param description flush agent description
       # @param dest_base_url base URL of the agent target destination, e.g. http://somedispatcher:8080
       # @param opts optional parameters:
+      # - alias_update: true, false, default is false
       # - log_level: error, info, debug, default is error
       # - retry_delay: in milliseconds, default is 30_000
       # @return RubyAem::Result
@@ -45,6 +46,7 @@ module RubyAem
         description,
         dest_base_url,
         opts = {
+          alias_update: false,
           log_level: 'error',
           retry_delay: 30_000
         }

data/lib/ruby_aem/resources/package.rb

@@ -20,6 +20,7 @@ module RubyAem
     # Package class contains API calls related to managing an AEM package.
     class Package
       include REXML
+
       # Initialise a package.
       # Package name and version will then be used to construct the package file in the filesystem.
       # E.g. package name 'somepackage' with version '1.2.3' will translate to somepackage-1.2.3.zip in the filesystem.
@@ -185,12 +186,12 @@ module RubyAem
         packages = list_all.data
         package = XPath.first(packages, "//packages/package[group=\"#{@call_params[:group_name]}\" and name=\"#{@call_params[:package_name]}\" and version=\"#{@call_params[:package_version]}\"]")
 
-        if package.to_s != ''
-          message = "Package #{@call_params[:group_name]}/#{@call_params[:package_name]}-#{@call_params[:package_version]} exists"
-          exists = true
-        else
+        if package.to_s == ''
           message = "Package #{@call_params[:group_name]}/#{@call_params[:package_name]}-#{@call_params[:package_version]} does not exist"
           exists = false
+        else
+          message = "Package #{@call_params[:group_name]}/#{@call_params[:package_name]}-#{@call_params[:package_version]} exists"
+          exists = true
         end
         result = RubyAem::Result.new(message, nil)
         result.data = exists
@@ -224,12 +225,12 @@ module RubyAem
         package = XPath.first(packages, "//packages/package[group=\"#{@call_params[:group_name]}\" and name=\"#{@call_params[:package_name]}\" and version=\"#{@call_params[:package_version]}\"]")
         last_unpacked_by = XPath.first(package, 'lastUnpackedBy') if package
 
-        if !['', '<lastUnpackedBy/>', '<lastUnpackedBy>null</lastUnpackedBy>'].include? last_unpacked_by.to_s
-          message = "Package #{@call_params[:group_name]}/#{@call_params[:package_name]}-#{@call_params[:package_version]} is installed"
-          is_installed = true
-        else
+        if ['', '<lastUnpackedBy/>', '<lastUnpackedBy>null</lastUnpackedBy>'].include? last_unpacked_by.to_s
           message = "Package #{@call_params[:group_name]}/#{@call_params[:package_name]}-#{@call_params[:package_version]} is not installed"
           is_installed = false
+        else
+          message = "Package #{@call_params[:group_name]}/#{@call_params[:package_name]}-#{@call_params[:package_version]} is installed"
+          is_installed = true
         end
         result = RubyAem::Result.new(message, nil)
         result.data = is_installed

data/lib/ruby_aem/resources/replication_agent.rb

@@ -55,6 +55,10 @@ module RubyAem
         @call_params[:title] = title
         @call_params[:description] = description
         @call_params[:dest_base_url] = dest_base_url
+
+        uri = URI.parse(dest_base_url)
+        @call_params[:ssl] = uri.scheme == 'https' ? 'relaxed' : ''
+
         @call_params = @call_params.merge(opts)
         @client.call(self.class, __callee__.to_s, @call_params)
       end

data/lib/ruby_aem/resources/ssl.rb

@@ -24,8 +24,7 @@ module RubyAem
       # @return new RubyAem::Resources::Ssl instance
       def initialize(client)
         @client = client
-        @call_params = {
-        }
+        @call_params = {}
       end
 
       # Disable SSL

data/lib/ruby_aem/response.rb

@@ -15,9 +15,7 @@
 module RubyAem
   # Response wraps HTTP response data returned by swagger_aem.
   class Response
-    attr_accessor :status_code
-    attr_accessor :body
-    attr_accessor :headers
+    attr_accessor :status_code, :body, :headers
 
     # Initialise a result.
     #

data/lib/ruby_aem/result.rb

@@ -21,9 +21,8 @@ module RubyAem
   # e.g. is_* and exists method provide result with boolean data.
   # Some API calls result doesn't contain any data.
   class Result
-    attr_accessor :message
+    attr_accessor :message, :data
     attr_reader :response
-    attr_accessor :data
 
     # Initialise a result.
     #

data/lib/ruby_aem/swagger.rb

@@ -22,7 +22,7 @@ module RubyAem
     # @return swagger_aem method name
     def self.operation_to_method(operation)
       operation.gsub(/[A-Z]/) { |char|
-        '_' + char.downcase
+        "_#{char.downcase}"
       }
     end
 
@@ -54,7 +54,7 @@ module RubyAem
     # @param config_node_name the name of the node for a given config
     # @return config name
     def self.config_node_name_to_config_name(config_node_name)
-      case config_node_name
+      case config_node_name # rubocop:disable Style/HashLikeCase
       when 'org.apache.felix.http'
         'Apache Felix Jetty Based HTTP Service'
       when 'org.apache.sling.servlets.get.DefaultGetServlet'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem
 version: !ruby/object:Gem::Version
-  version: 3.16.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Shine Solutions
 - Cliffano Subagio
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retries
@@ -26,61 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: swagger_aem
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
-  name: swagger_aem_osgi
+  name: swagger_aem
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.8.0
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: swagger_aem_osgi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.19
-  type: :development
+        version: 2.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 2.0.0
 description: ruby_aem is a Ruby client for Adobe Experience Manager (AEM) API, written
   on top of swagger_aem
 email:
@@ -126,8 +111,8 @@ files:
 homepage: https://github.com/shinesolutions/ruby_aem
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -135,15 +120,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 4.0.20
 specification_version: 4
 summary: AEM API Ruby client
 test_files: []