modulesync 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d5f0aeaef1a9f1931977a20b9d2e1ccc8791336f99643492f0d0a3a22d4566
-  data.tar.gz: a4ba51d9b0d1652255478df9bd980a80eea9113125f867c65ed15b96ec223343
+  metadata.gz: 615bffaa29507db526e145f6237667c29c4bb4e86542293b0d0645c11136fd64
+  data.tar.gz: 0cee8e4725e11f2087b5a916d668cbf614e25d40ea064c82f6f6979675a3d11c
 SHA512:
-  metadata.gz: 2f91356d53a10ebb48d686c964bb17f5a4ed636c91ad16b9c76a9639ee42b935956287f461c4a35b47af132760d6fc1f84912c4f4420525a6123d3827028e865
-  data.tar.gz: 2c9ecf3e76db7f5439953d29bd0bf6a19b09a51d6dcc87b3e64fdc412214870db6a3de17b5e19a46c82a06214053367428178a8ade31b13e8a363d19a62f90cc
+  metadata.gz: 86528c3b79d79bcfd57b13e0d999f653c6d1a5855db4078f812830f5326b9af52d511174914ed821999e014f151bab48c789364697e579ec8bcc9b9c4881d516
+  data.tar.gz: ee485fee4217c6677c6d8d9c2fa15b42c3f8d8f33bde34b02598966315dd86b8bc54ec02d74a999c03afa98f254fe1799824c6057182a3a83e5efe5bcd84cd2a

data/.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.4"
           bundler-cache: true
       - name: Run linter
         run: bundle exec rake rubocop
@@ -34,6 +34,8 @@ jobs:
           - ruby: "3.1"
             codecov: "yes"
           - ruby: "3.2"
+          - ruby: "3.3"
+          - ruby: "3.4"
     env:
       CODECOV: ${{ matrix.codecov }}
     steps:
@@ -48,7 +50,7 @@ jobs:
       - name: Run behavior tests
         run: bundle exec cucumber
       - name: Build gem
-        run: gem build --verbose *.gemspec
+        run: gem build --strict --verbose *.gemspec
   tests:
     needs:
       - rubocop

data/.github/workflows/release.yml

@@ -11,14 +11,14 @@ jobs:
     if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.2
+      - name: Install Ruby 3.4
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: "3.4"
         env:
           BUNDLE_WITHOUT: release
       - name: Build gem
-        run: gem build --verbose *.gemspec
+        run: gem build --strict --verbose *.gemspec
       - name: Publish gem to rubygems.org
         run: gem push *.gem
         env:

data/.rubocop_todo.yml

@@ -1,82 +1,45 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-06-16 18:17:35 UTC using RuboCop version 1.50.2.
+# on 2024-05-17 11:57:48 UTC using RuboCop version 1.63.5.
 # 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'lib/modulesync/renderer.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowComments, AllowNil.
 Lint/SuppressedException:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/StringInclude:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/BeEq:
-  Exclude:
-    - 'spec/unit/modulesync/settings_spec.rb'
-
 # Offense count: 3
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
-    - 'spec/unit/modulesync_spec.rb'
-
-# Offense count: 17
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SkipBlocks, EnforcedStyle.
-# SupportedStyles: described_class, explicit
-RSpec/DescribedClass:
-  Exclude:
-    - 'spec/unit/modulesync/git_service/factory_spec.rb'
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
-    - 'spec/unit/modulesync/git_service_spec.rb'
-    - 'spec/unit/modulesync/settings_spec.rb'
-    - 'spec/unit/modulesync/source_code_spec.rb'
-    - 'spec/unit/modulesync_spec.rb'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
+    - 'spec/unit/module_sync_spec.rb'
 
 # Offense count: 11
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 16
 
-# Offense count: 7
+# Offense count: 2
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
-    - 'spec/unit/modulesync/git_service/factory_spec.rb'
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
-    - 'spec/unit/modulesync/git_service_spec.rb'
-    - 'spec/unit/modulesync/settings_spec.rb'
-    - 'spec/unit/modulesync/source_code_spec.rb'
-    - 'spec/unit/modulesync_spec.rb'
+    - '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:
   Exclude:
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
 
 # Offense count: 7
 # Configuration parameters: .
@@ -93,20 +56,29 @@ RSpec/MultipleExpectations:
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
-    - 'spec/unit/modulesync/settings_spec.rb'
-    - 'spec/unit/modulesync/source_code_spec.rb'
+    - 'spec/unit/module_sync/settings_spec.rb'
+    - 'spec/unit/module_sync/source_code_spec.rb'
 
 # Offense count: 9
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
 
