modulesync 4.0.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf27b8e1ab5da1a382062fb50cf5fef7b1c24ec6df90988b9033b03a8293a5ae
-  data.tar.gz: f45b4745c56ecb09f2e41e7b7df376fa55da074d0e7eda123428282734ed1e4f
+  metadata.gz: 79b92d3120eabd8034f28fec21a10f0a5d67327cb4317018067493260b87082d
+  data.tar.gz: 4c3fffab7cd0aa697a90164485b36efad501e6432170373aabe1e911a9d8c7c1
 SHA512:
-  metadata.gz: 04116e1a9f754869a52d7b008bc079ab5b9018fbc5a2d92a0f065a5b65dcdaf7970701e35787b2f781dc7a8b74856e7fc81c9b4bc2de76b6ac8d5006ea29dcc1
-  data.tar.gz: 5bb03dd6cfd926a4f4249647dd54b5cf088a81015d6bf5493a7e7c6cfff657597e82884421c48814aedfcf01dba4da99290c8a89f848ac8eb6d0b5bea1595477
+  metadata.gz: 98cd5f5b84af7b68b042ecb240f995e3d597eae0e9cb86eab1001f56df7ff0ac22916cd4c21654409c79955cfb74455a53a4fa748685b8764819c7dbf53f334b
+  data.tar.gz: 589f8009a87934a82935434e4e657f87065efc179e7326f713a74bf3c5c403ef3e93b11856532e3b2f5466e24d24afacceb3b2cddd82af78f52da0871a6f27c2

data/.github/workflows/ci.yml

@@ -46,6 +46,11 @@ jobs:
         run: bundle exec rake spec
       - name: Run behavior tests
         run: bundle exec cucumber
+        env:
+          GIT_COMMITTER_NAME: 'Aruba'
+          GIT_COMMITTER_EMAIL: 'aruba@example.com'
+          GIT_AUTHOR_NAME: 'Aruba'
+          GIT_AUTHOR_EMAIL: 'aruba@example.com'
       - name: Build gem
         run: gem build --strict --verbose *.gemspec
 

data/.rubocop.yml

@@ -3,6 +3,3 @@ 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 --no-auto-gen-timestamp`
-# using RuboCop version 1.79.2.
+# using RuboCop version 1.81.1.
 # 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
@@ -66,8 +66,7 @@ RSpec/NestedGroups:
   Max: 5
 
 # Offense count: 2
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata.
 RSpec/SpecFilePathFormat:
   Exclude:
     - '**/spec/routing/**/*'
@@ -108,7 +107,7 @@ Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/modulesync/puppet_module.rb'
 
-# Offense count: 6
+# Offense count: 7
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.2.0](https://github.com/voxpupuli/modulesync/tree/4.2.0) (2025-10-16)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/4.1.0...4.2.0)
+
+**Implemented enhancements:**
+
+- git: Allow 4.x [\#327](https://github.com/voxpupuli/modulesync/pull/327) ([bastelfreak](https://github.com/bastelfreak))
+- puppet-blacksmith: Allow 9.x [\#325](https://github.com/voxpupuli/modulesync/pull/325) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Update gitlab requirement from \>= 4, \< 6 to \>= 4, \< 7 [\#330](https://github.com/voxpupuli/modulesync/pull/330) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update octokit requirement from \>= 4, \< 10 to \>= 4, \< 11 [\#329](https://github.com/voxpupuli/modulesync/pull/329) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update cucumber requirement from ~\> 9.2 to ~\> 10.1 [\#328](https://github.com/voxpupuli/modulesync/pull/328) ([dependabot[bot]](https://github.com/apps/dependabot))
+- voxpupuli-rubocop: Update 4.2.0-\>5.0.0 [\#324](https://github.com/voxpupuli/modulesync/pull/324) ([bastelfreak](https://github.com/bastelfreak))
+
+## [4.1.0](https://github.com/voxpupuli/modulesync/tree/4.1.0) (2025-10-16)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/4.0.1...4.1.0)
+
+**Implemented enhancements:**
+
+- Add execute option to preserve env vars [\#321](https://github.com/voxpupuli/modulesync/pull/321) ([Joris29](https://github.com/Joris29))
+- Update git requirement from ~\> 3.0 [\#280](https://github.com/voxpupuli/modulesync/pull/280) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [4.0.1](https://github.com/voxpupuli/modulesync/tree/4.0.1) (2025-09-02)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/4.0.0...4.0.1)

data/README.md

@@ -395,6 +395,14 @@ msync update -m "Commit message" --bump --tag --tag_pattern 'v%s'
 
 The default for the tag pattern is `%s`.
 
+#### Executing bundle command with a shared bundle path and gemfile
+
+By default `msync execute` will remove bundler related env vars (^BUNDLE|^SOURCE_DATE_EPOCH$|^GEM_|RUBY), you can use `--env` flag to keep specified env vars:
+
+```
+msync execute --env BUNDLE_PATH,BUNDLE_GEMFILE bundle exec rake lint
+```
+
 #### Updating the CHANGELOG
 
 When bumping the version in `metadata.json`, modulesync can let you

data/features/cli.feature

@@ -45,5 +45,5 @@ Feature: CLI
     When I successfully run `msync update --verbose --noop --namespace fakenamespace --branch command-line-branch`
     Then the output should contain:
       """
-      Creating new branch command-line-branch
+      Creating new branch command-line-branch from master
       """

data/features/execute.feature

@@ -49,3 +49,14 @@ Feature: execute
     [--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'
+
+  Scenario: Show preserved bundle env var.
+    Given a basic setup with a puppet module "puppet-test" from "awesome"
+    And I set the environment variables to:
+      | variable   | value  |
+      | BUNLE_PATH | /opt/msync/bundle |
+    When I successfully run `msync exec --env BUNLE_PATH -- env`
+    Then the stdout should contain:
+    """
+    BUNLE_PATH=/opt/msync/bundle
+    """

data/lib/modulesync/cli.rb

@@ -184,6 +184,9 @@ module ModuleSync
              type: :boolean,
              desc: 'Abort the run after a command execution failure',
              default: CLI.defaults[:fail_fast].nil? || CLI.defaults[:fail_fast]
+      option :env,
+             aliases: '-e',
+             desc: 'Comma-separated list of environment variables to preserve.'
       def execute(*command_args)
         raise Thor::Error, 'COMMAND is a required argument' if command_args.empty?
 

data/lib/modulesync/repository.rb

@@ -145,10 +145,15 @@ 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__, 2)}/../contrib/#{options[:pre_commit_script]}"
-          `#{script} #{@directory}`
+          script = "#{File.dirname(__FILE__, 3)}/contrib/#{options[:pre_commit_script]}"
+          system(script, @directory)
+        end
+        if repo.status.changed.empty? && repo.status.added.empty? && repo.status.deleted.empty?
+          puts "There were no changes in '#{@directory}'. Not committing."
+          return false
+        else
+          repo.commit(message, opts_commit)
         end
-        repo.commit(message, opts_commit)
         if options[:remote_branch]
           if remote_branch_differ?(branch, options[:remote_branch])
             repo.push('origin', "#{branch}:#{options[:remote_branch]}", opts_push)
@@ -158,11 +163,8 @@ module ModuleSync
           repo.push('origin', branch, opts_push)
           puts "Changes have been pushed to: '#{branch}'"
         end
-      rescue Git::GitExecuteError => e
-        raise unless e.message.match?(/working (directory|tree) clean/)
-
-        puts "There were no changes in '#{@directory}'. Not committing."
-        return false
+      rescue Git::Error => e
+        raise e.message
       end
 
       true
@@ -191,7 +193,7 @@ module ModuleSync
       checkout_branch(options[:branch])
 
       $stdout.puts 'Files changed:'
-      repo.diff('HEAD', '--').each do |diff|
+      repo.diff('HEAD').each do |diff|
         $stdout.puts diff.patch
       end
 
@@ -203,7 +205,7 @@ module ModuleSync
       $stdout.puts "\n\n"
       $stdout.puts '--------------------------------'
 
-      git.diff('HEAD', '--').any? || untracked_unignored_files.any?
+      git.diff('HEAD').any? || untracked_unignored_files.any?
     end
 
     def puts(*)

data/lib/modulesync.rb

@@ -178,7 +178,7 @@ module ModuleSync
     # managed_modules is either an array or a hash
     managed_modules.each do |puppet_module|
       manage_module(puppet_module, module_files, defaults)
-    rescue ModuleSync::Error, Git::GitExecuteError => e
+    rescue ModuleSync::Error, Git::Error => e
       message = e.message || 'Error during `update`'
       warn "#{puppet_module.given_name}: #{message}"
       exit 1 unless options[:skip_broken]
@@ -216,11 +216,12 @@ module ModuleSync
       end
 
       command_args = cli_options[:command_args]
+      env_whitelist = (@options[:env] || '').split(',')
       local_script = File.expand_path command_args[0]
       command_args[0] = local_script if File.exist?(local_script)
 
-      # Remove bundler-related env vars to allow the subprocess to run `bundle`
-      command_env = ENV.reject { |k, _v| k.match?(/(^BUNDLE|^SOURCE_DATE_EPOCH$|^GEM_|RUBY)/) }
+      # Remove bundler-related env vars to allow the subprocess to run `bundle` unless explicitly whitelisted.
+      command_env = ENV.reject { |k, _v| k.match?(/(^BUNDLE|^SOURCE_DATE_EPOCH$|^GEM_|RUBY)/) && !env_whitelist.include?(k) }
 
       result = system command_env, *command_args, unsetenv_others: true, chdir: puppet_module.working_directory
       unless result

data/lib/monkey_patches.rb

@@ -2,9 +2,9 @@
 
 module Git
   module LibMonkeyPatch
-    # Monkey patch set_custom_git_env_variables due to our ::Git::GitExecuteError handling.
+    # Monkey patch set_custom_git_env_variables due to our ::Git::Error handling.
     #
-    # We rescue on the GitExecuteError and proceed differently based on the output of git.
+    # We rescue on the Git::Error and proceed differently based on the output of git.
     # This way makes code language-dependent, so here we ensure that Git gem throw git commands with the "C" language
     def set_custom_git_env_variables
       super

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               = '4.0.1'
+  spec.version               = '4.2.0'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
@@ -19,14 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'aruba', '~>2.0'
-  spec.add_development_dependency 'cucumber', '~> 9.2'
+  spec.add_development_dependency 'cucumber', '~> 10.1'
   spec.add_development_dependency 'rake', '~> 13.2', '>= 13.2.1'
   spec.add_development_dependency 'rspec', '~> 3.13'
-  spec.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 5.0.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'
+  spec.add_dependency 'git', '>= 3.0', '< 5'
+  spec.add_dependency 'gitlab', '>=4', '<7'
+  spec.add_dependency 'octokit', '>=4', '<11'
+  spec.add_dependency 'puppet-blacksmith', '>= 3.0', '< 10'
   spec.add_dependency 'thor', '~> 1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.2'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.2'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -77,28 +77,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +114,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -118,7 +124,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +134,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +144,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +154,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -158,7 +164,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement