k_director 0.11.1 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ee6da028f776a4ed4ed470290696dfcf2c15c0caa417666e9300f1d75ea390
-  data.tar.gz: 14dd16cd8185b21eef317ea6b8cfda1ee570c8559e77db264021722889962a74
+  metadata.gz: 299e8ce98da8e9466c4394c2bd5b004a62cc69f3f9f99df5e0d94166de79604c
+  data.tar.gz: d2919e383af54afd515024ec6c6cc0e11906455680bb1fe62661b2649a32f3e6
 SHA512:
-  metadata.gz: 34896604b4d9731e4a4ab0924572fdb65736bab9e71b63491ba16fd9d3f79418e3e63d4d81818048870333c002f76316846617df1ccbe5aaffb1c171e73efdc8
-  data.tar.gz: dcf6fd9985456ad96ac7383b29a08fcf020b8947502eac2af80c2618481f12bc193d180a1518d40cb4d074d8a8412dcaeecb5c017e1cddeda406ee365deab520
+  metadata.gz: afca62f2f2ceeb8bb99aab3d720f23963d4b559144e0388aebdc22bf58deb746da7e86dec8fac60ed90cb76815c146ca8acb9ce868cd2aa1c408b42c6ac2b275
+  data.tar.gz: 2fb3e677abf07ad9f7ec9cad4c94beaac720e1d1f8cce8cc0d9e12c988f17fde5e8be91ae6187018de18a4cc3cea032fb8ac277e927613dc0e7d57623b9354d9

data/docs/CHANGELOG.md

@@ -1,3 +1,32 @@
+# [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)
+
+
+### Bug Fixes
+
+* add simple dsl ([0fd61ab](https://github.com/klueless-io/k_director/commit/0fd61abbe90a136c96b750fcf7456bc46aa73463))
+
+## [0.11.2](https://github.com/klueless-io/k_director/compare/v0.11.1...v0.11.2) (2022-02-08)
+
+
+### Bug Fixes
+
+* add typed_dom to base_director ([22ee75d](https://github.com/klueless-io/k_director/commit/22ee75da20cd00fe1f48f7027775b59dcf1c17a5))
+* move add, oadd, tadd, fadd from blueprint_director to base_director ([82f6aa0](https://github.com/klueless-io/k_director/commit/82f6aa02311ec04b9cb716846630274700deefb5))
+
+## [0.11.1](https://github.com/klueless-io/k_director/compare/v0.11.0...v0.11.1) (2022-02-07)
+
+
+### Bug Fixes
+
+* move add, oadd, tadd, fadd from blueprint_director to base_director ([caab926](https://github.com/klueless-io/k_director/commit/caab92618406a072c3e326a3a640f7c6a4b71f03))
+
 # [0.11.0](https://github.com/klueless-io/k_director/compare/v0.10.4...v0.11.0) (2022-02-07)
 
 

data/lib/k_director/builders/actions_builder.rb

@@ -3,18 +3,13 @@
 module KDirector
   module Builders
     # Actions document builder
-    class ActionsBuilder
+    class ActionsBuilder < KDirector::Builders::DomBuilder
       attr_reader :actions
-      attr_reader :dom
       attr_reader :last_action
 
-      def initialize
-        reset
-      end
-
       def reset
+        super
         @actions = []
-        @dom = {}
         @last_action = {}
       end
 
@@ -23,100 +18,12 @@ module KDirector
         @last_action = action
       end
 
-      # 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)
+        super
 
         self
       end
-
-      def build
-        # hook into the set, add and queue_action methods form memoization
-        KUtil.data.to_open_struct(@dom)
-      end
-
-      private
-
-      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
 end

data/lib/k_director/builders/dom_builder.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module KDirector
+  module Builders
+    # Dom builder
+    class DomBuilder
+      attr_reader :dom
+
+      def initialize
+        reset
+      end
+
+      def reset
+        @dom = {}
+      end
+
+      # 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(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 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
+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
@@ -51,6 +61,10 @@ module KDirector
         builder.dom
       end
 
+      def typed_dom
+        builder.build
+      end
+
       # Used by child directors to inherit options from parent
       def inherited_opts(**opts)
         {

data/lib/k_director/dsls/simple_dsl.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module KDirector
+  module Dsls
+    # BasicDsl is a DSL for generating basic projects.
+    class BasicDsl < KDirector::Directors::BaseDirector
+      def default_template_base_folder
+        'basic'
+      end
+    end
+  end
+end

data/lib/k_director/version.rb

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

data/lib/k_director.rb

@@ -7,6 +7,7 @@ require 'k_builder'
 require 'k_ext/github'
 
 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'
@@ -17,6 +18,7 @@ require_relative 'k_director/dsls/children/package_json_configuration'
 require_relative 'k_director/dsls/children/package_json'
 require_relative 'k_director/dsls/nuxt3_dsl'
 require_relative 'k_director/dsls/ruby_gem_dsl'
+require_relative 'k_director/dsls/simple_dsl'
 
 module KDirector
   # raise KDirector::Error, 'Sample message'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.11.1",
+  "version": "0.12.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.11.1",
+      "version": "0.12.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.11.1",
+  "version": "0.12.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.11.1
+  version: 0.12.1
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -90,7 +90,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"
@@ -113,6 +112,7 @@ 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
@@ -122,6 +122,7 @@ files:
 - lib/k_director/dsls/children/package_json_configuration.rb
 - lib/k_director/dsls/nuxt3_dsl.rb
 - lib/k_director/dsls/ruby_gem_dsl.rb
+- lib/k_director/dsls/simple_dsl.rb
 - lib/k_director/version.rb
 - package-lock.json
 - package.json

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