modulesync 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42cf2d8364d939be480302cbb0856e69df96468c5b35a460c29380dbb1455049
-  data.tar.gz: 93ee25b205bd960afe750188b5e1bf7c640aace8bdb91aac8345aed93d980a23
+  metadata.gz: b2b460c8084356169de564afc59efed808706c5a08aa3501f8fe1f6f3930fbd3
+  data.tar.gz: 637c12c11b80a3545949cb8e28e3c941e522d9b41fb2a7ba180a9a51e832b223
 SHA512:
-  metadata.gz: de6493978a435981fdc1b28bb0d937df4631f8eea6cdfe820bfb543b829a1c51d77672f31e510caaf18ef62754ead0988beab47040ad1ecc8c6e75723517d3fa
-  data.tar.gz: 46094244ce217f1e3dfbfd57d87b6aba64d0533dfe42b94d96ef48a66d2ef17dcc0cae9e24e08d54344bb0b9fa1553f1eb8898170489b0b79bfc9fab9acb5081
+  metadata.gz: 431a276bdaa1fef73a7cc9d670d5c7ee398c7eb82a84e32dd9ce14959d7f001656f7b8bada9d906f76d42ae51affa9298e9b03d629c54ae497b03485d63cc4c1
+  data.tar.gz: e9a0a7842ff1f908a7ffc81f99045186068919b052c5ffd0f4ed886d50ae1e6fd4338726db141333e0326221b79077b837e7e65da0f93bd032677f20c218e8ee

data/.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup ruby
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@e8944e80fb94b20106697132f8c20c665fab29e9 # v1.325.0
         with:
           ruby-version: "3.4"
           bundler-cache: true
@@ -38,7 +38,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@e8944e80fb94b20106697132f8c20c665fab29e9 # v1.325.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

data/.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Ruby
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@e8944e80fb94b20106697132f8c20c665fab29e9 # v1.325.0
         with:
           ruby-version: 'ruby'
       - name: Build gem
@@ -96,7 +96,7 @@ jobs:
         with:
           name: gem-artifact
       - name: Install Ruby
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@e8944e80fb94b20106697132f8c20c665fab29e9 # v1.325.0
         with:
           ruby-version: 'ruby'
       - name: Wait for release to propagate

data/CHANGELOG.md

@@ -2,9 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.6.0](https://github.com/voxpupuli/modulesync/tree/4.6.0) (2026-07-31)
+## [4.6.1](https://github.com/voxpupuli/modulesync/tree/4.6.1) (2026-09-25)
 
-[Full Changelog](https://github.com/voxpupuli/modulesync/compare/v4.5.0...4.6.0)
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/v4.6.0...4.6.1)
+
+**Fixed bugs:**
+
+- fix: rebase existing remote branches after a fresh clone [\#376](https://github.com/voxpupuli/modulesync/pull/376) ([rwaffen](https://github.com/rwaffen))
+
+## [v4.6.0](https://github.com/voxpupuli/modulesync/tree/v4.6.0) (2026-07-31)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/v4.5.0...v4.6.0)
 
 **Implemented enhancements:**
 

data/lib/modulesync/repository.rb

@@ -105,16 +105,17 @@ module ModuleSync
         puts "Overriding any local changes to repository in '#{@directory}'"
         git.fetch 'origin', prune: true unless operate_offline
         git.reset_hard
-        rebase_target = remote_default_branch if rebase && !operate_offline
         switch(branch: branch)
         git.pull('origin', branch) if !operate_offline && remote_branch_exists?(branch)
-        rebase_onto(rebase_target) if rebase_target
       else
         raise ModuleSync::Error, 'Unable to clone in offline mode.' if operate_offline
 
         clone
         switch(branch: branch)
       end
+
+      rebase_target = remote_default_branch if rebase && !operate_offline
+      rebase_onto(rebase_target) if rebase_target
     end
 
     def rebase_onto(branch)

data/lib/modulesync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ModuleSync
-  VERSION = '4.6.0'
+  VERSION = '4.6.1'
 end

data/spec/unit/module_sync/repository_spec.rb

@@ -73,6 +73,50 @@ describe ModuleSync::Repository do
   end
 
   describe '#prepare_workspace' do
+    context 'with a fresh clone and an existing remote modulesync branch' do
+      before do
+        allow(Dir).to receive(:exist?).with('/tmp/example/.git').and_return(false)
+        allow(Git).to receive(:clone).with('https://github.com/example/repository.git', '/tmp/example').and_return(git)
+        allow(Git).to receive(:default_branch).with('https://github.com/example/repository.git').and_return('main')
+        allow(git).to receive(:current_branch).and_return('main', 'modulesync')
+        allow(branches).to receive(:local).and_return([])
+        allow(git).to receive(:checkout).with('origin/modulesync')
+        allow(git).to receive(:branch).with('modulesync').and_return(instance_double(Git::Branch, checkout: true))
+        allow(log).to receive(:between).with('modulesync', 'origin/main').and_return(log)
+        allow(log).to receive(:execute).and_return([instance_double(Git::Object::Commit)])
+      end
+
+      it 'rebases and pushes the existing branch even when rendering makes no file changes' do
+        allow(git).to receive(:status).and_return(instance_double(Git::Status, added: {}, changed: {}, deleted: {}))
+        expect(git).to receive(:checkout).with('origin/modulesync').ordered
+        expect(git_lib).to receive(:send).with(:command, 'rebase', 'origin/main').ordered
+        expect(git_lib).to receive(:send).with(:command, 'push', '--force-with-lease', 'origin', 'modulesync').ordered
+
+        repository.prepare_workspace(branch: 'modulesync', operate_offline: false, rebase: true)
+
+        expect(repository.submit_changes([], branch: 'modulesync', message: 'Update', force: false)).to be true
+      end
+
+      it 'does not rebase unless requested' do
+        expect(Git).not_to receive(:default_branch)
+        expect(git_lib).not_to receive(:send)
+
+        repository.prepare_workspace(branch: 'modulesync', operate_offline: false)
+      end
+    end
+
+    it 'does not rebase an existing workspace in offline mode' do
+      allow(Dir).to receive(:exist?).with('/tmp/example/.git').and_return(true)
+      allow(git).to receive(:current_branch).and_return('modulesync')
+      expect(git).to receive(:reset_hard)
+      expect(git).not_to receive(:fetch)
+      expect(git).not_to receive(:pull)
+      expect(Git).not_to receive(:default_branch)
+      expect(git_lib).not_to receive(:send)
+
+      repository.prepare_workspace(branch: 'modulesync', operate_offline: true, rebase: true)
+    end
+
     it 'fetches and rebases the selected branch onto the remote default branch when requested' do
       allow(Dir).to receive(:exist?).with('/tmp/example/.git').and_return(true)
       allow(Git).to receive(:default_branch).with('https://github.com/example/repository.git').and_return('main')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Puppet Module Synchronizer
 test_files: []