From 26fa670e04492251dc402e357e58d70c43b2d7e9 Mon Sep 17 00:00:00 2001 From: jhongturney Date: Fri, 26 Jan 2024 07:54:49 -0800 Subject: [PATCH 1/9] drop 3.x support --- config/puppet-versions.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/puppet-versions.json b/config/puppet-versions.json index c5271fc1..4ed39b4b 100644 --- a/config/puppet-versions.json +++ b/config/puppet-versions.json @@ -1,12 +1,4 @@ [ - { - "minimum_version": "3.0.0", - "maximum_version": "3.99.99", - "additional_gems": [ - { "name": "safe_yaml", "version": "~> 1.0.4" }, - { "name": "puppetdb-terminus", "version": "3.2.4" } - ] - }, { "minimum_version": "4.0.0", "maximum_version": "4.99.99", From 124bcc04c36fd095f2a288a17882e853a8322c08 Mon Sep 17 00:00:00 2001 From: jhongturney Date: Mon, 29 Jan 2024 11:32:18 -0800 Subject: [PATCH 2/9] what if we relax the versions? --- octocatalog-diff.gemspec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec index cc3d30f5..bc28e0f1 100644 --- a/octocatalog-diff.gemspec +++ b/octocatalog-diff.gemspec @@ -30,18 +30,18 @@ EOF s.add_runtime_dependency 'hashdiff', '>= 0.3.0' s.add_runtime_dependency 'parallel', '>= 1.12.0' s.add_runtime_dependency 'rugged', '>= 0.25.0b2' - if puppet_version == '4.10.10' - s.add_runtime_dependency 'puppet', '4.10.10' - s.add_development_dependency 'puppet', '4.10.10' - elsif puppet_version == '5.5.22' - s.add_runtime_dependency 'puppet', '5.5.22' - s.add_development_dependency 'puppet', '5.5.22' - elsif puppet_version == '6.18.0' - s.add_runtime_dependency 'puppet', '6.18.0' - s.add_development_dependency 'puppet', '6.18.0' - elsif puppet_version == '7.3.0' - s.add_runtime_dependency 'puppet', '7.3.0' - s.add_development_dependency 'puppet', '7.3.0' + if puppet_version >= '4.0.0' + s.add_runtime_dependency 'puppet', '>= 4.0.0', '< 5.0.0' + s.add_development_dependency 'puppet', '>= 4.0.0', '< 5.0.0' + elsif puppet_version >= '5.0.0' + s.add_runtime_dependency 'puppet', '>= 5.0.0', '< 6.0.0' + s.add_development_dependency 'puppet', '>= 5.0.0', '< 6.0.0' + elsif puppet_version >= '6.0.0' + s.add_runtime_dependency 'puppet', '>= 6.0.0', '< 7.0.0' + s.add_development_dependency 'puppet', '>= 6.0.0', '< 7.0.0' + elsif puppet_version >= '7.0.0', + s.add_runtime_dependency 'puppet', '>= 7.0.0', '< 8.0.0' + s.add_development_dependency 'puppet', '>= 7.0.0', '< 8.0.0' end s.add_development_dependency 'rspec', '~> 3.4.0' From bd78ca9800e6ef8b5077ae21bebe02b390cb898d Mon Sep 17 00:00:00 2001 From: jhongturney Date: Mon, 29 Jan 2024 11:56:22 -0800 Subject: [PATCH 3/9] now I twiddle-wakka --- octocatalog-diff.gemspec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec index bc28e0f1..60ce2192 100644 --- a/octocatalog-diff.gemspec +++ b/octocatalog-diff.gemspec @@ -31,17 +31,17 @@ EOF s.add_runtime_dependency 'parallel', '>= 1.12.0' s.add_runtime_dependency 'rugged', '>= 0.25.0b2' if puppet_version >= '4.0.0' - s.add_runtime_dependency 'puppet', '>= 4.0.0', '< 5.0.0' - s.add_development_dependency 'puppet', '>= 4.0.0', '< 5.0.0' + s.add_runtime_dependency 'puppet', '~> 4.0.0' + s.add_development_dependency 'puppet', '~> 4.0.0' elsif puppet_version >= '5.0.0' - s.add_runtime_dependency 'puppet', '>= 5.0.0', '< 6.0.0' - s.add_development_dependency 'puppet', '>= 5.0.0', '< 6.0.0' + s.add_runtime_dependency 'puppet', '~> 5.0.0' + s.add_development_dependency 'puppet', '~> 5.0.0' elsif puppet_version >= '6.0.0' - s.add_runtime_dependency 'puppet', '>= 6.0.0', '< 7.0.0' - s.add_development_dependency 'puppet', '>= 6.0.0', '< 7.0.0' + s.add_runtime_dependency 'puppet', '~> 6.0.0' + s.add_development_dependency 'puppet', '~> 6.0.0' elsif puppet_version >= '7.0.0', - s.add_runtime_dependency 'puppet', '>= 7.0.0', '< 8.0.0' - s.add_development_dependency 'puppet', '>= 7.0.0', '< 8.0.0' + s.add_runtime_dependency 'puppet', '~> 7.0.0', + s.add_development_dependency 'puppet', '~> 7.0.0' end s.add_development_dependency 'rspec', '~> 3.4.0' From b98074fdb442ee9f50c0e8f344930ac1324fae9c Mon Sep 17 00:00:00 2001 From: jhongturney Date: Mon, 29 Jan 2024 11:59:43 -0800 Subject: [PATCH 4/9] casting version from string --- octocatalog-diff.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec index 60ce2192..16d4efef 100644 --- a/octocatalog-diff.gemspec +++ b/octocatalog-diff.gemspec @@ -30,16 +30,16 @@ EOF s.add_runtime_dependency 'hashdiff', '>= 0.3.0' s.add_runtime_dependency 'parallel', '>= 1.12.0' s.add_runtime_dependency 'rugged', '>= 0.25.0b2' - if puppet_version >= '4.0.0' + if Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0') s.add_runtime_dependency 'puppet', '~> 4.0.0' s.add_development_dependency 'puppet', '~> 4.0.0' - elsif puppet_version >= '5.0.0' + elsif Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0') s.add_runtime_dependency 'puppet', '~> 5.0.0' s.add_development_dependency 'puppet', '~> 5.0.0' - elsif puppet_version >= '6.0.0' + elsif Gem::Version.new(puppet_version) >= Gem::Version.new('6.0.0') s.add_runtime_dependency 'puppet', '~> 6.0.0' s.add_development_dependency 'puppet', '~> 6.0.0' - elsif puppet_version >= '7.0.0', + elsif Gem::Version.new(puppet_version) >= Gem::Version.new('7.0.0') s.add_runtime_dependency 'puppet', '~> 7.0.0', s.add_development_dependency 'puppet', '~> 7.0.0' end From 3f0da4b4f6df1b26f42512c910ed290f0a66dc58 Mon Sep 17 00:00:00 2001 From: jhongturney Date: Mon, 29 Jan 2024 12:02:21 -0800 Subject: [PATCH 5/9] flip it and reverse it --- octocatalog-diff.gemspec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec index 16d4efef..9874f556 100644 --- a/octocatalog-diff.gemspec +++ b/octocatalog-diff.gemspec @@ -30,18 +30,18 @@ EOF s.add_runtime_dependency 'hashdiff', '>= 0.3.0' s.add_runtime_dependency 'parallel', '>= 1.12.0' s.add_runtime_dependency 'rugged', '>= 0.25.0b2' - if Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0') - s.add_runtime_dependency 'puppet', '~> 4.0.0' - s.add_development_dependency 'puppet', '~> 4.0.0' - elsif Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0') - s.add_runtime_dependency 'puppet', '~> 5.0.0' - s.add_development_dependency 'puppet', '~> 5.0.0' + if Gem::Version.new(puppet_version) >= Gem::Version.new('7.0.0') + s.add_runtime_dependency 'puppet', '~> 7.0.0' + s.add_development_dependency 'puppet', '~> 7.0.0' elsif Gem::Version.new(puppet_version) >= Gem::Version.new('6.0.0') s.add_runtime_dependency 'puppet', '~> 6.0.0' s.add_development_dependency 'puppet', '~> 6.0.0' - elsif Gem::Version.new(puppet_version) >= Gem::Version.new('7.0.0') - s.add_runtime_dependency 'puppet', '~> 7.0.0', - s.add_development_dependency 'puppet', '~> 7.0.0' + elsif Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0') + s.add_runtime_dependency 'puppet', '~> 5.0.0' + s.add_development_dependency 'puppet', '~> 5.0.0' + elsif Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0') + s.add_runtime_dependency 'puppet', '~> 4.0.0' + s.add_development_dependency 'puppet', '~> 4.0.0' end s.add_development_dependency 'rspec', '~> 3.4.0' From d4f8998b870659091d6b0ab02f2b5e94daf5fd8f Mon Sep 17 00:00:00 2001 From: jhongturney Date: Mon, 29 Jan 2024 12:21:45 -0800 Subject: [PATCH 6/9] try this --- Gemfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fa75df15..3412a636 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ -source 'https://rubygems.org' +source 'https://rubygems.org' do + gem 'puppet' +end gemspec From 041d4a3fd6d8c375c1feb6bb049331e5494cb1bc Mon Sep 17 00:00:00 2001 From: jhongturney Date: Mon, 29 Jan 2024 12:26:04 -0800 Subject: [PATCH 7/9] maybe easier than I think? --- octocatalog-diff.gemspec | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec index 9874f556..56ee19f5 100644 --- a/octocatalog-diff.gemspec +++ b/octocatalog-diff.gemspec @@ -30,20 +30,21 @@ EOF s.add_runtime_dependency 'hashdiff', '>= 0.3.0' s.add_runtime_dependency 'parallel', '>= 1.12.0' s.add_runtime_dependency 'rugged', '>= 0.25.0b2' - if Gem::Version.new(puppet_version) >= Gem::Version.new('7.0.0') - s.add_runtime_dependency 'puppet', '~> 7.0.0' - s.add_development_dependency 'puppet', '~> 7.0.0' - elsif Gem::Version.new(puppet_version) >= Gem::Version.new('6.0.0') - s.add_runtime_dependency 'puppet', '~> 6.0.0' - s.add_development_dependency 'puppet', '~> 6.0.0' - elsif Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0') - s.add_runtime_dependency 'puppet', '~> 5.0.0' - s.add_development_dependency 'puppet', '~> 5.0.0' - elsif Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0') - s.add_runtime_dependency 'puppet', '~> 4.0.0' - s.add_development_dependency 'puppet', '~> 4.0.0' - end - + # if Gem::Version.new(puppet_version) >= Gem::Version.new('7.0.0') + # s.add_runtime_dependency 'puppet', '~> 7.0.0' + # s.add_development_dependency 'puppet', '~> 7.0.0' + # elsif Gem::Version.new(puppet_version) >= Gem::Version.new('6.0.0') + # s.add_runtime_dependency 'puppet', '~> 6.0.0' + # s.add_development_dependency 'puppet', '~> 6.0.0' + # elsif Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0') + # s.add_runtime_dependency 'puppet', '~> 5.0.0' + # s.add_development_dependency 'puppet', '~> 5.0.0' + # elsif Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0') + # s.add_runtime_dependency 'puppet', '~> 4.0.0' + # s.add_development_dependency 'puppet', '~> 4.0.0' + # end + s.add_runtime_dependency 'puppet', puppet_version + s.add_development_dependency 'puppet', puppet_version s.add_development_dependency 'rspec', '~> 3.4.0' s.add_development_dependency 'rake', '12.3.3' s.add_development_dependency 'parallel_tests', '2.7.1' From 7eeb2569e46808e5e525a5355b1ee6728b8d29f5 Mon Sep 17 00:00:00 2001 From: jhongturney Date: Mon, 29 Jan 2024 12:30:11 -0800 Subject: [PATCH 8/9] unnecessary --- Gemfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3412a636..fa75df15 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,3 @@ -source 'https://rubygems.org' do - gem 'puppet' -end +source 'https://rubygems.org' gemspec From 2fbb921ace15b6bdc92e0a55530cc360515a1928 Mon Sep 17 00:00:00 2001 From: jhongturney Date: Mon, 29 Jan 2024 12:36:04 -0800 Subject: [PATCH 9/9] clean up commented code --- octocatalog-diff.gemspec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/octocatalog-diff.gemspec b/octocatalog-diff.gemspec index 56ee19f5..eccebced 100644 --- a/octocatalog-diff.gemspec +++ b/octocatalog-diff.gemspec @@ -30,19 +30,6 @@ EOF s.add_runtime_dependency 'hashdiff', '>= 0.3.0' s.add_runtime_dependency 'parallel', '>= 1.12.0' s.add_runtime_dependency 'rugged', '>= 0.25.0b2' - # if Gem::Version.new(puppet_version) >= Gem::Version.new('7.0.0') - # s.add_runtime_dependency 'puppet', '~> 7.0.0' - # s.add_development_dependency 'puppet', '~> 7.0.0' - # elsif Gem::Version.new(puppet_version) >= Gem::Version.new('6.0.0') - # s.add_runtime_dependency 'puppet', '~> 6.0.0' - # s.add_development_dependency 'puppet', '~> 6.0.0' - # elsif Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0') - # s.add_runtime_dependency 'puppet', '~> 5.0.0' - # s.add_development_dependency 'puppet', '~> 5.0.0' - # elsif Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0') - # s.add_runtime_dependency 'puppet', '~> 4.0.0' - # s.add_development_dependency 'puppet', '~> 4.0.0' - # end s.add_runtime_dependency 'puppet', puppet_version s.add_development_dependency 'puppet', puppet_version s.add_development_dependency 'rspec', '~> 3.4.0'