k_director 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66bfeb5b766221eeda0cb0e7157b90c3852c7c617934a60e91794dd322090a18
-  data.tar.gz: fdad194dbe2c758946e83ba609ab27e9f7651e71e12ebc78730a2036f2c66cde
+  metadata.gz: 97d6905104f3f742383cd45344b303269a1d5ee6c2054d107c5b0be97c0406f9
+  data.tar.gz: 60ad2bfd8f1dcc5693dcda4e46a307174143c4231825df818c523c41d4dfb08a
 SHA512:
-  metadata.gz: ef4b7707f28b83b8d7c4a700e301c34729a501721f63e293c1772670f73c59cadf25f7b19abbcf91a31c110729b03e9633deb6699b603837948c7684691e6a2b
-  data.tar.gz: 72043f631e73267482e4e0d9a52541f8e121ded63222d714f9fa2503ecebb8c4cba88a541748a2d7bba9379b67199ea58bf266b6da9ea84c52db039d24c27cb3
+  metadata.gz: 8db80227990301c8485f8d4ee1f95efc4275f2cf3dc648c3abb0899f3b7da2b260dc6ec2791d9f4b5be03261dc08987f9a33cf3576e184527278418eef59e104
+  data.tar.gz: aa7df6cadc8a21e0a50d7998fc35596a24190e6cbd8045b2d7080b2352a7de97007afdfef7b55d9615c24317d9c03b6464f705b1f632c2f9b3e0af859ce3f366

data/.builders/_.rb

@@ -1,4 +1,3 @@
-require_relative './dsl/builders/dom_builder'
 require_relative './dsl/builders/actions_builder'
 require_relative './dsl/directors/base_director'
 require_relative './dsl/directors/child_director'

data/.builders/generators/01-bootstrap.rb

@@ -6,7 +6,9 @@ KManager.action :bootstrap do
       .init(k_builder,
         template_base_folder:       'ruby/gem',
         on_exist:                   :skip,                      # %i[skip write compare]
-        on_action:                  :queue,                     # %i[queue execute]
+        on_action:                  :queue                      # %i[queue execute]
+      )
+      .dom(:settings,
         ruby_version:               '2.7',
         repo_name:                  application_name,
         application:                application_name,
@@ -25,6 +27,9 @@ KManager.action :bootstrap do
       .github do
         parent.options.repo_info = repo_info
 
+        self.repo
+        self.name
+
         # create_repository # (:k_director)
         # delete_repository # (:k_director)
         # list_repositories

data/docs/CHANGELOG.md

@@ -1,3 +1,41 @@
+# [0.6.0](https://github.com/klueless-io/k_director/compare/v0.5.0...v0.6.0) (2022-01-31)
+
+
+### Bug Fixes
+
+* add improve group_set on action_builder ([b11ff25](https://github.com/klueless-io/k_director/commit/b11ff25475d48c07af67f3e82bff58ab903ae4a5))
+
+
+### Features
+
+* add data director class ([510d970](https://github.com/klueless-io/k_director/commit/510d9701480a57580b0cc4f4a58398ce7752a431))
+
+# [0.5.0](https://github.com/klueless-io/k_director/compare/v0.4.1...v0.5.0) (2022-01-31)
+
+
+### Features
+
+* add group_set to action_builder ([62d87ed](https://github.com/klueless-io/k_director/commit/62d87ed27cb1479cf5ba3a2fa8cac70fa71f63fd))
+
+## [0.4.1](https://github.com/klueless-io/k_director/compare/v0.4.0...v0.4.1) (2022-01-30)
+
+
+### Bug Fixes
+
+* refactor dom builder with set/add supporting key hierarchies ([8fee48d](https://github.com/klueless-io/k_director/commit/8fee48d12dfb37210ed87d0fb22222bd2db3da28))
+
+# [0.4.0](https://github.com/klueless-io/k_director/compare/v0.3.0...v0.4.0) (2022-01-29)
+
+
+### Bug Fixes
+
+* run rubocop ([e8805aa](https://github.com/klueless-io/k_director/commit/e8805aaddfde04ba1def563d3f7e5e311fa2841a))
+
+
+### Features
+
+* add GitHub DSL ([e8de7d5](https://github.com/klueless-io/k_director/commit/e8de7d599af16be9dced907617d534f029e1e1ad))
+
 # [0.3.0](https://github.com/klueless-io/k_director/compare/v0.2.0...v0.3.0) (2022-01-29)
 
 

data/lib/k_director/builders/actions_builder.rb

@@ -2,26 +2,120 @@
 
 module KDirector
   module Builders
-    # Data builder for KBuilder Actions
-    class ActionsBuilder < KDirector::Builders::DomBuilder
+    # Actions document builder
+    class ActionsBuilder
+      attr_reader :actions
+      attr_reader :dom
+      attr_reader :last_action
+
       def initialize
-        super(schema)
+        reset
+      end
+
+      def reset
+        @actions = []
+        @dom = {}
+        @last_action = {}
       end
 
       def queue_action(action)
-        dom[:actions] << current_node(action)
+        @actions << action
+        @last_action = action
       end
 
-      def actions
-        dom[:actions]
+      # Set many key/value pairs gainst a group
+      #
+      # example:
+      #   set_many(: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)
+          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)
+          end
+        end
+      end
+
+      # set key_set/value pair, can be used for
+      #
+      # - simple key/value pairs
+      # - 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)
+      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
+
+        raise ArgumentError, 'add requires 2 or more arguments' if size < 2
+
+        target = initialize_hierarchy(keyset_value)
+
+        add_kv(target, keyset_value[size - 2], keyset_value[size - 1], default_value: default_value)
+      end
+
+      def debug
+        puts JSON.pretty_generate(actions)
+        # puts JSON.pretty_generate(dom)
+        # log.structure(dom)
+
+        self
+      end
+
+      def build
+        # hook into the set, add and queue_action methods form memoization
+        KUtil.data.to_open_struct(@dom)
       end
 
       private
 
-      def schema
-        {
-          actions: []
-        }
+      def initialize_hierarchy(keys_value)
+        target = @dom
+
+        return target unless keys_value.size > 2
+
+        keys_value.slice(0..-3).each_with_index do |key, _index|
+          target[key] = {} unless target.key?(key)
+          target = target[key]
+        end
+        target
+      end
+
+      def set_kv(target, key, value, default_value: nil)
+        set_value = value.nil? ? default_value : value
+        target[key] = set_value
+      end
+
+      def add_kv(target, key, value, default_value: nil)
+        add_value = value.nil? ? default_value : value
+        target[key] = [] unless target.key?(key)
+        target[key] << add_value
       end
     end
   end

data/lib/k_director/directors/base_director.rb

@@ -22,7 +22,6 @@ module KDirector
       attr_reader :builder
       attr_reader :k_builder
       attr_reader :options
-      attr_accessor :dom
 
       def initialize(k_builder, builder, **opts)
         @k_builder  = k_builder
@@ -35,6 +34,22 @@ module KDirector
         @options.on_action            ||= :queue      # %i[queue execute]
       end
 
+      def data(name = nil, **opts)
+        KDirector::Directors::Data.new(self, name, **opts)
+
+        self
+      end
+
+      def settings(**opts)
+        KDirector::Directors::Data.new(self, :settings, **opts)
+
+        self
+      end
+
+      def dom
+        builder.dom
+      end
+
       # Used by child directors to inherit options from parent
       def inherited_opts(**opts)
         {
@@ -48,6 +63,10 @@ module KDirector
         @options.director_name
       end
 
+      def director_name=(name)
+        @options.director_name = name
+      end
+
       def template_base_folder
         @options.template_base_folder
       end
@@ -66,8 +85,7 @@ module KDirector
           on_exist: on_exist
         }.merge(opts)
 
-        # WHAT IS THIS FOR?
-        opts[:dom] = dom if dom
+        opts[:dom] = dom.except(:actions) if dom
 
         handle_action(k_builder.add_file_action(file, **opts))
 

data/lib/k_director/directors/data.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module KDirector
+  module Directors
+    # Data can update the underlying ActionBuilder DOM.
+    class Data
+      attr_reader :parent
+      attr_reader :name
+
+      def initialize(parent, name, **opts)
+        @parent = parent
+        @name   = name
+
+        parent.builder.group_set(name, **opts)
+      end
+    end
+  end
+end

data/lib/k_director/version.rb

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

data/lib/k_director.rb

@@ -5,10 +5,10 @@ require 'k_util'
 require 'k_builder'
 
 require_relative 'k_director/version'
-require_relative 'k_director/builders/dom_builder'
 require_relative 'k_director/builders/actions_builder'
 require_relative 'k_director/directors/base_director'
 require_relative 'k_director/directors/child_director'
+require_relative 'k_director/directors/data'
 require_relative 'k_director/dsls/children/blueprint'
 require_relative 'k_director/dsls/children/github'
 

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.4.0",
+  "version": "0.6.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.4.0",
+      "version": "0.6.1",
       "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.4.0",
+  "version": "0.6.1",
   "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.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-29 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_log
@@ -62,10 +62,6 @@ extra_rdoc_files: []
 files:
 - ".builders/_.rb"
 - ".builders/boot.rb"
-- ".builders/dsl/builders/actions_builder.rb"
-- ".builders/dsl/builders/dom_builder.rb"
-- ".builders/dsl/directors/base_director.rb"
-- ".builders/dsl/directors/child_director.rb"
 - ".builders/dsl/github_dsl.rb"
 - ".builders/dsl/ruby_gem_dsl.rb"
 - ".builders/generators/01-bootstrap.rb"
@@ -90,9 +86,9 @@ files:
 - k_director.gemspec
 - lib/k_director.rb
 - lib/k_director/builders/actions_builder.rb
-- lib/k_director/builders/dom_builder.rb
 - lib/k_director/directors/base_director.rb
 - lib/k_director/directors/child_director.rb
+- lib/k_director/directors/data.rb
 - lib/k_director/dsls/children/blueprint.rb
 - lib/k_director/dsls/children/github.rb
 - lib/k_director/version.rb

data/.builders/dsl/builders/actions_builder.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Dsl
-  module Builders
-    class ActionsBuilder < Dsl::Builders::DomBuilder
-      def initialize
-        super(schema)
-      end
-
-      def queue_action(action)
-        dom[:actions] << current_node(action)
-      end
-
-      def actions
-        dom[:actions]
-      end
-
-      private
-
-      def schema
-        { 
-          actions: []
-        }
-      end
-    end
-  end
-end

data/.builders/dsl/builders/dom_builder.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Dsl
-  module Builders
-    class DomBuilder
-      attr_reader :dom
-      attr_reader :node
-
-      def initialize(dom = nil)
-        @dom = dom || schema
-      end
-
-      def current_node(node)
-        @node = node
-      end
-
-      alias last_node node
-
-      def reset
-        @dom = schema
-        @last_node = nil
-      end
-
-      def schema
-        {}
-      end
-
-      def logit
-        puts JSON.pretty_generate(dom)
-        # log.structure(dom)
-
-        self
-      end
-
-      def data
-        KUtil.data.to_open_struct(@dom)
-      end
-    end
-  end
-end

data/.builders/dsl/directors/base_director.rb

@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-module Dsl
-  module Directors
-    class BaseDirector
-      include KLog::Logging
-
-      class << self
-        def init(k_builder, builder = nil, **opts)
-          if builder.nil?
-            builder = Dsl::Builders::ActionsBuilder.new
-          else
-            builder.reset
-          end
-
-          new(k_builder, builder, **opts)
-        end
-      end
-
-      attr_reader :builder
-      attr_reader :k_builder
-      attr_reader :options
-      attr_accessor :dom
-    
-      def initialize(k_builder, builder, **opts)
-        @k_builder  = k_builder
-        @builder    = builder
-        @options    = OpenStruct.new(**opts)
-
-        @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]
-      end
-
-      def director_name
-        @options.director_name
-      end
-
-      def template_base_folder
-        @options.template_base_folder
-      end
-
-      def on_exist
-        @options.on_exist
-      end
-
-      def on_action
-        @options.on_action
-      end
-
-      def add_file(file, **opts)
-        opts = {
-          on_exist: on_exist
-        }.merge(opts)
-
-        opts[:dom] = dom if dom
-
-        handle_action(k_builder.add_file_action(file, **opts))
-
-        self
-      end
-
-      def set_current_folder_action(folder_key)
-        # RUN (not handle)
-        run_action(k_builder.set_current_folder_action(folder_key))
-
-        self
-      end
-      alias cd set_current_folder_action
-
-      def run_command(command)
-        handle_action(k_builder.run_command_action(command))
-
-        self
-      end
-
-      def run_script(script)
-        handle_action(k_builder.run_script_action(script))
-
-        self
-      end
-
-      def play_actions
-        k_builder.play_actions(builder.actions)
-      end
-
-      def debug
-        log.section_heading director_name
-
-        h = options.to_h.sort.to_h
-        h.keys.each do |key|
-          log.kv(titleize.parse(key.to_s), h[key])
-        end
-        nil
-      end
-
-      # def debug_info
-      #   log.kv 'Template Root Folder'   , k_builder.template_folders.folder_paths
-      #   log.kv 'Template Base Folder'   , template_base_folder
-      #   log.kv 'on_exist'               , on_exist
-      #   log.kv 'on_action'              , on_action
-      # end
-
-      private
-
-      def default_template_base_folder
-        ''
-      end
-
-      def default_director_name
-        titleize.parse(self.class.name.split("::").last)
-      end
-
-      def folder_parts(*parts)
-        parts.reject(&:blank?).map(&:to_s)
-      end
-
-      def handle_action(action)
-        builder.queue_action(action)
-        k_builder.play_action(action) if on_action == :execute
-      end
-
-      # run action will queue an action just like handle_action, but it will also run it immediately
-      def run_action(action)
-        builder.queue_action(action)
-        k_builder.run_action(action)
-      end
-    end
-  end
-end

data/.builders/dsl/directors/child_director.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Dsl
-  module Directors
-    class ChildDirector < Dsl::Directors::BaseDirector
-      attr_reader :parent
-
-      def initialize(parent, **opts)
-        @parent = parent
-
-        opts = {
-          on_exist: parent.on_exist,
-          on_action: parent.on_action,
-          template_base_folder: parent.template_base_folder
-        }.merge(opts)
-
-        super(parent.k_builder, parent.builder, **opts)
-      end
-
-      def debug
-        parent.debug
-
-        super
-      end
-    end
-  end
-end

data/lib/k_director/builders/dom_builder.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module KDirector
-  module Builders
-    # Base document builder
-    class DomBuilder
-      attr_reader :dom
-      attr_reader :node
-
-      def initialize(dom = nil)
-        @dom = dom || schema
-      end
-
-      def current_node(node)
-        @node = node
-      end
-
-      alias last_node node
-
-      def reset
-        @dom = schema
-        @last_node = nil
-      end
-
-      def schema
-        {}
-      end
-
-      def logit
-        puts JSON.pretty_generate(dom)
-        # log.structure(dom)
-
-        self
-      end
-
-      def data
-        KUtil.data.to_open_struct(@dom)
-      end
-    end
-  end
-end