modulesync 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab88d217406b70303f6514b14c56a6ec6652b962d3fa16fd967e36fdb17b0b4
-  data.tar.gz: 18f7c8f38c273f248f80005b2edd6fe5528138739aad2daf0ffe11f22fad40e6
+  metadata.gz: 0b41363f2082735169f5f59ef530b697635f02fe189a217ce2709a2169774909
+  data.tar.gz: 68d900d78098bc423e3eab0844263c851bc1bf5771c04f1d9173775b36445f96
 SHA512:
-  metadata.gz: 4be95c61128a95c5cb28689f6abe256f7c164a197ef44028a58963139a474568ec82aef11adc6608b3a9681b126014ccb699ea4b82686558563e41740d6608f0
-  data.tar.gz: 6341644230ec2cd827180917c692cbf6e6abc3c5e8866f5c72ba415d3079517a910ebee988fe9009f693b3d2dcd91b1e50c7403071088ab234b13157b0902c0d
+  metadata.gz: 2bf91667d4f67255917c8accd52de69600544d256c1802c67eea94d12ef96b2463e10ed3056045cf2694e54dd788446f8c3432e0a7ea0a6954b8460db31a7864
+  data.tar.gz: d0aa6f428d9db4fa5af7046af60ee76cb310c325b09427833184d3d3f0d6f9179b2fd07c41ac472240f5e93ae211201e137791edfcdba1ef3a38dea32452a3b9

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+# raise PRs for gem updates
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+
+# Maintain dependencies for GitHub Actions
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -1,8 +1,11 @@
 ---
-name: CI
+name: ⚒️ CI
+
 on:
-  - pull_request
-  - push
+  pull_request: {}
+  push:
+    branches:
+      - master
 
 env:
   BUNDLE_WITHOUT: release
@@ -11,14 +14,14 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1'
           bundler-cache: true
       - name: Run linter
-        run: bundle exec rubocop --format github
+        run: bundle exec rake rubocop
   test:
     needs: rubocop
     runs-on: ubuntu-latest
@@ -26,16 +29,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.5"
-          - ruby: "2.6"
           - ruby: "2.7"
           - ruby: "3.0"
           - ruby: "3.1"
             codecov: "yes"
+          - ruby: "3.2"
     env:
       CODECOV: ${{ matrix.codecov }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
@@ -46,4 +48,12 @@ jobs:
       - name: Run behavior tests
         run: bundle exec cucumber
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --verbose *.gemspec
+  tests:
+    needs:
+      - rubocop
+      - test
+    runs-on: ubuntu-latest
+    name: Test suite
+    steps:
+      - run: echo Test suite completed

data/.github/workflows/release.yml

@@ -8,15 +8,17 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-    if: github.repository == 'voxpupuli/modulesync'
+    if: github.repository_owner == 'voxpupuli'
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Ruby 3.1
+      - uses: actions/checkout@v3
+      - name: Install Ruby 3.2
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: '3.2'
+        env:
+          BUNDLE_WITHOUT: release
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --verbose *.gemspec
       - name: Publish gem to rubygems.org
         run: gem push *.gem
         env:

data/.rubocop.yml

@@ -1,49 +1,5 @@
+---
 inherit_from: .rubocop_todo.yml
 
-require:
-  - rubocop-performance
-  - rubocop-rake
-  - rubocop-rspec
-
-AllCops:
-  TargetRubyVersion: 2.5
-  NewCops: enable
-  Exclude:
-    - 'vendor/**/*'
-    - 'tmp/**/*'
-    - 'pkg/**/*'
-    - 'lib/monkey_patches.rb'
-    - 'spec/**/*'
-    - 'Gemfile'
-    - 'Rakefile'
-
-Style/FetchEnvVar:
-  Enabled: false
-
-Style/HashSyntax:
-  Enabled: false
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-
-Layout/LineContinuationLeadingSpace:
-  Enabled: false
-
-# sane line length
-Layout/LineLength:
-  Max: 120
-  Exclude:
-    - 'features/**/*'
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# We explicitly prefer $stderr.puts over #warn
-Style/StderrPuts:
-  Enabled: false
+inherit_gem:
+  voxpupuli-rubocop: rubocop.yml

data/.rubocop_todo.yml

@@ -1,45 +1,114 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-02-14 21:55:21 UTC using RuboCop version 1.24.1.
+# on 2023-06-16 18:17:35 UTC using RuboCop version 1.50.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
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/RequireMFA:
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
   Exclude:
-    - 'modulesync.gemspec'
+    - 'lib/modulesync/renderer.rb'
 
-# Offense count: 9
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 60
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowNil.
+Lint/SuppressedException:
+  Exclude:
+    - 'Rakefile'
 
-# Offense count: 2
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
-  Max: 186
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Performance/StringInclude:
+  Exclude:
+    - 'Rakefile'
 
 # Offense count: 5
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 15
+# 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
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-Metrics/MethodLength:
-  Max: 34
+# 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'
 
-# Offense count: 4
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
+# Offense count: 11
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
   Max: 16
 
-# Offense count: 8
+# Offense count: 7
+# 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'
+
+# 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'
+
+# Offense count: 7
+# Configuration parameters: .
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+# Offense count: 6
+RSpec/MultipleExpectations:
+  Max: 2
+
+# Offense count: 10
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/unit/modulesync/settings_spec.rb'
+    - 'spec/unit/modulesync/source_code_spec.rb'
+
+# Offense count: 9
+# Configuration parameters: AllowedGroups.
+RSpec/NestedGroups:
+  Max: 5
+
+# 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'
+
+# Offense count: 9
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
@@ -50,6 +119,27 @@ Style/Documentation:
     - 'lib/modulesync/hook.rb'
     - 'lib/modulesync/renderer.rb'
     - 'lib/modulesync/util.rb'
+    - 'lib/monkey_patches.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedVars.
+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.
@@ -57,3 +147,10 @@ Style/Documentation:
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/modulesync/puppet_module.rb'
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 169

data/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.7.0](https://github.com/voxpupuli/modulesync/tree/2.7.0) (2023-06-16)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.6.0...2.7.0)
+
+**Breaking changes:**
+
+- Drop EoL Ruby 2.5/2.6 support [\#270](https://github.com/voxpupuli/modulesync/pull/270) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Update puppet-blacksmith requirement from \>= 3.0, \< 7 to \>= 3.0, \< 8 [\#268](https://github.com/voxpupuli/modulesync/pull/268) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update octokit requirement from ~\> 4.0 to \>= 4, \< 7 [\#263](https://github.com/voxpupuli/modulesync/pull/263) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [2.6.0](https://github.com/voxpupuli/modulesync/tree/2.6.0) (2023-04-14)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.5.0...2.6.0)
+
+**Implemented enhancements:**
+
+- Add Ruby 3.2 support [\#266](https://github.com/voxpupuli/modulesync/pull/266) ([bastelfreak](https://github.com/bastelfreak))
+- Update to latest RuboCop 1.28.2 [\#265](https://github.com/voxpupuli/modulesync/pull/265) ([bastelfreak](https://github.com/bastelfreak))
+
+**Fixed bugs:**
+
+- Fix compatibility with latest `ruby-git` [\#260](https://github.com/voxpupuli/modulesync/pull/260) ([alexjfisher](https://github.com/alexjfisher))
+
+**Closed issues:**
+
+- msync update --noop is broken with git 1.17.x [\#259](https://github.com/voxpupuli/modulesync/issues/259)
+
+**Merged pull requests:**
+
+- Add CI best practices [\#264](https://github.com/voxpupuli/modulesync/pull/264) ([bastelfreak](https://github.com/bastelfreak))
+- Bump actions/checkout from 2 to 3 [\#262](https://github.com/voxpupuli/modulesync/pull/262) ([dependabot[bot]](https://github.com/apps/dependabot))
+- dependabot: check for github actions and gems [\#261](https://github.com/voxpupuli/modulesync/pull/261) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [2.5.0](https://github.com/voxpupuli/modulesync/tree/2.5.0) (2022-10-14)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.4.0...2.5.0)

data/Gemfile

@@ -2,11 +2,12 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
 
-group :release do
-  gem 'github_changelog_generator', :require => false
+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 'simplecov-console', :require => false
-  gem 'codecov', :require => false
+group :coverage, optional: ENV['CODECOV'] != 'yes' do
+  gem 'codecov', require: false
+  gem 'simplecov-console', require: false
 end

data/Rakefile

@@ -9,7 +9,11 @@ rescue LoadError
   puts 'rspec not installed - skipping unit test task setup'
 end
 
-RuboCop::RakeTask.new
+begin
+  require 'voxpupuli/rubocop/rake'
+rescue LoadError
+  # RuboCop is an optional group
+end
 
 CLEAN.include('pkg/', 'tmp/')
 
@@ -18,8 +22,8 @@ Cucumber::Rake::Task.new do |t|
   t.cucumber_opts << '--format pretty'
 end
 
-task :test => %i[clean spec cucumber rubocop]
-task :default => %i[test]
+task test: %i[clean spec cucumber rubocop]
+task default: %i[test]
 
 begin
   require 'github_changelog_generator/task'
@@ -33,7 +37,7 @@ begin
 
   # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
   require 'rbconfig'
-  if RbConfig::CONFIG['host_os'] =~ /linux/
+  if /linux/.match?(RbConfig::CONFIG['host_os'])
     task :changelog do
       puts 'Fixing line endings...'
       changelog_file = File.join(__dir__, 'CHANGELOG.md')

data/features/update/pull_request.feature

@@ -32,9 +32,8 @@ Feature: Create a pull-request/merge-request after update
       """
       ---
       puppet-test:
-        gitlab: {
+        gitlab:
           base_url: 'https://gitlab.example.com'
-      }
       """
     And I set the environment variables to:
       | variable     | value  |
@@ -60,9 +59,8 @@ Feature: Create a pull-request/merge-request after update
       """
       ---
       puppet-test:
-        gitlab: {
+        gitlab:
           base_url: 'https://gitlab.example.com'
-        }
       """
     And I set the environment variables to:
       | variable     | value  |
@@ -77,9 +75,8 @@ Feature: Create a pull-request/merge-request after update
       """
       ---
       puppet-test:
-        gitlab: {
+        gitlab:
           base_url: https://gitlab.example.com
-        }
       """
     And a file named "config_defaults.yml" with:
       """