k_builder 0.0.53 → 0.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 122c7daee609c40dbd918d5bb98640c3850d3cb0c54eeabee10e4d4082c036f3
-  data.tar.gz: 3c2041cd23f31b624860a141858f0c54ac995cf49b277bd591acb94a37cb1456
+  metadata.gz: 3f0600bab4a6de1743b8be1d7f14f4cc20e997edc60201e920fd3102086472bf
+  data.tar.gz: ad10a064ebf45d8e73aac310b7c6725193f3cf36bacc847f0fe2e312919c0b1b
 SHA512:
-  metadata.gz: ae5aa592ffe9845c5438a80761a2ee8dccf358d4d32cfa6f84926038d64433c9e041911ba464c29811617b871a3c174baadb23d2dadb57bf76bcd9de44487ff9
-  data.tar.gz: c009caabf877b46d424e529bce376477835153338eef1b6bd2fd833fdbfb3b7cca157238823efd86aa44513c0ba5bd7e7fab5571a9799666ba9ab81624e4cb7f
+  metadata.gz: b3c82683757bf60d630b3e9e6827b57abbaca1bbd83b132e7dd1433961f8946acd651beb5eebf8614cbcd5ad544ea7aa8b7bfd7a7c48feadf87a3e0d8c651acf
+  data.tar.gz: d8c7778a7501ccf7a76611bf15aae7d3824658e48e5249c2a1f7879fad7b18ae354323fe92794171737b1ddd386e38ab254f9f399895acd8af86014f3688e98c

data/k_builder.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'handlebars-helpers', '~> 0'
   spec.add_dependency 'k_log', '~> 0'
+  spec.add_dependency 'k_type', '~> 0'
   spec.add_dependency 'k_util', '~> 0'
   # spec.add_dependency "anyway_config"     , ">= 2.0.0"
   # spec.add_dependency "config"     , ">= 3.0.0"

data/lib/k_builder.rb

@@ -1,30 +1,24 @@
 # frozen_string_literal: true
 
+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/file_segments'
-require 'k_builder/named_folders'
-require 'k_builder/layered_folders'
-require 'k_log'
-require 'k_util'
 
 require 'handlebars/helpers/template'
 
 module KBuilder
   # raise KBuilder::Error, 'Sample message'
   class Error < StandardError; end
-
-  # Need to move this into a KLog factory
-  def self.configure_logger
-    logger = Logger.new($stdout)
-    logger.level = Logger::DEBUG
-    logger.formatter = KLog::LogFormatter.new
-    KLog::LogUtil.new(logger)
-  end
 end
 
-L = KBuilder.configure_logger
-
-puts "KBuilder::Version: #{KBuilder::VERSION}" if ENV['KLUE_DEBUG']&.to_s&.downcase == 'true'
+if ENV['KLUE_DEBUG']&.to_s&.downcase == 'true'
+  namespace = 'KBuilder::Version'
+  file_path = $LOADED_FEATURES.find { |f| f.include?('k_builder/version') }
+  version   = KBuilder::VERSION.ljust(9)
+  puts "#{namespace.ljust(40)} : #{version.ljust(9)} : #{file_path}"
+end

data/lib/k_builder/configuration.rb

@@ -21,6 +21,8 @@ module KBuilder
 
   # Configuration class
   class Configuration < BaseConfiguration
+    include KLog::Logging
+
     attr_accessor :target_folders
     attr_accessor :template_folders
 
@@ -29,8 +31,8 @@ module KBuilder
       # @target_folder = Dir.getwd
       # @template_folder = File.join(Dir.getwd, '.templates')
       # @global_template_folder = nil
-      @target_folders = NamedFolders.new
-      @template_folders = LayeredFolders.new
+      @target_folders = KType::NamedFolders.new
+      @template_folders = KType::LayeredFolders.new
     end
 
     def initialize_copy(orig)
@@ -42,20 +44,20 @@ module KBuilder
 
     # rubocop:disable Metrics/AbcSize
     def debug
-      L.subheading 'kbuilder base configuration'
+      log.subheading 'kbuilder base configuration'
 
-      L.section_heading 'target_folders'
+      log.section_heading 'target_folders'
       target_folders.folders.each_key do |key|
         folder = target_folders.folders[key]
