orchparty 2.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371966e534d2370d5330bfe75cb313f497e33f93ce746619fb3435ccd4347bc5
-  data.tar.gz: 15a76f2560f3103beb3152b2694a539f1e82c167ca671a67ad1239e665bd06ab
+  metadata.gz: 81cbf4dee8cf2042995f19b85c90e26f7f40eb73522901c6047fa5a6d0a57ce2
+  data.tar.gz: 8dfe9bfbcbd929b9be9e474e5766dee950e2fdd2dc0dc27e8035d10eebb24b69
 SHA512:
-  metadata.gz: 2f4e1a007c640f44b86fac36f2593ebb1069cbef36302c910f4ca22b51c6fd21e187e7c713de15df8e9bf34f36a3bd288019a9011ac4bf27c8e1709bea4e1ce2
-  data.tar.gz: 497d71938e78efe7bb70f465ab096e3823ea0fd4ea20ddbb25751adb352a6c5cd1c9c44aeb965f1e6545ae433c1a9b32c25afba9680fe959308bd5edf7c5a676
+  metadata.gz: 14d764436e9341c27d103ec925380b0bfc327c98a415dbbbb8f9f1b40ac841fa1de0a99ec8a755aa28c99229cc94dba78ed85376d04909f6a8ea0a0840108541
+  data.tar.gz: 5504256f032f38c2334958b1591dd5c51b063b4c27d597cd938eb06766c72eb12f6eb3a58bb831cb893ecd024feb57d526f7f8588a81674ec92c3236b4d667a3

data/lib/orchparty/kubernetes_application.rb

@@ -2,7 +2,6 @@ require 'erb'
 require 'erubis'
 require 'open3'
 require 'ostruct'
-require 'byebug'
 require 'yaml'
 require 'tempfile'
 require 'active_support'

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.0"
+  VERSION = "2.0.3"
 end

data/orchparty.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
     With this gem you can write docker-compose like orchestration configuration with a Ruby DSL, that supports mixins, imports and variables.!
     Out of this you can generate docker-compose.yml v1 or v2. 
   EOF
-  spec.homepage      = "https://orch.party"
+  spec.homepage      = "https://github.com/jannishuebl/orchparty"
   spec.license       = "LGPL-3.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -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.0
+  version: 2.0.3
 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
@@ -153,11 +153,11 @@ files:
 - lib/orchparty/transformations/variable.rb
 - lib/orchparty/version.rb
 - orchparty.gemspec
-homepage: https://orch.party
+homepage: https://github.com/jannishuebl/orchparty
 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.