orchparty 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36cea1b0eaf3894a0bc33bba74ac62d5280bfbb0
-  data.tar.gz: edb5d5f36cb497497aab8a3fbf82e53baa127ba0
+  metadata.gz: a7e581687a4faa39cef9b1fc4bd506bcb6cbb1d2
+  data.tar.gz: 39511e9ed35643a39a17efed0d5151c1fb825c07
 SHA512:
-  metadata.gz: ccd0aca2b0d5e7f5b43121abff1a099fa790bfb229abf278bd171312d95fc1f413fd1b80fec560172f686e8900742b800f57b4ebf932341f000c9394222cf6e2
-  data.tar.gz: 8507ef27dbe893728d94b5f50bc9678185332742c89337b90ad241e5b9844c34f933e317e8f538bf69720a83c088ae4ccaefac225c25eadce41697bcbc3c41be
+  metadata.gz: 0f987a1868610bc273afa776e1086724693d35665b92ad5ee7ec86c1da23bd70a72fae1fab04be291ed7a90af586d77ce7acb0d0e789099ed712f20dffc797ce
+  data.tar.gz: d93ef5d2793ff2b441751ff391dd48fe9079737161d192b04132858e9f27d39c8cee19748ddd782f19d261bab6c206a9fba17bc18057babe53bcf0fd03042701

data/lib/deep_merge.rb

@@ -131,7 +131,7 @@ module Hashie
           hash[k] = if hash.key?(k) && hash[k].is_a?(::Hash) && v.is_a?(::Hash)
                       _recursive_merge(hash[k], v, &block)
                     elsif hash.key?(k) && hash[k].is_a?(::Array) && v.is_a?(::Array)
-                      hash[k].concat(v)
+                      hash[k].concat(v).uniq
                     else
                       if hash.key?(k) && block_given?
                         block.call(k, hash[k], v)

data/lib/orchparty/ast.rb

@@ -8,5 +8,37 @@ module Orchparty
       include Hashie::Extensions::MethodAccess
       include Hashie::Extensions::Mash::KeepOriginalKeys
     end
+
+    def self.hash(args = {})
+      Node.new.merge(args)
+    end
+
+    def self.array(args = [])
+      args
+    end
+
+    def self.root(args = {})
+      Node.new(applications: {}, _mixins: {}).merge(args)
+    end
+
+    def self.mixin(args = {})
+      Node.new({services: {}, _mixins: {}, volumes: {}, _variables: {}, networks: {}}).merge(args)
+    end
+
+    def self.application(args = {})
+      Node.new({services: {}, _mixins: {}, _mix:[], volumes: {}, _variables: {}, networks: {}}).merge(args)
+    end
+
+    def self.all(args = {})
+      Node.new(_mix:[], _variables: {}).merge(args)
+    end
+
+    def self.application_mixin(args = {})
+      Node.new(_mix:[], _variables: {}).merge(args)
+    end
+
+    def self.service(args = {})
+      Node.new(_mix:[], _variables: {}).merge(args)
+    end
   end
 end

data/lib/orchparty/cli.rb

@@ -18,11 +18,13 @@ class OrchPartyApp
         com.command(name) do |plugin_command|
           plugin_command.flag [:filename,:f,'file-name'], required: true, :desc => 'The Orchparty input file'
           plugin_command.flag [:application,:a], required: true, :desc => 'The application that should be compiled'
+          plugin_command.switch :"force-variable-definition", :default_value => false, :desc => "Raises an Error if the input contains a not defined variable"
           plugin.define_flags(plugin_command)
           plugin_command.action do |global_options,plugin_options,args|
             options = plugin_options.delete(GLI::Command::PARENT)
             options[:application] = plugin_options[:application]
             options[:filename] = plugin_options[:filename]
+            options[:force_variable_definition] = plugin_options[:"force-variable-definition"]
             Orchparty.generate(name, options, plugin_options)
           end
         end

data/lib/orchparty/context.rb

@@ -5,6 +5,16 @@ module Orchparty
       include Hashie::Extensions::MethodAccess
       include Hashie::Extensions::Mash::KeepOriginalKeys
 
+
+     def method_missing(name, *args)
+       raise "#{name} not declared for #{application.name}.#{service.name}" if @_force_variable_definition && !key?(name)  && !key?(name.to_s)
+       super
+     end
+
+     def _force_variable_definition=(v)
+       @_force_variable_definition = v
+     end
+
       def context
         self
       end

data/lib/orchparty/dsl_parser.rb

@@ -26,7 +26,7 @@ module Orchparty
   class RootBuilder < Builder
 
     def initialize
-      @root = AST::Node.new(applications: {}, mixins: {})
+      @root = AST.root
     end
 
     def import(rel_file)
@@ -43,7 +43,7 @@ module Orchparty
     end
 
     def mixin(name, &block)
-      @root.mixins[name] = MixinBuilder.build(name, block)
+      @root._mixins[name] = MixinBuilder.build(name, block)
       self
     end
 
@@ -55,22 +55,18 @@ module Orchparty
   class MixinBuilder < Builder
 
     def initialize(name)
-      @mixin = AST::Node.new(name: name, 
-                              services: {}, 
-                              mixins: {},
-                              volumes: {},
-                              networks: {})
+      @mixin = AST.mixin(name: name)
     end
 
     def service(name, &block)
       result = ServiceBuilder.build(name, block)
       @mixin.services[name] = result
-      @mixin.mixins[name] = result
+      @mixin._mixins[name] = result
       self
     end
 
     def mixin(name, &block)
-      @mixin.mixins[name] = ServiceBuilder.build(name, block)
+      @mixin._mixins[name] = ServiceBuilder.build(name, block)
     end
 
     def volumes(&block)
@@ -89,19 +85,15 @@ module Orchparty
   class ApplicationBuilder < Builder
 
     def initialize(name)
-      @application = AST::Node.new(name: name,
-                                          services: {},
-                                          mix: [],
-                                          mixins: {},
-                                          volumes: {})
+      @application = AST.application(name: name)
     end
 
     def mix(name)
-      @application.mix << name
+      @application._mix << name
     end
 
     def mixin(name, &block)
-      @application.mixins[name] = CommonBuilder.build(block)
+      @application._mixins[name] = ApplicationMixinBuilder.build(block)
       self
     end
 
@@ -140,20 +132,20 @@ module Orchparty
       if block_given?
         value = HashBuilder.build(block)
         if values.count == 1
-          @hash ||= {}
+          @hash ||= AST.hash
           @hash[values.first.to_sym] = value
         else
-          @hash ||= []
+          @hash ||= AST.array
           @hash << value
         end
       else
         value = values.first
         if value.is_a? Hash
-          @hash ||= {}
+          @hash ||= AST.hash
           key, value = value.first
           @hash[key.to_sym] = value
         else
-          @hash ||= []
+          @hash ||= AST.array
           @hash << value
         end
       end
@@ -161,45 +153,54 @@ module Orchparty
     end
 
     def _build
-      @hash || {}
+      @hash
     end
   end
 
   class CommonBuilder < Builder
 
-    def initialize
-      @service = AST::Node.new(_mix: [])
+    def initialize(node)
+      @node = node
     end
 
     def mix(name)
-      @service._mix << name
+      @node._mix << name
     end
 
     def method_missing(name, *values, &block)
       if block_given?
-        @service[name] = HashBuilder.build(block)
+        @node[name] = HashBuilder.build(block)
       else
-        @service[name] = values.first
+        @node[name] = values.first
       end
     end
 
     def _build
-      @service
+      @node
     end
 
     def variables(&block)
-      @service._variables = HashBuilder.build(block)
+      @node._variables = HashBuilder.build(block)
       self
     end
   end
 
   class AllBuilder < CommonBuilder
+    def initialize
+      super AST.all
+    end
+  end
+
+  class ApplicationMixinBuilder < CommonBuilder
+    def initialize
+      super AST.application_mixin
+    end
   end
 
   class ServiceBuilder < CommonBuilder
 
     def initialize(name)
-      @service = AST::Node.new(name: name, _mix: [])
+      super AST.service(name: name)
     end
   end
 end

data/lib/orchparty/transformations/all.rb

@@ -1,4 +1,3 @@
-
 module Orchparty
   module Transformations
     class All
@@ -6,7 +5,7 @@ module Orchparty
         ast.applications.each do |_, application|
           application.services.transform_values! do |service|
             if application.all.is_a?(Hash)
-              AST::Node.new(application.all.deep_merge_concat(service)) 
+              AST.service(application.all.deep_merge_concat(service)) 
             else
               service
             end

data/lib/orchparty/transformations/mixin.rb

@@ -3,9 +3,9 @@ module Orchparty
     class Mixin
       def transform(ast)
         ast.applications.transform_values! do |application|
-          current = AST::Node.new
-          application.mix.each do |mixin_name|
-            mixin = application.mixins[mixin_name] || ast.mixins[mixin_name]
+          current = AST.application
+          application._mix.each do |mixin_name|
+            mixin = application._mixins[mixin_name] || ast._mixins[mixin_name]
             current = current.deep_merge_concat(mixin)
           end
           transform_application(current.deep_merge_concat(application), ast)
@@ -15,7 +15,7 @@ module Orchparty
 
       def transform_application(application, ast)
         application.services = application.services.transform_values! do |service|
-          current = AST::Node.new
+          current = AST.service
           service.delete(:_mix).each do |mix|
             mixin = transform_mixin(resolve_mixin(mix, application, ast), application, ast)
             current = current.deep_merge_concat(mixin)
@@ -28,14 +28,14 @@ module Orchparty
       def resolve_mixin(mix, application, ast)
         if mix.include? "."
           mixin_name, mixin_service_name = mix.split(".")
-          ast.mixins[mixin_name].mixins[mixin_service_name]
+          ast._mixins[mixin_name]._mixins[mixin_service_name]
         else
-          application.mixins[mix]
+          application._mixins[mix]
         end
       end
 
       def transform_mixin(mixin, application, ast)
-        current = AST::Node.new
+        current = AST.application_mixin
         mixin[:_mix].each do |mix|
           current = current.deep_merge_concat(resolve_mixin(mix, application, ast))
         end

data/lib/orchparty/transformations/variable.rb

@@ -1,7 +1,11 @@
-
 module Orchparty
   module Transformations
     class Variable
+
+      def initialize(opts = {})
+        @force_variable_definition = opts[:force_variable_definition]
+      end
+
       def transform(ast)
         ast.applications.each do |_, application|
           application.services = application.services.each do |_, service|
@@ -32,7 +36,9 @@ module Orchparty
       def build_context(application:, service:)
         application._variables ||= {}
         variables = application._variables.merge(service._variables)
-        Context.new(variables.merge({application: application.merge(application._variables), service: service.merge(service._variables)}))
+        context = Context.new(variables.merge({application: application.merge(application._variables), service: service.merge(service._variables)}))
+        context._force_variable_definition = @force_variable_definition
+        context
       end
     end
   end

data/lib/orchparty/transformations.rb

@@ -7,10 +7,10 @@ require 'orchparty/transformations/sort'
 
 module Orchparty
   module Transformations
-    def self.transform(ast)
+    def self.transform(ast, opts = {})
       ast = All.new.transform(ast)
       ast = Mixin.new.transform(ast)
-      ast = Variable.new.transform(ast)
+      ast = Variable.new(opts).transform(ast)
       ast = RemoveInternal.new.transform(ast)
       ast = Sort.new.transform(ast)
     end

data/lib/orchparty/version.rb

@@ -1,3 +1,3 @@
 module Orchparty
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/orchparty.rb

@@ -23,11 +23,11 @@ module Orchparty
     Orchparty::Plugin.load_plugin(name)
   end
 
-  def self.ast(filename: , application:)
-    Transformations.transform(Orchparty::DSLParser.new(filename).parse).applications[application]
+  def self.ast(filename: , application:, force_variable_definition: nil )
+    Transformations.transform(Orchparty::DSLParser.new(filename).parse, force_variable_definition: force_variable_definition).applications[application]
   end
 
   def self.generate(plugin_name, options, plugin_options)
-    plugins[plugin_name].generate(ast(filename: options[:filename], application: options[:application]), plugin_options)
+    plugins[plugin_name].generate(ast(options), plugin_options)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchparty
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jannis Huebl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie