kube-dsl 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7366ef5120f332ba7dd2a4972a05016fe8ac2af4b254c8b3b86a845604b068e
-  data.tar.gz: baa911f8b536a492132ef7f67154956cb3194e13484b93bffcd7abdb65a64fcc
+  metadata.gz: b7a616f5571a180de6f04decd298d902b823148b10596292fa69ab68ce7f2ddb
+  data.tar.gz: 51d822c6644973f06cb3f8c819eef7bf99f21d54ff7c7820f0e3105b712a1880
 SHA512:
-  metadata.gz: 919368842ac9e463add459aac18b174741d6effa9c4a9e1b22ae9e4327f45189e97304dbb7e9946efaceaed4959f6daeb4af9bffd8e7353c505a761e5235b60e
-  data.tar.gz: ffabad8c8b402854ba45398fde48353b447b7184b7baf7f4e469f3bf0bbfb9220d41abf54f5a35934eaa619cb5badef804bbcf68beaf36c686fb85e8de6f3d96
+  metadata.gz: 821f0332b1aa16b3ba3ffc2fad7a3f453878fa97993dfb71fc74386dc5a0b1aecd0e56f9bd86518a869721d1a5d21a7c2f433edc8bc82e378bba5b1b1900929f
+  data.tar.gz: 6882c287e01af9c05d32a8729e1999a485a75bfec2fd433a53d65efbbd1de0d6fa6dc72b4f6169150d7f00b419e650d8ac4766308f23ba9d766c7bd7af0df354

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0
+* Introduce the `key_value_field` method to simplify creating key/value fields.
+* Add `#merge` and `#merge!` methods to anything that includes or extends `ValueFields`.
+
 ## 0.2.0
 * Treat bare array fields as value fields.
   - When specifying `array_field(:foo)`, you would get a doubly-nested array if you filled in the value via a block, eg: `foo { [1, 2, 3] }`.

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2020 Cameron Dutro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/kube-dsl.gemspec

@@ -13,5 +13,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'dry-inflector', '~> 0.2'
 
   s.require_path = 'lib'
-  s.files = Dir['{lib,spec}/**/*', 'Gemfile', 'CHANGELOG.md', 'README.md', 'Rakefile', 'kube-dsl.gemspec']
+  s.files = Dir['{lib,spec}/**/*', 'Gemfile', 'LICENSE', 'CHANGELOG.md', 'README.md', 'Rakefile', 'kube-dsl.gemspec']
 end

data/lib/kube-dsl/dsl/apiextensions/v1/json_schema_props.rb

@@ -7,10 +7,10 @@ module KubeDSL::DSL::Apiextensions::V1
     array_field(:one_of) { KubeDSL::DSL::Apiextensions::V1::JSONSchemaProps.new }
     object_field(:external_docs) { KubeDSL::DSL::Apiextensions::V1::ExternalDocumentation.new }
     object_field(:not) { KubeDSL::DSL::Apiextensions::V1::JSONSchemaProps.new }
-    object_field(:definitions) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:dependencies) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:pattern_properties) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:properties) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:definitions, format: :string)
+    key_value_field(:dependencies, format: :string)
+    key_value_field(:pattern_properties, format: :string)
+    key_value_field(:properties, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/apiextensions/v1beta1/json_schema_props.rb

@@ -7,10 +7,10 @@ module KubeDSL::DSL::Apiextensions::V1beta1
     array_field(:one_of) { KubeDSL::DSL::Apiextensions::V1beta1::JSONSchemaProps.new }
     object_field(:external_docs) { KubeDSL::DSL::Apiextensions::V1beta1::ExternalDocumentation.new }
     object_field(:not) { KubeDSL::DSL::Apiextensions::V1beta1::JSONSchemaProps.new }
-    object_field(:definitions) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:dependencies) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:pattern_properties) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:properties) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:definitions, format: :string)
+    key_value_field(:dependencies, format: :string)
+    key_value_field(:pattern_properties, format: :string)
+    key_value_field(:properties, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/apps/v1beta1/deployment_rollback.rb

@@ -2,7 +2,7 @@ module KubeDSL::DSL::Apps::V1beta1
   class DeploymentRollback < ::KubeDSL::DSLObject
     value_fields :name
     object_field(:rollback_to) { KubeDSL::DSL::Apps::V1beta1::RollbackConfig.new }
-    object_field(:updated_annotations) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:updated_annotations, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/apps/v1beta1/scale_status.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Apps::V1beta1
   class ScaleStatus < ::KubeDSL::DSLObject
     value_fields :replicas, :target_selector
-    object_field(:selector) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:selector, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/apps/v1beta2/scale_status.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Apps::V1beta2
   class ScaleStatus < ::KubeDSL::DSLObject
     value_fields :replicas, :target_selector
-    object_field(:selector) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:selector, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/authentication/v1/user_info.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Authentication::V1
   class UserInfo < ::KubeDSL::DSLObject
     value_fields :groups, :uid, :username
-    object_field(:extra) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:extra, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/authentication/v1beta1/user_info.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Authentication::V1beta1
   class UserInfo < ::KubeDSL::DSLObject
     value_fields :groups, :uid, :username
-    object_field(:extra) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:extra, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/authorization/v1/subject_access_review_spec.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::Authorization::V1
     value_fields :groups, :uid, :user
     object_field(:non_resource_attributes) { KubeDSL::DSL::Authorization::V1::NonResourceAttributes.new }
     object_field(:resource_attributes) { KubeDSL::DSL::Authorization::V1::ResourceAttributes.new }
-    object_field(:extra) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:extra, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/authorization/v1beta1/subject_access_review_spec.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::Authorization::V1beta1
     value_fields :group, :uid, :user
     object_field(:non_resource_attributes) { KubeDSL::DSL::Authorization::V1beta1::NonResourceAttributes.new }
     object_field(:resource_attributes) { KubeDSL::DSL::Authorization::V1beta1::ResourceAttributes.new }
-    object_field(:extra) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:extra, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/certificates/v1beta1/certificate_signing_request_spec.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Certificates::V1beta1
   class CertificateSigningRequestSpec < ::KubeDSL::DSLObject
     value_fields :groups, :request, :uid, :usages, :username
-    object_field(:extra) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:extra, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/discovery/v1beta1/endpoint.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::Discovery::V1beta1
     value_fields :addresses, :hostname
     object_field(:conditions) { KubeDSL::DSL::Discovery::V1beta1::EndpointConditions.new }
     object_field(:target_ref) { KubeDSL::DSL::V1::ObjectReference.new }
-    object_field(:topology) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:topology, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/extensions/v1beta1/deployment_rollback.rb

@@ -2,7 +2,7 @@ module KubeDSL::DSL::Extensions::V1beta1
   class DeploymentRollback < ::KubeDSL::DSLObject
     value_fields :name
     object_field(:rollback_to) { KubeDSL::DSL::Extensions::V1beta1::RollbackConfig.new }
-    object_field(:updated_annotations) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:updated_annotations, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/extensions/v1beta1/scale_status.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Extensions::V1beta1
   class ScaleStatus < ::KubeDSL::DSLObject
     value_fields :replicas, :target_selector
-    object_field(:selector) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:selector, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/meta/v1/label_selector.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Meta::V1
   class LabelSelector < ::KubeDSL::DSLObject
     array_field(:match_expression) { KubeDSL::DSL::Meta::V1::LabelSelectorRequirement.new }
-    object_field(:match_labels) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:match_labels, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/meta/v1/object_meta.rb

@@ -3,8 +3,8 @@ module KubeDSL::DSL::Meta::V1
     value_fields :cluster_name, :creation_timestamp, :deletion_grace_period_seconds, :deletion_timestamp, :finalizers, :generate_name, :generation, :name, :namespace, :resource_version, :self_link, :uid
     array_field(:managed_field) { KubeDSL::DSL::Meta::V1::ManagedFieldsEntry.new }
     array_field(:owner_reference) { KubeDSL::DSL::Meta::V1::OwnerReference.new }
-    object_field(:annotations) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:labels) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:annotations, format: :string)
+    key_value_field(:labels, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/node/v1alpha1/overhead.rb

@@ -1,6 +1,6 @@
 module KubeDSL::DSL::Node::V1alpha1
   class Overhead < ::KubeDSL::DSLObject
-    object_field(:pod_fixed) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:pod_fixed, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/node/v1alpha1/scheduling.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Node::V1alpha1
   class Scheduling < ::KubeDSL::DSLObject
     array_field(:toleration) { KubeDSL::DSL::V1::Toleration.new }
-    object_field(:node_selector) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:node_selector, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/node/v1beta1/overhead.rb

@@ -1,6 +1,6 @@
 module KubeDSL::DSL::Node::V1beta1
   class Overhead < ::KubeDSL::DSLObject
-    object_field(:pod_fixed) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:pod_fixed, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/node/v1beta1/scheduling.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Node::V1beta1
   class Scheduling < ::KubeDSL::DSLObject
     array_field(:toleration) { KubeDSL::DSL::V1::Toleration.new }
-    object_field(:node_selector) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:node_selector, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/policy/v1beta1/pod_disruption_budget_status.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::Policy::V1beta1
   class PodDisruptionBudgetStatus < ::KubeDSL::DSLObject
     value_fields :current_healthy, :desired_healthy, :disruptions_allowed, :expected_pods, :observed_generation
-    object_field(:disrupted_pods) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:disrupted_pods, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/storage/v1/storage_class.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::Storage::V1
     value_fields :allow_volume_expansion, :mount_options, :provisioner, :reclaim_policy, :volume_binding_mode
     array_field(:allowed_topology) { KubeDSL::DSL::V1::TopologySelectorTerm.new }
     object_field(:metadata) { KubeDSL::DSL::Meta::V1::ObjectMeta.new }
-    object_field(:parameters) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:parameters, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/storage/v1/volume_attachment_status.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::Storage::V1
     value_fields :attached
     object_field(:attach_error) { KubeDSL::DSL::Storage::V1::VolumeError.new }
     object_field(:detach_error) { KubeDSL::DSL::Storage::V1::VolumeError.new }
-    object_field(:attachment_metadata) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:attachment_metadata, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/storage/v1alpha1/volume_attachment_status.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::Storage::V1alpha1
     value_fields :attached
     object_field(:attach_error) { KubeDSL::DSL::Storage::V1alpha1::VolumeError.new }
     object_field(:detach_error) { KubeDSL::DSL::Storage::V1alpha1::VolumeError.new }
-    object_field(:attachment_metadata) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:attachment_metadata, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/storage/v1beta1/storage_class.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::Storage::V1beta1
     value_fields :allow_volume_expansion, :mount_options, :provisioner, :reclaim_policy, :volume_binding_mode
     array_field(:allowed_topology) { KubeDSL::DSL::V1::TopologySelectorTerm.new }
     object_field(:metadata) { KubeDSL::DSL::Meta::V1::ObjectMeta.new }
-    object_field(:parameters) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:parameters, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/storage/v1beta1/volume_attachment_status.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::Storage::V1beta1
     value_fields :attached
     object_field(:attach_error) { KubeDSL::DSL::Storage::V1beta1::VolumeError.new }
     object_field(:detach_error) { KubeDSL::DSL::Storage::V1beta1::VolumeError.new }
-    object_field(:attachment_metadata) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:attachment_metadata, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/config_map.rb

@@ -1,8 +1,8 @@
 module KubeDSL::DSL::V1
   class ConfigMap < ::KubeDSL::DSLObject
     object_field(:metadata) { KubeDSL::DSL::Meta::V1::ObjectMeta.new }
-    object_field(:binary_data) { ::KubeDSL::KeyValueFields.new(format: :byte) }
-    object_field(:data) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:binary_data, format: :byte)
+    key_value_field(:data, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/csi_persistent_volume_source.rb

@@ -5,7 +5,7 @@ module KubeDSL::DSL::V1
     object_field(:controller_publish_secret_ref) { KubeDSL::DSL::V1::SecretReference.new }
     object_field(:node_publish_secret_ref) { KubeDSL::DSL::V1::SecretReference.new }
     object_field(:node_stage_secret_ref) { KubeDSL::DSL::V1::SecretReference.new }
-    object_field(:volume_attributes) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:volume_attributes, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/csi_volume_source.rb

@@ -2,7 +2,7 @@ module KubeDSL::DSL::V1
   class CSIVolumeSource < ::KubeDSL::DSLObject
     value_fields :driver, :fs_type, :read_only
     object_field(:node_publish_secret_ref) { KubeDSL::DSL::V1::LocalObjectReference.new }
-    object_field(:volume_attributes) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:volume_attributes, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/flex_persistent_volume_source.rb

@@ -2,7 +2,7 @@ module KubeDSL::DSL::V1
   class FlexPersistentVolumeSource < ::KubeDSL::DSLObject
     value_fields :driver, :fs_type, :read_only
     object_field(:secret_ref) { KubeDSL::DSL::V1::SecretReference.new }
-    object_field(:options) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:options, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/flex_volume_source.rb

@@ -2,7 +2,7 @@ module KubeDSL::DSL::V1
   class FlexVolumeSource < ::KubeDSL::DSLObject
     value_fields :driver, :fs_type, :read_only
     object_field(:secret_ref) { KubeDSL::DSL::V1::LocalObjectReference.new }
-    object_field(:options) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:options, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/limit_range_item.rb

@@ -1,11 +1,11 @@
 module KubeDSL::DSL::V1
   class LimitRangeItem < ::KubeDSL::DSLObject
     value_fields :type
-    object_field(:default) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:default_request) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:max) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:max_limit_request_ratio) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:min) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:default, format: :string)
+    key_value_field(:default_request, format: :string)
+    key_value_field(:max, format: :string)
+    key_value_field(:max_limit_request_ratio, format: :string)
+    key_value_field(:min, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/node_status.rb

@@ -8,8 +8,8 @@ module KubeDSL::DSL::V1
     object_field(:config) { KubeDSL::DSL::V1::NodeConfigStatus.new }
     object_field(:daemon_endpoints) { KubeDSL::DSL::V1::NodeDaemonEndpoints.new }
     object_field(:node_info) { KubeDSL::DSL::V1::NodeSystemInfo.new }
-    object_field(:allocatable) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:capacity) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:allocatable, format: :string)
+    key_value_field(:capacity, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/persistent_volume_claim_status.rb

@@ -2,7 +2,7 @@ module KubeDSL::DSL::V1
   class PersistentVolumeClaimStatus < ::KubeDSL::DSLObject
     value_fields :access_modes, :phase
     array_field(:condition) { KubeDSL::DSL::V1::PersistentVolumeClaimCondition.new }
-    object_field(:capacity) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:capacity, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/persistent_volume_spec.rb

@@ -25,7 +25,7 @@ module KubeDSL::DSL::V1
     object_field(:scale_io) { KubeDSL::DSL::V1::ScaleIOPersistentVolumeSource.new }
     object_field(:storageos) { KubeDSL::DSL::V1::StorageOSPersistentVolumeSource.new }
     object_field(:vsphere_volume) { KubeDSL::DSL::V1::VsphereVirtualDiskVolumeSource.new }
-    object_field(:capacity) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:capacity, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/pod_spec.rb

@@ -13,8 +13,8 @@ module KubeDSL::DSL::V1
     object_field(:affinity) { KubeDSL::DSL::V1::Affinity.new }
     object_field(:dns_config) { KubeDSL::DSL::V1::PodDNSConfig.new }
     object_field(:security_context) { KubeDSL::DSL::V1::PodSecurityContext.new }
-    object_field(:node_selector) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:overhead) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:node_selector, format: :string)
+    key_value_field(:overhead, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/replication_controller_spec.rb

@@ -2,7 +2,7 @@ module KubeDSL::DSL::V1
   class ReplicationControllerSpec < ::KubeDSL::DSLObject
     value_fields :min_ready_seconds, :replicas
     object_field(:template) { KubeDSL::DSL::V1::PodTemplateSpec.new }
-    object_field(:selector) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:selector, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/resource_quota_spec.rb

@@ -2,7 +2,7 @@ module KubeDSL::DSL::V1
   class ResourceQuotaSpec < ::KubeDSL::DSLObject
     value_fields :scopes
     object_field(:scope_selector) { KubeDSL::DSL::V1::ScopeSelector.new }
-    object_field(:hard) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:hard, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/resource_quota_status.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::V1
   class ResourceQuotaStatus < ::KubeDSL::DSLObject
-    object_field(:hard) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:used) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:hard, format: :string)
+    key_value_field(:used, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/resource_requirements.rb

@@ -1,7 +1,7 @@
 module KubeDSL::DSL::V1
   class ResourceRequirements < ::KubeDSL::DSLObject
-    object_field(:limits) { ::KubeDSL::KeyValueFields.new(format: :string) }
-    object_field(:requests) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:limits, format: :string)
+    key_value_field(:requests, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/secret.rb

@@ -2,8 +2,8 @@ module KubeDSL::DSL::V1
   class Secret < ::KubeDSL::DSLObject
     value_fields :type
     object_field(:metadata) { KubeDSL::DSL::Meta::V1::ObjectMeta.new }
-    object_field(:data) { ::KubeDSL::KeyValueFields.new(format: :byte) }
-    object_field(:string_data) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:data, format: :byte)
+    key_value_field(:string_data, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/dsl/v1/service_spec.rb

@@ -3,7 +3,7 @@ module KubeDSL::DSL::V1
     value_fields :cluster_ip, :external_i_ps, :external_name, :external_traffic_policy, :health_check_node_port, :ip_family, :load_balancer_ip, :load_balancer_source_ranges, :publish_not_ready_addresses, :session_affinity, :topology_keys, :type
     array_field(:port) { KubeDSL::DSL::V1::ServicePort.new }
     object_field(:session_affinity_config) { KubeDSL::DSL::V1::SessionAffinityConfig.new }
-    object_field(:selector) { ::KubeDSL::KeyValueFields.new(format: :string) }
+    key_value_field(:selector, format: :string)
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/key_value_fields.rb

@@ -31,6 +31,10 @@ module KubeDSL
       end
     end
 
+    def merge!(other)
+      @kv_pairs.merge!(other.instance_variable_get(:@kv_pairs))
+    end
+
     private
 
     def serialize_value(data)

data/lib/kube-dsl/resource_meta.rb

@@ -72,7 +72,7 @@ module KubeDSL
         end
 
         key_value_fields.each do |name, fmt|
-          str << "    object_field(:#{underscore(name)}) { ::KubeDSL::KeyValueFields.new(format: :#{fmt}) }\n"
+          str << "    key_value_field(:#{underscore(name)}, format: :#{fmt})\n"
         end
       end
     end

data/lib/kube-dsl/value_fields.rb

@@ -2,77 +2,163 @@ require 'securerandom'
 
 module KubeDSL
   module ValueFields
-    def value_fields(*fields)
-      fields.each { |field| value_field(field) }
-    end
+    class ClassMismatchError < StandardError; end
 
-    def value_field(field, default: nil)
-      define_method(field) do |*args|
-        if args.empty?
-          instance_variable_get(:"@#{field}") || (
-            default.respond_to?(:call) ? default.call : default
-          )
-        else
-          instance_variable_set(:"@#{field}", args.first)
-        end
+    module ClassMethods
+      def value_fields(*fields)
+        fields.each { |field| value_field(field) }
       end
-    end
 
-    def object_field(field, &field_block)
-      define_method(field) do |*args, &block|
-        ivar = :"@#{field}"
-        val = instance_variable_get(ivar)
+      def value_field(field, default: nil)
+        __fields__[:value] << field
 
-        unless val
-          val = field_block.call(*args)
-          instance_variable_set(ivar, val)
+        define_method(field) do |*args|
+          if args.empty?
+            instance_variable_get(:"@#{field}") || (
+              default.respond_to?(:call) ? default.call : default
+            )
+          else
+            instance_variable_set(:"@#{field}", args.first)
+          end
         end
+      end
+
+      def object_field(field, &field_block)
+        __fields__[:object] << field
+
+        define_method(field) do |*args, &block|
+          ivar = :"@#{field}"
+          val = instance_variable_get(ivar)
 
-        val.instance_exec(&block) if block
-        val
+          unless val
+            val = field_block.call(*args)
+            instance_variable_set(ivar, val)
+          end
+
+          val.instance_exec(&block) if block
+          val
+        end
       end
-    end
 
-    def array_field(field, accessor = nil, &field_block)
-      accessor ||= Inflector.pluralize(field.to_s).to_sym
+      def key_value_field(field, format:)
+        __fields__[:key_value] << field
+
+        define_method(field) do |*args, &block|
+          ivar = :"@#{field}"
+          val = instance_variable_get(ivar)
 
-      define_method(field) do |elem_name = nil, &block|
-        ivar = :"@#{accessor}"
-        arr = instance_variable_get(ivar)
+          unless val
+            val = ::KubeDSL::KeyValueFields.new(format: format)
+            instance_variable_set(ivar, val)
+          end
 
-        # use a hash so elements can be named and modified later
-        unless arr
-          arr = {}
-          instance_variable_set(ivar, arr)
+          val.instance_exec(&block) if block
+          val
         end
+      end
+
+      def array_field(field, accessor = nil, &field_block)
+        accessor ||= Inflector.pluralize(field.to_s).to_sym
+
+        __fields__[:array] << { field: field, accessor: accessor }
 
-        if elem_name && elem = arr[elem_name]
-          elem.instance_eval(&block) if block
-        else
-          if field_block
-            new_val = field_block.call
-            new_val.instance_eval(&block) if block
+        define_method(field) do |elem_name = nil, &block|
+          ivar = :"@#{accessor}"
+          arr = instance_variable_get(ivar)
+
+          # use a hash so elements can be named and modified later
+          unless arr
+            arr = {}
+            instance_variable_set(ivar, arr)
+          end
+
+          if elem_name && elem = arr[elem_name]
+            elem.instance_eval(&block) if block
+            elem
           else
-            new_val = block.call if block
+            if field_block
+              new_val = field_block.call
+              new_val.instance_eval(&block) if block
+            else
+              new_val = block.call if block
+            end
+
+            arr[elem_name || SecureRandom.hex] = new_val
+            new_val
           end
+        end
 
-          arr[elem_name || SecureRandom.hex] = new_val
+        define_method(accessor) do
+          ivar = :"@#{accessor}"
+          arr = instance_variable_get(ivar)
+
+          unless arr
+            arr = {}
+            instance_variable_set(ivar, arr)
+          end
+
+          arr.values
         end
+      end
 
-        nil
+      def __fields__
+        @__fields__ ||= {
+          value: [],
+          object: [],
+          key_value: [],
+          array: []
+        }
       end
+    end
+
+
+    module InstanceMethods
+      def merge!(other, fields: nil)
+        unless other.is_a?(self.class)
+          raise ClassMismatchError, 'cannot merge two objects of '\
+            "different types, namely '#{self.class}' and '#{other.class}'"
+        end
+
+        (self.class.__fields__[:value] + self.class.__fields__[:object]).each do |field|
+          next if fields && !fields.include?(field)
+          ivar = :"@#{field}"
+
+          if other_val = other.instance_variable_get(ivar)
+            instance_variable_set(ivar, other_val)
+          end
+        end
+
+        self.class.__fields__[:key_value].each do |field|
+          next if fields && !fields.include?(field)
+          send(field).merge!(other.send(field))
+        end
 
-      define_method(accessor) do
-        ivar = :"@#{accessor}"
-        arr = instance_variable_get(ivar)
+        self.class.__fields__[:array].each do |af|
+          next if fields && !fields.include?(af[:field])
+          ivar = :"@#{af[:accessor]}"
+
+          arrs = instance_variable_get(ivar) || {}
+
+          arrs.merge!(
+            other.instance_variable_get(ivar) || {}
+          )
 
-        unless arr
-          arr = {}
-          instance_variable_set(ivar, arr)
+          instance_variable_set(ivar, arrs)
         end
+      end
 
-        arr.values
+      def merge(other, fields)
+        self.class.new.tap do |result|
+          result.merge!(self)
+          result.merge!(other, fields: fields)
+        end
       end
     end
+
+
+    def self.extended(base)
+      base.include(InstanceMethods)
+      base.extend(ClassMethods)
+    end
   end
 end

data/lib/kube-dsl/version.rb

@@ -1,3 +1,3 @@
 module KubeDSL
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kube-dsl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - Rakefile
 - kube-dsl.gemspec
 - lib/kube-dsl.rb
@@ -795,7 +796,7 @@ files:
 homepage: http://github.com/getkuby/kube-dsl
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -810,8 +811,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A Ruby DSL for defining Kubernetes resources.
 test_files: []