+# Offense count: 2
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - '**/spec/routing/**/*'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
+
 # Offense count: 6
 RSpec/StubbedMock:
   Exclude:
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
-    - 'spec/unit/modulesync_spec.rb'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
+    - 'spec/unit/module_sync_spec.rb'
 
 # Offense count: 9
 # Configuration parameters: AllowedConstants.
@@ -128,19 +100,6 @@ Style/FetchEnvVar:
   Exclude:
     - 'lib/modulesync/git_service.rb'
 
-# Offense count: 34
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'lib/modulesync/renderer.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?

data/.simplecov

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SimpleCov.start do
   if ENV['SIMPLECOV_ROOT']
     SimpleCov.root(ENV['SIMPLECOV_ROOT'])

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file.
 
+## [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)
+
+**Implemented enhancements:**
+
+- Add Ruby 3.4 to CI [\#295](https://github.com/voxpupuli/modulesync/pull/295) ([kenyon](https://github.com/kenyon))
+- gemspec: allow puppet-blacksmith 8.x [\#294](https://github.com/voxpupuli/modulesync/pull/294) ([kenyon](https://github.com/kenyon))
+- CI: Build gems with strict and verbose mode [\#292](https://github.com/voxpupuli/modulesync/pull/292) ([bastelfreak](https://github.com/bastelfreak))
+- Add Ruby 3.3 to CI [\#291](https://github.com/voxpupuli/modulesync/pull/291) ([bastelfreak](https://github.com/bastelfreak))
+- Add a flag to `msync execute` on the default branch [\#288](https://github.com/voxpupuli/modulesync/pull/288) ([smortex](https://github.com/smortex))
+- Update octokit requirement from \>= 4, \< 9 to \>= 4, \< 10 [\#287](https://github.com/voxpupuli/modulesync/pull/287) ([dependabot[bot]](https://github.com/apps/dependabot))
+- update to voxpupuli-rubocop 2.7.0; adjust path to unit files & rubocop: autofix & regen todo file [\#281](https://github.com/voxpupuli/modulesync/pull/281) ([bastelfreak](https://github.com/bastelfreak))
+
+**Fixed bugs:**
+
+- pin thor to 1.3.0 [\#282](https://github.com/voxpupuli/modulesync/pull/282) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Update voxpupuli-rubocop requirement from ~\> 2.7.0 to ~\> 2.8.0 [\#290](https://github.com/voxpupuli/modulesync/pull/290) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update gitlab requirement from ~\> 4.0 to \>= 4, \< 6 [\#289](https://github.com/voxpupuli/modulesync/pull/289) ([dependabot[bot]](https://github.com/apps/dependabot))
+- rubocop: Fix Style/FrozenStringLiteralComment [\#285](https://github.com/voxpupuli/modulesync/pull/285) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [3.2.0](https://github.com/voxpupuli/modulesync/tree/3.2.0) (2023-10-31)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/3.1.0...3.2.0)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/clean'
 require 'cucumber/rake/task'
 require 'rubocop/rake_task'
@@ -37,7 +39,7 @@ begin
 
   # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
   require 'rbconfig'
-  if /linux/.match?(RbConfig::CONFIG['host_os'])
+  if RbConfig::CONFIG['host_os'].include?('linux')
     task :changelog do
       puts 'Fixing line endings...'
       changelog_file = File.join(__dir__, 'CHANGELOG.md')

data/bin/msync

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 if ENV['COVERAGE']
   # This block allow us to grab code coverage when running this script.

data/features/step_definitions/git_steps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../spec/helpers/faker/puppet_module_remote_repo'
 
 Given 'a basic setup with a puppet module {string} from {string}' do |name, namespace|

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 
 SimpleCov.command_name 'Cucumber'

data/lib/modulesync/cli/thor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'modulesync/cli'
 

data/lib/modulesync/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 require 'modulesync'
@@ -173,6 +175,11 @@ module ModuleSync
              aliases: '-b',
              desc: 'Branch name to make the changes in.',
              default: CLI.defaults[:branch]
+      option :default_branch,
+             aliases: '-B',
+             type: :boolean,
+             desc: 'Work on the default branch (take precedence over --branch).',
+             default: false
       option :fail_fast,
              type: :boolean,
              desc: 'Abort the run after a command execution failure',

data/lib/modulesync/constants.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ModuleSync
   module Constants
-    MODULE_FILES_DIR     = 'moduleroot/'.freeze
-    CONF_FILE            = 'config_defaults.yml'.freeze
-    MODULE_CONF_FILE     = '.sync.yml'.freeze
-    MODULESYNC_CONF_FILE = 'modulesync.yml'.freeze
-    HOOK_FILE            = '.git/hooks/pre-push'.freeze
+    MODULE_FILES_DIR     = 'moduleroot/'
+    CONF_FILE            = 'config_defaults.yml'
+    MODULE_CONF_FILE     = '.sync.yml'
+    MODULESYNC_CONF_FILE = 'modulesync.yml'
+    HOOK_FILE            = '.git/hooks/pre-push'
     GLOBAL_DEFAULTS_KEY  = :global
   end
 end

data/lib/modulesync/git_service/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   module GitService
     # Generic class for git services

data/lib/modulesync/git_service/factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   module GitService
     # Git service's factory

data/lib/modulesync/git_service/github.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync/git_service'
 require 'modulesync/git_service/base'
 require 'octokit'

data/lib/modulesync/git_service/gitlab.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gitlab'
 require 'modulesync/git_service'
 require 'modulesync/git_service/base'

data/lib/modulesync/git_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   class Error < StandardError; end
 

data/lib/modulesync/hook.rb

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

data/lib/modulesync/puppet_module.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet_blacksmith'
 
 require 'modulesync/source_code'

data/lib/modulesync/renderer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 require 'find'
 

data/lib/modulesync/repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git'
 
 module ModuleSync

data/lib/modulesync/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   # Encapsulate a configs for a module, providing easy access to its parts
   # All configs MUST be keyed by the relative target filename

data/lib/modulesync/source_code.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync'
 require 'modulesync/git_service'
 require 'modulesync/git_service/factory'

data/lib/modulesync/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module ModuleSync

data/lib/modulesync.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'English'
 require 'fileutils'
 require 'pathname'
@@ -207,7 +209,11 @@ module ModuleSync
       $stdout.puts "#{puppet_module.given_name}:"
 
       puppet_module.repository.clone unless puppet_module.repository.cloned?
-      puppet_module.repository.switch branch: @options[:branch]
+      if @options[:default_branch]
+        puppet_module.repository.switch branch: false
+      else
+        puppet_module.repository.switch branch: @options[:branch]
+      end
 
       command_args = cli_options[:command_args]
       local_script = File.expand_path command_args[0]

data/lib/monkey_patches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
   module LibMonkeyPatch
     # Monkey patch set_custom_git_env_variables due to our ::Git::GitExecuteError handling.

data/modulesync.gemspec

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'modulesync'
-  spec.version               = '3.2.0'
+  spec.version               = '3.3.0'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
@@ -17,15 +19,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'aruba', '~>2.0'
-  spec.add_development_dependency 'cucumber'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.0'
+  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_runtime_dependency 'git', '~>1.7'
-  spec.add_runtime_dependency 'gitlab', '~>4.0'
-  spec.add_runtime_dependency 'octokit', '>=4', '<9'
-  spec.add_runtime_dependency 'puppet-blacksmith', '>= 3.0', '< 8'
-  spec.add_runtime_dependency 'thor'
+  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'
 end

data/spec/helpers/faker/puppet_module_remote_repo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 
 require_relative '../faker'

data/spec/helpers/faker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ModuleSync
   # Faker is a top-level module to keep global faker config
   module Faker

data/spec/spec_helper.rb

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

data/spec/unit/{modulesync → module_sync}/git_service/factory_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync'
 require 'modulesync/git_service/factory'
 
@@ -5,8 +7,7 @@ describe ModuleSync::GitService::Factory do
   context 'when instantiate a GitHub service without credentials' do
     it 'raises an error' do
       expect do
-        ModuleSync::GitService::Factory.instantiate(type: :github, endpoint: nil,
-                                                    token: nil)
+        described_class.instantiate(type: :github, endpoint: nil, token: nil)
       end.to raise_error(ModuleSync::GitService::MissingCredentialsError)
     end
   end
@@ -14,8 +15,7 @@ describe ModuleSync::GitService::Factory do
   context 'when instantiate a GitLab service without credentials' do
     it 'raises an error' do
       expect do
-        ModuleSync::GitService::Factory.instantiate(type: :gitlab, endpoint: nil,
-                                                    token: nil)
+        described_class.instantiate(type: :gitlab, endpoint: nil, token: nil)
       end.to raise_error(ModuleSync::GitService::MissingCredentialsError)
     end
   end

data/spec/unit/{modulesync → module_sync}/git_service/github_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'modulesync/git_service/github'
@@ -7,7 +9,7 @@ describe ModuleSync::GitService::GitHub do
     before do
       @client = double
       allow(Octokit::Client).to receive(:new).and_return(@client)
-      @it = ModuleSync::GitService::GitHub.new('test', 'https://api.github.com')
+      @it = described_class.new('test', 'https://api.github.com')
     end
 
     let(:args) do

data/spec/unit/{modulesync → module_sync}/git_service/gitlab_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'modulesync/git_service/gitlab'
@@ -7,7 +9,7 @@ describe ModuleSync::GitService::GitLab do
     before do
       @client = double
       allow(Gitlab::Client).to receive(:new).and_return(@client)
-      @it = ModuleSync::GitService::GitLab.new('test', 'https://gitlab.com/api/v4')
+      @it = described_class.new('test', 'https://gitlab.com/api/v4')
     end
 
     let(:args) do

data/spec/unit/{modulesync → module_sync}/git_service_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'modulesync'
 require 'modulesync/git_service'
 
@@ -30,11 +32,11 @@ describe ModuleSync::GitService do
       end
 
       it 'build git service arguments from configuration entry' do
-        expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-                                                                                         type: :gitlab,
-                                                                                         endpoint: 'https://vcs.example.com/api/v4',
-                                                                                         token: 'secret',
-                                                                                       })
+        expect(described_class.configuration_for(sourcecode: sourcecode)).to eq({
+                                                                                  type: :gitlab,
+                                                                                  endpoint: 'https://vcs.example.com/api/v4',
+                                                                                  token: 'secret',
+                                                                                })
       end
     end
 
@@ -55,11 +57,11 @@ describe ModuleSync::GitService do
             .with('GITLAB_TOKEN')
             .and_return('secret')
 
-          expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-                                                                                           type: :gitlab,
-                                                                                           endpoint: 'https://vcs.example.com/api/v4',
-                                                                                           token: 'secret',
-                                                                                         })
+          expect(described_class.configuration_for(sourcecode: sourcecode)).to eq({
+                                                                                    type: :gitlab,
+                                                                                    endpoint: 'https://vcs.example.com/api/v4',
+                                                                                    token: 'secret',
+                                                                                  })
         end
       end
 
@@ -69,21 +71,21 @@ describe ModuleSync::GitService do
             .with('GITLAB_TOKEN')
             .and_return('secret')
 
-          expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-                                                                                           type: :gitlab,
-                                                                                           endpoint: 'https://git.example.com/api/v4',
-                                                                                           token: 'secret',
-                                                                                         })
+          expect(described_class.configuration_for(sourcecode: sourcecode)).to eq({
+                                                                                    type: :gitlab,
+                                                                                    endpoint: 'https://git.example.com/api/v4',
+                                                                                    token: 'secret',
+                                                                                  })
         end
       end
 
       context 'without any environment variable sets' do
         it 'returns a nil token' do
-          expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-                                                                                           type: :gitlab,
-                                                                                           endpoint: 'https://git.example.com/api/v4',
-                                                                                           token: nil,
-                                                                                         })
+          expect(described_class.configuration_for(sourcecode: sourcecode)).to eq({
+                                                                                    type: :gitlab,
+                                                                                    endpoint: 'https://git.example.com/api/v4',
+                                                                                    token: nil,
+                                                                                  })
         end
       end
     end
@@ -102,21 +104,21 @@ describe ModuleSync::GitService do
               .with('GITLAB_TOKEN')
               .and_return('secret')
 
-            expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-                                                                                             type: :gitlab,
-                                                                                             endpoint: 'https://gitlab.example.com/api/v4',
-                                                                                             token: 'secret',
-                                                                                           })
+            expect(described_class.configuration_for(sourcecode: sourcecode)).to eq({
+                                                                                      type: :gitlab,
+                                                                                      endpoint: 'https://gitlab.example.com/api/v4',
+                                                                                      token: 'secret',
+                                                                                    })
           end
         end
 
         context 'without a GITLAB_TOKEN environment variable sets' do
           it 'returns a nil token' do
-            expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-                                                                                             type: :gitlab,
-                                                                                             endpoint: 'https://gitlab.example.com/api/v4',
-                                                                                             token: nil,
-                                                                                           })
+            expect(described_class.configuration_for(sourcecode: sourcecode)).to eq({
+                                                                                      type: :gitlab,
+                                                                                      endpoint: 'https://gitlab.example.com/api/v4',
+                                                                                      token: nil,
+                                                                                    })
           end
         end
       end
@@ -134,11 +136,11 @@ describe ModuleSync::GitService do
               .with('GITHUB_TOKEN')
               .and_return('secret')
 
-            expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-                                                                                             type: :github,
-                                                                                             endpoint: 'https://vcs.example.com',
-                                                                                             token: 'secret',
-                                                                                           })
+            expect(described_class.configuration_for(sourcecode: sourcecode)).to eq({
+                                                                                      type: :github,
+                                                                                      endpoint: 'https://vcs.example.com',
+                                                                                      token: 'secret',
+                                                                                    })
           end
         end
 
@@ -152,7 +154,7 @@ describe ModuleSync::GitService do
               .with('GITLAB_TOKEN')
               .and_return('secret')
 
-            expect { ModuleSync::GitService.configuration_for(sourcecode: sourcecode) }
+            expect { described_class.configuration_for(sourcecode: sourcecode) }
               .to raise_error ModuleSync::Error
           end
         end

