k_director 0.10.4 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 698c7a115b9641c2e43e67a9687dc5915a4db15a01804213e8d9b032cc343989
-  data.tar.gz: 8c7fe44606d3d30bab53f338c40f9891673adc1758389cf26938946b936b7ae2
+  metadata.gz: 30dd3c3e965fcfffe2f5a1bed60503f7bce7d81ebbb6e8222a839cdb12158a00
+  data.tar.gz: 3dc4f966e719adf8bb9c360034484dbb9592d3738a4a1bfc5d11cfd40c310619
 SHA512:
-  metadata.gz: 89dde4df4e1e0560b05e73155cb22c508b299a7be4d43d6fea261f5fc26cd52ef62d13413f95638cb5832e259ff92aa5afead9ee48ec4d5a67bf815d2747b364
-  data.tar.gz: 37d154d3cf14db3b63eb83c9110851ff50cddc335d326bbf3676b74afd07c6e38b3a3bb34729f26c25024167a8fa2b6c243aa284b4e9764ce4ce1c424054047b
+  metadata.gz: 4a6b899015103ceb4781ddffb7027e8f854dbc9a004bb8f4a5b28f1192e6bf53bedbd6d4a0dea501caa7afb047fbbf6b6c9e65462ddf24ba94e879d01c8e5e87
+  data.tar.gz: a87a0fe0a07591a0f39a244e7287e21999bea92e819382a2f6e3899af73a917d348f13917c1fd7918d53cc5047f768b40b459722aac1e3ad1e8bbc2a5ae04bb3

data/docs/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [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)
+
+
+### Features
+
+* move github, blueprint and package_json fluent accessors onto BaseDirector ([88fa3fd](https://github.com/klueless-io/k_director/commit/88fa3fd0df530bef3731f0b4a62369d925df2fa5))
+
+## [0.10.4](https://github.com/klueless-io/k_director/compare/v0.10.3...v0.10.4) (2022-02-07)
+
+
+### Bug Fixes
+
+* add active option so that child directors can be suppressed or executed ([8a57617](https://github.com/klueless-io/k_director/commit/8a57617eea20dd9a020aec329bd994b3c444f087))
+
 ## [0.10.3](https://github.com/klueless-io/k_director/compare/v0.10.2...v0.10.3) (2022-02-06)
 
 

data/lib/k_director/directors/base_director.rb

@@ -51,6 +51,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)
         {
@@ -89,6 +93,37 @@ module KDirector
         @options.on_action
       end
 
+      # Add a single file into the code base
+      #
+      # This is a wrapper around add_file that will add the file to the codebase using template path rules
+      #
+      # @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], template_file].reject(&:blank?)
+        template_path = File.join(*template_parts)
+
+        # maybe template_file should be renamed to template_path in k_builder
+        opts[:template_file] = template_path
+
+        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
+
       # Add a file to target folder
       def add_file(file, **opts)
         opts = {
@@ -133,6 +168,29 @@ module KDirector
         k_builder.play_actions(builder.actions)
       end
 
+      # Common child directors
+
+      def github(**opts, &block)
+        github = KDirector::Dsls::Children::Github.new(self, **opts)
+        github.instance_eval(&block) if github.active? && block_given?
+
+        self
+      end
+
+      def package_json(**opts, &block)
+        package_json = KDirector::Dsls::Children::PackageJson.new(self, **opts)
+        package_json.instance_eval(&block) if package_json.active? && block_given?
+
+        self
+      end
+
+      def blueprint(**opts, &block)
+        blueprint = KDirector::Dsls::Children::Blueprint.new(self, **opts)
+        blueprint.instance_eval(&block) if blueprint.active? && block_given?
+
+        self
+      end
+
       def debug
         debug_options
         debug_dom

data/lib/k_director/dsls/children/blueprint.rb

@@ -7,35 +7,6 @@ module KDirector
       #
       # A blueprint is a recipe that you can follow to build out assets on the target application
       class Blueprint < KDirector::Directors::ChildDirector
-        # Add a single file into the code base
-        #
-        # @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], template_file].reject(&:blank?)
-          template_path = File.join(*template_parts)
-
-          # maybe template_file should be renamed to template_path in k_builder
-          opts[:template_file] = template_path
-
-          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
-
         # def template_content(template_file, **opts)
         #   template_parts = [template_base_folder, opts[:template_subfolder], template_file].reject(&:blank?)
         #   template_file = File.join(*template_parts)

data/lib/k_director/dsls/nuxt3_dsl.rb

@@ -8,27 +8,6 @@ module KDirector
         'nuxt3'
       end
 
-      def github(**opts, &block)
-        github = KDirector::Dsls::Children::Github.new(self, **opts)
-        github.instance_eval(&block) if github.active? && block_given?
-
-        self
-      end
-
-      def package_json(**opts, &block)
-        package_json = KDirector::Dsls::Children::PackageJson.new(self, **opts)
-        package_json.instance_eval(&block) if package_json.active? && block_given?
-
-        self
-      end
-
-      def blueprint(**opts, &block)
-        blueprint = KDirector::Dsls::Children::Blueprint.new(self, **opts)
-        blueprint.instance_eval(&block) if blueprint.active? && block_given?
-
-        self
-      end
-
       # def app(**opts, &block)
       #   app = Dsl::Nuxt3App.new(self, **opts)
       #   app.instance_eval(&block)

data/lib/k_director/dsls/ruby_gem_dsl.rb

@@ -8,26 +8,26 @@ module KDirector
         'ruby/gem'
       end
 
-      def github(**opts, &block)
-        github = KDirector::Dsls::Children::Github.new(self, **opts)
-        github.instance_eval(&block) if block_given?
+      # def github(**opts, &block)
+      #   github = KDirector::Dsls::Children::Github.new(self, **opts)
+      #   github.instance_eval(&block) if github.active? && block_given?
 
-        self
-      end
+      #   self
+      # end
 
-      def package_json(**opts, &block)
-        package_json = KDirector::Dsls::Children::PackageJson.new(self, **opts)
-        package_json.instance_eval(&block) if block_given?
+      # def package_json(**opts, &block)
+      #   package_json = KDirector::Dsls::Children::PackageJson.new(self, **opts)
+      #   package_json.instance_eval(&block) if package_json.active? && block_given?
 
-        self
-      end
+      #   self
+      # end
 
-      def blueprint(**opts, &block)
-        blueprint = KDirector::Dsls::Children::Blueprint.new(self, **opts)
-        blueprint.instance_eval(&block) if block_given?
+      # def blueprint(**opts, &block)
+      #   blueprint = KDirector::Dsls::Children::Blueprint.new(self, **opts)
+      #   blueprint.instance_eval(&block) if blueprint.active? && block_given?
 
-        self
-      end
+      #   self
+      # end
     end
   end
 end

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.10.4'
+  VERSION = '0.11.3'
 end

data/lib/k_director.rb

@@ -17,6 +17,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.10.4",
+  "version": "0.11.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.10.4",
+      "version": "0.11.3",
       "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.10.4",
+  "version": "0.11.3",
   "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.10.4
+  version: 0.11.3
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -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