k_director 0.8.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a815561b5b1396f42cb9a229c9f596505dfc9aa7e4806e52c5e9561fe3b4ee8b
-  data.tar.gz: 55e7a341a190c4e022d8041b520d79f7d30007a644a277b5a0b761a3054f9843
+  metadata.gz: 431e5c6f071221fcdea319010b83bb17bba62187f835ae595a5453eaffd30956
+  data.tar.gz: ebcfe2cda7f2538f0511cd5e6df7bbf9d53bb29834b43286f34054d51521eecd
 SHA512:
-  metadata.gz: 51b5a5b3c460a6b2f5059f3e99348697184d10710ff128797db01a0684d06667432802fc986e363cdea19610c6e5b23ed71679bcac530b14b8baa347b83d4c1b
-  data.tar.gz: 179bc109bb350c5be224c52b0c3b5f9115dc719a92a2f071a1df27307fa94a0c5e494b4c7388d658183de7ab5536af122a638e1fdae98591495b414f5ed0c15c
+  metadata.gz: 725a68f629da441807038726a8899bf19004c0dec43b7e41ac11fccb9124bd2bbcb3dd6babd10938287c9b00394aba3e7588af91cbf5be99f5d8523c29459381
+  data.tar.gz: aeca07e40f162c470767a7590865cf7cb41f48c5ffa605dc37cb1f71b538acff734963321b0bd9a7e05d03d716a476cd485baaff595070f5f72b718963384621

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/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "cSpell.words": [
+    "postcss"
+  ]
+}

data/docs/CHANGELOG.md

@@ -1,3 +1,37 @@
+# [0.10.0](https://github.com/klueless-io/k_director/compare/v0.9.0...v0.10.0) (2022-02-06)
+
+
+### Bug Fixes
+
+* package_json set key converted to string and stripped ([784b33d](https://github.com/klueless-io/k_director/commit/784b33db2a045e8273e4e5a30747f0b05cc50cfd))
+
+
+### Features
+
+* add package_json dsl support to nuxt3 and rubygem ([9b4650d](https://github.com/klueless-io/k_director/commit/9b4650d48deaeb158ef25300b12f9de5725bf2c0))
+* add sort package json keys to package_json dsl ([90e2041](https://github.com/klueless-io/k_director/commit/90e2041759714faa1333c51226102e7ab8041a0a))
+
+# [0.9.0](https://github.com/klueless-io/k_director/compare/v0.8.1...v0.9.0) (2022-02-05)
+
+
+### Features
+
+* add package_json dsl support ([15b3ad7](https://github.com/klueless-io/k_director/commit/15b3ad7472a3374e646c391a7271fb7782636afe))
+
+## [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)
 
 

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/dsls/children/package_json.rb

@@ -17,14 +17,6 @@ module KDirector
 
           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
 
         # ----------------------------------------------------------------------
@@ -44,6 +36,278 @@ module KDirector
 
           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)
+          remove(key, group: 'scripts')
+          # load
+
+          # @package['scripts']&.delete(key)
+
+          # write
+
+          self
+        end
+
+        # Add a script with key and value (command line to run)
+        def add_script(key, value)
+          set(key, value, group: 'scripts')
+
+          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, group: nil)
+          load
+
+          key = key.to_s.strip
+
+          if group.nil?
+            @package[key] = value
+          else
+            group = group.to_s.strip
+            @package[group] = {} unless @package[group]
+            @package[group][key] = value
+          end
+
+          write
+
+          self
+        end
+
+        def remove(key, group: nil)
+          load
+
+          key = key.to_s.strip
+
+          if group.nil?
+            @package.delete(key)
+          else
+            group = group.to_s.strip
+            @package[group]&.delete(key)
+          end
+
+          @package['scripts']&.delete(key)
+
+          write
+
+          self
+        end
+
+        # Package.sort using `npx sort-package-json`
+        # ----------------------------------------------------------------------
+
+        # Sort the package.json keys using `npx sort-package-json`
+        def sort
+          run_command 'npx sort-package-json'
+
+          load
+
+          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

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

@@ -0,0 +1,78 @@
+# 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('semver-ruby'     , 'Semantic Release for Ruby' , %w[semantic-release github:klueless-js/semantic-release-rubygem @semantic-release/changelog @semantic-release/git])
+
+          set_package_group('semver-nuxt'     , 'Semantic Release for Nuxt' , %w[
+                              semantic-release
+                              @semantic-release/changelog
+                              @semantic-release/git
+                            ])
+
+          set_package_group('tailwind-nuxt'   , 'TailwindCSS for Nuxt'      , %w[
+                              tailwindcss@latest
+                              postcss@latest
+                              autoprefixer@latest
+                            ])
+
+          # this does not work yet
+          set_package_group('storybook-nuxt'  , 'Storybook for (Vite/Nuxt)' , %w[
+                              @storybook/vue3@6.4.18
+                              @storybook/addon-docs@6.4.18
+                              @storybook/addon-essentials@6.4.18
+                              @storybook/addon-postcss@2.0.0
+                              @storybook/addon-storysource@6.4.18
+                              storybook-builder-vite
+                            ])
+          # @storybook/addon-docs
+        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

@@ -10,14 +10,21 @@ module KDirector
 
       def github(**opts, &block)
         github = KDirector::Dsls::Children::Github.new(self, **opts)
-        github.instance_eval(&block)
+        github.instance_eval(&block) if block_given?
+
+        self
+      end
+
+      def package_json(**opts, &block)
+        package_json = KDirector::Dsls::Children::PackageJson.new(self, **opts)
+        package_json.instance_eval(&block) if block_given?
 
         self
       end
 
       def blueprint(**opts, &block)
         blueprint = KDirector::Dsls::Children::Blueprint.new(self, **opts)
-        blueprint.instance_eval(&block)
+        blueprint.instance_eval(&block) if block_given?
 
         self
       end

data/lib/k_director/dsls/ruby_gem_dsl.rb

@@ -15,6 +15,13 @@ module KDirector
         self
       end
 
+      def package_json(**opts, &block)
+        package_json = KDirector::Dsls::Children::PackageJson.new(self, **opts)
+        package_json.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?

data/lib/k_director/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KDirector
-  VERSION = '0.8.0'
+  VERSION = '0.10.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,6 +13,7 @@ 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'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.8.0",
+  "version": "0.10.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.8.0",
+      "version": "0.10.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.8.0",
+  "version": "0.10.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.8.0
+  version: 0.10.1
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-06 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
@@ -86,6 +100,7 @@ files:
 - ".releaserc.json"
 - ".rspec"
 - ".rubocop.yml"
+- ".vscode/settings.json"
 - Gemfile
 - Guardfile
 - README.md
@@ -104,6 +119,7 @@ files:
 - 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