k_director 0.16.2 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c41ed55fd66c043e43cce56f5236736a6b31fc2b79c200239687215143f516c
-  data.tar.gz: 2711c6c18aaadc378e6286e07b880e96fb746482e513d3e8f2fa7544af80b071
+  metadata.gz: 76d03ecb47b4ab1d6b78fe4cef725c62f653544d6545f10f7bc70632ca6f5c54
+  data.tar.gz: 93828d501cd06d33bcd3ae8a60b22e15b7aa38372d33579b7fce2457aec7429e
 SHA512:
-  metadata.gz: d7dca0e6e9609f089cb61cd2fb6cbe191856c8854559626241a43bc02e74173bcf0cf84ec965e5cac5411039c937eb97eadc1ea7616164f9e8f871b21fb6c332
-  data.tar.gz: 2d2728875d7470255a8fbdecbf232064d5daf6bffc574e4e82ef1926d2aeb178fd9db3d4c7122f3c07b5c85adb6a1b451b05cf92574a93b608472eaa98cce174
+  metadata.gz: d95faef7de2dbc93c8cfb5bd460859e687bde303884c53321b4c4682ff1f0f8ad27ac12d48baf86af159bffe25d2ce5dbad903770c1922493164149c5e3c7208
+  data.tar.gz: 21edd00b2cdf4ea482d4ccce41954543e7e86971e027d1e5bc13105a58b432e9468002416737a00c51396067bb986e2c2857afc3d894e26f977dd5e53f2de407

data/docs/CHANGELOG.md

@@ -1,3 +1,28 @@
+## [0.16.4](https://github.com/klueless-io/k_director/compare/v0.16.3...v0.16.4) (2022-07-09)
+
+
+### Bug Fixes
+
+* add default on_exist and on_action ([36d0634](https://github.com/klueless-io/k_director/commit/36d06345f803fbbd97f0c9dd44c7bcff123b4c51))
+* add default on_exist and on_action ([6f4003e](https://github.com/klueless-io/k_director/commit/6f4003eb447205829c15375adaf06f1a32126349))
+* improve default on_exist and on_action ([c89ed83](https://github.com/klueless-io/k_director/commit/c89ed830d6b9b322539f4b5bf4abfb649312501f))
+
+## [0.16.3](https://github.com/klueless-io/k_director/compare/v0.16.2...v0.16.3) (2022-07-08)
+
+
+### Bug Fixes
+
+* add json_dom support ([03d0b5e](https://github.com/klueless-io/k_director/commit/03d0b5e2de6b4f37780416acd4c72bd2ea9b2eb6))
+* add json_dom support ([ef623b9](https://github.com/klueless-io/k_director/commit/ef623b913122314618dce195e4050594c802f3ad))
+
+## [0.16.2](https://github.com/klueless-io/k_director/compare/v0.16.1...v0.16.2) (2022-07-08)
+
+
+### Bug Fixes
+
+* add json_dom support ([f42994a](https://github.com/klueless-io/k_director/commit/f42994ab0854fda6574f20d5ff5e81f06692c4bc))
+* add json_dom support ([8d3c142](https://github.com/klueless-io/k_director/commit/8d3c142b1e2fc6584a66f97e31df664163a0975f))
+
 ## [0.16.1](https://github.com/klueless-io/k_director/compare/v0.16.0...v0.16.1) (2022-04-28)
 
 

data/lib/k_director/builders/dom_builder.rb

@@ -58,12 +58,12 @@ module KDirector
       end
 
       # add value to array
-      #   add(:a, 1)
-      #   add(:a, 2)
-      #   add(:a, 3)
-      #   add(:a, {key: 1})
-      #   add(:a, {key: 2})
-      #   add(:a, {key: 3})
+      #   add(:a, value: 1)
+      #   add(:a, value: 2)
+      #   add(:a, value: 3)
+      #   add(:a, value: {key: 1})
+      #   add(:a, value: {key: 2})
+      #   add(:a, value: {key: 3})
       def add(*keys, value: nil, default_value: nil)
         size = keys.size
 
@@ -86,6 +86,10 @@ module KDirector
         KUtil.data.to_open_struct(@dom)
       end
 
+      def to_json(*args)
+        JSON.pretty_generate(dom, *args)
+      end
+
       private
 
       def initialize_hierarchy(keys)

data/lib/k_director/directors/base_director.rb

@@ -18,6 +18,12 @@ module KDirector
           new(k_builder, builder, **opts)
         end
 
+        def defaults(**opts)
+          default_builder_type(opts[:builder_type]) if opts[:builder_type]
+          default_on_exist(opts[:on_exist]) if opts[:on_exist]
+          default_on_action(opts[:on_action]) if opts[:on_action]
+        end
+
         def default_builder_type(type)
           @builder_type = type
         end
@@ -27,12 +33,31 @@ module KDirector
 
           @builder_type = KDirector::Builders::ActionsBuilder
         end
+
+        # valid values %i[skip write compare]
+        def default_on_exist(on_exist)
+          @on_exist = on_exist
+        end
+
+        def on_exist
+          @on_exist ||= :skip
+        end
+
+        # valid values %i[queue execute]
+        def default_on_action(on_action)
+          @on_action = on_action
+        end
+
+        def on_action
+          @on_action ||= :queue
+        end
       end
 
       attr_reader :builder
       attr_reader :k_builder
       attr_reader :options
 
+      # rubocop:disable Metrics/AbcSize
       def initialize(k_builder, builder, **opts)
         @k_builder  = k_builder
         @builder    = builder
@@ -40,10 +65,11 @@ module KDirector
 
         @options.director_name        ||= default_director_name
         @options.template_base_folder ||= default_template_base_folder
-        @options.on_exist             ||= :skip       # %i[skip write compare]
-        @options.on_action            ||= :queue      # %i[queue execute]
+        @options.on_exist             ||= self.class.on_exist # %i[skip write compare]
+        @options.on_action            ||= self.class.on_action # %i[queue execute]
         @options.active = true unless defined?(@options.active)
       end
+      # rubocop:enable Metrics/AbcSize
 
       def data(name = nil, **opts)
         KDirector::Directors::Data.new(self, name, **opts)
@@ -68,9 +94,7 @@ module KDirector
       end
 
       def json_dom
-        return '{}' if dom.nil?
-
-        JSON.pretty_generate(dom)
+        builder.to_json
       end
 
       # Used by child directors to inherit options from parent

data/lib/k_director/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KDirector
-  VERSION = '0.16.2'
+  VERSION = '0.16.5'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.16.2",
+  "version": "0.16.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.16.2",
+      "version": "0.16.5",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.1",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k_director",
-  "version": "0.16.2",
+  "version": "0.16.5",
   "description": "Command line and CI/CD tools for k_director",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_director
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.5
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config