kontena-cli 1.0.2.pre1 → 1.0.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d95d577cd62d1ef303de2391e5cc943a258492
-  data.tar.gz: e38f1964bae2e547b28b281f38a49cb661106e5d
+  metadata.gz: d958eccc9f62fd73f519d3ef624e62f0ab203c48
+  data.tar.gz: 72a3d121bbefee09efd42a69e900dd33cf66d298
 SHA512:
-  metadata.gz: 79ee080091fef65600adb307d308599bd7399c151b48f5322cfd39baf0f5d61101234d146bf64cfe6a72636ecdda68820ac5deb08bdbb4c82c96272e373b2fcd
-  data.tar.gz: 39a0fe44eadac6a14c92ee7b9437b2d9965232d2439d2030163383c6130a2f0b987307d5b79b7eae93b7ed47472f3c010d79839d85d17433efefc119e9900ad0
+  metadata.gz: 7ac1410618aaeaba33075e6c90a2b811137cbc7d566cba719eb90672ae12601e4f3a2e28e6f92989ce12d1a3f69980b8ee3ce6dcb7b6014b5ec9b1f9284dee9d
+  data.tar.gz: 4a158c1741f8e53c04aa7651f6c8166a179add5f9eda122c46fd28743313bd7bb5cb2cf5aa9f6e8729554c0ae95c1df05e7a94ce05e5f2047b75a3eb45c0892b

data/VERSION

@@ -1 +1 @@
-1.0.2.pre1
+1.0.2.rc1

data/kontena-cli.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
   spec.add_runtime_dependency "hash_validator", "~> 0.7.0"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
-  spec.add_runtime_dependency "opto", "1.5.2"
+  spec.add_runtime_dependency "opto", "~> 1.5.3"
   spec.add_runtime_dependency "semantic", "~> 1.5"
 end

data/lib/kontena/cli/stacks/yaml/reader.rb

@@ -44,7 +44,7 @@ module Kontena::Cli::Stacks
         return @variables if @variables
         if yaml && yaml.has_key?('variables')
           variables_yaml = yaml['variables'].to_yaml
-          variables_hash = ::YAML.load(replace_dollar_dollars(interpolate(variables_yaml)))
+          variables_hash = ::YAML.load(replace_dollar_dollars(interpolate(variables_yaml, use_opto: false)))
           @variables = Opto::Group.new(variables_hash, defaults: { from: :env, to: :env })
         else
           @variables = Opto::Group.new(defaults: { from: :env, to: :env })
@@ -220,19 +220,30 @@ module Kontena::Cli::Stacks
 
       ##
       # @param [String] text - content of YAML file
-      def interpolate(text)
-        text.gsub(/(?<!\$)\$(?!\$)\{?\w+\}?/) do |v| # searches $VAR and ${VAR} and not $$VAR
-          var = v.tr('${}', '')
-          val = ENV[var]
-          if val
-            val
-          elsif @replace_missing
-            @replace_missing
+      def interpolate(text, use_opto: true)
+        text.split(/[\r\n]/).map do |row|
+          # skip lines that opto is interpolating
+          if row.strip.start_with?('interpolate:') || row.strip.start_with?('evaluate:')
+            row
           else
-            puts "Value for #{var} is not set. Substituting with an empty string." unless skip_validation?
-            ''
+            row.gsub(/(?<!\$)\$(?!\$)\{?\w+\}?/) do |v| # searches $VAR and ${VAR} and not $$VAR
+              var = v.tr('${}', '')
+
+              if use_opto
+                val = variables.value_of(var) || ENV[var]
+              else
+                val = ENV[var]
+              end
+
+              if val
+                val.to_s =~ /[\r\n\"\'\|]/ ? val.inspect : val
+              else
+                puts "Value for #{var} is not set. Substituting with an empty string." unless skip_validation?
+                @replace_missing || ''
+              end
+            end
           end
-        end
+        end.join("\n")
       end
 
       ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.2.pre1
+  version: 1.0.2.rc1
 platform: ruby
 authors:
 - Kontena, Inc
@@ -140,16 +140,16 @@ dependencies:
   name: opto
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement