k_director 0.7.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01c2703862b9bf79b4c341909d33799f83fc4b3db8a486f709061e8dcda1f795
-  data.tar.gz: '063359b7c3717c8c8512db963bae8ebd23e4339799a477893bd90964342b7800'
+  metadata.gz: 4a7a7b652cc348b24d223f9c0df0d39443a61699e6b7221eaa65499d517f155b
+  data.tar.gz: 7b196d138fa1953a54562e0e381aee32754b55f43eada1981ac45db973c55209
 SHA512:
-  metadata.gz: 58555b963f3cd67d9dc1097dacdbeabadeda3f9f258a769cd9bdfa623a5c2c5bf71fb37d28f6c33b4a2baae0ceff86b9f0f838e34624e81da2e6bfcd9efc9135
-  data.tar.gz: 5baf583a108004162cb990eb022f660d23bf260f7b0b6aa45c56fb102ed5f6cf1f9e72f489ae5f52560af03d0d37c56d3cf2fd8d0d71168f344df0d46c73878c
+  metadata.gz: 03cb460ca47b4c4c5ef5f355ef13882ffd1b38b9590ecba60eb4c49551efe91d067029c79c02b9e5526a12677b23cbd87accf473650c62daa1ca91de4b71be8c
+  data.tar.gz: 14294acc2367c38f19f7c1ccb5dcecdcbf58bd86fc754bce974de4bb75ad635a8b21b36d698362d08d5eb584e0da23c4475c81d7938f697cf30f9de0d704dc51

data/.builders/boot.rb

@@ -40,10 +40,10 @@ def dasherize
 end
 
 def k_builder
-  @k_builder ||= KBuilder::BaseBuilder.init(KBuilder.configuration(CONFIG_KEY))
+  @k_builder ||= KBuilder::BaseBuilder.init(KConfig.configuration(CONFIG_KEY))
 end
 
-KBuilder.configure(CONFIG_KEY) do |config|
+KConfig.configure(CONFIG_KEY) do |config|
   builder_folder    = Dir.pwd
   base_folder       = File.expand_path('../', builder_folder)
   global_template   = File.expand_path('~/dev/kgems/k_templates/templates')
@@ -58,7 +58,7 @@ KBuilder.configure(CONFIG_KEY) do |config|
   # config.target_folders.add(:database             , :data, 'database')
 end
 
-KBuilder.configuration(CONFIG_KEY).debug
+KConfig.configuration(CONFIG_KEY).debug
 
 area = KManager.add_area(CONFIG_KEY)
 resource_manager = area.resource_manager

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.1](https://github.com/klueless-io/k_director/compare/v0.8.0...v0.8.1) (2022-02-05)
+
+
+### Bug Fixes
+
+* add tests for package_json configuration ([d900065](https://github.com/klueless-io/k_director/commit/d900065bf810771841b97de03dfa9011c48c8e43))
+
+# [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)
 
 

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/directors/base_director.rb

@@ -59,6 +59,10 @@ module KDirector
         }.merge(opts)
       end
 
+      def configuration
+        k_builder.configuration
+      end
+
       def director_name
         @options.director_name
       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,278 @@
+# 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)
+        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
+
+        # Init an NPN package
+        #
+        # run npm init -y
+        #
+        # Note: npm init does not support --silent operation
+        def npm_init
+          run_command 'npm init -y'
+
+          load
+
+          self
+        end
+
+        # Space separated list of packages
+        def npm_install(packages, options: nil)
+          npm_add_or_install(packages, parse_options(options))
+
+          self
+        end
+        alias npm_i npm_install
+
+        def npm_add(packages, options: nil)
+          npm_add_or_install(packages, parse_options(options, '--package-lock-only --no-package-lock'))
+
+          self
+        end
+        alias npm_a npm_add
+
+        def npm_add_group(key, options: nil)
+          group = get_group(key)
+
+          puts "Adding #{group.description}"
+
+          npm_add(group.package_names, options: options)
+
+          self
+        end
+        alias npm_ag npm_add_group
+
+        # Add a group of NPN packages which get defined in configuration
+        def npm_install_group(key, options: nil)
+          group = get_group(key)
+
+          puts "Installing #{group.description}"
+
+          npm_install(group.package_names, options: options)
+
+          self
+        end
+
+        # Load the existing package.json into memory
+        #
+        # ToDo: Would be useful to record the update timestamp on the package
+        # so that we only load if the in memory package is not the latest.
+        #
+        # The reason this can happen, is because external tools such are
+        # npm install are updating the package.json and after this happens
+        # we need to call load, but if there is any bug in the code we may
+        # for get to load, or we may load multiple times.
+        def load
+          raise KDirector::Error, 'package.json does not exist' unless File.exist?(package_file)
+
+          puts 'loading...'
+
+          content = File.read(package_file)
+          @package = JSON.parse(content)
+
+          self
+        end
+
+        # Write the package.json file
+        def write
+          puts 'writing...'
+
+          content = JSON.pretty_generate(@package)
+
+          File.write(package_file, content)
+
+          self
+        end
+
+        # Remove a script reference by key
+        def remove_script(key)
+          load
+
+          @package['scripts']&.delete(key)
+
+          write
+
+          self
+        end
+
+        # Add a script with key and value (command line to run)
+        def add_script(key, value)
+          load
+
+          @package['scripts'][key] = value
+
+          write
+
+          self
+        end
+
+        # ----------------------------------------------------------------------
+        # Attributes: Think getter/setter
+        #
+        # The following getter/setters can be referenced both inside and outside
+        # of the fluent builder fluent API. They do not implement the fluent
+        # interface unless prefixed by set_.
+        #
+        # set_: Only setters with the prefix _set are considered fluent.
+        # ----------------------------------------------------------------------
+
+        # Package
+        # ----------------------------------------------------------------------
+
+        # Load the package.json into a memory as object
+        def package
+          return @package if defined? @package
+
+          load
+
+          @package
+        end
+
+        # Package.set
+        # ----------------------------------------------------------------------
+
+        # Set a property value in the package
+        def set(key, value)
+          load
+
+          @package[key] = value
+
+          write
+
+          self
+        end
+
+        # Dependency option
+        # ----------------------------------------------------------------------
+
+        # Getter for dependency option
+        def dependency_option
+          dependency_type == :development ? '-D' : '-P'
+        end
+
+        # Dependency type
+        # ----------------------------------------------------------------------
+
+        # Fluent setter for target folder
+        # rubocop:disable Naming/AccessorMethodName
+        def set_dependency_type(value)
+          self.dependency_type = value
+
+          self
+        end
+        # rubocop:enable Naming/AccessorMethodName
+
+        # Package file
+        # ----------------------------------------------------------------------
+
+        # Fluent setter for package file
+        # rubocop:disable Naming/AccessorMethodName
+        def set_package_file(value)
+          self.package_file = value
+
+          self
+        end
+        # rubocop:enable Naming/AccessorMethodName
+
+        # Setter for package file
+        def package_file=(_value)
+          @package_file = File.join(k_builder.target_folder, 'package.json')
+        end
+
+        # # Getter for target folder
+        # def package_file
+        #   hash['package_file']
+        # end
+
+        # -----------------------------------
+        # Helpers
+        # -----------------------------------
+
+        def parse_options(options = nil, required_options = nil)
+          options = [] if options.nil?
+          options = options.split if options.is_a?(String)
+          options.reject(&:empty?)
+
+          required_options = [] if required_options.nil?
+          required_options = required_options.split if required_options.is_a?(String)
+
+          options | required_options
+        end
+
+        def options_any?(options, *any_options)
+          (options & any_options).any?
+        end
+
+        def execute(command)
+          puts "RUN: #{command}"
+          run_command command
+          load
+        end
+
+        def npm_add_or_install(packages, options)
+          # if -P or -D is not in the options then use the current builder dependency option
+          options.push dependency_option unless options_any?(options, '-P', '-D')
+          packages = packages.join(' ') if packages.is_a?(Array)
+          command = "npm install #{options.join(' ')} #{packages}"
+          execute command
+        end
+
+        # # Debug method to open the package file in vscode
+        # # ToDo: Maybe remove
+        # def vscode
+        #   puts "cd #{output_path}"
+        #   puts package_file
+        #   run_command "code #{package_file}"
+        # end
+
+        # private
+
+        def get_group(key)
+          group = configuration.package_json.package_groups[key]
+
+          raise KConfig::PackageJson::Error, "unknown package group: #{key}" if group.nil?
+
+          group
+        end
+
+        def run_command(command)
+          parent.k_builder.run_command(command)
+        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/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.2'
+  VERSION = '0.9.0'
 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.2",
+  "version": "0.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.7.2",
+      "version": "0.9.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.7.2",
+  "version": "0.9.0",
   "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.2
+  version: 0.9.0
 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