kontena-mortar 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a38ec31db23f7f5e15fab1c4353e74e7bc594331bb0a9f9780e73ffb35ff1fb2
-  data.tar.gz: b08a257223e1a55c70bed8ade0709a644ed70468a62d39d4df7b6bd9f415b1c2
+  metadata.gz: a2974cbd580d1c5fc0b1caed95c9ce3c9a6646945a817f1ef5a1f4a92bcc161a
+  data.tar.gz: 25509e29586ec34630e43a65949a3c36eba4bc94e5000c7a4d1a575e9204d807
 SHA512:
-  metadata.gz: 1cc1a5a16e6b4338858790e639bff7616920875bf5e590b52455c43e2226e3ff3555123b74986e8ee762b3a14e11d56415dedc9191e10a179bb2b0b220a56624
-  data.tar.gz: f00a63b973c0f38676445b7ca3fa55d9fe5c16e0e88dcb106447777030c0e3105cd0dc792f5595eb92278ba5eead355753dbbc677a1c7e4e665264b29a59aaa1
+  metadata.gz: 0167efd3300845e5120f5142c6fbd355ed24dc4ad721f783c60f8229ca6eba614c409c5c5ad4b44d085f7439bb1c8528e6e05a8b881996741e010cf355e3fd9c
+  data.tar.gz: b1016129775db3841f8128a41e36daef5d441699e3865125b91748b6c86d22c54307a1333bee18ca7663db16435405fb2790dfd0604a4e2d3a43eef97c40cfdc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kontena-mortar (0.4.5)
+    kontena-mortar (0.4.6)
       clamp (~> 1.3)
       deep_merge (~> 1.2)
       k8s-client (~> 0.10.4)
@@ -26,7 +26,7 @@ GEM
     dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.2)
-    dry-inflector (0.1.2)
+    dry-inflector (0.2.0)
     dry-logic (0.6.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
@@ -44,7 +44,7 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.4, >= 0.4.2)
     equatable (0.5.0)
-    excon (0.67.0)
+    excon (0.68.0)
     hashdiff (1.0.0)
     ice_nine (0.11.2)
     jaro_winkler (1.5.3)
@@ -60,7 +60,7 @@ GEM
       recursive-open-struct (~> 1.1.0)
       yajl-ruby (~> 1.4.0)
       yaml-safe_load_stream (~> 0.1)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     necromancer (0.4.0)
     parallel (1.17.0)
     parser (2.6.4.1)
@@ -71,7 +71,7 @@ GEM
     rainbow (3.0.0)
     rake (10.5.0)
     recursive-open-struct (1.1.0)
-    rouge (3.11.0)
+    rouge (3.12.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

data/lib/mortar/config.rb

@@ -49,7 +49,7 @@ module Mortar
     def labels(other = {})
       hash = @labels.dup
       hash.merge!(other)
-      RecursiveOpenStruct.new(hash)
+      RecursiveOpenStruct.new(hash, preserve_original_keys: true)
     end
   end
 end

data/lib/mortar/fire_command.rb

@@ -116,7 +116,7 @@ module Mortar
       resources.map { |resource|
         resource.merge(
           metadata: {
-            labels: labels
+            labels: labels.to_hash
           }
         )
       }

data/lib/mortar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mortar
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/lib/mortar/yaml_file.rb

@@ -54,7 +54,7 @@ module Mortar
 
     def read(variables = {})
       Namespace.new(variables).with_binding do |ns_binding|
-        ERB.new(@content, nil, '%<>-').tap { |e| e.location = [@filename, nil] }.result(ns_binding)
+        ERB.new(@content, nil, '-').tap { |e| e.location = [@filename, nil] }.result(ns_binding)
       end
     rescue StandardError, ScriptError => e
       raise ParseError, "#{e.class.name} : #{e.message} (#{e.backtrace.first.gsub(/:in `with_binding'/, '')})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-mortar
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp