orchparty 2.0.0.rc2 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6da1869574cdc30632755d3c697b0f67a6cf5c66
-  data.tar.gz: b840711e9f9ecd544d0b3afb83360c35ecbe75a0
+SHA256:
+  metadata.gz: '094942f103771b85c3ddb7268baecd6c4b70becc95c78650052ef3a35ce37db7'
+  data.tar.gz: 8d0bdaf761f6715801ecfce8663688e2cabad6e58c1584db9a2fd8c3d1154934
 SHA512:
-  metadata.gz: c56f79dce8504a78a2848dde0754eb9ac3f7c2ebc1d5e6e70606fd26a010194d17e81fe89e4df40a550ce0a507d6076248a2ea1e66c2150fcbc8b87935257fd2
-  data.tar.gz: a3f0f28d0e3a3ba2d58803d1f274bf5ea13aea28e3879d825a1c56c104861e2acf0c371d363ee7a356243a4f35a0b3dfae0fd73751b25b3d28ea034bfd1ff30f
+  metadata.gz: 68afad75c4294c80f6730835d554824679dd8151c0269abc35d8c0e8c4343ddb13f40d7d5575edd915d05dac7ceecbcbcf090acd0d5f44557d5d4c4fc95c7537
+  data.tar.gz: 1e527f6cccb2b8b352f6885a112113f14c0d526ec1393eae3ae75008aebbf4cb5382ca5c14bc5010d1c3a945ac8eeb98ef7ef9c99cd9fe4b825f16417f0451d1

data/lib/orchparty/dsl_parser.rb

@@ -73,6 +73,11 @@ module Orchparty
       self
     end
 
+    def variables(&block)
+      @mixin._variables = VariableBuilder.build(block)
+      self
+    end
+
     def mixin(name, &block)
       @mixin._mixins[name] = ServiceBuilder.build(name, block)
     end

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.rc2"
+  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.0.rc2
+  version: 2.0.2
 platform: ruby
 authors:
 - Jannis Huebl
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -70,30 +70,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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
@@ -168,13 +168,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
-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.