orchparty 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a12be28c647132ab82f5171d4d921b8a8cabf45
-  data.tar.gz: 22e3c4a05117fb22000d5d747222e12840ab6e86
+  metadata.gz: 6da1869574cdc30632755d3c697b0f67a6cf5c66
+  data.tar.gz: b840711e9f9ecd544d0b3afb83360c35ecbe75a0
 SHA512:
-  metadata.gz: 77fc1d0f4a59ccfc2dbf0b37d15c457a5b68cef5d589b7121b1a8f36178b7fa5fb1d12dfed827dc77063887b0fdddf377d6b6c0d6662ff465348dbef08351f24
-  data.tar.gz: a87c1bab464cffaccc1f6562909892b2e444f6ec3e7c1e2c2863a588749788ea10bee10108480794ec661b52d93347994fffd145a311a40591df0a76d6b63306
+  metadata.gz: c56f79dce8504a78a2848dde0754eb9ac3f7c2ebc1d5e6e70606fd26a010194d17e81fe89e4df40a550ce0a507d6076248a2ea1e66c2150fcbc8b87935257fd2
+  data.tar.gz: a3f0f28d0e3a3ba2d58803d1f274bf5ea13aea28e3879d825a1c56c104861e2acf0c371d363ee7a356243a4f35a0b3dfae0fd73751b25b3d28ea034bfd1ff30f

data/lib/orchparty/ast.rb

@@ -27,7 +27,7 @@ module Orchparty
     end
 
     def self.mixin(args = {})
-      Node.new({services: {}, _mixins: {}, volumes: {}, _variables: {}, networks: {}}).merge(args)
+      Node.new({services: {}, _mixins: {}, volumes: {}, _variables: {}, networks: {}, _service_order: []}).merge(args)
     end
 
     def self.application(args = {})

data/lib/orchparty/dsl_parser_kubernetes.rb

@@ -68,10 +68,32 @@ module Orchparty
         @mixin = AST.mixin(name: name)
       end
 
+      def template(path)
+        chart_name = "_mixin_temp_name"
+        unless @mixin.services[chart_name]
+          @mixin.services[chart_name] = AST.chart(name: chart_name, _type: "chart" )
+          @mixin._service_order << chart_name
+        end
+        chart = @mixin.services[chart_name]
+        chart.template = path
+        self
+      end
+
       def service(name, &block)
-        result = ServiceMixinBuilder.build(name, block)
+
+        chart_name = "_mixin_temp_name"
+        unless @mixin.services[chart_name]
+          @mixin.services[chart_name] = AST.chart(name: chart_name, _type: "chart" )
+          @mixin._service_order << chart_name
+        end
+        chart = @mixin.services[chart_name]
+
+        result = ServiceBuilder.build(name, "chart-service", block)
+
+        name = "chart-#{chart.name}-#{name}"
         @mixin.services[name] = result
-        @mixin._mixins[name] = result
+        @mixin._service_order << name
+        chart._services << name
         self
       end
 

data/lib/orchparty/kubernetes_application.rb

@@ -30,7 +30,7 @@ module Orchparty
         file_path = File.join(self.dir_path, file_path)
         if(file_path.end_with?(".erb"))
           helm.application = OpenStruct.new(cluster_name: cluster_name, namespace: namespace)
-          template = ERB.new File.read(file_path )
+          template = Erubis::Eruby.new(File.read(file_path))
           yaml = template.result(helm.get_binding)
           file = Tempfile.new("kube-deploy.yaml")
           file.write(yaml)
@@ -72,7 +72,7 @@ module Orchparty
       end
 
       def upgrade_cmd(helm, fix_file_path = nil)
-        "helm upgrade --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(value_path(helm), helm, fix_file_path: fix_file_path)}"
+        "helm upgrade --namespace #{namespace} --kube-context #{cluster_name} --force --version #{helm.version} #{helm.name} #{helm.chart} #{template(value_path(helm), helm, fix_file_path: fix_file_path)}"
       end
 
       def install_cmd(helm, fix_file_path = nil)
@@ -206,6 +206,11 @@ module Orchparty
       end
 
       def generate_documents_from_erbs(templates_path:, app_name:, params:, output_chart_path:)
+        if params[:kind].nil?
+          warn "ERROR: Could not generate service '#{app_name}'. Missing key: 'kind'."
+          exit 1
+        end
+
         kind = params.fetch(:kind)
 
         Dir[File.join(templates_path, kind, '*.erb')].each do |template_path|

data/lib/orchparty/transformations/mixin.rb

@@ -6,6 +6,7 @@ module Orchparty
           current = AST.application
           application._mix.each do |mixin_name|
             mixin = application._mixins[mixin_name] || ast._mixins[mixin_name]
+            mixin = resolve_chart_name(mixin, application)
             current = current.deep_merge_concat(mixin)
           end
           transform_application(current.deep_merge_concat(application), ast)
@@ -13,6 +14,16 @@ module Orchparty
         ast
       end
 
+      def resolve_chart_name(mixin, application)
+            if mixin.services[:_mixin_temp_name]
+              mixin.services[application.name.to_s] = mixin.services.delete("_mixin_temp_name")
+              mixin.services[application.name.to_s][:name] = application.name.to_s
+              mixin._service_order.delete("_mixin_temp_name")
+              mixin._service_order << application.name.to_s
+            end
+            mixin
+      end
+
       def transform_application(application, ast)
         application.services = application.services.transform_values! do |service|
           current = AST.service
@@ -31,11 +42,16 @@ module Orchparty
         else
           application._mixins[mix]
         end
+        if mixin.nil?
+          warn "ERROR: Could not find mixin '#{mix}'."
+          exit 1
+        end
         transform_mixin(mixin, application, ast)
       end
 
       def transform_mixin(mixin, application, ast)
         current = AST.application_mixin
+
         mixin[:_mix].each do |mix|
           current = current.deep_merge_concat(resolve_mixin(mix, application, ast))
         end

data/lib/orchparty/version.rb

@@ -1,3 +1,3 @@
 module Orchparty
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchparty
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Jannis Huebl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie