From a6bdabedc70d25bdb1d431fd70304514a4d7bd22 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 13 Jun 2022 10:49:41 +0900
Subject: [PATCH] Unpin modulesync

... to use the recent modulesync which is compatible with Ruby 3.0.

Template files are renamed according to the requirement of modulesync
>= 0.8.0[1]

[1] https://github.com/voxpupuli/modulesync/blob/master/CHANGELOG.md#2017-05-05---080

Depends-on: https://review.opendev.org/845530
Change-Id: I64552b454557f9f33f422f4d64c4c01961aef0e0
---
 Gemfile                                                     | 6 +-----
 moduleroot/{.gitignore => .gitignore.erb}                   | 0
 moduleroot/{Gemfile => Gemfile.erb}                         | 0
 moduleroot/{Rakefile => Rakefile.erb}                       | 0
 moduleroot/{bindep.txt => bindep.txt.erb}                   | 0
 moduleroot/spec/{spec_helper.rb => spec_helper.rb.erb}      | 0
 ...c_helper_acceptance.rb => spec_helper_acceptance.rb.erb} | 0
 moduleroot/{tox.ini => tox.ini.erb}                         | 0
 8 files changed, 1 insertion(+), 5 deletions(-)
 rename moduleroot/{.gitignore => .gitignore.erb} (100%)
 rename moduleroot/{Gemfile => Gemfile.erb} (100%)
 rename moduleroot/{Rakefile => Rakefile.erb} (100%)
 rename moduleroot/{bindep.txt => bindep.txt.erb} (100%)
 rename moduleroot/spec/{spec_helper.rb => spec_helper.rb.erb} (100%)
 rename moduleroot/spec/{spec_helper_acceptance.rb => spec_helper_acceptance.rb.erb} (100%)
 rename moduleroot/{tox.ini => tox.ini.erb} (100%)

diff --git a/Gemfile b/Gemfile
index 3deaadf..dc16cb6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,6 @@
 source 'https://rubygems.org'
 
-# TODO(aschultz): 0.8.x doesn't seem to work recursively, needs investigation
-gem 'modulesync', ['>=0.6.0','<0.8.0']
-# TODO(aschultz): techincally modulesync needs json which was satisfied by
-# puppet previously, but since 5.0.0 they dropped that dependency which has
-# broken the jobs that use this
+gem 'modulesync'
 gem 'json_pure'
 
 # vim:ft=ruby
diff --git a/moduleroot/.gitignore b/moduleroot/.gitignore.erb
similarity index 100%
rename from moduleroot/.gitignore
rename to moduleroot/.gitignore.erb
diff --git a/moduleroot/Gemfile b/moduleroot/Gemfile.erb
similarity index 100%
rename from moduleroot/Gemfile
rename to moduleroot/Gemfile.erb
diff --git a/moduleroot/Rakefile b/moduleroot/Rakefile.erb
similarity index 100%
rename from moduleroot/Rakefile
rename to moduleroot/Rakefile.erb
diff --git a/moduleroot/bindep.txt b/moduleroot/bindep.txt.erb
similarity index 100%
rename from moduleroot/bindep.txt
rename to moduleroot/bindep.txt.erb
diff --git a/moduleroot/spec/spec_helper.rb b/moduleroot/spec/spec_helper.rb.erb
similarity index 100%
rename from moduleroot/spec/spec_helper.rb
rename to moduleroot/spec/spec_helper.rb.erb
diff --git a/moduleroot/spec/spec_helper_acceptance.rb b/moduleroot/spec/spec_helper_acceptance.rb.erb
similarity index 100%
rename from moduleroot/spec/spec_helper_acceptance.rb
rename to moduleroot/spec/spec_helper_acceptance.rb.erb
diff --git a/moduleroot/tox.ini b/moduleroot/tox.ini.erb
similarity index 100%
rename from moduleroot/tox.ini
rename to moduleroot/tox.ini.erb