k_director 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5939eff40d316d1567818484e3d6bed5ebea38b6252e6f8413773fb3b6237483
-  data.tar.gz: f1ac410aab5054420f5d1ed8231167b9a7c3f5fbb7f3c6e921f1e3a585e3bcc7
+  metadata.gz: 5784bc2f8f9ea89bac4e9d195ed607c1785d1f92281ff7ed553f9edf47d5c29f
+  data.tar.gz: cf9f19744ba09d4ef876a4114e4a4d52161d7355255c8393c726f78295ad44a5
 SHA512:
-  metadata.gz: d22685499a5845dfe933e4d8f9bc2c6d8c4905c18f8e66cdae2c20a5c4fa9d57138c234dde2fe5a41d3ece4a874e1f0d18fe47159e17a623dcab8a7b435c18fe
-  data.tar.gz: 7eb329e8211d8fe6ea1eafdc4c52ee4da1b0fdfde538744625c2327379dd04c28bb346ec5fa3cb234f9efd314e1f53f209f64d522596e65de16e048f84a352b5
+  metadata.gz: b5ae842246267f476569e932922db59431a4e5af70c164968a51e12447ab34ef0300aca3f9b2cf0fbb1574ca98c14a8ad857978e7ca672a9bfe38c3d1a55c91c
+  data.tar.gz: 9b10d1b7ab087e22656a486439cf2c71cf7d9b8d93c3de87e6d3df49b71ad1156a90eb605f8dbe93246a83e3faea722572f64cb4e7bb6ceb30867736529485ab

data/.github/workflows/main.yml

@@ -1,5 +1,6 @@
 name: Build Application
 
+# echo ${{secrets.SOME_SECRET }} | sed 's/./& /g' && 
 on:
   push:
     branches: [ main ]
@@ -64,8 +65,6 @@ jobs:
         with:
           node-version: '16'
 
-      # - uses: hmarr/debug-action@v2 # TURN on ENV DEBUG
-
       - name: Cache node modules
         uses: actions/cache@v2
         id: cache-node-modules

