modulesync 3.4.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0606b5ae974f3a0206c67892a9d0d905a36683f67b766fca7b90585c98c085c8
-  data.tar.gz: '087d043ed37b41106b14dc2886f2bf8f350eb859378a0f2c95ac089692375b08'
+  metadata.gz: 18b8c746ba0cde88e90c644943e3f9ceedd6f9b6b677133223e7706a0b71c568
+  data.tar.gz: 644c526cc5b4f004317634f1a6afeeec356e22190a8230f34141ef3fe961e52f
 SHA512:
-  metadata.gz: ddaa1c588e3171a6b7ebad0c6fc3ea9a4e2446a0b5708f85f35446d97191c587676c76363654e1247171a444f8601da8d48ccd10b83ecc5cb75adfa229152068
-  data.tar.gz: f911e1807549bb26088485835317ccf2fade4a7e0c97c74c2e4792b6061b329d2b9c73f0084ea46745953cedee7afaf3c04e5f9fac351252dda488192579ac66
+  metadata.gz: b56f97438c169d9bf061724ec5afc120e81478f514c9faf374a065000dcf4cbf64970d38b079bab0077e95c25d79a2b44088417a85b414dd633534006337a559
+  data.tar.gz: 5016b55f147551a5786fafd799fe929a358a8c5aec2e1b4b1c49604e1778a74ccea7faa9aefa7aca3828174c8fb53420912a0add7c4f91321eddc0c06abc3b39

data/.github/workflows/ci.yml

@@ -7,8 +7,8 @@ on:
     branches:
       - master
 
-env:
-  BUNDLE_WITHOUT: release
+permissions:
+  contents: read
 
 jobs:
   rubocop_and_matrix:
