From 3bfb63e61018249e3436ec963744cea4ed0c84f5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 19 Aug 2025 15:50:18 +0200 Subject: [PATCH 1/4] Drop Puppet support; Drop OpenVox 7 support --- metadata.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/metadata.json b/metadata.json index ce5145d..0d02def 100644 --- a/metadata.json +++ b/metadata.json @@ -65,13 +65,9 @@ } ], "requirements": [ - { - "name": "puppet", - "version_requirement": ">= 7.0.0 < 9.0.0" - }, { "name": "openvox", - "version_requirement": ">= 7.0.0 < 9.0.0" + "version_requirement": ">= 8.19.0 < 9.0.0" } ], "dependencies": [ From 101312d9ac1fb83a04c7a92c30d36a95697f1d3d Mon Sep 17 00:00:00 2001 From: Jerald Sheets Date: Fri, 27 Jun 2025 10:35:12 -0400 Subject: [PATCH 2/4] modulesync 10.0.0 --- Gemfile | 2 +- spec/spec_helper.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 571f2c0..dc90537 100644 --- a/Gemfile +++ b/Gemfile @@ -4,9 +4,9 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'mocha', :require => false gem 'voxpupuli-test', '~> 11.0', :require => false gem 'puppet_metadata', '~> 5.0', :require => false + gem 'mocha', :require => false end group :development do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3226b22..58c9b66 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,7 +11,6 @@ RSpec.configure do |c| c.facterdb_string_keys = false - c.mock_with :mocha end add_mocked_facts! From 673a804dea9facb038b656ee75f9421421eeb639 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Tue, 12 Aug 2025 07:53:27 +0000 Subject: [PATCH 3/4] modulesync 10.0.0-19-g1adc8e0 --- .msync.yml | 2 +- Gemfile | 2 +- Rakefile | 14 +++----------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.msync.yml b/.msync.yml index af9a220..cf1792b 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '10.0.0' +modulesync_config_version: '10.1.0' diff --git a/Gemfile b/Gemfile index dc90537..b149e6c 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 3.5', :require => false + gem 'voxpupuli-acceptance', '~> 4.0', :require => false end group :release do diff --git a/Rakefile b/Rakefile index 053e81c..9414779 100644 --- a/Rakefile +++ b/Rakefile @@ -1,30 +1,22 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -# Attempt to load voxpupuli-test (which pulls in puppetlabs_spec_helper), -# otherwise attempt to load it directly. begin require 'voxpupuli/test/rake' rescue LoadError - begin - require 'puppetlabs_spec_helper/rake_tasks' - rescue LoadError - end + # only available if gem group test is installed end -# load optional tasks for acceptance -# only available if gem group releases is installed begin require 'voxpupuli/acceptance/rake' rescue LoadError + # only available if gem group acceptance is installed end -# load optional tasks for releases -# only available if gem group releases is installed begin require 'voxpupuli/release/rake_tasks' rescue LoadError - # voxpupuli-release not present + # only available if gem group releases is installed else GCGConfig.user = 'voxpupuli' GCGConfig.project = 'puppet-alternatives' From 79da96fc9fa983296e89fc186649662b0ceb5767 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 19 Aug 2025 15:55:23 +0200 Subject: [PATCH 4/4] fix mocha mocking --- .sync.yml | 2 ++ spec/spec_helper.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/.sync.yml b/.sync.yml index 1eef135..872928e 100644 --- a/.sync.yml +++ b/.sync.yml @@ -7,3 +7,5 @@ Gemfile: optional: ':test': - gem: 'mocha' +spec/spec_helper.rb: + mock_with: ':mocha' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 58c9b66..3226b22 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,6 +11,7 @@ RSpec.configure do |c| c.facterdb_string_keys = false + c.mock_with :mocha end add_mocked_facts!