kube-dsl 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de8bd85a855059eb721225535bf9116a71a724fa6200204f68fde813131536a8
-  data.tar.gz: 9086677e1ccdd62fcea750c39b57d6dac113cbb5bba4033db0893c861c843f44
+  metadata.gz: 999f2bf83f428a8df758af2b435fb0aa64b8e69a722ff8eeb7ffc9837573a1ba
+  data.tar.gz: 735868e4588d34645f9cc7164ddb21f363b2b3af1b7a9b8b1ad6c4e5cb506a02
 SHA512:
-  metadata.gz: 1c4222594087e664ceb1f35d2f22382f42c5a3b78fcee23fd7fcf2d43c4f2d1e426f3e3cebbd42ca8f6d12b02a6c5c0bb465b4f6772b1d411d2130f818da9683
-  data.tar.gz: 91bad2ac1bb76b7e5c1b906f34e49a6e9cbfba755bf6f80ab6483b1a3fe0ef7f27a6b73c05cb9d0d9fd733683eb8f5053d519d79a1422a65c3101f597dbf7aee
+  metadata.gz: bb4a68116b5fefcf99bddd0857e43907f4dead424e51a5b6e76d1845c5264b193cefb871502a351aa172445ff47ad7fcdb39cc02eaec4050fb3e8bcb1f86930d
+  data.tar.gz: 5b4065446416e170515e3138d42805c1a2c0c8ab128b505f565c7135a2e587d87808811ef3be70a1726aece93d709b35eb1db882ac766b20e5d3009a3303d1d5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.8.2
+* Fix entrypoint type signatures to make the block optional (#8, @Bo98)
+* Tighten arity of value and object fields (#9, @Bo98)
+
+## 0.8.1
+* Fix Sorbet types for blocks passed to DSL methods (#6, @Bo98)
+* Fix handling of number types (#5, @Bo98)
+
 ## 0.8.0
 
 * Update Kubernetes to v1.23.17 to match kuby.

data/lib/kube-dsl/dsl_object.rb

@@ -7,7 +7,7 @@ module KubeDSL
     extend ::KubeDSL::ValueFields
     extend ::KubeDSL::Validations
 
-    # T::Sig::WithoutRuntime.sig { params(block: T.nilable(T.proc.void)).void }
+    # T::Sig::WithoutRuntime.sig { params(block: T.nilable(T.proc.bind(::KubeDSL::DSLObject).void)).void }
     def initialize(&block)
       instance_eval(&block) if block
     end

data/lib/kube-dsl/entrypoint_builder.rb

@@ -42,8 +42,9 @@ module KubeDSL
         next if block && !block.call(resource, ns)
 
         method_name = method_name_for(resource)
+        resource_type = "::#{ns}::#{resource.ref.kind}"
 
-        rbi_code << "#{indent}T::Sig::WithoutRuntime.sig { params(block: T.proc.void).returns(::#{ns}::#{resource.ref.kind}) }\n"
+        rbi_code << "#{indent}T::Sig::WithoutRuntime.sig { params(block: T.nilable(T.proc.bind(#{resource_type}).void)).returns(#{resource_type}) }\n"
         rbi_code << "#{indent}def #{method_name}(&block); end\n\n"
       end
 

data/lib/kube-dsl/key_value_field_res.rb

@@ -22,7 +22,7 @@ module KubeDSL
 
     def fields_to_rbi(_inflector)
       [
-        "T::Sig::WithoutRuntime.sig { params(block: T.nilable(T.proc.void)).returns(::KubeDSL::KeyValueFields) }",
+        "T::Sig::WithoutRuntime.sig { params(block: T.nilable(T.proc.bind(::KubeDSL::KeyValueFields).void)).returns(::KubeDSL::KeyValueFields) }",
         "def #{underscore(name)}(&block); end"
       ]
     end

data/lib/kube-dsl/object_field_res.rb

@@ -18,8 +18,8 @@ module KubeDSL
 
     def fields_to_rbi(_inflector)
       [
-        "T::Sig::WithoutRuntime.sig { returns(#{ruby_type}) }",
-        "def #{ruby_safe_name}; end",
+        "T::Sig::WithoutRuntime.sig { params(block: T.nilable(T.proc.bind(#{ruby_type}).void)).returns(#{ruby_type}) }",
+        "def #{ruby_safe_name}(&block); end",
         "",
         "T::Sig::WithoutRuntime.sig { returns(T::Boolean) }",
         "def #{ruby_safe_name}_present?; end"

data/lib/kube-dsl/rbi_helpers.rb

@@ -5,7 +5,7 @@ module KubeDSL
 
     TYPE_MAP = {
       'boolean' => 'T::Boolean',
-      'number' => 'Integer'
+      'number' => 'T.any(Integer, Float)'
     }
 
     TYPE_MAP.freeze

data/lib/kube-dsl/validations.rb

@@ -88,6 +88,8 @@ module KubeDSL
             [String]
           when :integer
             [Integer]
+          when :number
+            [Integer, Float]
           when :boolean
             [TrueClass, FalseClass]
           else

data/lib/kube-dsl/value_fields.rb

@@ -14,13 +14,13 @@ module KubeDSL
       def value_field(field, default: nil)
         __fields__[:value] << field
 
-        define_method(field) do |*args|
-          if args.empty?
+        define_method(field) do |value = (value_set = true; nil)|
+          if value_set
+            instance_variable_set(:"@#{field}", value)
+          else
             instance_variable_get(:"@#{field}") || (
               default.respond_to?(:call) ? default.call(self) : default
             )
-          else
-            instance_variable_set(:"@#{field}", args.first)
           end
         end
       end
@@ -29,11 +29,11 @@ module KubeDSL
         __fields__[:object] << field
         ivar = :"@#{field}"
 
-        define_method(field) do |*args, &block|
+        define_method(field) do |&block|
           val = instance_variable_get(ivar)
 
           unless val
-            val = field_block.call(*args)
+            val = field_block.call
             instance_variable_set(ivar, val)
           end
 

data/lib/kube-dsl/version.rb

@@ -1,5 +1,5 @@
 # typed: strict
 
 module KubeDSL
-  VERSION = '0.8.0'
+  VERSION = '0.8.2'
 end