k_builder 0.0.71 → 0.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 608a406238f03125011e9fcf3e09eda00ec82f973ae2a2cafe99119e712b0693
-  data.tar.gz: 563cc5eb0c7e5aa0cadbbba6b9ad2008339ac4e758bb842b6b17a059e7d46bbd
+  metadata.gz: 71d70294c1dc49e1fc67dd77f71414019a3814f44057831273bc79d815146f05
+  data.tar.gz: 5d18531c4d7f4ddb2c1cafb8297bf7d2e0c3f708526464d2d700ea7750eb048f
 SHA512:
-  metadata.gz: f10c8c559770b885062ac07fa321bfffec918cf09765c1febf287221e3252edbc21e7837d6a9547b57571cc47a5f4cdd487a2c68944e7a1b02d43a7e7d30e109
-  data.tar.gz: 76d9c0bbcdb2d6163f4258e138c724489cab7b313c9bd0ce5ba7792ef47a6049f345b5118c5e6d397c460c3f21f8250dd625a884bab835ebf611655721d496fb
+  metadata.gz: 7f5059460b2ab02d3708de1019a7ca2a9b4974c13e7f6da9b0c1d0aa720cdbdaabd29e3d9cb1451ce3b3db11211bd3fc9fd76edf4d284f12e48d0287ee328289
+  data.tar.gz: b02df37b1b11213b71e364d2c881de6df3e09ce355ada72807d30d6a37cca4a3fa263c8539e05cd582a64e3456c10b0ef74fed0a64de711c20bcf4c217fe546d

data/hooks/update-version

@@ -30,4 +30,4 @@ end
 output.push('')
 
 printf "%-25<label>s : %<version>s\n", label: 'GEM VERSION', version: version
-File.open('lib/k_builder/version.rb', 'w+') { |f| f.write(output.join("\n")) }
+File.write('lib/k_builder/version.rb', output.join("\n"))

data/k_builder.gemspec

@@ -38,11 +38,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   # spec.extensions    = ['ext/k_builder/extconf.rb']
   spec.add_dependency 'handlebars-helpers', '~> 0'
+  spec.add_dependency 'k_config', '~> 0'
   spec.add_dependency 'k_log', '~> 0'
   spec.add_dependency 'k_type', '~> 0'
   spec.add_dependency 'k_util', '~> 0'
   spec.add_dependency 'rubocop', '~> 1.8'
 
-  # spec.add_dependency "anyway_config"     , ">= 2.0.0"
-  # spec.add_dependency "config"     , ">= 3.0.0"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/k_builder/base_builder.rb

@@ -54,7 +54,7 @@ module KBuilder
 
     # assigns a builder hash and defines builder methods
     def initialize(configuration = nil)
-      configuration = KBuilder.configuration if configuration.nil?
+      configuration = KConfig.configuration if configuration.nil?
 
       @configuration = configuration
 
@@ -130,7 +130,7 @@ module KBuilder
       }
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def add_file(file, **opts)
       # move to command
       full_file = target_file(file, **opts) # opts.key?(:folder_key) || opts.key?(:folder) ? target_file(file, folder: opts[:folder], folder_key: opts[:folder_key]) : target_file(file)
@@ -157,7 +157,7 @@ module KBuilder
 
       self
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     def play_actions(actions)
       actions.reject { |action| action[:played] }.each do |action|
@@ -171,6 +171,7 @@ module KBuilder
     end
 
     # certain actions (e.g. set_current_folder) will run independently to play
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
     def run_action(action)
       case action[:action]
       when :add_file
@@ -191,6 +192,7 @@ module KBuilder
         log.error "Unknown action: #{action[:action]}"
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
     alias touch add_file # it is expected that you would not supply any options, just a file name
 
@@ -541,7 +543,6 @@ module KBuilder
       # FROM k_dsl
       # system "/usr/local/bin/zsh #{output_file}" if execution_context == :system
       # fork { exec("/usr/local/bin/zsh #{output_file}") } if execution_context == :fork
-
     end
     alias rc run_command
 
@@ -562,13 +563,13 @@ module KBuilder
 
       Dir.chdir(tf) do
         output, status = Open3.capture2(script) # , **opts)
-  
+
         unless status.success?
-          log.error("Script failed") 
+          log.error('Script failed')
           puts script
           return nil
         end
-        
+
         return output
       end
     end

data/lib/k_builder/configuration_extension.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# Attach configuration to the KBuilder module
+module KBuilder
+  module ConfigurationExtension
+    # Target folders provide a set of named folders that can be written to
+    def target_folders=(value)
+      @target_folders = value
+    end
+
+    def target_folders
+      @target_folders ||= KType::NamedFolders.new
+    end
+
+    # Template folders provides layered folders that templates can exist within
+    def template_folders=(value)
+      @template_folders = value
+    end
+
+    def template_folders
+      @template_folders ||= KType::LayeredFolders.new
+    end
+
+    # Custom debug method for k_builder
+    #
+    # usage:
+    #   config.debug(:k_builder_debug)
+    def k_builder_debug
+      target_folders.debug(title: 'target_folders')
+
+      template_folders.debug(title: 'template folders (search order)')
+      ''
+    end
+
+    # Custom initialize_copy method for k_builder. This is called during clone
+    def k_builder_initialize_copy(orig)
+      @target_folders = orig.target_folders.clone
+      @template_folders = orig.template_folders.clone
+    end
+  end
+end
+
+puts 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+KConfig::Configuration.register(:k_builder, KBuilder::ConfigurationExtension)

data/lib/k_builder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KBuilder
-  VERSION = '0.0.71'
+  VERSION = '0.0.73'
 end

data/lib/k_builder.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 require 'rubocop'
-require "open3"
+require 'open3'
 
+require 'k_config'
 require 'k_log'
 require 'k_util'
 require 'k_type'
 require 'k_builder/version'
 require 'k_builder/base_builder'
-require 'k_builder/base_configuration'
-require 'k_builder/configuration'
+require 'k_builder/configuration_extension'
 require 'k_builder/file_segments'
 
 # should commands be in their own gem?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.71
+  version: 0.0.73
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars-helpers
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: k_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: k_log
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +117,7 @@ files:
 - Sample.drawio
 - Sample.xml
 - USAGE.md
+- a.txt
 - bin/console
 - bin/k
 - bin/kgitsync
@@ -113,11 +128,10 @@ files:
 - k_builder.gemspec
 - lib/k_builder.rb
 - lib/k_builder/base_builder.rb
-- lib/k_builder/base_configuration.rb
 - lib/k_builder/commands/base_command.rb
 - lib/k_builder/commands/code_syntax_highlighter_command.rb
 - lib/k_builder/commands/rubo_cop_command.rb
-- lib/k_builder/configuration.rb
+- lib/k_builder/configuration_extension.rb
 - lib/k_builder/file_segments.rb
 - lib/k_builder/version.rb
 - usage/_out1.png
@@ -134,6 +148,7 @@ metadata:
   homepage_uri: http://appydave.com
   source_code_uri: https://github.com/klueless-io/k_builder
   changelog_uri: https://github.com/klueless-io/k_builder/commits/master
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/k_builder/base_configuration.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-module KBuilder
-  # Base configuration object for all k_builder* GEM
-  class BaseConfiguration
-    class << self
-      # Attach a child configuration with it's own settings to a parent configuration
-      #
-      # @param [Class] klass_child what class would you like as the child
-      # @param [Class] klass_parent what class would you like to extend with a new child configuration
-      # @param [Symbol] accessor_name what is the name of the accessor that you are adding
-      def attach_config_to_parent(klass_child, klass_parent, accessor_name)
-        # Create a memoized getter to an instance of the attaching class (:klass_child)
-        #
-        # def third_party
-        #   @third_party ||= KBuilder::ThirdPartyGem::Configuration.new
-        # end
-        klass_parent.send(:define_method, accessor_name) do
-          return instance_variable_get("@#{accessor_name}") if instance_variable_defined?("@#{accessor_name}")
-
-          instance_variable_set("@#{accessor_name}", klass_child.new)
-        end
-      end
-      alias attach_to attach_config_to_parent
-    end
-
-    # move out into module
-    def to_h
-      hash = {}
-      instance_variables.each do |var|
-        value = instance_variable_get(var)
-
-        value = KUtil.data.to_hash(value) if complex_type?(value)
-
-        hash[var.to_s.delete('@')] = value
-      end
-      hash
-    end
-
-    # This code is being moved into k_util (data)
-    # Any basic (aka primitive) type
-    def basic_type?(value)
-      value.is_a?(String) ||
-        value.is_a?(Symbol) ||
-        value.is_a?(FalseClass) ||
-        value.is_a?(TrueClass) ||
-        value.is_a?(Integer) ||
-        value.is_a?(Float)
-    end
-
-    # Anything container that is not a regular class
-    def complex_type?(value)
-      value.is_a?(Array) ||
-        value.is_a?(Hash) ||
-        value.is_a?(Struct) ||
-        value.is_a?(OpenStruct) ||
-        value.respond_to?(:to_h)
-    end
-
-    def kv(name, value)
-      puts "#{name.rjust(30)} : #{value}"
-    end
-  end
-end

data/lib/k_builder/configuration.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-# Attach configuration to the KBuilder module
-module KBuilder
-  # Configuration for webpack5/builder
-  class << self
-    attr_writer :configuration
-
-    def configuration(name = :default)
-      @configuration ||= Hash.new do |h, key|
-        h[key] = KBuilder::Configuration.new
-      end
-      @configuration[name]
-    end
-
-    def reset(name = :default)
-      @configuration ||= Hash.new do |h, key|
-        h[key] = KBuilder::Configuration.new
-      end
-      @configuration[name] = KBuilder::Configuration.new
-    end
-
-    def configure(name = :default)
-      yield(configuration(name))
-    end
-  end
-
-  # Does this class need to move out into k_types?
-  # It is being used with k_manager in a similar fashion
-  #
-  # Configuration class
-  class Configuration < BaseConfiguration
-    include KLog::Logging
-
-    # Target folders provide a set named folders that can be written to
-    attr_accessor :target_folders
-
-    # Template folders provides layered folders that templates can exist within
-    attr_accessor :template_folders
-
-    def initialize
-      super
-      # @target_folder = Dir.getwd
-      # @template_folder = File.join(Dir.getwd, '.templates')
-      # @global_template_folder = nil
-      @target_folders = KType::NamedFolders.new
-      @template_folders = KType::LayeredFolders.new
-    end
-
-    def initialize_copy(orig)
-      super(orig)
-
-      @target_folders = orig.target_folders.clone
-      @template_folders = orig.template_folders.clone
-    end
-
-    def debug(heading: 'kbuilder base configuration')
-      log.section_heading 'kbuilder base configuration' if heading
-
-      # TODO: Add name to configuration object
-      # Don't have support for name on the configuration object yet
-      # log.kv 'config name', name
-
-      target_folders.debug(title: 'target_folders')
-
-      # log.info ''
-
-      template_folders.debug(title: 'template folders (search order)')
-      ''
-    end
-  end
-end