kube_schema 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9946ce747cc72c7fd6ca85a8427daf711844160d0fd932e2ee0adaba687f4982
-  data.tar.gz: 3b4843e1165f6ac2a61ded6415851d80a9515b4e7f0a533be9940560e55446ca
+  metadata.gz: ff3fedb44c520fb2db66f16b3ae12b6b4fbe3d8a947e636da9c196fa9e80c529
+  data.tar.gz: ca30582966d7fa750b14ef69d935a24ea2532d1b9b5eb330df9b611d1894a675
 SHA512:
-  metadata.gz: f369dd4d71f53dc8ce4ad7b310c992283cabda559d0f493017400418043f69d5f340b6f8642b6e34a61db9610be206defdb5deeb6ac01f5f9e1f97f2dd3665bf
-  data.tar.gz: 52cdb3057cd53c1ae36c1be4115d03ff353ec39707bf07f11ce7d7c0732de8c56a2ff2c5f5be8bfe0f244bef4fea82d54f33b407909bb61a9e9c5da0fb3884e3
+  metadata.gz: 199d71dcee2dc211d5bc06a5d748e1019a2df409d7dbfc086d9b3c397c8f7c72ddc4143739e8418d366799e5ec3c5dafa46e693f09722aaf0c7ca8138633f588
+  data.tar.gz: cf5ed7f39324cdd202585edc0aa5b52825c746daee4776d2900d9dc4b2b4f353dd854d986100b61b2815c9949f3cedbfaa74696296f320ff07a08c3e7a8c86f4

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    kube_schema (1.9.0)
+    kube_schema (1.9.2)
       json_schemer (~> 2.5.0)
       rubyshell (~> 1.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.3)
     async (2.39.0)
       console (~> 1.29)
       fiber-annotation
@@ -106,8 +105,6 @@ GEM
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
-    language_server-protocol (3.17.0.5)
-    lint_roller (1.1.0)
     localhost (1.7.0)
     logger (1.7.0)
     mail (2.9.0)
@@ -135,10 +132,6 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     openssl (4.0.1)
-    parallel (2.0.1)
-    parser (3.3.11.1)
-      ast (~> 2.4.1)
-      racc
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
@@ -158,13 +151,11 @@ GEM
     psych (5.3.1)
       date
       stringio
-    racc (1.8.1)
     rack (3.2.6)
     rackula (1.4.1)
       falcon (~> 0.46)
       samovar (~> 2.1)
       variant
-    rainbow (3.1.1)
     rake (13.4.2)
     rbs (4.0.2)
       logger
@@ -190,21 +181,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.86.1)
-      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
-      parallel (>= 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.49.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
-      parser (>= 3.3.7.2)
-      prism (~> 1.7)
-    ruby-progressbar (1.13.0)
     rubyshell (1.5.0)
     rugged (1.9.0)
     samovar (2.4.1)
@@ -217,9 +193,6 @@ GEM
     timeout (0.6.1)
     traces (0.18.2)
     tsort (0.2.0)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.2.0)
     utopia (2.32.1)
       bake (~> 0.20)
       concurrent-ruby (~> 1.2)
@@ -258,7 +231,6 @@ DEPENDENCIES
   kube_schema!
   rake (~> 13.0)
   rspec (~> 3.13)
-  rubocop (~> 1.21)
   utopia-project
 
 BUNDLED WITH

data/kube_schema.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec", "~> 3.13"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rubocop", "~> 1.21"
 
   spec.add_dependency "rubyshell", "~> 1.5.0"
   spec.add_dependency "json_schemer", "~> 2.5.0"

data/lib/kube/schema/instance.rb

@@ -66,6 +66,12 @@ module Kube
                 "\nExpected \"group/version/kind\" or \"version/kind\"."
             end
 
+            # Custom schemas take precedence on full-GVK lookups too.
+            custom = find_custom_entry_by_gvk(group, version, kind)
+            if custom
+              return build_resource_class(custom[:schema], custom[:defaults])
+            end
+
             entry = find_gvk_entry_by_full_gvk(group, version, kind)
           else
             # Kind-only lookup — custom schemas take precedence.
@@ -92,7 +98,8 @@ module Kube
       #
       # @return [Array<String>] sorted kind names
       def list_resources
-        (gvk_index.keys + Schema.custom_schemas.keys).uniq.sort
+        custom_kinds = Schema.custom_schemas.values.map { |v| v[:defaults]["kind"] }
+        (gvk_index.keys + custom_kinds).uniq.sort
       end
 
       # Look up a sub-spec definition by short name (e.g. "Container",
@@ -243,19 +250,25 @@ module Kube
           end
         end
 
-        # Find a custom schema entry by kind (case-insensitive).
+        # Find a custom schema entry by kind (case-insensitive). The registry
+        # is keyed by full GVK, so match on each entry's recorded kind. When
+        # several groups register the same kind, the first registered wins.
         # Returns the { schema:, defaults: } hash or nil.
         def find_custom_entry(kind)
           registry = Schema.custom_schemas
-          return registry[kind] if registry.key?(kind)
-
-          registry.each do |k, v|
-            return v if k.downcase == kind.downcase
-          end
+          registry.each_value { |v| return v if v[:defaults]["kind"] == kind }
+          registry.each_value { |v| return v if v[:defaults]["kind"].casecmp?(kind) }
 
           nil
         end
 
+        # Find a custom schema entry by exact group, version, and kind.
+        # Returns the { schema:, defaults: } hash or nil.
+        def find_custom_entry_by_gvk(group, version, kind)
+          api_version = group.empty? ? version : "#{group}/#{version}"
+          Schema.custom_schemas["#{api_version}/#{kind}"]
+        end
+
         # Build a Resource subclass from a JSONSchemer instance and defaults hash.
         def build_resource_class(schema_instance, defaults)
           Class.new(::Kube::Schema::Resource) do

data/lib/kube/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Kube
   module Schema
-    VERSION = "1.9.0"
+    VERSION = "1.9.2"
   end
 end

data/lib/kube/schema.rb

@@ -74,7 +74,12 @@ module Kube
               "schema must be a Hash, a JSON string, or a file path — got #{schema.class}"
           end
 
-        @custom_schemas[kind] = {
+        # Key by full GVK ("group/version/Kind") so a registered CRD resolves
+        # on fully-qualified lookups (e.g. the api_version/kind path that
+        # Resource#rebuild reconstructs), not just kind-only lookups. Keying by
+        # bare kind also collided when two CRDs shared a kind across groups.
+        key = api_version ? "#{api_version}/#{kind}" : kind
+        @custom_schemas[key] = {
           schema: JSONSchemer.schema(parsed),
           defaults: { "apiVersion" => api_version, "kind" => kind }.freeze
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kube_schema
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - Nathan K
@@ -37,20 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: rubyshell
   requirement: !ruby/object:Gem::Requirement