Skip to content

Commit db0d848

Browse files
(CAT-643) - Add puppet_forge gem and deps to pdk-runtime
(CAT-643) - This commit adds 5.0.4 puppet forge gem as a component and a dependency to the PDK project dependencies of puppet-forge gem: faraday ~> 2.0 -> v2.12.0 added as component faraday-follow_redirects ~> 0.3.0 -> added as component minitar < 1.0.0 -> v0.9.0 already present in runtime semantic_puppet ~> 1.0 -> semantic puppet version 1.1.0 already present in runtime (default version)
1 parent dd4b02c commit db0d848

6 files changed

+51
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
component 'rubygem-faraday-follow_redirects' do |pkg, settings, platform|
2+
pkg.version '0.3.0'
3+
pkg.md5sum '75fa678fa40b54a94e51efc1600a6461'
4+
5+
instance_eval File.read('configs/components/_base-rubygem.rb')
6+
end
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
component 'rubygem-faraday-net_http' do |pkg, settings, platform|
2-
pkg.version '1.0.2'
3-
pkg.md5sum 'b8e560b8cd7c008a7fd1686143428337'
2+
version = settings[:rubygem_faraday_net_http_version] || '1.0.2'
3+
4+
case version
5+
when '1.0.2'
6+
pkg.version '1.0.2'
7+
pkg.md5sum 'b8e560b8cd7c008a7fd1686143428337'
8+
when '3.3.0'
9+
pkg.version '3.3.0'
10+
pkg.md5sum '7e6378aaa271587dd4109795c0a05769'
11+
else
12+
raise "rubygem-faraday-net_http version #{version} is not supported"
13+
end
414

515
instance_eval File.read('configs/components/_base-rubygem.rb')
616
end

configs/components/rubygem-faraday.rb

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
component 'rubygem-faraday' do |pkg, settings, platform|
2-
pkg.version '1.10.3'
3-
pkg.md5sum 'c7b56130721c0b055c071bec593e2446'
2+
version = settings[:rubygem_faraday_version] || '1.10.3'
3+
4+
case version
5+
when '1.10.3'
6+
pkg.version '1.10.3'
7+
pkg.md5sum 'c7b56130721c0b055c071bec593e2446'
8+
when '2.12.0'
9+
pkg.version '2.12.0'
10+
pkg.md5sum 'c0248b00a32c46b64cd2a172c96409ec'
11+
else
12+
raise "rubygem-faraday version #{version} is not supported"
13+
end
414

515
instance_eval File.read('configs/components/_base-rubygem.rb')
616
end
+13-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
component 'rubygem-puppet_forge' do |pkg, settings, platform|
2-
pkg.version '3.2.0'
3-
pkg.md5sum '501d5f9f742007504d0d60ce6cf0c27f'
2+
version = settings[:rubygem_puppet_forge_version] || '3.2.0'
3+
pkg.version version
4+
5+
case version
6+
when '3.2.0'
7+
pkg.version '3.2.0'
8+
pkg.md5sum '501d5f9f742007504d0d60ce6cf0c27f'
9+
when '5.0.4'
10+
pkg.version '5.0.4'
11+
pkg.md5sum '04a2ca2f027ed41d9142ced587b71bd7'
12+
else
13+
raise "rubygem-puppet_forge version #{version} is not supported"
14+
end
415

516
instance_eval File.read('configs/components/_base-rubygem.rb')
617
end

configs/projects/_pdk-components.rb

+5
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
proj.component 'rubygem-fast_gettext'
6161
proj.component 'rubygem-gettext-setup'
6262
proj.component 'rubygem-minitar'
63+
proj.component 'rubygem-faraday'
64+
proj.component 'rubygem-faraday-follow_redirects'
65+
proj.component 'rubygem-semantic_puppet'
66+
proj.component 'rubygem-faraday-net_http'
6367

6468
# Bundler
6569
proj.component 'rubygem-bundler'
@@ -99,5 +103,6 @@
99103
proj.component 'rubygem-json_pure'
100104
proj.component 'rubygem-diff-lcs'
101105
proj.component 'rubygem-pathspec'
106+
proj.component 'rubygem-puppet_forge'
102107

103108
proj.component 'ansicon' if platform.is_windows?

configs/projects/pdk-runtime.rb

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
proj.setting(:rubygem_fast_gettext_version, '1.1.2')
66
proj.setting(:rubygem_gettext_version, '3.2.2')
77
proj.setting(:rubygem_gettext_setup_version, '0.34')
8+
proj.setting(:rubygem_puppet_forge_version, '5.0.4')
9+
proj.setting(:rubygem_faraday_version, '2.12.0')
10+
proj.setting(:rubygem_faraday_net_http_version, '3.3.0')
811

912
platform = proj.get_platform
1013

0 commit comments

Comments
 (0)