k_director 0.9.0 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a7a7b652cc348b24d223f9c0df0d39443a61699e6b7221eaa65499d517f155b
-  data.tar.gz: 7b196d138fa1953a54562e0e381aee32754b55f43eada1981ac45db973c55209
+  metadata.gz: fb7ed7623517d20d588f3fd176ee05dd8d28161d5164b099eaef39152475735d
+  data.tar.gz: 54b3ce3d61554f6d6f85b82167b9f1fcb82de4ccaacd7ec970ca68ae8cf07ccf
 SHA512:
-  metadata.gz: 03cb460ca47b4c4c5ef5f355ef13882ffd1b38b9590ecba60eb4c49551efe91d067029c79c02b9e5526a12677b23cbd87accf473650c62daa1ca91de4b71be8c
-  data.tar.gz: 14294acc2367c38f19f7c1ccb5dcecdcbf58bd86fc754bce974de4bb75ad635a8b21b36d698362d08d5eb584e0da23c4475c81d7938f697cf30f9de0d704dc51
+  metadata.gz: d25fbb9ad8b1dcd71b6fb7a56a31d5a54022071f28559d0e31bb1d53b3274e6287342f87cca3ea2f0e7dd812f436db2eb4458454266e83ea5f9c4202d9d2ad34
+  data.tar.gz: 486576cb37d37f4e973df1a4baf0a1430188d29a525fddc64b79528ed16f2bb830aa04de81fe65e94a3a258c5d8d75d1d901a7d1f272859f84430ad9cb48a1c8

data/.vscode/settings.json

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

data/docs/CHANGELOG.md

@@ -1,3 +1,38 @@
+## [0.10.2](https://github.com/klueless-io/k_director/compare/v0.10.1...v0.10.2) (2022-02-06)
+
+
+### Bug Fixes
+
+* package_json, remove_package_lcok, remove_yarn_locak, create_yarn_lock ([d69c6a5](https://github.com/klueless-io/k_director/commit/d69c6a53a80551cdf5ac73024de8d2e597c37614))
+* package_json, remove_package_lcok, remove_yarn_locak, create_yarn_lock ([fdeef48](https://github.com/klueless-io/k_director/commit/fdeef481763160ca0c8d306491d7eb2e29536641))
+
+## [0.10.1](https://github.com/klueless-io/k_director/compare/v0.10.0...v0.10.1) (2022-02-06)
+
+
+### Bug Fixes
+
+* package_json, add set by group, remove and re ove by group ([93317f8](https://github.com/klueless-io/k_director/commit/93317f8b590ac2551e72072e93ca9b7f0d54f568))
+
+# [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)
 
 

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

@@ -99,7 +99,7 @@ module KDirector
         def load
           raise KDirector::Error, 'package.json does not exist' unless File.exist?(package_file)
 
-          puts 'loading...'
+          # puts 'loading...'
 
           content = File.read(package_file)
           @package = JSON.parse(content)
@@ -109,7 +109,7 @@ module KDirector
 
         # Write the package.json file
         def write
-          puts 'writing...'
+          # puts 'writing...'
 
           content = JSON.pretty_generate(@package)
 
@@ -120,22 +120,19 @@ module KDirector
 
         # Remove a script reference by key
         def remove_script(key)
-          load
+          remove(key, group: 'scripts')
+          # load
 
-          @package['scripts']&.delete(key)
+          # @package['scripts']&.delete(key)
 
-          write
+          # 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
+          set(key, value, group: 'scripts')
 
           self
         end
@@ -162,20 +159,73 @@ module KDirector
           @package
         end
 
+        # Package.settings is a hash of settings that can be applied to package.json
+        # ----------------------------------------------------------------------
+
+        # Settings
+        #
+        # Add multiple settings to the package.json
+        # @param opts [Hash] Hash of settings to add
+        #   opts[:group] is the group to add the settings to
+        def settings(**opts)
+          load
+
+          group = opts.delete(:group)
+
+          opts.each do |key, value|
+            set_key_value(key, value, group: group)
+          end
+
+          write
+
+          self
+        end
+
         # Package.set
         # ----------------------------------------------------------------------
 
         # Set a property value in the package
-        def set(key, value)
+        def set(key, value, group: nil)
           load
 
-          @package[key] = value
+          set_key_value(key, value, group: group)
 
           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
         # ----------------------------------------------------------------------
 
@@ -213,10 +263,36 @@ module KDirector
           @package_file = File.join(k_builder.target_folder, 'package.json')
         end
 
-        # # Getter for target folder
-        # def package_file
-        #   hash['package_file']
-        # end
+        # Remove package-lock.json
+        # ----------------------------------------------------------------------
+
+        def remove_package_lock
+          file = File.join(k_builder.target_folder, 'package-lock.json')
+
+          File.delete(file) if File.exist?(file)
+
+          self
+        end
+
+        # Remove yarn.lock
+        # ----------------------------------------------------------------------
+
+        def remove_yarn_lock
+          file = File.join(k_builder.target_folder, 'yarn.lock')
+
+          File.delete(file) if File.exist?(file)
+
+          self
+        end
+
+        # Create yarn.lock
+        # ----------------------------------------------------------------------
+
+        def create_yarn_lock
+          run_command 'yarn install --check-files'
+
+          self
+        end
 
         # -----------------------------------
         # Helpers
@@ -259,7 +335,7 @@ module KDirector
         #   run_command "code #{package_file}"
         # end
 
-        # private
+        private
 
         def get_group(key)
           group = configuration.package_json.package_groups[key]
@@ -269,6 +345,18 @@ module KDirector
           group
         end
 
+        def set_key_value(key, value, group: nil)
+          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
+        end
+
         def run_command(command)
           parent.k_builder.run_command(command)
         end

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

@@ -37,11 +37,34 @@ module KDirector
 
         # 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])
+          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
+                            ])
+
+          set_package_group('storybook-nuxt'  , 'Storybook for (Vite/Nuxt)' , %w[
+                              @storybook/vue3@6.4.18
+                              @storybook/addon-postcss@2.0.0
+                              @storybook/addon-storysource@6.4.18
+                              storybook-builder-vite
+                            ])
+
+          # Currently these two need to be forced
+          # @storybook/addon-docs@6.4.18
+          # @storybook/addon-essentials@6.4.18
         end
 
         def debug

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.9.0'
+  VERSION = '0.10.3'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.9.0",
+  "version": "0.10.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.9.0",
+      "version": "0.10.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.9.0",
+  "version": "0.10.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.9.0
+  version: 0.10.3
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_config
@@ -100,6 +100,7 @@ files:
 - ".releaserc.json"
 - ".rspec"
 - ".rubocop.yml"
+- ".vscode/settings.json"
 - Gemfile
 - Guardfile
 - README.md