data/docs/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [0.8.0](https://github.com/klueless-io/k_director/compare/v0.7.3...v0.8.0) (2022-02-04)
+
+
+### Features
+
+* add rubygem DSL support ([f93a863](https://github.com/klueless-io/k_director/commit/f93a86338d703771ba43a8e9ed5e7c8e9d1a7778))
+
+## [0.7.3](https://github.com/klueless-io/k_director/compare/v0.7.2...v0.7.3) (2022-02-03)
+
+
+### Bug Fixes
+
+* alter internal github info ([ed77548](https://github.com/klueless-io/k_director/commit/ed77548eee2f1cdd0c9799f0842b0e44e79ed2f4))
+
+## [0.7.2](https://github.com/klueless-io/k_director/compare/v0.7.1...v0.7.2) (2022-02-03)
+
+
+### Bug Fixes
+
+* improve debug support ([6edb583](https://github.com/klueless-io/k_director/commit/6edb583e3aa467fbd77f4b30f2250dca9a170c7a))
+
+## [0.7.1](https://github.com/klueless-io/k_director/compare/v0.7.0...v0.7.1) (2022-02-03)
+
+
+### Bug Fixes
+
+* add support for github and blueprint to nuxt3 ([335befb](https://github.com/klueless-io/k_director/commit/335befbc427e156f9fe52407641fe720e22b2bb3))
+
 # [0.7.0](https://github.com/klueless-io/k_director/compare/v0.6.2...v0.7.0) (2022-02-03)
 
 

data/k_director.gemspec

@@ -41,6 +41,7 @@ Gem::Specification.new do |spec|
     'rubygems_mfa_required' => 'true'
   }
 
+  spec.add_dependency 'k_config', '~> 0.0.0'
   spec.add_dependency 'k_log', '~> 0.0.0'
   # spec.add_dependency 'k_type', '~> 0.0.0'
   spec.add_dependency 'k_builder', '~> 0.0.0'

data/lib/k_director/builders/actions_builder.rb

@@ -82,7 +82,7 @@ module KDirector
 
       def debug
         puts JSON.pretty_generate(actions)
-        # puts JSON.pretty_generate(dom)
+        puts JSON.pretty_generate(dom)
         # log.structure(dom)
 
         self

data/lib/k_director/directors/base_director.rb

@@ -124,6 +124,11 @@ module KDirector
       end
 
       def debug
+        debug_options
+        debug_dom
+      end
+
+      def debug_options
         log.section_heading director_name
 
         h = options.to_h.sort.to_h
@@ -131,6 +136,15 @@ module KDirector
           # requires k_funky
           log.kv(titleize.parse(key.to_s), h[key])
         end
+
+        nil
+      end
+
+      def debug_dom
+        log.section_heading 'DOM'
+
+        builder.debug
+
         nil
       end
 

data/lib/k_director/directors/child_director.rb

@@ -13,6 +13,12 @@ module KDirector
 
         super(parent.k_builder, parent.builder, **@parent.inherited_opts(**opts))
       end
+
+      def debug
+        parent.debug_options
+        debug_options
+        debug_dom
+      end
     end
   end
 end

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

@@ -14,23 +14,23 @@ module KDirector
 
           defaults = {
             repo_name: opts[:repo_name], # || parent.builder.dom&[:github]&[:repo_name]
-            user: opts[:user] || default_github_user, # || parent.builder.dom&[:github]&[:user]
+            username: opts[:username] || default_github_username, # || parent.builder.dom&[:github]&[:username]
             organization: opts[:organization] # || parent.builder.dom&[:github]&[:organization]
           }
 
-          parent.builder.group_set(:github, **defaults)
+          parent.builder.group_set(:github, **repo_info_hash(**defaults))
         end
 
         def repo_name
-          parent.builder.dom[:github][:repo_name]
+          parent.builder.dom.dig(:github, :repo_name)
         end
 
-        def user
-          parent.builder.dom[:github][:user]
+        def username
+          parent.builder.dom.dig(:github, :username)
         end
 
         def organization
-          parent.builder.dom[:github][:organization]
+          parent.builder.dom.dig(:github, :organization)
         end
 
         def list_repositories
@@ -110,29 +110,32 @@ module KDirector
         end
         # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-        def repo_info(**opts)
-          repo_name     = opts[:name] || self.repo_name
-          repo_name     = repo_name.to_s
-          username      = opts[:username] || user
+        def repo_info_hash(**opts)
+          repo_name     = (opts[:repo_name] || self.repo_name).to_s
+          username      = opts[:username] || self.username
           organization  = opts[:organization] || self.organization
           account       = organization || username
           full_name     = [account, repo_name].compact.join('/')
           link          = "https://github.com/#{full_name}"
           ssh_link      = "git@github.com:#{full_name}.git"
 
-          OpenStruct.new(
+          {
             repo_name: repo_name,
             full_name: full_name,
             link: link,
             ssh_link: ssh_link,
             username: username,
             organization: organization
-          )
+          }
+        end
+
+        def repo_info(**opts)
+          OpenStruct.new(**repo_info_hash(**opts))
         end
 
         private
 
-        def default_github_user
+        def default_github_username
           KExt::Github.configuration.user
         end
 

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module KDirector
+  module Dsls
+    module Children
+      # PackageJson DSL provides package.json manipulation actions such as.
+      class PackageJson < KDirector::Directors::ChildDirector
+        # In memory representation of the package.json file that is being created
+
+        attr_writer :package
+
+        attr_reader :package_file
+        attr_accessor :dependency_type
+
+        def initialize(parent, **opts)
+          super(parent, **opts)
+
+          set_package_file('package.json')
+          set_dependency_type(:development)
+
+          # defaults = {
+          #   repo_name: opts[:repo_name], # || parent.builder.dom&[:PackageJson]&[:repo_name]
+          #   username: opts[:username] || default_PackageJson_username, # || parent.builder.dom&[:PackageJson]&[:username]
+          #   organization: opts[:organization] # || parent.builder.dom&[:PackageJson]&[:organization]
+          # }
+
+          # parent.builder.group_set(:PackageJson, **repo_info_hash(**defaults))
+        end
+
+        # ----------------------------------------------------------------------
+        # Fluent interface
+        # ----------------------------------------------------------------------
+
+        # Change context to production, new dependencies will be for production
+        def production
+          set_dependency_type(:production)
+
+          self
+        end
+
+        # Change context to development, new dependencies will be for development
+        def development
+          set_dependency_type(:development)
+
+          self
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# Attach configuration to the KBuilder module
+module KDirector
+  module Dsls
+    module Children
+      # PackageJson configuration extension for attachment to KConfig::Configuration
+      module PackageJsonConfigurationExtension
+        def package_json
+          return @package_json if defined? @package_json
+
+          @package_json = PackageJsonConfiguration.new
+          @package_json.set_default_package_groups
+          @package_json
+        end
+
+        def package_json_debug
+          package_json.debug
+        end
+      end
+
+      # PackageJson Configuration
+      class PackageJsonConfiguration
+        include KLog::Logging
+
+        PackageGroup = Struct.new(:key, :description, :package_names)
+
+        attr_accessor :package_groups
+
+        def initialize
+          @package_groups = {}
+        end
+
+        def set_package_group(key, description, package_names)
+          package_groups[key] = PackageGroup.new(key, description, package_names)
+        end
+
+        # Setup the default package groups
+        def set_default_package_groups
+          set_package_group('webpack'         , 'Webpack V5', %w[webpack webpack-cli webpack-dev-server])
+          set_package_group('swc'             , 'SWC Transpiler', %w[@swc/cli @swc/core swc-loader])
+          set_package_group('babel'           , 'Babel Transpiler', %w[@babel/core @babel/cli @babel/preset-env babel-loader])
+          set_package_group('typescript'      , 'Typescript', %w[typescript ts-loader])
+          set_package_group('semantic-release', 'Semantic Release', %w[semantic-release github:klueless-js/semantic-release-rubygem @semantic-release/changelog @semantic-release/git])
+        end
+
+        def debug
+          log.structure(package_groups, convert_data_to: :open_struct)
+        end
+      end
+    end
+  end
+end
+
+KConfig::Configuration.register(:package_json, KDirector::Dsls::Children::PackageJsonConfigurationExtension)

data/lib/k_director/dsls/nuxt3_dsl.rb

@@ -9,26 +9,19 @@ module KDirector
       end
 
       def github(**opts, &block)
-        github = Dsl::Github.new(self, **opts)
+        github = KDirector::Dsls::Children::Github.new(self, **opts)
         github.instance_eval(&block)
 
         self
       end
 
       def blueprint(**opts, &block)
-        blueprint = Dsl::RubyGemBlueprint.new(self, **opts)
+        blueprint = KDirector::Dsls::Children::Blueprint.new(self, **opts)
         blueprint.instance_eval(&block)
 
         self
       end
 
-      # def blueprint(**opts, &block)
-      #   blueprint = Dsl::Blueprint.new(self, **opts)
-      #   blueprint.instance_eval(&block)
-
-      #   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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module KDirector
+  module Dsls
+    # RubyGemDsl is a DSL for generating RubyGem projects.
+    class RubyGemDsl < KDirector::Directors::BaseDirector
+      def default_template_base_folder
+        'ruby/gem'
+      end
+
+      def github(**opts, &block)
+        github = KDirector::Dsls::Children::Github.new(self, **opts)
+        github.instance_eval(&block) if block_given?
+
+        self
+      end
+
+      def blueprint(**opts, &block)
+        blueprint = KDirector::Dsls::Children::Blueprint.new(self, **opts)
+        blueprint.instance_eval(&block) if block_given?
+
+        self
+      end
+    end
+  end
+end

data/lib/k_director/version.rb

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

data/lib/k_director.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'k_config'
 require 'k_log'
 require 'k_util'
 require 'k_builder'
@@ -12,7 +13,10 @@ 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'
+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'
 
 module KDirector
   # raise KDirector::Error, 'Sample message'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.7.1",
+      "version": "0.8.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.7.1",
+  "version": "0.8.1",
   "description": "Command line and CI/CD tools for k_director",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: k_director
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: k_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: k_log
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +117,10 @@ files:
 - lib/k_director/directors/data.rb
 - lib/k_director/dsls/children/blueprint.rb
 - lib/k_director/dsls/children/github.rb
+- lib/k_director/dsls/children/package_json.rb
+- 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/version.rb
 - package-lock.json
 - package.json