orchparty 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0075cb8447ce75f61e92582d35ed9fe7120585ce37cbbdf4ee58fdbee68f9473
-  data.tar.gz: cbe9479f0ef089251e9081ac533bdc27ba3eb132a407e2607b5879662ef081dc
+  metadata.gz: '094942f103771b85c3ddb7268baecd6c4b70becc95c78650052ef3a35ce37db7'
+  data.tar.gz: 8d0bdaf761f6715801ecfce8663688e2cabad6e58c1584db9a2fd8c3d1154934
 SHA512:
-  metadata.gz: 462b73368c8bbc35d37aac8d6d5191dd0c299574a177da2cff378895c1e8e50d097272185aacdc2de077283b8efb9c070a8f81cb0df61caf2bd413c20c41fbad
-  data.tar.gz: bf159109f6bbb30e68a322a10537a211109b6fa307808e4371a4e5faf4f5cfdb3893ebfa86b6d000614c3e45aa36093eb2b5a6486b5ab1a5ba9cd219330f1891
+  metadata.gz: 68afad75c4294c80f6730835d554824679dd8151c0269abc35d8c0e8c4343ddb13f40d7d5575edd915d05dac7ceecbcbcf090acd0d5f44557d5d4c4fc95c7537
+  data.tar.gz: 1e527f6cccb2b8b352f6885a112113f14c0d526ec1393eae3ae75008aebbf4cb5382ca5c14bc5010d1c3a945ac8eeb98ef7ef9c99cd9fe4b825f16417f0451d1

data/lib/orchparty/transformations/variable.rb

@@ -8,24 +8,27 @@ module Orchparty
 
       def transform(ast)
         ast.applications.each do |_, application|
+          app_variables = application._variables || {}
+          app_variables = app_variables.merge({application: application.merge(application._variables)})
           application.services = application.services.each do |_, service|
-            resolve(application, service, service)
+            resolve(app_variables, service, service)
           end
           application.volumes = application.volumes.each do |_, volume|
-            resolve(application, volume, nil) if volume
+            resolve(app_variables, volume, nil) if volume
           end
         end
         ast
       end
 
-      def resolve(application, subject, service)
+      def resolve(app_variables, subject, service)
+        context = build_context(app_variables, service)
         subject.deep_transform_values! do |v|
           if v.respond_to?(:call)
-            eval_value(build_context(application: application, service: service), v) 
+            eval_value(context, v) 
           elsif v.is_a? Array
             v.map do |v|
               if v.respond_to?(:call)
-                eval_value(build_context(application: application, service: service), v) 
+                eval_value(context, v) 
               else
                 v
               end
@@ -40,12 +43,10 @@ module Orchparty
         context.instance_exec(&value)
       end
 
-      def build_context(application:, service:)
-        variables = application._variables || {}
-        variables = variables.merge({application: application.merge(application._variables)})
+      def build_context(variables, service)
         if service
           variables = variables.merge(service._variables)
-          variables = variables.merge({service: service.merge(service._variables)})
+          variables[:service] = service.merge(service._variables)
         end
         context = Context.new(variables)
         context._force_variable_definition = @force_variable_definition

data/lib/orchparty/version.rb

@@ -1,3 +1,3 @@
 module Orchparty
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/orchparty.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gli", "~> 2.16.0"
   spec.add_dependency "activesupport"
   spec.add_dependency "erubis"
-  spec.add_development_dependency "bundler"#, "~> 2.0.1"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchparty
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jannis Huebl
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ homepage: https://orch.party
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,8 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Write your orchestration configuration with a Ruby DSL that allows you to
   have mixins, imports and variables.