kennel 1.163.0 → 1.163.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b07d4f21ef18f6f89875f4bdb1f4ba86144d4291180ffeff34ef6c8c8b6ad01
-  data.tar.gz: e90f0c27577b343baf745b342b6eea95053b029a788bdaf740c9a1e717da0303
+  metadata.gz: 9d1c9696c979e6a8bedf59a717376cb9d483164c86683a90e2208087694c1a83
+  data.tar.gz: f8c0b7f924cb4e8e3c0c3966406b47de23e472034e6fafaef5e5817826e12bb5
 SHA512:
-  metadata.gz: 4aa14e50c3b4c17690de793c84889e0a92fa48c6d59b491226cc487de75922ec98300cdaded30781ac22f1845c14a834aa9fec0bffe2b31d72fc4726a7948d95
-  data.tar.gz: 95b2a1d28f5f98703c7ba448cf865009e9d53989bb7aec3492adddde172f032ebdae447688615e29a1d47055f785a50ee8ea9fe7278ab7c88436b5e418529c7e
+  metadata.gz: 218aefed2969de6f3ce27c2bb94248a486fc9eae81eda0cf546d0016995b92e994e8561abbece9c9b87cf64f0de8c266769d0aefb13bdeed90f989b683b06559
+  data.tar.gz: 88c1cea6f02c9952ab27de289867d2df12bbbb5e3d6bf6053145b434b34efe350e7ec01060379adee1edf244ad25ec104f9bfe03cf1fd9b1ee1e0c9db0d44979

data/lib/kennel/projects_provider.rb

@@ -13,7 +13,7 @@ module Kennel
     #   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>]
@@ -21,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
@@ -47,19 +51,18 @@ module Kennel
           projects_path = "#{File.expand_path("projects")}/"
           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)/
+            search = project_search project
+
+            # sort by name and nesting level to pick the best candidate
+            found = known_paths.grep(search).sort.sort_by { |path| path.count("/") }
 
-            if (project_path = known_paths.grep(search).sort.min_by { |path| path.count("/") })
-              require project_path
+            if found.any?
+              require found.first
+              assert_project_loaded search, found
             elsif autoload != "abort"
               Kennel.err.puts(
-                "No projects/ file matching #{search} found" \
-                  ", falling back to slow loading of all projects instead"
+                "No projects/ file matching #{search} found, falling back to slow loading of all projects instead"
               )
               loader.eager_load
               break
@@ -67,10 +70,12 @@ module Kennel
               raise AutoloadFailed, "No projects/ file matching #{search} found"
             end
           end
-        else # all projects needed
+        else
+          # all projects needed
           loader.eager_load
         end
-      else # old style without autoload to be removed eventually
+      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
@@ -99,5 +104,33 @@ module Kennel
 
       raise
     end
+
+    # - support PROJECT being used for nested folders, to allow teams to easily group their projects
+    # - support PROJECT.rb but also PROJECT/base.rb or PROJECT/project.rb
+    def project_search(project)
+      suffixes = ["base.rb", "project.rb"]
+      project_match = Regexp.escape(project.tr("-", "_")).gsub("_", "[-_/]")
+      /\/#{project_match}(\.rb|#{suffixes.map { |s| Regexp.escape "/#{s}" }.join("|")})$/
+    end
+
+    def assert_project_loaded(search, paths)
+      return if loaded_projects.any?
+      paths = paths.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:
+          #{paths.first}
+          After finding:
+          #{paths.join("\n")}
+          With regex:
+          #{search}
+        MSG
+      )
+    end
   end
 end

data/lib/kennel/version.rb

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

metadata

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