From 233282181e3fef86fe15b5c555ad1ab7310d1ae5 Mon Sep 17 00:00:00 2001
From: Tomas Barton <barton.tomas@gmail.com>
Date: Tue, 8 Aug 2023 09:05:32 +0200
Subject: [PATCH] Remove librarian, use fixtures

---
 .fixtures.yml          |  5 +++++
 .sync.yml              |  1 -
 Gemfile                |  1 -
 Puppetfile.lock        | 15 ---------------
 metadata.json          |  8 ++++----
 rakelib/librarian.rake |  5 -----
 6 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 Puppetfile.lock
 delete mode 100644 rakelib/librarian.rake

diff --git a/.fixtures.yml b/.fixtures.yml
index 3e876ff..96e4f4c 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,4 +1,9 @@
 ---
 fixtures:
+  forge_modules:
+     archive: puppet/archive
+     cron: puppet/cron
+     stdlib: puppetlabs/stdlib
+     yumrepo_core: puppetlabs/yumrepo_core
   symlinks:
     zookeeper: "#{source_dir}"
diff --git a/.sync.yml b/.sync.yml
index a6ec839..a58bbd1 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -32,7 +32,6 @@ Gemfile:
         version: '~> 1.15'
         condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
       - gem: overcommit
-      - gem: librarian-puppet
   optional:
     ':acceptance':
       - gem: beaker
diff --git a/Gemfile b/Gemfile
index 5481de6..6ece596 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,6 @@ group :development do
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator", '~> 1.15',   require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
   gem "overcommit",                              require: false
-  gem "librarian-puppet",                        require: false
 end
 group :system_tests do
   gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
diff --git a/Puppetfile.lock b/Puppetfile.lock
deleted file mode 100644
index d3d31b9..0000000
--- a/Puppetfile.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-FORGE
-  remote: https://forgeapi.puppetlabs.com
-  specs:
-    puppet-archive (4.4.0)
-      puppetlabs-stdlib (>= 4.18.0, < 7.0.0)
-    puppet-cron (2.0.0)
-    puppetlabs-stdlib (6.2.0)
-    puppetlabs-yumrepo_core (1.0.6)
-
-DEPENDENCIES
-  puppet-archive (>= 0.4.4, < 7.0.0)
-  puppet-cron (>= 1.3.1, < 3.0.0)
-  puppetlabs-stdlib (>= 2.3.3, < 9.0.0)
-  puppetlabs-yumrepo_core (>= 1.0.3, < 2.0.0)
-
diff --git a/metadata.json b/metadata.json
index ef0387f..11396a7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,19 +10,19 @@
   "dependencies": [
     {
       "name": "puppet/archive",
-      "version_requirement": ">= 0.4.4 < 7.0.0"
+      "version_requirement": ">= 0.4.4 < 8.0.0"
     },
     {
       "name": "puppet/cron",
-      "version_requirement": ">= 1.3.1 < 3.0.0"
+      "version_requirement": ">= 1.3.1 < 5.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 2.3.3 < 9.0.0"
+      "version_requirement": ">= 2.3.3 < 10.0.0"
     },
     {
       "name": "puppetlabs/yumrepo_core",
-      "version_requirement": ">= 1.0.3 < 2.0.0"
+      "version_requirement": ">= 1.0.3 < 3.0.0"
     }
   ],
   "operatingsystem_support": [
diff --git a/rakelib/librarian.rake b/rakelib/librarian.rake
deleted file mode 100644
index fb6a2f6..0000000
--- a/rakelib/librarian.rake
+++ /dev/null
@@ -1,5 +0,0 @@
-task :librarian_spec_prep do
-  sh 'librarian-puppet install --path=spec/fixtures/modules/'
-end
-task :spec_prep => :librarian_spec_prep
-