From 53ea2b2c533491073445d4d756b734b0b274bfeb Mon Sep 17 00:00:00 2001
From: Dana Doherty <danadoherty639@outlook.com>
Date: Tue, 8 Oct 2024 11:02:32 +0100
Subject: [PATCH] update

---
 .../rubygem-faraday-follow_redirects.rb         |  6 ++++++
 configs/components/rubygem-faraday.rb           | 14 ++++++++++++--
 configs/components/rubygem-minitar.rb           |  1 +
 configs/components/rubygem-puppet_forge.rb      | 17 +++++++++++++----
 configs/projects/_pdk-components.rb             |  2 ++
 configs/projects/pdk-runtime.rb                 |  4 +++-
 6 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 configs/components/rubygem-faraday-follow_redirects.rb

diff --git a/configs/components/rubygem-faraday-follow_redirects.rb b/configs/components/rubygem-faraday-follow_redirects.rb
new file mode 100644
index 000000000..8abdb6f22
--- /dev/null
+++ b/configs/components/rubygem-faraday-follow_redirects.rb
@@ -0,0 +1,6 @@
+component 'rubygem-faraday-follow_redirects' do |pkg, settings, platform|
+  pkg.version '0.3.0'
+  pkg.md5sum '75fa678fa40b54a94e51efc1600a6461'
+
+  instance_eval File.read('configs/components/_base-rubygem.rb')
+end
diff --git a/configs/components/rubygem-faraday.rb b/configs/components/rubygem-faraday.rb
index 829bf6b2e..5231945a7 100644
--- a/configs/components/rubygem-faraday.rb
+++ b/configs/components/rubygem-faraday.rb
@@ -1,6 +1,16 @@
 component 'rubygem-faraday' do |pkg, settings, platform|
-  pkg.version '1.10.3'
-  pkg.md5sum 'c7b56130721c0b055c071bec593e2446'
+  version = settings[:rubygem_faraday_version] || '1.10.3'
+
+  case version
+  when '1.10.3'
+    pkg.version '1.10.3'
+    pkg.md5sum 'c7b56130721c0b055c071bec593e2446'
+  when '2.12.0'
+    pkg.version '2.12.0'
+    pkg.md5sum 'c0248b00a32c46b64cd2a172c96409ec' 
+  else
+    raise "rubygem-faraday version #{version} is not supported"
+  end
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-minitar.rb b/configs/components/rubygem-minitar.rb
index a0d98419f..9ce9d1d0c 100644
--- a/configs/components/rubygem-minitar.rb
+++ b/configs/components/rubygem-minitar.rb
@@ -2,5 +2,6 @@
   pkg.version '0.9'
   pkg.md5sum '4ab2c278183c9a83f3ad97066c381d84'
 
+
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
\ No newline at end of file
diff --git a/configs/components/rubygem-puppet_forge.rb b/configs/components/rubygem-puppet_forge.rb
index 6d4056de9..89b0d1d85 100644
--- a/configs/components/rubygem-puppet_forge.rb
+++ b/configs/components/rubygem-puppet_forge.rb
@@ -1,10 +1,19 @@
 component 'rubygem-puppet_forge' do |pkg, settings, platform|
-  if settings[:ruby_version].to_f >= 3.2
-    pkg.version '6.0.0'
-    pkg.md5sum '9913aa456a1c852e851b10ecee60d61d'
-  else
+  version = settings[:rubygem_puppet_forge_version] || '3.2.0'
+  pkg.version version
+
+  case version
+  when '3.2.0'
     pkg.version '3.2.0'
     pkg.md5sum '501d5f9f742007504d0d60ce6cf0c27f'
+  when '5.0.4'
+    pkg.version '5.0.4'
+    pkg.md5sum '04a2ca2f027ed41d9142ced587b71bd7'
+  when '6.0.0'
+    pkg.version '6.0.0'
+    pkg.md5sum '9913aa456a1c852e851b10ecee60d61d'
+  else 
+    raise "rubygem-puppet_forge version #{version} is not supported"
   end
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/projects/_pdk-components.rb b/configs/projects/_pdk-components.rb
index f528e58ee..9444ce55b 100644
--- a/configs/projects/_pdk-components.rb
+++ b/configs/projects/_pdk-components.rb
@@ -60,6 +60,8 @@
 proj.component 'rubygem-fast_gettext'
 proj.component 'rubygem-gettext-setup'
 proj.component 'rubygem-minitar'
+proj.component 'rubygem-faraday'
+proj.component 'rubygem-faraday-follow_redirects'
 
 # Bundler
 proj.component 'rubygem-bundler'
diff --git a/configs/projects/pdk-runtime.rb b/configs/projects/pdk-runtime.rb
index 37e5cc0a7..a3b46e1ce 100644
--- a/configs/projects/pdk-runtime.rb
+++ b/configs/projects/pdk-runtime.rb
@@ -5,7 +5,9 @@
   proj.setting(:rubygem_fast_gettext_version, '1.1.2')
   proj.setting(:rubygem_gettext_version, '3.2.2')
   proj.setting(:rubygem_gettext_setup_version, '0.34')
-
+  proj.setting(:rubygem_puppet_forge_version, '5.0.4')
+  proj.setting(:rubygem_faraday_version, '2.12.0')
+  
   platform = proj.get_platform
 
   proj.version_from_git