@@ -16,7 +16,7 @@ jobs:
     outputs:
       ruby: ${{ steps.ruby.outputs.versions }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -26,6 +26,7 @@ jobs:
         run: bundle exec rake rubocop
       - id: ruby
         uses: voxpupuli/ruby-version@v1
+
   test:
     name: "Ruby ${{ matrix.ruby }}"
     needs: rubocop_and_matrix
@@ -35,7 +36,7 @@ jobs:
       matrix:
         ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
@@ -47,11 +48,16 @@ jobs:
         run: bundle exec cucumber
       - name: Build gem
         run: gem build --strict --verbose *.gemspec
+
   tests:
+    if: always()
     needs:
       - rubocop_and_matrix
       - test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Test suite
     steps:
-      - run: echo Test suite completed
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

data/.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     name: Build the gem
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -39,7 +39,7 @@ jobs:
       contents: write # clone repo and create release
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Create Release
@@ -56,7 +56,7 @@ jobs:
       packages: write # publish to rubygems.pkg.github.com
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Publish gem to GitHub packages
@@ -73,7 +73,7 @@ jobs:
       id-token: write # rubygems.org authentication
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - uses: rubygems/configure-rubygems-credentials@v1.0.0
@@ -92,7 +92,7 @@ jobs:
       - release-to-rubygems
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Install Ruby

data/.rubocop.yml

@@ -3,3 +3,6 @@ inherit_from: .rubocop_todo.yml
 
 inherit_gem:
   voxpupuli-rubocop: rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 3.2

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2025-05-21 12:14:38 UTC using RuboCop version 1.75.6.
+# `rubocop --auto-gen-config --no-auto-gen-timestamp`
+# using RuboCop version 1.79.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -17,6 +17,14 @@ Lint/UselessConstantScoping:
   Exclude:
     - 'spec/helpers/faker/puppet_module_remote_repo.rb'
 
+# Offense count: 2
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'lib/modulesync/repository.rb'
+
 # Offense count: 3
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
@@ -44,10 +52,6 @@ RSpec/InstanceVariable:
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 6
-RSpec/MultipleExpectations:
-  Max: 2
-
 # Offense count: 10
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
@@ -92,7 +96,7 @@ Style/Documentation:
 
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedVars.
+# Configuration parameters: AllowedVars, DefaultToNil.
 Style/FetchEnvVar:
   Exclude:
     - 'lib/modulesync/git_service.rb'
@@ -106,7 +110,7 @@ Style/OptionalBooleanParameter:
 
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 169

data/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.0.0](https://github.com/voxpupuli/modulesync/tree/4.0.0) (2025-08-28)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/3.5.0...4.0.0)
+
+**Breaking changes:**
+
+- Require Ruby 3.2+ [\#317](https://github.com/voxpupuli/modulesync/pull/317) ([bastelfreak](https://github.com/bastelfreak))
+- Drop ruby older than 3.2.0 [\#312](https://github.com/voxpupuli/modulesync/pull/312) ([traylenator](https://github.com/traylenator))
+
+**Implemented enhancements:**
+
+- Allow YAML aliases in configuration [\#311](https://github.com/voxpupuli/modulesync/pull/311) ([traylenator](https://github.com/traylenator))
+
+
+## [3.5.0](https://github.com/voxpupuli/modulesync/tree/3.5.0) (2025-07-23)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/3.4.2...3.5.0)
+
+**Merged pull requests:**
+
+- thor: require 1.4 or newer [\#309](https://github.com/voxpupuli/modulesync/pull/309) ([kenyon](https://github.com/kenyon))
+- README: change example config to voxpupuli [\#308](https://github.com/voxpupuli/modulesync/pull/308) ([trefzer](https://github.com/trefzer))
+
 ## [3.4.2](https://github.com/voxpupuli/modulesync/tree/3.4.2) (2025-06-27)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/3.4.1...3.4.2)

data/README.md

@@ -64,8 +64,8 @@ How It Works
 ModuleSync is a gem that uses the GitHub workflow to clone, update, and push module
 repositories. It expects to be activated from a directory containing
 configuration for modulesync and the modules, or you can pass it the location
-of this configuration directory. [The configuration for the Puppet Labs
-modules](https://github.com/puppetlabs/modulesync_configs), can be used as an
+of this configuration directory. [The configuration for the Vox Pupuli
+modules](https://github.com/voxpupuli/modulesync_config), can be used as an
 example for your own configuration. The configuration directory contains a
 directory called moduleroot which mirrors the structure of a module. The files
 in the moduleroot are ERB templates, and MUST be named after the target file,
@@ -442,8 +442,7 @@ workdir: modules/github-org/puppet-test
 The Templates
 -------------
 
-See [Puppet's modulesync\_configs](https://github.com/puppetlabs/modulesync_configs) and [Vox Pupuli's modulesync\_config](https://github.com/voxpupuli/modulesync_config)
-repositories for different templates currently in use.
+See [Vox Pupuli's modulesync\_config](https://github.com/voxpupuli/modulesync_config) and [Puppet's modulesync\_configs (Archived)](https://github.com/puppetlabs/modulesync_configs) repositories for different templates currently in use.
 
 ## Transfer Notice
 

data/lib/modulesync/cli/thor.rb

@@ -13,7 +13,7 @@ module ModuleSync
     # - show subcommands help using `msync subcommand --help`
     class Thor < ::Thor
       def self.start(*args)
-        if (Thor::HELP_MAPPINGS & ARGV).any? && subcommands.none? { |command| command.start_with?(ARGV[0]) }
+        if Thor::HELP_MAPPINGS.intersect?(ARGV) && subcommands.none? { |command| command.start_with?(ARGV[0]) }
           Thor::HELP_MAPPINGS.each do |cmd|
             if (match = ARGV.delete(cmd))
               ARGV.unshift match

data/lib/modulesync/repository.rb

@@ -145,7 +145,7 @@ module ModuleSync
         opts_commit = { amend: true } if options[:amend]
         opts_push = { force: true } if options[:force]
         if options[:pre_commit_script]
-          script = "#{File.dirname(File.dirname(__FILE__))}/../contrib/#{options[:pre_commit_script]}"
+          script = "#{File.dirname(__FILE__, 2)}/../contrib/#{options[:pre_commit_script]}"
           `#{script} #{@directory}`
         end
         repo.commit(message, opts_commit)
@@ -206,8 +206,8 @@ module ModuleSync
       git.diff('HEAD', '--').any? || untracked_unignored_files.any?
     end
 
-    def puts(*args)
-      $stdout.puts(*args) if ModuleSync.options[:verbose]
+    def puts(*)
+      $stdout.puts(*) if ModuleSync.options[:verbose]
     end
   end
 end

data/lib/modulesync/util.rb

@@ -12,7 +12,7 @@ module ModuleSync
 
     def self.parse_config(config_file)
       if File.exist?(config_file)
-        YAML.load_file(config_file) || {}
+        YAML.load_file(config_file, aliases: true) || {}
       else
         puts "No config file under #{config_file} found, using default values"
         {}

data/modulesync.gemspec

@@ -5,14 +5,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'modulesync'
-  spec.version               = '3.4.2'
+  spec.version               = '4.0.0'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
   spec.description           = 'Utility to synchronize common files across puppet modules in Github.'
   spec.homepage              = 'https://github.com/voxpupuli/modulesync'
   spec.license               = 'Apache-2.0'
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -22,13 +22,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'cucumber', '~> 9.2'
   spec.add_development_dependency 'rake', '~> 13.2', '>= 13.2.1'
   spec.add_development_dependency 'rspec', '~> 3.13'
-  spec.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
 
   spec.add_dependency 'git', '~>1.7'
   spec.add_dependency 'gitlab', '>=4', '<6'
   spec.add_dependency 'octokit', '>=4', '<10'
   spec.add_dependency 'puppet-blacksmith', '>= 3.0', '< 9'
-  # 1.3.1 has a bug that was fixed in 1.3.2 https://github.com/rails/thor/pull/878
-  # Allow 1.2 and newer, because Perforce facter 4.10.0 only allows < 1.3....
-  spec.add_dependency 'thor', '~> 1.2', '!= 1.3.1'
+  spec.add_dependency 'thor', '~> 1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -165,20 +165,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.4'
 description: Utility to synchronize common files across puppet modules in Github.
 email:
 - voxpupuli@groups.io
@@ -255,14 +249,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Puppet Module Synchronizer
 test_files: []