data/spec/unit/{modulesync → module_sync}/settings_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ModuleSync::Settings do
   subject do
-    ModuleSync::Settings.new(
+    described_class.new(
       {},
       {},
       {},
@@ -13,11 +15,11 @@ describe ModuleSync::Settings do
     )
   end
 
-  it { is_expected.not_to eq nil }
-  it { expect(subject.managed?('Rakefile')).to eq false }
-  it { expect(subject.managed?('Rakefile/foo')).to eq false }
-  it { expect(subject.managed?('Gemfile')).to eq true }
-  it { expect(subject.managed?('Gemfile/foo')).to eq true }
+  it { is_expected.not_to be_nil }
+  it { expect(subject.managed?('Rakefile')).to be false }
+  it { expect(subject.managed?('Rakefile/foo')).to be false }
+  it { expect(subject.managed?('Gemfile')).to be true }
+  it { expect(subject.managed?('Gemfile/foo')).to be true }
   it { expect(subject.managed_files([])).to eq ['Gemfile'] }
   it { expect(subject.managed_files(%w[Rakefile Gemfile other_file])).to eq %w[Gemfile other_file] }
   it { expect(subject.unmanaged_files([])).to eq ['Rakefile'] }

data/spec/unit/{modulesync → module_sync}/source_code_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ModuleSync::SourceCode do
   subject do
-    ModuleSync::SourceCode.new('namespace/name', nil)
+    described_class.new('namespace/name', nil)
   end
 
   before do

data/spec/unit/{modulesync_spec.rb → module_sync_spec.rb}

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ModuleSync do
   context '::update' do
     it 'loads the managed modules from the specified :managed_modules_conf' do
-      allow(ModuleSync).to receive(:find_template_files).and_return([])
+      allow(described_class).to receive(:find_template_files).and_return([])
       allow(ModuleSync::Util).to receive(:parse_config).with('./config_defaults.yml').and_return({})
-      expect(ModuleSync).to receive(:managed_modules).with(no_args).and_return([])
+      expect(described_class).to receive(:managed_modules).with(no_args).and_return([])
 
       options = { managed_modules_conf: 'test_file.yml' }
-      ModuleSync.update(options)
+      described_class.update(options)
     end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Vox Pupuli
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -28,72 +27,78 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +117,22 @@ dependencies:
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +142,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +152,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +162,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -161,21 +172,21 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 description: Utility to synchronize common files across puppet modules in Github.
 email:
 - voxpupuli@groups.io
@@ -234,18 +245,17 @@ files:
 - spec/helpers/faker.rb
 - spec/helpers/faker/puppet_module_remote_repo.rb
 - spec/spec_helper.rb
-- spec/unit/modulesync/git_service/factory_spec.rb
-- spec/unit/modulesync/git_service/github_spec.rb
-- spec/unit/modulesync/git_service/gitlab_spec.rb
-- spec/unit/modulesync/git_service_spec.rb
-- spec/unit/modulesync/settings_spec.rb
-- spec/unit/modulesync/source_code_spec.rb
-- spec/unit/modulesync_spec.rb
+- spec/unit/module_sync/git_service/factory_spec.rb
+- spec/unit/module_sync/git_service/github_spec.rb
+- spec/unit/module_sync/git_service/gitlab_spec.rb
+- spec/unit/module_sync/git_service_spec.rb
+- spec/unit/module_sync/settings_spec.rb
+- spec/unit/module_sync/source_code_spec.rb
+- spec/unit/module_sync_spec.rb
 homepage: https://github.com/voxpupuli/modulesync
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -260,8 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Puppet Module Synchronizer
 test_files: []