From 5f5d21afe60c9f800e3b50bd89ce0b7b3fa186d9 Mon Sep 17 00:00:00 2001
From: Michael Bloch <michael.bloch@shinesolutions.com>
Date: Thu, 27 Sep 2018 11:11:20 +1000
Subject: [PATCH] Fix issue with post waiting for deploy packages #41

* Fix issue with wait post Deploy package in deploy_packages.pp #41
* Removed Ruby 2.1 support as ruby_aem  1.5.0 doesn't support ruby 2.1
---
 .travis.yml                         | 1 -
 CHANGELOG.md                        | 2 ++
 lib/puppet/provider/aem_aem/aem.rb  | 1 +
 lib/puppet/provider/aem_path/aem.rb | 2 ++
 manifests/deploy_packages.pp        | 9 ++++-----
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a0843b..7a949b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 sudo: false
 language: ruby
 rvm:
-  - "2.1"
   - "2.2"
   - "2.3"
   - "2.4"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e240f1..be80018 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
 ### 2.3.2
+* Fix issue with wait post Deploy package in deploy_packages.pp #41
+* Removed Ruby 2.1 support as ruby_aem 1.5.0 doesn't support ruby 2.1
 *
 
 ### 2.3.1
diff --git a/lib/puppet/provider/aem_aem/aem.rb b/lib/puppet/provider/aem_aem/aem.rb
index 747087d..fd45281 100644
--- a/lib/puppet/provider/aem_aem/aem.rb
+++ b/lib/puppet/provider/aem_aem/aem.rb
@@ -73,6 +73,7 @@ def list_packages_by_groups(package_groups)
     packages = result.data
     packages.each do |package|
       next unless (package_groups.include? package['group']) || package_groups.empty?
+
       puts '========================================================================'
       package.each do |key, value|
         puts "#{key}: #{value}"
diff --git a/lib/puppet/provider/aem_path/aem.rb b/lib/puppet/provider/aem_path/aem.rb
index c6f8a78..d8d82e0 100644
--- a/lib/puppet/provider/aem_path/aem.rb
+++ b/lib/puppet/provider/aem_path/aem.rb
@@ -23,6 +23,7 @@ def activate
 
   def destroy
     return false if resource[:path].eql? nil
+
     path = resource[:path]
     client(resource).path(resource[:name]).delete(path)
   end
@@ -30,6 +31,7 @@ def destroy
   # Existence check true unless a path is defined
   def exists?
     return true if resource[:path].eql? nil
+
     path = client(resource).node(resource[:path], resource[:name])
     path.exists.data
   end
diff --git a/manifests/deploy_packages.pp b/manifests/deploy_packages.pp
index c554835..2775def 100644
--- a/manifests/deploy_packages.pp
+++ b/manifests/deploy_packages.pp
@@ -1,6 +1,6 @@
 define aem_resources::deploy_packages (
   $packages,
-  $path = '/tmp/shinesolutions/puppet-aem-resources',
+  $path          = '/tmp/shinesolutions/puppet-aem-resources',
   $sleep_seconds = 10,
   $aem_id        = undef,
   $aem_username  = undef,
@@ -33,10 +33,9 @@
       aem_password => $aem_password,
       aem_id       => $_aem_id,
     } -> exec { "[${_aem_id}] Wait post Deploy package ${package['group']}/${package['name']}-${package['version']}":
-      command     => "sleep ${final_sleep_seconds}",
-      path        => ['/usr/bin', '/usr/sbin', '/bin'],
-      timeout     => 0,
-      refreshonly => true,
+      command => "sleep ${final_sleep_seconds}",
+      path    => ['/usr/bin', '/usr/sbin', '/bin'],
+      timeout => 0
     }
 
     aem_aem { "[${_aem_id}] Wait until login page is ready post Deploy package ${package['group']}/${package['name']}-${package['version']}":