minfra-cli 4.0.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f3b63b9c6e391715e568fed4c5e113a7574afc4d8944b78bbed9b0a8f1fed28
-  data.tar.gz: 915a61225192f2f2d306b3736f02c5573e737932a7bab2ccdc64dffb6108eda1
+  metadata.gz: ea616e6ead0473faae98389aa80a06a829059445d4e2c04c6860b8ab293f557e
+  data.tar.gz: 75e9ef0413aeaf293e69c1e19918dc9cb7179bdb97fac7450fdc8b21bfce3565
 SHA512:
-  metadata.gz: c8cea1d91de6744dd40eb6ae3d841b95fc0890723c953f9ac2af27b5c1e0e22af13be7bb1fc996bdd552cca9e1488e9eed24ae0f0c4d4479d97eb8a31ffd052a
-  data.tar.gz: 2d427efb9533341b778d700f44d5f7596972331a4cb8e0f2beb6e23af83cad67ce36445102bd5de9251de9d0be16941772de4dfa2475918c42372b50d7d277ce
+  metadata.gz: d68c1105544f8f64cc80d46dd4ee534e1e46ce4827c38dbbfc50e503283185ba4c1a15b1287e9e05584fb6a4b5ab34e72bca0a93c8533472cddaeec869dc170e
+  data.tar.gz: f8ee54db259d6afed47ea39c1b1f5ba8af5438c9f063607719028e4360f0f45e15aeeeab53d723e153a147cf1c5c6c5d2e73c428b673e0bc0a23fb41e6b3728b

data/CHANGELOG.md

@@ -1,8 +1,12 @@
+# 4.1.1
+ * fix: puts statement removed
+# 4.1.0
+ * improvement: Minfra::Cli::Templater can now user helper modules
 # 4.0.0
- * in apply mode of secrets we prefix the name with the chart name
+ * feature: 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
+ * improvement: overriding backends via MINFRA_HIERA_BACKENDS
+ * improvement: overriding Yaml Backend to allow :extension: setting
 # 3.0.2
  * removing complex dns manipulation and hardcoding google servers
 # 3.0.1

data/lib/minfra/cli/templater.rb

@@ -5,6 +5,25 @@ 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
+           result(b._binding)
+         end
+      end
+      
       def self.read(path, params: {}, fallback: nil)
         p = Pathname.new(path)
         if p.exist?
@@ -18,11 +37,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 +53,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 +62,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 +87,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 +98,7 @@ module Minfra
           super
         end
       end
+      
     end
   end
 end

data/lib/minfra/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Minfra
   module Cli
-    VERSION = '4.0.0'
+    VERSION = '4.1.1'
   end
 end

metadata

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