kubes 0.8.10 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306b63f7f97138b489a5877a2726499b8329c805787e282f1e856ad76226ebec
-  data.tar.gz: 1943fd0f6e702d8bf285ba201d89da359f8425988a542a408f6635b70e57d3c7
+  metadata.gz: db6959c3513133da9d5340dc8c332e15f86be47e5f72d47188243fafb21b3bd0
+  data.tar.gz: 94762322cb38b47c1d4167060545012dd6416515628801efdd969fc8dd189b91
 SHA512:
-  metadata.gz: 32d2554b904d987cf40271cf1f924fc8c5aae7c309395c70bd0cef6ccd2b88fee401e34ad3b9f99f4c10056530b456be0713e740bb58972775b5e9e957b5e2c8
-  data.tar.gz: 7deec002773c177e201d5b8712a350cf087349260ecbc8945292325c76df4e9c4382be8ba9070a23493838c752281b204650538dcd71d0b71c8a6214496e7f63
+  metadata.gz: 9a506b81df303fd915146596f792fcbd6b0ede5b93c81d6bcd75f0fa3123a47129086969decef3d44b273e6740d518facf91053c8f10e61ad3de6698c673a0e9
+  data.tar.gz: f2ddb1238b542b0279069a5b7417d4ed458384729cdd3859511b55222161c6443131ade97534f91fe19df9f20fae3074943a40120a3470bbf91142cd8d419a89

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.9.0] - 2022-08-24
+- [#66](https://github.com/boltops-tools/kubes/pull/66) show layering improvements: show resource layers also
+- only show error if exit_on_fail
+
 ## [0.8.10] - 2022-08-18
 - [#65](https://github.com/boltops-tools/kubes/pull/65) show variables layers support
 - improve new secret generator

data/docs/_docs/layering/{debugging.md → debug.md}

@@ -1,10 +1,10 @@
 ---
-title: "Debugging Layering"
+title: "Debug Layering"
 category: layering
 order: 9
 ---
 
-Kube's Layering abilities are so powerful that they can be difficult to debug when overly used.  It is recommend you chose only a few layers that make sense for your goals and stick to them. Essentially, limit the rope length. Here are also some debugging tips.
+Kube's Layering abilities are so powerful that they can be difficult to debug when overly used.  It is recommended that you chose only a few layers that make sense for your goals and stick to them. Essentially, limit the rope length. Here are also some debugging tips.
 
 ## Enable Logging
 
@@ -20,16 +20,16 @@ end
 
 This will show the **found** layers.
 
-        $ kubes compile
-        Compiling .kubes/resources/shared/namespace.yaml
-            .kubes/variables/base.rb
-            .kubes/variables/dev.rb
-        Compiling .kubes/resources/web/deployment.yaml
-            .kubes/variables/base.rb
-            .kubes/variables/dev.rb
-        Compiling .kubes/resources/web/service.yaml
-            .kubes/variables/base.rb
-            .kubes/variables/dev.rb
+    $ kubes compile
+    Compiling .kubes/resources/shared/namespace.yaml
+        .kubes/variables/base.rb
+        .kubes/variables/dev.rb
+    Compiling .kubes/resources/web/deployment.yaml
+        .kubes/variables/base.rb
+        .kubes/variables/dev.rb
+    Compiling .kubes/resources/web/service.yaml
+        .kubes/variables/base.rb
+        .kubes/variables/dev.rb
 
 ## All Considered Layers
 
@@ -59,4 +59,4 @@ If you want to also see all the considered layers use `KUBES_LAYERING_SHOW_ALL=1
         .kubes/variables/web/deployment.rb
         .kubes/variables/web/deployment/base.rb
         .kubes/variables/web/deployment/dev.rb
-    ...
+    ...

data/lib/kubes/compiler/shared/runtime_helpers.rb

@@ -85,21 +85,30 @@ module Kubes::Compiler::Shared
         layers += app_layers
       end
 
-      layers.each do |layer|
-        path = "#{Kubes.root}/.kubes/variables/#{layer}"
+      layer_paths = layers.map { |layer| "#{Kubes.root}/.kubes/variables/#{layer}" }
+      layer_paths = layer_paths.select { |path| File.exist?(path) } unless ENV['KUBES_LAYERING_SHOW_ALL']
+      layer_paths.each do |path|
         show_variable_layer_path(path)
         evaluate_file(path)
       end
     end
 
+    @@header_shown = {} # key is main @path
     @@shown = {}
     def show_variable_layer_path(path)
+      main_path = @path # main path is main resource file
+
+      show_header = !@@header_shown.dig(main_path)
+      if show_header && Kubes.config.layering.show
+        logger.info "    Variables layers:"
+        @@header_shown[main_path] = true
+      end
       # Examples:
       #   .kubes/resources/web/deployment.yaml
       #   .kubes/resources/shared/namespace.yaml
-      main_path = @path # main path is main resource file
       show_once = !@@shown.dig(main_path, path)
-      if ENV['KUBES_LAYERING_SHOW_ALL'] || (Kubes.config.layering.show && show_once && File.exist?(path))
+      show_layer = Kubes.config.layering.show && show_once
+      if show_layer
         logger.info "    #{pretty_path(path)}"
         @@shown[main_path] ||= {}
         @@shown[main_path][path] = true

data/lib/kubes/compiler/strategy/dispatcher.rb

@@ -1,7 +1,7 @@
 class Kubes::Compiler::Strategy
   class Dispatcher < Base
     def dispatch
-      logger.info "Compiling #{pretty_path(@path)}" if Kubes.config.layering.show
+      show_layers if Kubes.config.layering.show
       result = render(@path) # main
       results = [result].flatten # ensure array
       data = results.map! do |main|
@@ -11,13 +11,22 @@ class Kubes::Compiler::Strategy
       Result.new(@save_file, data)
     end
 
+    def show_layers
+      logger.info "Compiling #{pretty_path(@path)}"
+      logger.info "    Resource layers:"
+      all_layers = pre_layers + [@path] + post_layers
+      all_layers.each do |layer|
+        logger.info "    #{pretty_path(layer)}"
+      end
+    end
+
     # Render via to Erb or one of the DSL syntax classes or Core/Blocks class
     def render(path)
       if path.include?('.rb')
         klass = dsl_class(path) # IE: Kubes::Compiler::Dsl::Syntax::Deployment or Kubes::Compiler::Dsl::Core::Blocks
         klass.new(@options.merge(path: path, data: @data)).run
       else
-        logger.info "Rendering #{pretty_path(path)}" if ENV['KUBES_LAYERING_SHOW_ALL']
+        logger.info "Rendering #{pretty_path(path)}" if ENV['KUBES_LAYERING_SHOW_RENDERING']
         Erb.new(@options.merge(data: @data)).render_result(path)
       end
     end

data/lib/kubes/util/sh.rb

@@ -24,7 +24,7 @@ module Kubes::Util
       logger.info "=> #{command}" if show_command
       success = system(env, command)
       unless success
-        logger.error "ERROR: running #{command}".color(:red)
+        logger.error "ERROR: running #{command}".color(:red) if exit_on_fail
         exit $?.exitstatus if exit_on_fail
       end
       success

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.8.10"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.9.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -367,7 +367,7 @@ files:
 - docs/_docs/intro/ordering/custom.md
 - docs/_docs/intro/structure.md
 - docs/_docs/layering.md
-- docs/_docs/layering/debugging.md
+- docs/_docs/layering/debug.md
 - docs/_docs/layering/dsl.md
 - docs/_docs/layering/extra.md
 - docs/_docs/layering/merge-dsl.md