From ea26ba601c8b00e241f37a89792ed9723cad68c3 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sat, 16 Jan 2021 13:55:35 +0100
Subject: [PATCH 1/3] gemspec: fix repo url

---
 hiera-eyaml.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hiera-eyaml.gemspec b/hiera-eyaml.gemspec
index f0b22b8..0043059 100644
--- a/hiera-eyaml.gemspec
+++ b/hiera-eyaml.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.author        = "Tom Poulton"
   gem.license       = "MIT"
 
-  gem.homepage      = "http://github.com/TomPoulton/hiera-eyaml"
+  gem.homepage      = "https://github.com/voxpupuli/hiera-eyaml/"
   gem.files         = `git ls-files`.split($/).reject { |file| file =~ /^features.*$/ }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

From e29baebc0d5becc37db9b6b81dcedcf97ec82301 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sat, 16 Jan 2021 13:55:48 +0100
Subject: [PATCH 2/3] Drop Puppet 4/5 tests; Add Ruby 2.7 testing

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a11a8fd..ce3c45d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,11 @@ script:
   bundle exec cucumber -f progress
 matrix:
   include:
-    - rvm: 2.1.9
-      env: PUPPET_VERSION="~> 4.0" RUBYGEMS_VERSION=2.7.8
-    - rvm: 2.4.2
-      env: PUPPET_VERSION="~> 5.0"
-    - rvm: 2.5.7
+    - rvm: 2.5
+      env: PUPPET_VERSION="~> 6.0"
+    - rvm: 2.6
+      env: PUPPET_VERSION="~> 6.0"
+    - rvm: 2.7
       env: PUPPET_VERSION="~> 6.0"
 notifications:
   email: false

From bc13b1783629618099dcc19d1163fa128c4b0664 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sat, 16 Jan 2021 14:08:41 +0100
Subject: [PATCH 3/3] cleanup Gemfile

---
 Gemfile | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 59113d6..067e4e9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,28 +2,14 @@ source 'https://rubygems.org/'
 
 gemspec
 
-def default_puppet_restriction
-  # Puppet 6 should be the default for Ruby 2.5+
-  # Puppet 5 should be the defualt for Ruby 2.4
-  Gem::Requirement.create('>= 2.5.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) ? '~> 6.0' : '~> 5.0'
-end
-
-def activesupport_restriction
-  # Active Support 6.x requires ruby 2.5.0+
-  Gem::Requirement.create('>= 2.5.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) ? '~> 6.0' : '~> 5.0'
-end
-
 group :development do
   gem "aruba", '~> 0.6.2'
   gem "cucumber", '~> 1.1'
   gem "rspec-expectations", '~> 3.1.0'
   gem "hiera-eyaml-plaintext"
-  gem "puppet", ENV['PUPPET_VERSION'] || default_puppet_restriction
-  gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
-  if RUBY_VERSION >= '2.5.0'
-    gem 'github_changelog_generator', :require => false, :git => 'https://github.com/voxpupuli/github-changelog-generator', :branch => 'voxpupuli_essential_fixes'
-    gem "activesupport", activesupport_restriction
-  end
+  gem "puppet", ENV['PUPPET_VERSION'] || '>= 7'
+  gem 'github_changelog_generator', :require => false, :git => 'https://github.com/voxpupuli/github-changelog-generator', :branch => 'voxpupuli_essential_fixes'
+  gem "activesupport"
 end
 
 group :test do