ra10ke 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243d5bb6ab67f59d83bd35459b5b3298e8dc7e4cbf1fd7ee9b43cc94f8e82cc0
-  data.tar.gz: c669f309afdf94e8161e3172a0480297d2004813d919495ed146774fb77c8630
+  metadata.gz: 883f171a01c0e4fadfaf85ad6e86fc26cc648886deef0d4928077c5aa4178427
+  data.tar.gz: 272ffe0a099bf72503576027f5e5fbd86c282c0755d026828690676976eefbc6
 SHA512:
-  metadata.gz: 40d61d18fd971499b78b1b99a1b62113308df55459ff1c9f77dcd2e8b5e6db3103f4470a5854f0d39ccbe79f4202948d82619f1c4710e2c7d314f7d75d22247f
-  data.tar.gz: c11c06f6183dec11f793d92ec3d8f53e45a40b1d8edd81245153e49abbefda6181dca344d9891569a5b7c13b41aaeaeb93d1baf362de22a6b58d44d0a4fb557b
+  metadata.gz: 388664a62dc656b87ac830756692c1f3bfa06ec51a19575d09b68f540ce8c34d4b466383dc42ae6b1fe31c8bac8e9d412e687915ac8708c474aff86ce6608c51
+  data.tar.gz: 90280754dec37c6e0f307559541a6f385e39d09af7767702d360d8fb6a94c66b41388b49d11a39749613348ce36107444d93dc6b6c3cb2d57e96b772d5a47831

data/.github/workflows/test.yml

@@ -31,6 +31,7 @@ jobs:
             coverage: "yes"
           - ruby: "3.2"
           - ruby: "3.3"
+          - ruby: "3.4"
     env:
       COVERAGE: ${{ matrix.coverage }}
     name: Ruby ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v4.1.0](https://github.com/voxpupuli/ra10ke/tree/v4.1.0) (2025-01-08)
+
+[Full Changelog](https://github.com/voxpupuli/ra10ke/compare/v4.0.0...v4.1.0)
+
+**Implemented enhancements:**
+
+- Add Ruby 3.4 support [\#119](https://github.com/voxpupuli/ra10ke/pull/119) ([bastelfreak](https://github.com/bastelfreak))
+- Improve dependencies check against :control\_branch [\#116](https://github.com/voxpupuli/ra10ke/pull/116) ([ananace](https://github.com/ananace))
+
+**Fixed bugs:**
+
+- Fix false positive errors when ra10ke tries to validate modules with  `branch: :control_branch` [\#117](https://github.com/voxpupuli/ra10ke/issues/117)
+
 ## [v4.0.0](https://github.com/voxpupuli/ra10ke/tree/v4.0.0) (2025-01-02)
 
 [Full Changelog](https://github.com/voxpupuli/ra10ke/compare/v3.1.0...v4.0.0)

data/lib/ra10ke/dependencies.rb

@@ -59,10 +59,12 @@ module Ra10ke::Dependencies
     # @note does not include ignored modules or modules up2date
     def processed_modules(supplied_puppetfile = puppetfile)
       threads = []
-      threads = supplied_puppetfile.modules.map do |puppet_module|
-        Thread.new do
-          next if ignored_modules.include? puppet_module.title
+      supplied_puppetfile.modules.each do |puppet_module|
+        next if ignored_modules.include? puppet_module.title
+        # Ignore modules where ref is explicitly set to control branch
+        next if puppet_module.instance_of?(R10K::Module::Git) && puppet_module.desired_ref == :control_branch
 
+        threads << Thread.new do
           if puppet_module.instance_of?(::R10K::Module::Forge)
             module_name = puppet_module.title.tr('/', '-')
             forge_version = ::PuppetForge::Module.find(module_name).current_release.version
@@ -76,8 +78,7 @@ module Ra10ke::Dependencies
             }
 
           elsif puppet_module.instance_of?(R10K::Module::Git)
-            # use helper; avoid `desired_ref`
-            # we do not want to deal with `:control_branch`
+            # use helper; let r10k figure out correct ref
             ref = puppet_module.version
             next unless ref
 
@@ -185,6 +186,24 @@ module Ra10ke::Dependencies
     task :dependencies do
       PuppetForge.user_agent = "ra10ke/#{Ra10ke::VERSION}"
       puppetfile = get_puppetfile
+      if puppetfile.respond_to? :environment=
+        # Use a fake environment object to reduce log spam and keep :control_branch reference for R10k >= 3.10.0
+        fake_env = Object.new
+        fake_env.instance_eval do
+          def module_conflicts?(*)
+            false
+          end
+
+          def name
+            'test'
+          end
+
+          def ref
+            :control_branch
+          end
+        end
+        puppetfile.environment = fake_env
+      end
       PuppetForge.host = puppetfile.forge if /^http/.match?(puppetfile.forge)
       dependencies = Ra10ke::Dependencies::Verification.new(puppetfile)
       dependencies.print_table(dependencies.outdated)

data/lib/ra10ke/version.rb

@@ -1,3 +1,3 @@
 module Ra10ke
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ra10ke
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Theo Chatzimichos
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git