orchparty 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f74508ff820e0b932d58aae5d6c8b3cfc41aa5e
-  data.tar.gz: d3043e2090e4558b10143b3c6a1f610725e17a43
+  metadata.gz: c5188728e716189c344e9a6d288670cc23be351f
+  data.tar.gz: 8f4f7ef1c744668761b7870c219b84c02f6752dc
 SHA512:
-  metadata.gz: 6077deb22a2937260918f0cd91e909c2afd47a04f4ac119f22ff2cd0213bc66d2e488ff25cd17ebfd2aa399a3c9e2cb5e5122a30e8150c20fee1d7c806999f4a
-  data.tar.gz: 7f9796ec7cab612a71c7519800077bd093d61a75e80d360957493eda79b9c677abcc4136eab94f4bbeafef58780616680b8f50645729d33740d5de866875b608
+  metadata.gz: 1318dcccb4853a0b4e100ff5b6d55aa7977d4225c9d739148dd3e75a9fda962d451406b8ad9ce112f87062c2a173536cac7e64976ac1d684a5c2f79fdf13c255
+  data.tar.gz: 7d8457abe046d21f86392d7ecd37a62ffd4bc7ee3a8f9df291e5293cce4abd5a430169727297aa7b0159781584d2014be3450bafcb4d1200fbd8188142c47d38

data/lib/orchparty/transformations/variable.rb

@@ -9,24 +9,31 @@ module Orchparty
       def transform(ast)
         ast.applications.each do |_, application|
           application.services = application.services.each do |_, service|
-            service.deep_transform_values! do |v|
+            resolve(application, service, service)
+          end
+          application.volumes = application.volumes.each do |_, volume|
+            resolve(application, volume, nil) if volume
+          end
+        end
+        ast
+      end
+
+      def resolve(application, subject, service)
+        subject.deep_transform_values! do |v|
+          if v.respond_to?(:call)
+            eval_value(build_context(application: application, service: service), v) 
+          elsif v.is_a? Array
+            v.map do |v|
               if v.respond_to?(:call)
                 eval_value(build_context(application: application, service: service), v) 
-              elsif v.is_a? Array
-                v.map do |v|
-                  if v.respond_to?(:call)
-                    eval_value(build_context(application: application, service: service), v) 
-                  else
-                    v
-                  end
-                end
               else
                 v
               end
             end
+          else
+            v
           end
         end
-        ast
       end
 
       def eval_value(context, value)
@@ -34,9 +41,13 @@ module Orchparty
       end
 
       def build_context(application:, service:)
-        application._variables ||= {}
-        variables = application._variables.merge(service._variables)
-        context = Context.new(variables.merge({application: application.merge(application._variables), service: service.merge(service._variables)}))
+        variables = application._variables || {}
+        variables = variables.merge({application: application.merge(application._variables)})
+        if service
+          variables = variables.merge(service._variables)
+          variables = variables.merge({service: service.merge(service._variables)})
+        end
+        context = Context.new(variables)
         context._force_variable_definition = @force_variable_definition
         context
       end

data/lib/orchparty/version.rb

@@ -1,3 +1,3 @@
 module Orchparty
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchparty
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jannis Huebl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie