k_director 0.10.0 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 741cb887f450ab36a09fb0a8cbdfae5f3fbb0c61699c0f85b45489f70a370e8a
-  data.tar.gz: 50bbfab6ae514ffdbcd779519d10a1235aa5df76932f5a0e7d5b67f3eb3b8f5e
+  metadata.gz: 698c7a115b9641c2e43e67a9687dc5915a4db15a01804213e8d9b032cc343989
+  data.tar.gz: 8c7fe44606d3d30bab53f338c40f9891673adc1758389cf26938946b936b7ae2
 SHA512:
-  metadata.gz: 2fc8d306520190e022aec53d56750cdff63d70dd56b70041389aaac086d954ad11d370df325cedddaaba428063c61492b71681f36ac3049a05334702bc986bc5
-  data.tar.gz: baad0f5b9986f35880cb86b1da28670c114b1c307bf04651979968f765f3eaabd7ed106ae848ddc4abec299ca7bbf9221c9ec1d36621dcdb7d2e38295be875d0
+  metadata.gz: 89dde4df4e1e0560b05e73155cb22c508b299a7be4d43d6fea261f5fc26cd52ef62d13413f95638cb5832e259ff92aa5afead9ee48ec4d5a67bf815d2747b364
+  data.tar.gz: 37d154d3cf14db3b63eb83c9110851ff50cddc335d326bbf3676b74afd07c6e38b3a3bb34729f26c25024167a8fa2b6c243aa284b4e9764ce4ce1c424054047b

data/.vscode/settings.json

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

data/docs/CHANGELOG.md

@@ -1,3 +1,38 @@
+## [0.10.3](https://github.com/klueless-io/k_director/compare/v0.10.2...v0.10.3) (2022-02-06)
+
+
+### Bug Fixes
+
+* package_json and multi-settings #settings(**opts, group: nil) ([7f23a08](https://github.com/klueless-io/k_director/commit/7f23a08751c3bca7ea99685f33a95eeed8786e1a))
+
+## [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)
 
 

data/lib/k_director/directors/base_director.rb

@@ -32,6 +32,7 @@ module KDirector
         @options.template_base_folder ||= default_template_base_folder
         @options.on_exist             ||= :skip       # %i[skip write compare]
         @options.on_action            ||= :queue      # %i[queue execute]
+        @options.active = true unless defined?(@options.active)
       end
 
       def data(name = nil, **opts)
@@ -55,7 +56,8 @@ module KDirector
         {
           on_exist: @options.on_exist,
           on_action: @options.on_action,
-          template_base_folder: @options.template_base_folder
+          template_base_folder: @options.template_base_folder,
+          active: @options.active
         }.merge(opts)
       end
 
@@ -63,6 +65,10 @@ module KDirector
         k_builder.configuration
       end
 
+      def active?
+        @options.active == true
+      end
+
       def director_name
         @options.director_name
       end

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,15 +159,55 @@ 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
+
+          set_key_value(key, value, group: group)
+
+          write
+
+          self
+        end
+
+        def remove(key, group: nil)
           load
 
           key = key.to_s.strip
-          @package[key] = value
+
+          if group.nil?
+            @package.delete(key)
+          else
+            group = group.to_s.strip
+            @package[group]&.delete(key)
+          end
+
+          @package['scripts']&.delete(key)
 
           write
 
@@ -222,14 +259,40 @@ module KDirector
         # rubocop:enable Naming/AccessorMethodName
 
         # Setter for package file
-        def package_file=(_value)
-          @package_file = File.join(k_builder.target_folder, 'package.json')
+        def package_file=(value)
+          @package_file = File.join(k_builder.target_folder, value)
         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
@@ -282,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

@@ -36,13 +36,43 @@ module KDirector
         end
 
         # Setup the default package groups
+        # rubocop:disable Metrics/MethodLength
         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
+                              @semantic-release/changelog
+                              @semantic-release/git
+                              @klueless-js/semantic-release-rubygem@github:klueless-js/semantic-release-rubygem
+                            ])
+
+          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
+        # rubocop:enable Metrics/MethodLength
 
         def debug
           log.structure(package_groups, convert_data_to: :open_struct)

data/lib/k_director/dsls/nuxt3_dsl.rb

@@ -10,21 +10,21 @@ module KDirector
 
       def github(**opts, &block)
         github = KDirector::Dsls::Children::Github.new(self, **opts)
-        github.instance_eval(&block) if block_given?
+        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 block_given?
+        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 block_given?
+        blueprint.instance_eval(&block) if blueprint.active? && block_given?
 
         self
       end

data/lib/k_director/version.rb

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

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.10.0",
+  "version": "0.10.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.10.0",
+      "version": "0.10.4",
       "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.0",
+  "version": "0.10.4",
   "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.0
+  version: 0.10.4
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2022-02-07 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