ra10ke 3.1.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e3e814da82c6aa4acbd3b7f4f0adddc230a8dbbed906b0f35287356249a102f
-  data.tar.gz: 3f771cc808fd040e6ff7e2dce5a53d0c6efe5353c3389169898586fb050846aa
+  metadata.gz: 883f171a01c0e4fadfaf85ad6e86fc26cc648886deef0d4928077c5aa4178427
+  data.tar.gz: 272ffe0a099bf72503576027f5e5fbd86c282c0755d026828690676976eefbc6
 SHA512:
-  metadata.gz: 264f9fe9cf6e5ee0720d2b9058f1f0589bae6bbc7258eb6a25918d57379e6db06cda9653b4331f2d9a6627d3b900e6500476485f9f3dc41df850349adc4ba499
-  data.tar.gz: ba106d764f979704fdbd79e07906438791d9f4b33021731a3006e49fa252ecae98a73dd0010e5152faf4b6f002d184f4a7f90a11ad95d1ce8b68222fee9673c4
+  metadata.gz: 388664a62dc656b87ac830756692c1f3bfa06ec51a19575d09b68f540ce8c34d4b466383dc42ae6b1fe31c8bac8e9d412e687915ac8708c474aff86ce6608c51
+  data.tar.gz: 90280754dec37c6e0f307559541a6f385e39d09af7767702d360d8fb6a94c66b41388b49d11a39749613348ce36107444d93dc6b6c3cb2d57e96b772d5a47831

data/.github/workflows/test.yml

@@ -27,12 +27,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.7"
-          - ruby: "3.0"
           - ruby: "3.1"
             coverage: "yes"
           - ruby: "3.2"
           - ruby: "3.3"
+          - ruby: "3.4"
     env:
       COVERAGE: ${{ matrix.coverage }}
     name: Ruby ${{ matrix.ruby }}

data/.rubocop.yml

@@ -3,3 +3,6 @@ inherit_from: .rubocop_todo.yml
 
 inherit_gem:
   voxpupuli-rubocop: rubocop.yml
+
+AllCops:
+  TargetRubyVersion: '3.1'

data/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 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)
+
+**Breaking changes:**
+
+- Require Ruby 3.1 & puppet\_forge 6 & r10k 5 [\#106](https://github.com/voxpupuli/ra10ke/pull/106) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Update pry requirement from ~\> 0.14.2 to ~\> 0.15.2 [\#114](https://github.com/voxpupuli/ra10ke/pull/114) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Cleanup Rakefile; remove unused rake tasks [\#109](https://github.com/voxpupuli/ra10ke/pull/109) ([bastelfreak](https://github.com/bastelfreak))
+- Update voxpupuli-rubocop requirement from ~\> 2.8.0 to ~\> 3.0.0 [\#108](https://github.com/voxpupuli/ra10ke/pull/108) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [v3.1.0](https://github.com/voxpupuli/ra10ke/tree/v3.1.0) (2024-06-28)
 
 [Full Changelog](https://github.com/voxpupuli/ra10ke/compare/v3.0.0...v3.1.0)

data/Rakefile

@@ -1,14 +1,5 @@
-require 'rake'
-require 'rake/clean'
-require 'rubygems'
-require 'bundler/gem_tasks'
-require 'fileutils'
-require 'rspec/core'
 require 'rspec/core/rake_task'
 
-CLEAN.include('pkg/', 'tmp/')
-CLOBBER.include('Gemfile.lock')
-
 task default: [:spec]
 
 RSpec::Core::RakeTask.new(:spec) do |spec|

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 = '3.1.0'
+  VERSION = '4.1.0'
 end

data/ra10ke.gemspec

@@ -14,17 +14,17 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
   spec.add_dependency 'git', '>= 1.18', '< 3.0'
-  spec.add_dependency 'puppet_forge', '~> 5.0', '>= 5.0.1'
-  spec.add_dependency 'r10k', '>= 2.6.5', '< 5'
+  spec.add_dependency 'puppet_forge', '~> 6.0'
+  spec.add_dependency 'r10k', '~> 5.0'
   spec.add_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_dependency 'semverse', '>= 2.0', '< 4'
   spec.add_dependency 'solve', '~> 4.0', '>= 4.0.4'
   spec.add_dependency 'table_print', '~> 1.5.6'
-  spec.add_development_dependency 'pry', '~> 0.14.2'
+  spec.add_development_dependency 'pry', '~> 0.15.2'
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
-  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.8.0'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 3.0.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ra10ke
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Theo Chatzimichos
 - Vox Pupuli
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -37,40 +37,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,14 +139,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -193,14 +181,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.0.0
 description: R10K and Puppetfile rake tasks
 email:
 - voxpupuli@groups.io
@@ -258,7 +246,7 @@ homepage: https://github.com/voxpupuli/ra10ke
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -266,15 +254,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Syntax check for the Puppetfile, check for outdated installed puppet modules
 test_files: []