modulesync 3.3.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 615bffaa29507db526e145f6237667c29c4bb4e86542293b0d0645c11136fd64
-  data.tar.gz: 0cee8e4725e11f2087b5a916d668cbf614e25d40ea064c82f6f6979675a3d11c
+  metadata.gz: 8da0dddd013661a7bb0cc32467fac8fe5bd3c0b2325796ec6c35e6df2e5e3121
+  data.tar.gz: 5ac3727d6238f334fd4137ca483318a5b6eea6a76968b3bc80a185a7fec38d76
 SHA512:
-  metadata.gz: 86528c3b79d79bcfd57b13e0d999f653c6d1a5855db4078f812830f5326b9af52d511174914ed821999e014f151bab48c789364697e579ec8bcc9b9c4881d516
-  data.tar.gz: ee485fee4217c6677c6d8d9c2fa15b42c3f8d8f33bde34b02598966315dd86b8bc54ec02d74a999c03afa98f254fe1799824c6057182a3a83e5efe5bcd84cd2a
+  metadata.gz: 6ace01d65b6ae1a27cd4534cf0dd67eedcd0ff4333633beb8de0be556dde2943dbe741b65dbbc704d105aee3eb4abcf3d72c4727d0eedd5a67c5d45399643af6
+  data.tar.gz: 6be66302f954b0f73731ce6293d2ad0386a9490713011a21a670f3905226e583b3bfa980de42ab0b2f33ca9e56b7507c62f57ce96ad03b127ee13d0ef9ca7c50

data/.github/workflows/ci.yml

@@ -11,8 +11,10 @@ env:
   BUNDLE_WITHOUT: release
 
 jobs:
-  rubocop:
-    runs-on: ubuntu-latest
+  rubocop_and_matrix:
+    runs-on: ubuntu-24.04
+    outputs:
+      ruby: ${{ steps.ruby.outputs.versions }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup ruby
@@ -22,22 +24,16 @@ jobs:
           bundler-cache: true
       - name: Run linter
         run: bundle exec rake rubocop
+      - id: ruby
+        uses: voxpupuli/ruby-version@v1
   test:
-    needs: rubocop
-    runs-on: ubuntu-latest
+    name: "Ruby ${{ matrix.ruby }}"
+    needs: rubocop_and_matrix
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - ruby: "2.7"
-          - ruby: "3.0"
-          - ruby: "3.1"
-            codecov: "yes"
-          - ruby: "3.2"
-          - ruby: "3.3"
-          - ruby: "3.4"
-    env:
-      CODECOV: ${{ matrix.codecov }}
+        ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
     steps:
       - uses: actions/checkout@v4
       - name: Install Ruby ${{ matrix.ruby }}
@@ -53,7 +49,7 @@ jobs:
         run: gem build --strict --verbose *.gemspec
   tests:
     needs:
-      - rubocop
+      - rubocop_and_matrix
       - test
     runs-on: ubuntu-latest
     name: Test suite

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-05-17 11:57:48 UTC using RuboCop version 1.63.5.
+# on 2025-05-21 12:14:38 UTC using RuboCop version 1.75.6.
 # 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
@@ -12,6 +12,11 @@ Lint/SuppressedException:
   Exclude:
     - 'Rakefile'
 
+# Offense count: 1
+Lint/UselessConstantScoping:
+  Exclude:
+    - 'spec/helpers/faker/puppet_module_remote_repo.rb'
+
 # Offense count: 3
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
@@ -26,14 +31,6 @@ RSpec/ContextWording:
 RSpec/ExampleLength:
   Max: 16
 
-# Offense count: 2
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
-  Exclude:
-    - 'spec/unit/module_sync/git_service/github_spec.rb'
-    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
-
 # Offense count: 19
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
@@ -109,7 +106,7 @@ Style/OptionalBooleanParameter:
 
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 169

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.4.1](https://github.com/voxpupuli/modulesync/tree/3.4.1) (2025-05-21)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/3.4.0...3.4.1)
+
+**Fixed bugs:**
+
+- thor: Allow 1.2 to stay compatible with ancient facter [\#303](https://github.com/voxpupuli/modulesync/pull/303) ([bastelfreak](https://github.com/bastelfreak))
+
+## [3.4.0](https://github.com/voxpupuli/modulesync/tree/3.4.0) (2025-05-21)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/3.3.0...3.4.0)
+
+**Merged pull requests:**
+
+- Disable coverage reports [\#300](https://github.com/voxpupuli/modulesync/pull/300) ([bastelfreak](https://github.com/bastelfreak))
+- voxpupuli-rubocop: Update 3.0.0-\>3.1.0 [\#299](https://github.com/voxpupuli/modulesync/pull/299) ([bastelfreak](https://github.com/bastelfreak))
+- voxpupuli-rubocop: Update 2.8.0-\>3.0.0 [\#297](https://github.com/voxpupuli/modulesync/pull/297) ([bastelfreak](https://github.com/bastelfreak))
+- Allow thor 1.3.2 and newer [\#293](https://github.com/voxpupuli/modulesync/pull/293) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [3.3.0](https://github.com/voxpupuli/modulesync/tree/3.3.0) (2025-02-26)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/3.2.0...3.3.0)

data/Gemfile

@@ -8,8 +8,3 @@ group :release, optional: true do
   gem 'faraday-retry', '~> 2.1', require: false
   gem 'github_changelog_generator', '~> 1.16', require: false
 end
-
-group :coverage, optional: ENV['CODECOV'] != 'yes' do
-  gem 'codecov', require: false
-  gem 'simplecov-console', require: false
-end

data/bin/msync

@@ -1,22 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-if ENV['COVERAGE']
-  # This block allow us to grab code coverage when running this script.
-  #
-  # Note: This environment variable (ie. COVERAGE) is set in Cucumber/Aruba configuration to collect reports
-  simplecov_root = File.expand_path File.join(File.dirname(__FILE__), '..')
-
-  # When running with aruba simplecov was using /tmp/aruba as the root folder.
-  # This is to force using the project folder
-  ENV['SIMPLECOV_ROOT'] = simplecov_root
-  require 'simplecov'
-
-  # https://github.com/simplecov-ruby/simplecov/issues/234
-  # As described in the issue, every process must have an unique name:
-  SimpleCov.command_name "#{File.basename $PROGRAM_NAME} (pid: #{Process.pid})"
-end
-
 lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 

data/features/execute.feature

@@ -37,8 +37,8 @@ Feature: execute
     When I successfully run `msync help exec`
     Then the stdout should contain:
     """
-          [--fail-fast], [--no-fail-fast]                # Abort the run after a command execution failure
-                                                         # Default: true
+          [--fail-fast], [--no-fail-fast], [--skip-fail-fast]                 # Abort the run after a command execution failure
+                                                                              # Default: true
     """
 
   Scenario: Override fail-fast default value using config file
@@ -46,6 +46,6 @@ Feature: execute
     When I successfully run `msync help exec`
     Then the stdout should contain:
     """
-          [--fail-fast], [--no-fail-fast]                # Abort the run after a command execution failure
+    [--fail-fast], [--no-fail-fast], [--skip-fail-fast]                 # Abort the run after a command execution failure
     """
     # NOTE: It seems there is a Thor bug here: default value is missing in help when sets to 'false'

data/features/support/env.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'simplecov'
-
-SimpleCov.command_name 'Cucumber'
-
 require 'aruba/cucumber'
 
 require_relative '../../spec/helpers/faker'
@@ -13,8 +9,5 @@ ModuleSync::Faker.working_directory = File.expand_path('faker', Aruba.config.wor
 Before do
   @aruba_timeout_seconds = 5
 
-  # This enables coverage when aruba runs `msync` executable (cf. `bin/msync`)
-  set_environment_variable('COVERAGE', '1')
-
   aruba.config.activate_announcer_on_command_failure = %i[stdout stderr]
 end

data/lib/modulesync/cli.rb

@@ -183,7 +183,7 @@ module ModuleSync
       option :fail_fast,
              type: :boolean,
              desc: 'Abort the run after a command execution failure',
-             default: CLI.defaults[:fail_fast].nil? ? true : CLI.defaults[:fail_fast]
+             default: CLI.defaults[:fail_fast].nil? || CLI.defaults[:fail_fast]
       def execute(*command_args)
         raise Thor::Error, 'COMMAND is a required argument' if command_args.empty?
 

data/modulesync.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'modulesync'
-  spec.version               = '3.3.0'
+  spec.version               = '3.4.1'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
@@ -22,12 +22,13 @@ 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 'simplecov', '~> 0.22.0'
-  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.8.0'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
 
-  spec.add_runtime_dependency 'git', '~>1.7'
-  spec.add_runtime_dependency 'gitlab', '>=4', '<6'
-  spec.add_runtime_dependency 'octokit', '>=4', '<10'
-  spec.add_runtime_dependency 'puppet-blacksmith', '>= 3.0', '< 9'
-  spec.add_runtime_dependency 'thor', '1.3.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'
 end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
 # frozen_string_literal: true
 
-require 'simplecov'
-
 require 'modulesync'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Vox Pupuli
 bindir: bin
 cert_chain: []
-date: 2025-02-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -71,34 +71,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.22.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -177,16 +163,22 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.2'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   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.0
+        version: 1.3.1
 description: Utility to synchronize common files across puppet modules in Github.
 email:
 - voxpupuli@groups.io
@@ -203,7 +195,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".simplecov"
 - CHANGELOG.md
 - Gemfile
 - HISTORY.md
@@ -270,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Puppet Module Synchronizer
 test_files: []

data/.simplecov

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-SimpleCov.start do
-  if ENV['SIMPLECOV_ROOT']
-    SimpleCov.root(ENV['SIMPLECOV_ROOT'])
-
-    filters.clear # This will remove the :root_filter and :bundler_filter that come via simplecov's defaults
-
-    # Because simplecov filters everything outside of the SimpleCov.root
-    # This should be added, cf.
-    # https://github.com/colszowka/simplecov#default-root-filter-and-coverage-for-things-outside-of-it
-    add_filter do |src|
-      src.filename !~ /^#{SimpleCov.root}/
-    end
-  end
-
-  add_group 'Source code', 'lib'
-
-  add_group 'Unit tests', 'spec'
-
-  add_group 'Behavior tests', 'features'
-  add_filter '/features/support/env.rb'
-
-  enable_coverage :branch
-
-  # do not track vendored files
-  add_filter '/vendor'
-  add_filter '/.vendor'
-
-  # exclude anything that is not in lib, spec or features directories
-  add_filter do |src|
-    src.filename !~ %r{^#{SimpleCov.root}/(lib|spec|features)}
-  end
-
-  track_files '**/*.rb'
-end
-
-if ENV['CODECOV'] == 'yes'
-  require 'simplecov-console'
-  require 'codecov'
-
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::Console,
-    SimpleCov::Formatter::Codecov,
-  ]
-end
-
-# vim: filetype=ruby