-        L.kv key.to_s, folder
+        log.kv key.to_s, folder
       end
-      L.info ''
+      log.info ''
 
-      L.section_heading 'template folders (search order)'
+      log.section_heading 'template folders (search order)'
 
       template_folders.ordered_keys.each do |key|
         folder = template_folders.folders[key]
-        L.kv key.to_s, folder
+        log.kv key.to_s, folder
       end
       ''
     end

data/lib/k_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.55
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars-helpers
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: k_type
+  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_util
   requirement: !ruby/object:Gem::Requirement
@@ -85,8 +99,6 @@ files:
 - lib/k_builder/base_configuration.rb
 - lib/k_builder/configuration.rb
 - lib/k_builder/file_segments.rb
-- lib/k_builder/layered_folders.rb
-- lib/k_builder/named_folders.rb
 - lib/k_builder/version.rb
 - usage/_out1.png
 - usage/_out2.png

data/lib/k_builder/layered_folders.rb

@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-module KBuilder
-  #
-  # Named folders makes sense for generated/output folders because you may want
-  # more than one type of location to generate output.
-  #
-  # Don't confuse multiple named output folders with sub-paths, when you want to
-  # build up a file name in a child folder, you can do that as part of building
-  # the filename.
-  #
-  # The idea behind named folders is for when you have two or more totally different
-  # outputs that (may live in the a similar location) or live in different locations.
-
-  # Layered folders allow files to be found in any of the searchable folders
-  #
-  # They derive from and thus work just like named folders in that they allow folders
-  # to be stored with easy to remember names/alias's.
-  #
-  # Where they differ is that they are retrieved in preferential search order that is
-  # by default (First In, Last Out) priority aka a Stack (Last In, First Out) or
-  # optionally over ridden via the search_order method
-  #
-  # Layered folders makes sense for use with template files and source data/model
-  # where you can have specific usage files available and if they are not found then
-  # you can use fall-back files in other folders.
-  #
-  # example:
-  #   folders = LayeredFolders.new
-  #   folders.add(:global       , '~/global_templates')
-  #   folders.add(:domain       , '/my-project/domain_templates')
-  #   folders.add(:app          , '/my-project/my-app/.templates')
-  #
-  #   # Find a file and folder will in folders in this order
-  #   # app_templates, then domain_templates and then finally global templates
-  #   # ['/my-project/my-app/.templates', '/my-project/domain_templates', '~/global_templates']
-  #   #
-  #   # Find a file called template1.txt and return its fully-qualified path
-  #   folders.find_file('template1.txt')
-  #
-  #   # As above, but returns the folder only, file name and sub-paths are ignored
-  #   folders.find_file_folder('template1.txt')
-  #   folders.find_file_folder('abc/xyz/deep-template.txt')
-  #
-  #   # If an additional folder is added, say in child configuration that is designed
-  #   # to override some of the global templates, then you can run a search_order
-  #   # method to re-order the templates
-  #
-  #   folders.add(:global_shim  , '~/global_templates_shim')
-  #   folders.search_order(:app, :domain, :global_shim, :global)
-  #
-  # class Builder < KBuilder::BaseBuilder
-  class LayeredFolders < KBuilder::NamedFolders
-    attr_reader :ordered_keys
-    attr_reader :ordered_folders
-
-    def initialize
-      super()
-
-      @ordered_keys = []
-      @ordered_folders = []
-    end
-
-    def initialize_copy(orig)
-      super(orig)
-
-      @ordered_keys = orig.ordered_keys.clone
-      @ordered_folders = orig.ordered_folders.clone
-    end
-
-    def add(folder_key, *folder_parts)
-      folder = super(folder_key, *folder_parts)
-
-      ordered_keys.prepend(folder_key)
-      ordered_folders.prepend(folder)
-
-      folder
-    end
-
-    # File name or array of sub-paths plus file
-    #
-    # Return the folder that a file is found in
-    def find_file(file_parts)
-      folder = find_file_folder(file_parts)
-      folder.nil? ? nil : File.join(folder, file_parts)
-    end
-
-    # File name or array of sub-paths plus file
-    #
-    # Return the folder that a file is found in
-    def find_file_folder(file_parts)
-      ordered_folders.find { |folder| File.exist?(File.join(folder, file_parts)) }
-    end
-
-    def to_h
-      {
-        ordered: {
-          keys: ordered_keys,
-          folders: ordered_folders
-        }
-      }.merge(@folders)
-    end
-  end
-end

data/lib/k_builder/named_folders.rb

@@ -1,116 +0,0 @@
-# frozen_string_literal: true
-
-module KBuilder
-  # Named folders allow folders to be stored with easy to remember names/alias's
-  # Secondarily, you can also build up file names based on these named folders.
-  #
-  # Named folders makes sense for generated/output folders because you may want
-  # more than one type of location to generate output.
-  #
-  # Don't confuse multiple named output folders with sub-paths, when you want to
-  # build up a file name in a child folder, you can do that as part of building
-  # the filename.
-  #
-  # The idea behind named folders is for when you have two or more totally different
-  # outputs that (may live in the a similar location) or live in different locations.
-  # Samples:
-  #   name: :code       - generating source code into a project
-  #   name: :slide      - generating slide deck into a documentation folder
-  #   name: :webpack    - folder where you might generate webpack files, e.g. webpack.config.*.json
-  #
-  # example:
-  #   folders = NamedFolders.new
-  #   folders.add(:csharp       , '~/dev/csharp/cool-project')
-  #   folders.add(:package_json , :csharp)
-  #   folders.add(:webpack      , folders.join(:csharp, 'config'))
-  #   folders.add(:builder      , folders.join(:csharp, 'builder'))
-  #   folders.add(:slides       , '~/doc/csharp/cool-project')
-  #
-  #   puts folders.get(:builder)
-  #
-  #   puts folders.get_filename(:csharp, 'Program.cs')
-  #   puts folders.get_filename(:csharp, 'Models/Order.cs')
-  #   puts folders.get_filename(:csharp, 'Models', 'Order.cs')
-  #
-  # Do I need to support :default?
-  class NamedFolders
-    attr_reader :folders
-
-    attr_reader :current
-
-    def initialize
-      @folders = {}
-      @current = nil
-    end
-
-    def initialize_copy(orig)
-      super(orig)
-
-      @folders = orig.folders.clone
-    end
-
-    def current=(folder_key)
-      guard_folder_key(folder_key)
-      @current = folder_key
-    end
-
-    # Add support for file_parts
-    def add(folder_key, *folder_parts)
-      # get a predefined folder by symbol
-      folder = join_folder_parts(folder_parts)
-      if folder.is_a?(Symbol)
-        folder = get(folder)
-      elsif folder.start_with?('~')
-        folder = File.expand_path(folder)
-      end
-
-      @current = folder_key if @current.nil?
-      folders[folder_key] = folder
-    end
-
-    # Get a folder
-    def get(folder_key)
-      guard_folder_key(folder_key)
-      folders[folder_key]
-    end
-
-    # Join the lookup folder key with the subpath folder parts (optionally + filename) and return the folder or filename
-    #
-    # Return fully qualified filename
-    def join(folder_key, *file_folder_parts)
-      folder = get(folder_key)
-
-      File.join(folder, file_folder_parts)
-    end
-    # Get a file name using the lookup folder key and the file name or array of sub-paths plus filename
-    alias get_filename join
-
-    def folder_keys
-      @folders.keys
-    end
-
-    def to_h
-      @folders
-    end
-
-    private
-
-    def join_folder_parts(folder_parts)
-      raise KBuilder::Error, 'No folder part provided' if folder_parts.nil? || folder_parts.length.zero?
-
-      # If only one part, and that can be a folder or :folder_key, then just return it
-      return folder_parts.first if folder_parts.length == 1
-
-      folder_parts = folder_parts.map.with_index do |folder_part, index|
-        folder_part = get(folder_part) if index.zero? && folder_part.is_a?(Symbol)
-        folder_part
-      end
-
-      File.join(folder_parts)
-    end
-
-    def guard_folder_key(folder_key)
-      raise KBuilder::Error, "Folder not found, this folder key not found: #{folder_key}" unless folders.key?(folder_key)
-    end
-  end
-end