ruby_aem 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd2ed673ae15b68e95ab826d68fcbe626be9d311
-  data.tar.gz: 05a5ce3cbb7b71bd803e0e84ea3bde75c8f5cfe9
+  metadata.gz: 4aeb1fe97514d136bf71c865801a2fd01ee6171d
+  data.tar.gz: 239284f42251a5b5bf498217be67a8ec79ce4589
 SHA512:
-  metadata.gz: a9575353f79e67a36b1ff72c710ab178e8589459e07a415fd4597809b9e95911cd1f55f2cf54e7fd15708adab7094d5a433bb3a718617f08e169fef485d9754e
-  data.tar.gz: d031a4e54a02d5fd02313e91ae108ba01495dd892b1b69e8b1c5d0736840ac369778846648784ead03a45af3296044568f563ee8110e6c0df18bb873277cd52e
+  metadata.gz: b9349cc5c4baeeaef1ee58a3e6b7af79b09d178ce0d3c2c724702d1b398424bdb32b8ffc66b2edabe105acdb3474dd434d1346ba5e744d1fa3aba770fa2f7c23
+  data.tar.gz: ae96390118a070803f81ff2e519d6ff45b27e8a126082055644628ef472053bd6559fb1e8bc26a83e754cb5e40d20d43fcd3e4e1e6e8186bbf97cfc4b28d6d4a

data/lib/ruby_aem/resources/aem.rb

@@ -42,10 +42,24 @@ module RubyAem
       # Retrieve AEM login page with retries until it is successful.
       # This is handy for waiting for AEM to start or restart Jetty.
       #
+      # @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_login_page_wait_until_ready()
+      def get_login_page_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
+
         result = nil
-        with_retries(:max_tries => 30, :base_sleep_seconds => 2, :max_sleep_seconds => 2) { |retries_count|
+        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/

data/lib/ruby_aem/resources/package.rb

@@ -97,7 +97,6 @@ module RubyAem
       # Upload the package without waiting until the package status states it is uploaded.
       #
       # @param file_path the directory where the package file to be uploaded is
-      # @param force if true, then overwrite if the package already exists
       # @param opts optional parameters:
       # - force: if false then a package file will not be uploaded when the package already exists with the same group, name, and version, default is true (will overwrite existing package file)
       # @return RubyAem::Result
@@ -190,16 +189,27 @@ module RubyAem
       # Upload the package and wait until the package status states it is uploaded.
       #
       # @param file_path the directory where the package file to be uploaded is
-      # @param force if true, then overwrite if the package already exists
       # @param opts optional parameters:
       # - force: if false then a package file will not be uploaded when the package already exists with the same group, name, and version, default is true (will overwrite existing package file)
+      # - _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 upload_wait_until_ready(file_path,
         opts = {
-          force: true
+          force: true,
+          _retries: {
+            max_tries: 30,
+            base_sleep_seconds: 2,
+            max_sleep_seconds: 2
+          }
         })
+        opts[:force] ||= true
+        opts[:_retries] ||= {}
+        opts[:_retries][:max_tries] ||= 30
+        opts[:_retries][:base_sleep_seconds] ||= 2
+        opts[:_retries][:max_sleep_seconds] ||= 2
+
         result = upload(file_path, opts)
-        with_retries(:max_tries => 30, :base_sleep_seconds => 2, :max_sleep_seconds => 2) { |retries_count|
+        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 'Upload check #%d: %s - %s' % [retries_count, check_result.data, check_result.message]
           if check_result.data == false
@@ -211,10 +221,24 @@ module RubyAem
 
       # Install the package and wait until the package status states it is installed.
       #
+      # @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 install_wait_until_ready()
+      def install_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
+
         result = install()
-        with_retries(:max_tries => 30, :base_sleep_seconds => 2, :max_sleep_seconds => 2) { |retries_count|
+        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 'Install check #%d: %s - %s' % [retries_count, check_result.data, check_result.message]
           if check_result.data == false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Shine Solutions
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -18,6 +18,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement