ruby_aem 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0f1ce4ed2a578ad6207b8ee2084a68fc33add63
-  data.tar.gz: 40234461975d56d98f46114379bfdce1db25bae1
+  metadata.gz: 017b94ee59bf80abe0156c15ec3d70c200b122a9
+  data.tar.gz: 27a555764cd6460d277d1658fc7c0bf0311ee71b
 SHA512:
-  metadata.gz: 3fe281388b41b35867c105caa54eb8904d0e77f9287c13e021ebf3437fe09e70f090aae218deea7ffc9efac332b3995f698668b02e3f472b2896c75b75480e9f
-  data.tar.gz: e1068b423cd27d207b10be4ec13e082869c7e159dc7df892c49d3a7b47bd66fa5154aeeb251e0be668c150f4feb1435cf796703421e9cf156ed5a33baef5b79b
+  metadata.gz: c0f06810662d558aa580fac1939fafe6a98e5c7edba6342ac4be1e4dab9467a04ee9d08ec7601ae06403804ffa9bf72a9327e326c81598321ea06b588344ddd1
+  data.tar.gz: d8e300cefacd46d650a11da26cd0cca16d1e950e2efbc45e219da0fb8e31d1fe055aa186eb0a744e1157fdd31d57d04ed341e164b99d7cdfb50ea7d8499f115f

data/lib/ruby_aem/resources/package.rb

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 =end
 
+require 'retries'
+
 module RubyAem
   module Resources
     # Package class contains API calls related to managing an AEM package.
@@ -68,7 +70,7 @@ module RubyAem
         @client.call(self.class, __callee__.to_s, @call_params)
       end
 
-      # Install the package.
+      # Install the package without waiting until the package status states it is installed.
       #
       # @return RubyAem::Result
       def install()
@@ -92,7 +94,7 @@ module RubyAem
         @client.call(self.class, __callee__.to_s, @call_params)
       end
 
-      # Upload the package.
+      # 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
@@ -185,6 +187,43 @@ module RubyAem
         result
       end
 
+      # 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)
+      # @return RubyAem::Result
+      def upload_wait_until_ready(file_path,
+        opts = {
+          force: true
+        })
+        result = upload(file_path, opts)
+        with_retries(:max_tries => 30, :base_sleep_seconds => 2, :max_sleep_seconds => 2) { |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
+            raise StandardError.new(check_result.message)
+          end
+        }
+        result
+      end
+
+      # Install the package and wait until the package status states it is installed.
+      #
+      # @return RubyAem::Result
+      def install_wait_until_ready()
+        result = install()
+        with_retries(:max_tries => 30, :base_sleep_seconds => 2, :max_sleep_seconds => 2) { |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
+            raise StandardError.new(check_result.message)
+          end
+        }
+        result
+      end
+
     end
   end
 end

data/lib/ruby_aem.rb

@@ -79,14 +79,6 @@ module RubyAem
       RubyAem::Resources::Bundle.new(@client, name)
     end
 
-    # Create a path instance.
-    #
-    # @param name the name of the path, e.g. /etc/designs
-    # @return new RubyAem::Resources::Path instance
-    def path(name)
-      RubyAem::Resources::Path.new(@client, name)
-    end
-
     # Create a config property instance.
     #
     # @param name the property's name
@@ -102,8 +94,8 @@ module RubyAem
     # @param run_mode AEM run mode: author or publish
     # @param name the flush agent's name, e.g. some-flush-agent
     # @return new RubyAem::Resources::FlushAgent instance
-    def flush_agent(name, run_mode)
-      RubyAem::Resources::FlushAgent.new(@client, name, run_mode)
+    def flush_agent(run_mode, name)
+      RubyAem::Resources::FlushAgent.new(@client, run_mode, name)
     end
 
     # Create a group instance.
@@ -134,13 +126,21 @@ module RubyAem
       RubyAem::Resources::Package.new(@client, group_name, package_name, package_version)
     end
 
+    # Create a path instance.
+    #
+    # @param name the name of the path, e.g. /etc/designs
+    # @return new RubyAem::Resources::Path instance
+    def path(name)
+      RubyAem::Resources::Path.new(@client, name)
+    end
+
     # Create a replication agent instance.
     #
     # @param run_mode AEM run mode: author or publish
     # @param name the replication agent's name, e.g. some-replication-agent
     # @return new RubyAem::Resources::ReplicationAgent instance
-    def replication_agent(name, run_mode)
-      RubyAem::Resources::ReplicationAgent.new(@client, name, run_mode)
+    def replication_agent(run_mode, name)
+      RubyAem::Resources::ReplicationAgent.new(@client, run_mode, name)
     end
 
     # Create a repository instance.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Shine Solutions
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-20 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -31,6 +31,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8
+- !ruby/object:Gem::Dependency
+  name: retries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: swagger_aem
   requirement: !ruby/object:Gem::Requirement