kennel 1.157.0 → 1.159.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0eb799adf9a9e41a5b3220147a7e348ee75583e642d0ee9aa1db6ca2a021028
-  data.tar.gz: 804bd718f42d35986d42ab53df20cd4ae97611f6e665553050812e24b653b833
+  metadata.gz: afa96484d3351de6a715ca440d8a22d3eb81012866a08987b0ddce36b568ae48
+  data.tar.gz: 5f8d189f4447e998711ae07a1ee245c56c0453569a5a43e12ca8a9e9c3184030
 SHA512:
-  metadata.gz: 90dccebc1bba4e4ed329cbd3a495c7808c5ee37ea5b8705e64fc132de9ea3cb62f6f49cfc4e949c77364922ff6032609fa4c3e654ce0033e3b4be81ce2475084
-  data.tar.gz: a5ba017d7c0887cd25ef7c9ce4effeba46dbc527c0705829cda5ce0f6deddd32fadda3856b9163ed245032c94d75e5d60bd91dcb614716da4760d956b231bb51
+  metadata.gz: a3886ae264c55d8112de1f16e7d0af92b97d1ecbf470219ff7131cb45df6fa115ef14142cc3c31056e88a135bb2c4091d15fd9a160a624875f2758db23ad70d8
+  data.tar.gz: 072d6d09e64c55e1a0c167ec884dfcf17102c05fdba614b5bbc1132e3c582cb5699c6bfdf1faf4d6a5d5d0b7b702adbc94b82753b20530d1d3d435593cea774a

data/lib/kennel/importer.rb

@@ -2,12 +2,9 @@
 
 module Kennel
   class Importer
-    # title will have the lock symbol we need to remove when re-importing
-    TITLES = [:name, :title].freeze
-
     # bring important fields to the top
     SORT_ORDER = [
-      *TITLES, :id, :kennel_id, :type, :tags, :query, :sli_specification,
+      *Kennel::Models::Record::TITLE_FIELDS, :id, :kennel_id, :type, :tags, :query, :sli_specification,
       *Models::Record.subclasses.flat_map { |k| k::TRACKING_FIELDS },
       :template_variables
     ].freeze
@@ -31,9 +28,10 @@ module Kennel
       model.normalize({}, data) # removes id
       data[:id] = id
 
-      title_field = TITLES.detect { |f| data[f] }
+      # title will have the lock symbol we need to remove when re-importing
+      title_field = Kennel::Models::Record::TITLE_FIELDS.detect { |f| data[f] }
       title = data.fetch(title_field)
-      title.tr!(Kennel::Models::Record::LOCK, "") # avoid double lock icon
+      title.tr!(Kennel::Models::Record::LOCK, "")
 
       # calculate or reuse kennel_id
       data[:kennel_id] =

data/lib/kennel/models/record.rb

@@ -26,6 +26,7 @@ module Kennel
         :deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at,
         :klass, :tracking_id # added by syncer.rb
       ].freeze
+      TITLE_FIELDS = [:name, :title].freeze # possible fields that could have the title
       ALLOWED_KENNEL_ID_CHARS = "a-zA-Z_\\d.-"
       ALLOWED_KENNEL_ID_SEGMENT = /[#{ALLOWED_KENNEL_ID_CHARS}]+/
       ALLOWED_KENNEL_ID_FULL = "#{ALLOWED_KENNEL_ID_SEGMENT}:#{ALLOWED_KENNEL_ID_SEGMENT}".freeze

data/lib/kennel/projects_provider.rb

@@ -31,15 +31,19 @@ module Kennel
           # 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)/
+
           projects_path = "#{File.expand_path("projects")}/"
-          project_path = loader.all_expected_cpaths.each_key.select do |path|
-            path.start_with?(projects_path) && path.end_with?("/#{project}.rb", "/#{project}/project.rb")
+          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
           else
             Kennel.err.puts(
-              "No file named #{project}.rb or #{project}/project.rb" \
+              "No projects/ file matching #{search} found" \
               ", falling back to slow loading of all projects instead"
             )
             loader.eager_load

data/lib/kennel/syncer.rb

@@ -89,6 +89,24 @@ module Kennel
 
         # see which expected match the actual
         matching, unmatched_expected, unmatched_actual = MatchedExpected.partition(expected, actual)
+        unmatched_actual.select! { |a| a.fetch(:tracking_id) } # ignore items that were never managed by kennel
+
+        # if there is a new item that has the same name/title as a to be deleted item, we should just update it
+        # careful with unmatched_expected being huge since it has all api resources
+        unmatched_expected.reject! do |e|
+          actual = unmatched_actual.detect do |a|
+            a[:klass] == e.class &&
+              Kennel::Models::Record::TITLE_FIELDS.any? { |f| (set = a[f]) && set == e.as_json.fetch(f) }
+          end
+          next false unless actual # keep in unmatched
+
+          unmatched_actual.delete(actual)
+          actual[:tracking_id] = e.tracking_id
+          matching << [e, actual]
+
+          true # remove from unmatched
+        end
+
         validate_expected_id_not_missing unmatched_expected
         fill_details! matching # need details to diff later
 
@@ -105,7 +123,7 @@ module Kennel
         end.compact
 
         # delete previously managed
-        deletes = unmatched_actual.map { |a| Types::PlannedDelete.new(a) if a.fetch(:tracking_id) }.compact
+        deletes = unmatched_actual.map { |a| Types::PlannedDelete.new(a) }
 
         # unmatched expected need to be created
         unmatched_expected.each(&:add_tracking_id)

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.157.0
+  version: 1.159.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs