kennel 1.162.0 → 1.163.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8412928c5e979ad1f46ac333e0f51a9d2601fa435a6ec2951390211515b0b35b
-  data.tar.gz: 2d25fbf232b3d784f3ea04ff51a38aeea2c7f034969e2065c4ddbb6dbbd3ea99
+  metadata.gz: 81d0c04d0d3a16c2c46d12aa217e5c5353702a613af3a0d3fea52832839ebd12
+  data.tar.gz: 4619a82006932e5d0dc4782488b1caec8a789ab4614b8968185ba41defd768d7
 SHA512:
-  metadata.gz: 320fbf356dbfb89826f99b7a3b90f3f41af07022b8ab783b546af7cb6a7430081fa955431bfd642fbda50de31e6308b863912c9c6d0af768622ff2f9b302b4e1
-  data.tar.gz: ef91e1bebe47fd623d65a5a308c726930e077632ac3b993241986f8625b695312789675e2bc5de4ee55ea2bfc1828252e110fbc65f81b91307ba0f6773efaf9f
+  metadata.gz: 87bb834a983a635134521548d01f278dcd26c93cbb88c5e929ca3a7a454b241dfccd5e74ec65936c61120d9785dbab027c028c12a35fbb9b481efb0bd4bde157
+  data.tar.gz: 94abdde8bf155cd9ea7a6ed74d3e7216937af142224b2e8e7766b0506874d7abfa9c494c05716f365644272e439bece107126c9edae038ca79e919fd00939db3

data/lib/kennel/filter.rb

@@ -2,6 +2,8 @@
 
 module Kennel
   class Filter
+    attr_reader :project_filter
+
     def initialize
       # read early so we fail fast on invalid user input
       @tracking_id_filter = read_tracking_id_filter_from_env
@@ -39,7 +41,7 @@ module Kennel
 
     private
 
-    attr_reader :project_filter, :tracking_id_filter
+    attr_reader :tracking_id_filter
 
     # needs to be called after read_tracking_id_filter_from_env
     def read_project_filter_from_env

data/lib/kennel/projects_provider.rb

@@ -4,12 +4,16 @@ module Kennel
     class AutoloadFailed < StandardError
     end
 
+    def initialize(filter:)
+      @filter = filter
+    end
+
     # @return [Array<Models::Project>]
     #   All projects in the system. This is a slow operation.
     #   Use `projects` to get all projects in the system.
     def all_projects
       load_all
-      Models::Project.recursive_subclasses.map(&:new)
+      loaded_projects.map(&:new)
     end
 
     # @return [Array<Models::Project>]
@@ -17,11 +21,15 @@ module Kennel
 
     def projects
       load_all
-      Models::Project.recursive_subclasses.map(&:new)
+      loaded_projects.map(&:new)
     end
 
     private
 
+    def loaded_projects
+      Models::Project.recursive_subclasses
+    end
+
     # load_all's purpose is to "require" all the .rb files under './projects',
     # while allowing them to resolve reference to ./teams and ./parts via autoload
     def load_all
@@ -39,33 +47,52 @@ module Kennel
         loader.push_dir("projects")
         loader.setup
 
-        if (project = ENV["PROJECT"]) # TODO: use project filter instead and also support TRACKING_ID
-          # we support PROJECT being used for nested folders, to allow teams to easily group their projects
-          # so when loading a project we need to find anything that could be a project source
-          # sorting by name and nesting level to avoid confusion
-          segments = project.split("_")
-          search = /#{segments[0...-1].map { |p| "#{p}[_/]" }.join}#{segments[-1]}(\.rb|\/project\.rb|\/base\.rb)/
-
+        if (projects = @filter.project_filter)
           projects_path = "#{File.expand_path("projects")}/"
-          known_paths = loader.all_expected_cpaths.keys
-          project_path = known_paths.select do |path|
-            path.start_with?(projects_path) && path.match?(search)
-          end.sort.min_by { |p| p.count("/") }
-          if project_path
-            require project_path
-          elsif autoload != "abort"
-            Kennel.err.puts(
-              "No projects/ file matching #{search} found" \
-              ", falling back to slow loading of all projects instead"
-            )
-            loader.eager_load
-          else
-            raise AutoloadFailed, "No projects/ file matching #{search} found"
+          known_paths = loader.all_expected_cpaths.keys.select! { |path| path.start_with?(projects_path) }
+
+          # - we support PROJECT being used for nested folders, to allow teams to easily group their projects
+          # - when loading a project we need to find anything that could be a project source
+          #   sorting by name and nesting level to avoid confusion
+          projects.each do |project|
+            segments = project.tr("-", "_").split("_")
+            search = /#{segments[0...-1].map { |part| "#{part}[_/]" }.join}#{segments[-1]}(\.rb|\/project\.rb|\/base\.rb)/
+            found = known_paths.grep(search).sort.sort_by { |path| path.count("/") }
+            if found.any?
+              require found.first
+              if loaded_projects.empty?
+                found.map! { |path| path.sub("#{Dir.pwd}/", "") }
+                raise(
+                  AutoloadFailed,
+                  <<~MSG
+                    No project found in loaded files!
+                    Ensure the project file you want to load is first in the list,
+                    list is sorted alphabetically and by nesting level.
+
+                    Loaded:
+                    #{found.first}
+                    After finding:
+                    #{found.join("\n")}
+                    With regex:
+                    #{search}
+                  MSG
+                )
+              end
+            elsif autoload != "abort"
+              Kennel.err.puts(
+                "No projects/ file matching #{search} found" \
+                  ", falling back to slow loading of all projects instead"
+              )
+              loader.eager_load
+              break
+            else
+              raise AutoloadFailed, "No projects/ file matching #{search} found"
+            end
           end
         else # all projects needed
           loader.eager_load
         end
-      else # old style without autoload
+      else # old style without autoload to be removed eventually
         loader.setup
         loader.eager_load # TODO: this should not be needed but we see hanging CI processes when it's not added
         # TODO: also auto-load projects and update expected path too

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.162.0"
+  VERSION = "1.163.1"
 end

data/lib/kennel.rb

@@ -107,7 +107,7 @@ module Kennel
     def generated(**kwargs)
       @generated ||= begin
         projects = Progress.progress "Loading projects", **kwargs do
-          projects = ProjectsProvider.new.projects
+          projects = ProjectsProvider.new(filter: filter).projects
           filter.filter_projects projects
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.162.0
+  version: 1.163.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-26 00:00:00.000000000 Z
+date: 2025-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs