k_director 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61ab15797b459bd3b8a2938801a016638c268ef5339cd5df1a5a4a7985c255cd
-  data.tar.gz: d8670419a2617533e13c8ad2eef7e1f74b412ee780c119550f670d850b6f9897
+  metadata.gz: 54958cfb760bc051a50fd025ddecf686f591977d69e3799d4f9f2d389982b48f
+  data.tar.gz: 384246ae71efb39e95b55f9f40724c53610daa77ad681ea60534500a43038a20
 SHA512:
-  metadata.gz: 67eabf548f77d0d21d444b8186304054fe097195ce78a7f5d8e0ccc072dd04b16a05d59a43956d287c2045e3fe2aeb8a9ba778442c2620dd1ff9668b503968a0
-  data.tar.gz: c29f1c1d1440a5de7d3081cefd7463efcd4d6d8d95020d72a3efab8f71c25c5ee7ba0fceb0b9e76d2a5eb372a0459080299d9952a82cb19ea3ed3cca2ad26202
+  metadata.gz: ee1fe32bebf5f70c3a68315a8f1e430c4b032628e5c16ef5fa98f76553a65d6fa59c15e8d8c778ffc2cc839a9667e96a264ca67101b1a898fd8c11d8db02d5b4
+  data.tar.gz: 9328fe80f0e363c8f787fe242b4c8112b288d45d31ea1b374c8e63b0a137998d45545a6ff3d9080b2c403bedab0efc8e52295e16920bfce15e0b9b6905d444ef

data/.builders/boot.rb

@@ -68,4 +68,4 @@ resource_manager
   .glob('generators/**/*.rb')
 resource_manager.add_resources
 
-KManager.fire_actions(:load_content, :register_document, :load_document)
+KManager.boot

data/docs/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [0.13.0](https://github.com/klueless-io/k_director/compare/v0.12.1...v0.13.0) (2022-02-11)
+
+
+### Features
+
+* dom builder set method now uses value: and will support hashes as a value ([24145a1](https://github.com/klueless-io/k_director/commit/24145a15d03b9670a605846b5c1dcb4635bb374d))
+
+## [0.12.1](https://github.com/klueless-io/k_director/compare/v0.12.0...v0.12.1) (2022-02-11)
+
+
+### Bug Fixes
+
+* builder can be configured via #default_builder_type ([f82c46f](https://github.com/klueless-io/k_director/commit/f82c46f10aea06b154d5ac957e71cce1216cae4a))
+
+# [0.12.0](https://github.com/klueless-io/k_director/compare/v0.11.3...v0.12.0) (2022-02-11)
+
+
+### Features
+
+* split dom_builder out from actions_builder ([f728e0e](https://github.com/klueless-io/k_director/commit/f728e0e04ef668928ed78ed6e008c3996a2023e8))
+
 ## [0.11.3](https://github.com/klueless-io/k_director/compare/v0.11.2...v0.11.3) (2022-02-08)
 
 

data/k_director.gemspec

@@ -47,4 +47,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'k_builder', '~> 0.0.0'
   spec.add_dependency 'k_ext-github', '~> 0.0.0'
   spec.add_dependency 'k_util', '~> 0.0.0'
+  spec.add_dependency 'nokogiri', '~> 1.13'
 end

data/lib/k_director/builders/dom_builder.rb

@@ -17,18 +17,18 @@ module KDirector
       # Set many key/value pairs gainst a group
       #
       # example:
-      #   set_many(:github, repo_name: 'repo-name', organization: 'org-name')
+      #   group_set(:github, repo_name: 'repo-name', organization: 'org-name')
       def group_set(group = nil, **opts)
         return if group.nil? && opts.empty?
 
         if group.nil?
           opts.each do |key, value|
-            set(key, value)
+            set(key, value: value)
           end
         else
           dom[group] = {} if opts.empty? # initialize the group name if no options are provided
           opts.each do |key, value|
-            set(group, key, value)
+            set(group, key, value: value)
           end
         end
       end
@@ -39,36 +39,39 @@ module KDirector
       # - initialize key/array pairs
       #
       # example:
-      #   set(:a, 1)
-      #   set(:a, [])
-      #   set(:a, [1, 2, 3])
-      #   set(:a, some_value, default_value: 'use if not supplied')
-      #   set(:a, :b, 'nested value')
-      #   set(:a, :b, :c, 'deeply nested value')
-      #   set(:a, :b, :c, :d, :e, :f, 'depth is no barrier')
-      def set(*keyset_value, default_value: nil)
-        size = keyset_value.size
-
-        raise ArgumentError, 'set requires 2 or more arguments' if size < 2
-
-        target = initialize_hierarchy(keyset_value)
-
-        set_kv(target, keyset_value[size - 2], keyset_value[size - 1], default_value: default_value)
+      #   set(:a, value: 1)
+      #   set(:a, value: [])
+      #   set(:a, value: [1, 2, 3])
+      #   set(:a, value: { a: 1, b: 2 })
+      #   set(:a, value: some_value, default_value: 'use if not supplied')
+      #   set(:a, value: :b, 'nested value')
+      #   set(:a, value: :b, :c, 'deeply nested value')
+      #   set(:a, value: :b, :c, :d, :e, :f, 'depth is no barrier')
+      def set(*keys, value: nil, default_value: nil)
+        size = keys.size
+
+        raise ArgumentError, 'set requires 1 or more keys' if size < 1
+
+        target = initialize_hierarchy(keys)
+
+        set_kv(target, keys[size - 1], value, default_value: default_value)
       end
 
       # add value to array
-      #   set(:a, [])
-      #   add(:a, 1])
-      #   add(:a, 2])
-      #   add(:a, 3])
-      def add(*keyset_value, default_value: nil)
-        size = keyset_value.size
+      #   add(:a, 1)
+      #   add(:a, 2)
+      #   add(:a, 3)
+      #   add(:a, {key: 1})
+      #   add(:a, {key: 2})
+      #   add(:a, {key: 3})
+      def add(*keys, value: nil, default_value: nil)
+        size = keys.size
 
-        raise ArgumentError, 'add requires 2 or more arguments' if size < 2
+        raise ArgumentError, 'add requires 1 or more keys' if size < 1
 
-        target = initialize_hierarchy(keyset_value)
+        target = initialize_hierarchy(keys)
 
-        add_kv(target, keyset_value[size - 2], keyset_value[size - 1], default_value: default_value)
+        add_kv(target, keys[size - 1], value, default_value: default_value)
       end
 
       def debug
@@ -85,12 +88,12 @@ module KDirector
 
       private
 
-      def initialize_hierarchy(keys_value)
+      def initialize_hierarchy(keys)
         target = @dom
 
-        return target unless keys_value.size > 2
+        return target unless keys.size > 1
 
-        keys_value.slice(0..-3).each_with_index do |key, _index|
+        keys.slice(0..-2).each_with_index do |key, _index|
           target[key] = {} unless target.key?(key)
           target = target[key]
         end

data/lib/k_director/directors/base_director.rb

@@ -10,13 +10,23 @@ module KDirector
       class << self
         def init(k_builder, builder = nil, **opts)
           if builder.nil?
-            builder = KDirector::Builders::ActionsBuilder.new
+            builder = builder_type.new
           else
             builder.reset
           end
 
           new(k_builder, builder, **opts)
         end
+
+        def builder_type
+          return @builder_type if defined? @builder_type
+
+          @builder_type = KDirector::Builders::ActionsBuilder
+        end
+
+        def default_builder_type(type)
+          @builder_type = type
+        end
       end
 
       attr_reader :builder

data/lib/k_director/version.rb

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

data/lib/k_director.rb

@@ -5,6 +5,7 @@ require 'k_log'
 require 'k_util'
 require 'k_builder'
 require 'k_ext/github'
+require 'nokogiri'
 
 require_relative 'k_director/version'
 require_relative 'k_director/builders/dom_builder'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.12.0",
+      "version": "0.14.0",
       "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.12.0",
+  "version": "0.14.0",
   "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.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
 description: "    KDirector provides domain specific language implementations for
   code generation\n"
 email:
@@ -90,7 +104,6 @@ extra_rdoc_files: []
 files:
 - ".builders/_.rb"
 - ".builders/boot.rb"
-- ".builders/dsl/ruby_gem_dsl.rb"
 - ".builders/generators/01-bootstrap.rb"
 - ".builders/run.rb"
 - ".githooks/commit-msg"

data/.builders/dsl/ruby_gem_dsl.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-module Dsl
-  class RubyGemDsl < Dsl::Directors::BaseDirector
-    def default_director_name
-      'Ruby Gem'
-    end
-
-    def repo_name
-      options.repo_name
-    end
-
-    def repo_account
-      options.repo_account
-    end
-
-    # def default_template_base_folder
-    # end
-    # def initialize(k_builder, builder, **opts)
-    #   super(k_builder, builder, **opts)
-    #   # @on_action  = opts[:on_action] || :queue      # %i[queue execute]
-    # end
-    def github(**opts, &block)
-      github = Dsl::Github.new(self, **opts)
-      github.instance_eval(&block) 
-
-      self
-    end
-
-    def blueprint(**opts, &block)
-      blueprint = Dsl::RubyGemBlueprint.new(self, **opts)
-      blueprint.instance_eval(&block) 
-
-      self
-    end
-  end
-
-  class RubyGemBlueprint < Dsl::Directors::ChildDirector
-    def template_content(template_filename)
-      template_parts = [template_base_folder, template_filename]
-      template_file = File.join(*template_parts)
-
-      file = k_builder.find_template_file(template_file)
-      File.read(file)
-    end
-
-    def run_template_script(template_filename, **opts)
-      template_parts = [template_base_folder, template_filename]
-      template_file = File.join(*template_parts)
-      
-      script = k_builder.process_any_content(template_file: template_file, **opts)
-
-      run_script(script)
-      # action = k_builder.run_script_action(script)
-      # run_action(action)
-    end
-
-    # Create a single file
-    #
-    # @param [String] output_filename The output file name, this can be a relative path
-    # @param [Hash] **opts The options
-    # @option opts [String] :template_filename Template filename can be set or it will default to the same value as the output file name
-    # @option opts [String] :template_subfolder Template subfolder
-    def add(output_file, **opts)
-      template_file = opts[:template_file] || output_file
-      template_parts = [template_base_folder, opts[:template_subfolder], opts[:template_variant], template_file].reject(&:blank?)
-
-      opts[:template_file] = File.join(*template_parts)
-
-      add_file(output_file, **opts)
-    end
-
-    def oadd(name, **opts); add(name, **{ open: true          }.merge(opts)); end
-    def tadd(name, **opts); add(name, **{ open_template: true }.merge(opts)); end
-    def fadd(name, **opts); add(name, **{ on_exist: :write    }.merge(opts)); end
-  end
-end