k_builder 0.0.51 → 0.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 528f2587aacba6aa1d13d32737aa081b3ebb5364d3bc7e4628a2935a3746ff15
-  data.tar.gz: bb780d8e64e7c814e0b51c8561537a2cbdc31a1ab81f5ee4c78e8d3bb3fa1e89
+  metadata.gz: 122c7daee609c40dbd918d5bb98640c3850d3cb0c54eeabee10e4d4082c036f3
+  data.tar.gz: 3c2041cd23f31b624860a141858f0c54ac995cf49b277bd591acb94a37cb1456
 SHA512:
-  metadata.gz: 2d1dfa3e5875b691576390c970d8005036244566277fee71bbaebe5fc8e63e43588b87780c7616d8e5e07df838dcc3f2ccbf2d4edad8689d2308b8ce41e780e0
-  data.tar.gz: 2eda2bb2b6caa396b0a7ffa0052d22e1bd98fc2931fbb3eb1352ff0b2e0c4fe86880c70e947f456d862d7279bf862f948ffb1c8eea9f9581b29257eb75ded468
+  metadata.gz: ae5aa592ffe9845c5438a80761a2ee8dccf358d4d32cfa6f84926038d64433c9e041911ba464c29811617b871a3c174baadb23d2dadb57bf76bcd9de44487ff9
+  data.tar.gz: c009caabf877b46d424e529bce376477835153338eef1b6bd2fd833fdbfb3b7cca157238823efd86aa44513c0ba5bd7e7fab5571a9799666ba9ab81624e4cb7f

data/.rubocop.yml

@@ -73,6 +73,9 @@ Layout/EmptyLineBetweenDefs:
   Exclude:
     - "**/spec/**/*"
 
+Style/Documentation:
+  Enabled: false
+
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - "**/spec/**/*"

data/Rakefile

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+GEM_NAME = 'k_builder'
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'k_builder/version'
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -14,4 +17,15 @@ Rake::ExtensionTask.new('k_builder') do |ext|
   ext.lib_dir = 'lib/k_builder'
 end
 
+desc 'Publish the gem to RubyGems.org'
+task :publish do
+  system 'gem build'
+  system "gem push #{GEM_NAME}-#{KBuilder::VERSION}.gem"
+end
+
+desc 'Remove old *.gem files'
+task :clean do
+  system 'rm *.gem'
+end
+
 task default: %i[clobber compile spec]

data/k_builder.gemspec

@@ -39,6 +39,8 @@ Gem::Specification.new do |spec|
   # spec.extensions    = ['ext/k_builder/extconf.rb']
 
   spec.add_dependency 'handlebars-helpers', '~> 0'
+  spec.add_dependency 'k_log', '~> 0'
+  spec.add_dependency 'k_util', '~> 0'
   # spec.add_dependency "anyway_config"     , ">= 2.0.0"
   # spec.add_dependency "config"     , ">= 3.0.0"
 end

data/lib/k_builder.rb

@@ -4,10 +4,11 @@ require 'k_builder/version'
 require 'k_builder/base_builder'
 require 'k_builder/base_configuration'
 require 'k_builder/configuration'
-require 'k_builder/data_helper'
 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'
 
@@ -15,5 +16,15 @@ module KBuilder
   # raise KBuilder::Error, 'Sample message'
   class Error < StandardError; end
 
-  # Your code goes here...
+  # 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'

data/lib/k_builder/base_configuration.rb

@@ -22,7 +22,7 @@ module KBuilder
       instance_variables.each do |var|
         value = instance_variable_get(var)
 
-        value = KBuilder.data.struct_to_hash(value) if complex_type?(value)
+        value = KUtil.data.to_hash(value) if complex_type?(value)
 
         hash[var.to_s.delete('@')] = value
       end

data/lib/k_builder/configuration.rb

@@ -42,19 +42,22 @@ module KBuilder
 
     # rubocop:disable Metrics/AbcSize
     def debug
-      puts '-' * 120
-      puts 'kbuilder base configuration'
+      L.subheading 'kbuilder base configuration'
 
-      puts 'target_folders'
+      L.section_heading 'target_folders'
       target_folders.folders.each_key do |key|
         folder = target_folders.folders[key]
-        kv key.to_s, folder
+        L.kv key.to_s, folder
       end
+      L.info ''
 
-      puts 'template folders (search order)'
-      template_folders.ordered_folders.each do |folder|
-        puts folder.to_s
+      L.section_heading 'template folders (search order)'
+
+      template_folders.ordered_keys.each do |key|
+        folder = template_folders.folders[key]
+        L.kv key.to_s, folder
       end
+      ''
     end
     # rubocop:enable Metrics/AbcSize
   end

data/lib/k_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.53
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars-helpers
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: k_log
+  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
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "    K Builder provides various fluent builders for initializing applications
   with different language requirements\n"
 email:
@@ -56,7 +84,6 @@ files:
 - lib/k_builder/base_builder.rb
 - lib/k_builder/base_configuration.rb
 - lib/k_builder/configuration.rb
-- lib/k_builder/data_helper.rb
 - lib/k_builder/file_segments.rb
 - lib/k_builder/layered_folders.rb
 - lib/k_builder/named_folders.rb

data/lib/k_builder/data_helper.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-# Attach data helper to the KBuilder module
-module KBuilder
-  # Data helpers/utils for Kbuilder
-  class << self
-    attr_writer :data
-  end
-
-  def self.data
-    @data ||= DataHelper.new
-  end
-
-  # Helper methods attached to the namespace for working with Data
-  #
-  # Usage: KBuilder.data.to_struct(data)
-  class DataHelper
-    # Convert a hash into a deep OpenStruct or array an array
-    # of objects into an array of OpenStruct
-    def to_struct(data)
-      case data
-      when Hash
-        OpenStruct.new(data.transform_values { |v| to_struct(v) })
-
-      when Array
-        data.map { |o| to_struct(o) }
-
-      else
-        # Some primitave type: String, True/False, Symbol or an ObjectStruct
-        data
-      end
-    end
-
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    def struct_to_hash(data)
-      # No test yet
-      if data.is_a?(Array)
-        return data.map { |v| v.is_a?(OpenStruct) ? struct_to_hash(v) : v }
-      end
-
-      return struct_to_hash(data.to_h) if !data.is_a?(Hash) && data.respond_to?(:to_h)
-
-      data.each_pair.with_object({}) do |(key, value), hash|
-        case value
-        when OpenStruct, Struct, Hash
-          hash[key] = struct_to_hash(value)
-        when Array
-          # No test yet
-          values = value.map do |v|
-            v.is_a?(OpenStruct) || v.is_a?(Struct) || v.is_a?(Hash) ? struct_to_hash(v) : v
-          end
-          hash[key] = values
-        else
-          hash[key] = value
-        end
-      end
-    end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-    def clean_symbol(value)
-      return value if value.nil?
-
-      value.is_a?(Symbol) ? value.to_s : value
-    end
-  end
-end