minfra-cli 3.1.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57af73071c5c324ef7f908176a695c2cbdee6d2a1be1d65f6d0b9a9055c10aa4
-  data.tar.gz: 45e45f3bc0766a8fe6354f3b036bcb3327a4c79df5c1026a9e84d3f8314b8b37
+  metadata.gz: 559888088dd171a754ae0ccab6b6e8bf9ff0940e5cea2a64da90c83714250e1f
+  data.tar.gz: 212ed7b65798feda2b14a408d2f8066e73b21736ade7eed3a5fe5fafe50adbc6
 SHA512:
-  metadata.gz: 242cdcc9c027b110adc0fc0c3615de37a627888a594b8104212c9631530c99d7b8fafcc1ab5f3bd7808cc08af53c988b309394583c6abf4a40b7b49b25c9318e
-  data.tar.gz: 286be675ceb5ad1839d5c500fb2e23219fa7dbce860dbe1308f5d884e0c350898b541de1288088e2330b46b1022f93786ca925d8bff608b5cf903737350d090e
+  metadata.gz: 68ae0b701280177906cd79fbbebcd18b53380abb023f23ecb94c40b410ca0be47b6b2ffd2a8bad4e11b5f6e1b8430ff6aa4c3f2f1cde92e4e15d222fef001fc8
+  data.tar.gz: b47a78a9681d51bbde838d6d9527a5dfb7eea37f37d5cdcf78d28ab037e2bdfc85aca43ae72c3ddae3b1087ab82930f1d7d4097262f0c940ad79693995bed243

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.1.0
+ * Minfra::Cli::Templater can now user helper modules
+# 4.0.0
+ * in apply mode of secrets we prefix the name with the chart name
 # 3.1.0
  * overriding backends via MINFRA_HIERA_BACKENDS
  * overriding Yaml Backend to allow :extension: setting

data/lib/minfra/cli/templater.rb

@@ -5,6 +5,26 @@ module Minfra
   module Cli
     # not threadsafe!
     class Templater
+      class TemplateBinding
+        def _binding
+          @binding ||= binding
+        end
+      end
+      #see https://apidock.com/ruby/v2_5_5/ERB/result_with_hash
+      class ERBPlus < ERB
+         def result_with(hash: {}, helpers: [])
+           b = TemplateBinding.new
+           hash.each_pair do |key, value|
+             b.define_singleton_method(key) do value end
+           end
+           helpers.each do |helper|
+             b.extend helper
+           end
+           p b._binding.receiver
+           result(b._binding)
+         end
+      end
+      
       def self.read(path, params: {}, fallback: nil)
         p = Pathname.new(path)
         if p.exist?
@@ -18,11 +38,11 @@ module Minfra
         render(content, params)
       end
 
-      def self.render(template, params)
-        new(template).render(params)
+      def self.render(template, params, helpers: [])
+        new(template, helpers: ).render(params)
       end
 
-      def self.template_dir(src, dst, extensions)
+      def self.template_dir(src, dst, extensions, helpers: [], params: {})
         destination = Pathname.new(dst)
         destination.mkpath
         source = Pathname.new(src)
@@ -34,7 +54,7 @@ module Minfra
           elsif extensions.include?(File.extname(filename)) # a file
 #            puts("templating: #{filename}")
             content = File.read(filename)
-            modified_content = Minfra::Cli::Templater.render(content, {})
+            modified_content = Minfra::Cli::Templater.render(content, params, helpers: )
             File.write("#{destination}/#{rel_path}", modified_content)
           else
 #            puts("copying  : #{filename}")
@@ -43,10 +63,11 @@ module Minfra
         end
       end
 
-      def initialize(template)
-        @erb = ERB.new(template)
+      def initialize(template, helpers: [])
+        @erb = ERBPlus.new(template)
         @check_mode = false
         @check_missing = []
+        @helpers = helpers
       end
 
       def missing?
@@ -67,7 +88,7 @@ module Minfra
       end
 
       def render(params)
-        @erb.result_with_hash(params)
+        @erb.result_with(hash: params, helpers: @helpers)
       end
 
       def method_missing(name)
@@ -78,6 +99,7 @@ module Minfra
           super
         end
       end
+      
     end
   end
 end

data/lib/minfra/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Minfra
   module Cli
-    VERSION = '3.1.0'
+    VERSION = '4.1.0'
   end
 end

data/lib/orchparty/dsl_parser_kubernetes.rb

@@ -390,7 +390,7 @@ module Orchparty
           result = ServiceBuilder.build(name, 'apply', block)
           file = Tempfile.create(name)
           result.tmp_file = file.path
-          file.puts "apiVersion: v1\nkind: Secret\nmetadata:\n  name: #{name}\ntype: Opaque\ndata:"
+          file.puts "apiVersion: v1\nkind: Secret\nmetadata:\n  name: #{@node.name}-#{name}\ntype: Opaque\ndata:"
           result._.each do |key, value|
             file.puts "  #{key}: #{Base64.strict_encode64(value.respond_to?(:call) ? value.call : value)}"
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor