ddsl 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876daff17fe025456c007e7a6b49aeaefe308694
-  data.tar.gz: c7724c6cfd1088081d87febf8420283feb0a6c3d
+  metadata.gz: 0267bb0d50eb2e64aa3023afdfff575e6de01ea8
+  data.tar.gz: 1c38388f8a46c447598bd380e15a972f73c6dcc9
 SHA512:
-  metadata.gz: c69636d47110c9d3cb5fc38ca0e5670f7012a8f58bf8b03777ee1670e844ffbaf81e8fd77802c579a95c1874a365211303c110eb295675a775b5878e0690f208
-  data.tar.gz: f274b265cd533d9e5474b829cb1be93b9c1d103249351c4d0e148241a08250c9794564685d7e524db0a2f33fc24f1d3ce93a4aeada63dcfed07d9e245a550229
+  metadata.gz: 42fb11df5ff0143860630a470ed2372efd59b7b5a843f43f937d6c0ba7a226aa09b4d547863e7b9b10c8d93f67edeeec82fc3e9365b1d12727e7863e30dbd115
+  data.tar.gz: c4ad5c06aac5e57421fe877d3a766f605d07ab0e21485668cdba7c11a81502cffdbbd7c7a00f24ffa34b040c82524bb049e58aeedd225d35ac799b88a71e3798

data/.rubocop.yml

@@ -11,6 +11,9 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*.rb'
 
+Metrics/CyclomaticComplexity:
+  Max: 10
+
 Style/Documentation:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v0.0.5](https://github.com/bilby91/ddsl/tree/v0.0.5) (2019-01-11)
+[Full Changelog](https://github.com/bilby91/ddsl/compare/v0.0.4...v0.0.5)
+
+**Merged pull requests:**
+
+- Fix permissions for gem credentials file [\#14](https://github.com/bilby91/ddsl/pull/14) ([bilby91](https://github.com/bilby91))
+- Bump version [\#13](https://github.com/bilby91/ddsl/pull/13) ([bilby91](https://github.com/bilby91))
+- Add automatic publish via ddsl and GitLab [\#12](https://github.com/bilby91/ddsl/pull/12) ([bilby91](https://github.com/bilby91))
+- Fix service\_port for docker-compose run [\#11](https://github.com/bilby91/ddsl/pull/11) ([bilby91](https://github.com/bilby91))
+- Update README.md [\#10](https://github.com/bilby91/ddsl/pull/10) ([bilby91](https://github.com/bilby91))
+- Add docs builder with ddsl [\#8](https://github.com/bilby91/ddsl/pull/8) ([bilby91](https://github.com/bilby91))
+
 ## [v0.0.4](https://github.com/bilby91/ddsl/tree/v0.0.4) (2018-12-08)
 [Full Changelog](https://github.com/bilby91/ddsl/compare/v0.0.3...v0.0.4)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ddsl (0.0.4)
+    ddsl (0.0.5)
       clamp (~> 1)
       json (~> 2)
       json_schemer (~> 0.1)

data/README.md

@@ -68,7 +68,69 @@ Now that we have our image built we can run things on it
 
 ### Environment Variables
 
-- [ ] TODO
+If you want to inject environmental variables in your build or run definition it's really easy with `ddsl`. You just need to interpolate the environmental variable name in your `.ddsl.yml` file like you would do
+in a bash script in order to get them injected.
+
+Lets take a look at a section of the previous example:
+
+```
+builds:
+  - name: feature-branch
+    type: docker
+    context: .
+    file: docker/Dockerfile
+    tags:
+      - bilby91/ddsl:$CI_SHA1
+    push: true
+    cache_from:
+      - bilby91/ddsl:latest
+```
+
+In this case, our feature-branch build depends on the `CI_SHA1` enviromental variable. When invoking `CI_SHA1=XXXX ddsl build feature-branch`, ddsl will replace `CI_SHA1` with the appropiate value (in this case, XXXX) and continue it's normal work.
+
+### Templates
+
+Templates let you [DRY](https://en.wikipedia.org/wiki/Don%27t_repeat_yourself) your `.ddsl.yml` configurations. If you have multiple builds in your project, templates will be very useful for encapsulating common options that all or some of your builds need. Templates can be used in either builds or runs.
+
+Lets take a look at a possible scenario where using templates would make sense.
+
+```
+version: 1
+
+templates:
+  - name: base-build
+    context: .
+    file: docker/Dockerfile
+    push: true
+    tags:
+      - bilby91/ddsl:$CI_SHA1
+    cache_from:
+      - bilby91/ddsl:latest
+
+builds:
+  - name: feature-branch
+    type: docker
+    templates:
+      - base-build
+
+  - name: master
+    type: docker
+    templates:
+      - base-build
+    tags:
+      - bilby91/ddsl:latest
+```
+
+In the example above we have introduced a new build called master. We have encapsulated all the common options between master and feature-branch in a template called base-build. When ddsl runs either feature-branch or master builds it will merge the options from the template into each build's options.
+
+Some important things to note in regards to templates implementation:
+
+If the templateable object (either a build or a run) have the same key defined, ddsl will behave like this:
+
+1. If the key's value is either a string or a number, the templetable object value will be favored. This allows overriding certain keys when inheriting from a template.
+2. If the key's value is an array, the template items of the array will be added to the templatable object array.
+3. If the key's value is a map, the template items of the map will be merged in the templatable object map.
+    1. If we have a collision here, `ddsl` will behave like described in point 1.
 
 ## Documentation
 

data/docs/build.schema.json

@@ -25,11 +25,29 @@
         "build_docker_options": {
             "type": "object",
             "required": [
-                "type",
-                "context",
-                "file"
+                "type"
+            ],
+            "anyOf": [
+                {
+                    "required": [
+                        "templates"
+                    ]
+                },
+                {
+                    "required": [
+                        "file",
+                        "context"
+                    ]
+                }
             ],
             "properties": {
+                "templates": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "List of templates the build will inherit"
+                },
                 "type": {
                     "type": "string",
                     "enum": [
@@ -89,6 +107,13 @@
                 "type"
             ],
             "properties": {
+                "templates": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "List of templates the build will inherit"
+                },
                 "type": {
                     "type": "string",
                     "enum": [

data/docs/build.schema.md

@@ -57,6 +57,7 @@ Unique name to identify the build task.
 | [push](#push) | `boolean` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/build.schema.json#/definitions/build_docker_options` |
 | [service](#service) | `string` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/build.schema.json#/definitions/build_docker_compose_options` |
 | [tags](#tags) | `string[]` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/build.schema.json#/definitions/build_docker_options` |
+| [templates](#templates) | `string[]` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/build.schema.json#/definitions/build_docker_compose_options` |
 | [type](#type) | `enum` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/build.schema.json#/definitions/build_docker_compose_options` |
 
 ## build_args
@@ -362,6 +363,33 @@ All items must be of the type:
 
 
 
+## templates
+
+List of templates the build will inherit
+
+`templates`
+
+* is optional
+* type: `string[]`
+* defined in this schema
+
+### templates Type
+
+
+Array type: `string[]`
+
+All items must be of the type:
+`string`
+
+
+
+
+
+
+
+
+
+
 ## type
 
 Type of builder to use

data/docs/ddsl.schema.json

@@ -37,6 +37,13 @@
                 "$ref": "https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json"
             },
             "description": "List of run tasks to run"
+        },
+        "templates": {
+            "type": "array",
+            "items": {
+                "$ref": "https://raw.githubusercontent.com/bilby91/ddsl/master/docs/template.schema.json"
+            },
+            "description": "List of templates to use in builds or runs"
         }
     }
 }

data/docs/ddsl.schema.md

@@ -18,6 +18,7 @@ Schema for the DDSL file format.
 | [builds](#builds) | Build | Optional |  | DDSL (this schema) |
 | [registries](#registries) | Registry | Optional | `[]` | DDSL (this schema) |
 | [runs](#runs) | Run | Optional |  | DDSL (this schema) |
+| [templates](#templates) | Template | Optional |  | DDSL (this schema) |
 | [version](#version) | `enum` | **Required** |  | DDSL (this schema) |
 
 ## builds
@@ -97,6 +98,31 @@ All items must be of the type:
 
 
 
+## templates
+
+List of templates to use in builds or runs
+
+`templates`
+
+* is optional
+* type: Template
+* defined in this schema
+
+### templates Type
+
+
+Array type: Template
+
+All items must be of the type:
+* [Template](template.schema.md) – `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/template.schema.json`
+
+
+
+
+
+
+
+
 ## version
 
 Version of the DDSL schema

data/docs/run.schema.json

@@ -28,7 +28,26 @@
                 "type",
                 "image"
             ],
+            "anyOf": [
+                {
+                    "required": [
+                        "templates"
+                    ]
+                },
+                {
+                    "required": [
+                        "image"
+                    ]
+                }
+            ],
             "properties": {
+                "templates": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "List of templates the run will inherit"
+                },
                 "type": {
                     "type": "string",
                     "enum": [
@@ -78,7 +97,26 @@
                 "type",
                 "service"
             ],
+            "anyOf": [
+                {
+                    "required": [
+                        "templates"
+                    ]
+                },
+                {
+                    "required": [
+                        "service"
+                    ]
+                }
+            ],
             "properties": {
+                "templates": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "List of templates the run will inherit"
+                },
                 "type": {
                     "type": "string",
                     "enum": [
@@ -111,7 +149,7 @@
                     "description": "Working directory inside the container"
                 },
                 "service_ports": {
-                    "type": "string",
+                    "type": "boolean",
                     "description": "Run command with the service's ports enabled and mapped to the host"
                 },
                 "detach": {

data/docs/run.schema.md

@@ -51,7 +51,8 @@ Unique name to identify the run task.
 | [no_deps](#no_deps) | `boolean` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
 | [rm](#rm) | `boolean` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
 | [service](#service) | `string` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
-| [service_ports](#service_ports) | `string` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
+| [service_ports](#service_ports) | `boolean` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
+| [templates](#templates) | `string[]` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
 | [type](#type) | `enum` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
 | [user](#user) | `string` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
 | [volumes](#volumes) | `string[]` | `https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json#/definitions/run_docker_compose_options` |
@@ -229,12 +230,34 @@ Run command with the service's ports enabled and mapped to the host
 `service_ports`
 
 * is optional
-* type: `string`
+* type: `boolean`
 * defined in this schema
 
 ### service_ports Type
 
 
+`boolean`
+
+
+
+
+
+## templates
+
+List of templates the run will inherit
+
+`templates`
+
+* is optional
+* type: `string[]`
+* defined in this schema
+
+### templates Type
+
+
+Array type: `string[]`
+
+All items must be of the type:
 `string`
 
 
@@ -243,6 +266,9 @@ Run command with the service's ports enabled and mapped to the host
 
 
 
+
+
+
 ## type
 
 Type of runner to use

data/docs/template.schema.json

@@ -0,0 +1,17 @@
+{
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "$id": "https://raw.githubusercontent.com/bilby91/ddsl/master/docs/template.schema.json",
+    "title": "Template",
+    "description": "Template for encapsulating common option either docker or docker-compose",
+    "type": "object",
+    "required": [
+        "name"
+    ],
+    "properties": {
+        "name": {
+            "type": "string",
+            "description": "Unique name to identify the template."
+        }
+    },
+    "additionalProperties": true
+}

data/docs/template.schema.md

@@ -0,0 +1,40 @@
+
+# Template Schema
+
+```
+https://raw.githubusercontent.com/bilby91/ddsl/master/docs/template.schema.json
+```
+
+Template for encapsulating common option either docker or docker-compose
+
+| Abstract | Extensible | Status | Identifiable | Custom Properties | Additional Properties | Defined In |
+|----------|------------|--------|--------------|-------------------|-----------------------|------------|
+| Can be instantiated | No | Experimental | No | Forbidden | Permitted | [template.schema.json](template.schema.json) |
+
+# Template Properties
+
+| Property | Type | Required | Defined by |
+|----------|------|----------|------------|
+| [name](#name) | `string` | **Required** | Template (this schema) |
+| `*` | any | Additional | this schema *allows* additional properties |
+
+## name
+
+Unique name to identify the template.
+
+`name`
+
+* is **required**
+* type: `string`
+* defined in this schema
+
+### name Type
+
+
+`string`
+
+
+
+
+
+

data/lib/ddsl/parser.rb

@@ -2,7 +2,7 @@
 
 require 'json'
 require 'yaml'
-require_relative './schema_validator'
+require_relative './schema_parser'
 
 module DDSL
   class Parser
@@ -26,7 +26,7 @@ module DDSL
                         raise UnsupportedFileFormatError, "format #{format} is unsupported"
                       end
 
-      DDSL::SchemaValidator.new.validate!(parsed_config)
+      DDSL::SchemaParser.new.parse!(parsed_config)
     end
   end
 end

data/lib/ddsl/schema.rb

@@ -1,13 +1,58 @@
 # frozen_string_literal: true
 
+require 'json_schemer'
+
 module DDSL
-  SCHEMA_VERSION  = :draft4
-  SCHEMA_DIR      = File.join(File.dirname(__FILE__), '../../schemas')
-  SCHEMA_PATH     = Pathname.new(File.join(SCHEMA_DIR, '/ddsl.schema.json'))
-  SCHEMA_RESOLVER = lambda { |uri|
-    file_name = uri.path.split('/').last
-    file_path = File.join(SCHEMA_DIR, file_name)
-
-    JSON.parse(File.read(file_path))
-  }
+  class Schema
+    VERSION = :draft4
+
+    def initialize(data)
+      @data = data
+    end
+
+    def validate
+      schemer_validator.validate(@data).to_a
+    end
+
+    protected def schema_path
+      raise NotImplementedError
+    end
+
+    private def schemer_validator
+      @schemer_validator ||= JSONSchemer.schema(
+        schema_path,
+        format: true,
+        ref_resolver: resolver
+      )
+    end
+
+    private def resolver
+      lambda do |uri|
+        file_name = uri.path.split('/').last
+        file_path = File.join(schema_dir, file_name)
+
+        JSON.parse(File.read(file_path))
+      end
+    end
+
+    private def schema_dir
+      File.join(File.dirname(__FILE__), '../../schemas')
+    end
+  end
+
+  class SchemaDDSL < Schema
+    protected def schema_path
+      Pathname.new(File.join(schema_dir, '/ddsl.schema.json'))
+    end
+  end
+  class SchemaBuild < Schema
+    protected def schema_path
+      Pathname.new(File.join(schema_dir, '/build.schema.json'))
+    end
+  end
+  class SchemaRun < Schema
+    protected def schema_path
+      Pathname.new(File.join(schema_dir, '/run.schema.json'))
+    end
+  end
 end

data/lib/ddsl/schema_parser.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'json_schemer'
+require_relative './schema'
+require_relative './template_merger'
+
+module DDSL
+  class SchemaParser
+    class InvalidError < StandardError; end
+
+    SCHEMA_MAP = {
+      'builds' => SchemaBuild,
+      'runs' => SchemaRun
+    }.freeze
+
+    #
+    # Parse given potentially compatible data schema. Parser will merge template values if used.
+    #
+    # @raise [InvalidError] if data is not compliant with the schema
+    #
+    # @param [Hash] data
+    #
+    # @return [Hash] data
+    #
+    def parse!(data)
+      errors = SchemaDDSL.new(data).validate
+
+      # Validate initial schema without potential templates applied
+      raise InvalidError, 'Invalid schema' if errors&.count&.positive?
+
+      # Apply potentially defined templates to the data
+      applied_data = DDSL::TemplateMerger.new(data).apply
+
+      # Re evaluate schema in case template corrupted the data
+      %w[builds runs].each { |x| validate_schema_key!(applied_data, x) }
+
+      applied_data
+    end
+
+    private def validate_schema_key!(data, key)
+      return unless data.key?(key)
+
+      data[key].each do |build|
+        errors = SCHEMA_MAP[key].new(build).validate
+
+        raise InvalidError, 'Invalid schema' if errors&.count&.positive?
+      end
+    end
+  end
+end

data/lib/ddsl/template_merger.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module DDSL
+  class TemplateMerger
+    class MissingTemplateError < StandardError; end
+    class ValueTypeMismatchError < StandardError; end
+
+    # Set of keys that can't be extracted from a template
+    SKIPPABLE_TEMPLATE_KEYS = %w[name].freeze
+
+    # Set of keys that can't be merged in a templatable hash
+    SKIPPABLE_MERGE_KEYS = %w[templates].freeze
+
+    # Keys that can use the templates feature
+    TEMPLETABLE_KEYS = %w[builds runs].freeze
+
+    attr_reader :data
+
+    def initialize(data)
+      @data = data.dup
+    end
+
+    #
+    # Apply `build` and `run` templates to data
+    #
+    # @note `templates` key will be removed from objects after they are applied
+    #
+    # @return [Hash]
+    #
+    def apply
+      TEMPLETABLE_KEYS.each do |key|
+        data[key] = data[key].map { |b| apply_templates(b) } if data.key?(key)
+      end
+
+      data
+    end
+
+    #
+    # Merge values of all inherited templates for the given templetable object
+    #
+    # @param [Hash] templatable
+    #
+    # @return [Hash]
+    #
+    private def apply_templates(templatable)
+      templates = templatable['templates'] || []
+
+      templates.inject(templatable) do |applied, template_name|
+        template = find_template!(template_name)
+
+        mergable_key_space(template, applied).map do |key|
+          [key, extend_value!(template[key], applied[key])]
+        end.to_h
+      end
+    end
+
+    #
+    # Extend the given spec_value in case it's type is Array or Hash, return the spec_value otherwise
+    #
+    # @raise [ValueTypeMismatchError] if template_value and spec_value are not nil and have different types
+    #
+    # @param [Array|Hash|Object] template_value
+    # @param [Array|Hash|Object] spec_value
+    #
+    # @return [Array|Hash|Object]
+    #
+    private def extend_value!(template_value, spec_value)
+      # Short circuit if either template_value or spec_value are nil
+      return spec_value || template_value if template_value.nil? || spec_value.nil?
+
+      # Check for data type mismatches
+      unless template_value.is_a?(spec_value.class)
+        raise ValueTypeMismatchError, "#{template_value} has a different type than #{spec_value}"
+      end
+
+      case template_value
+      when Array
+        # Template values are concatenated at the end
+        spec_value.concat(template_value)
+      when Hash
+        # We merge the spec_value in order to favor "old" values vs template values
+        # in case of a collision
+        template_value.merge(spec_value)
+      else
+        # We favor spec values vs templates values on collisions again
+        spec_value
+      end
+    end
+
+    #
+    # Build array of uniq keys that compose the templetable hash.
+    #
+    # @param [Hash] template
+    # @param [Hash] templatable
+    #
+    # @return [Array<String>]
+    #
+    private def mergable_key_space(template, templatable)
+      Set.new(template.keys.concat(templatable.keys))
+         .to_a
+         .delete_if { |x| SKIPPABLE_MERGE_KEYS.include?(x) }
+    end
+
+    #
+    # Lookup for template by given name in the data object.
+    #
+    # @raise [MissingTemplateError] if template can't be found
+    #
+    # @param [String] name
+    #
+    # @return [Hash]
+    #
+    private def find_template!(name)
+      template = data['templates'].find { |t| t['name'] == name }
+
+      raise MissingTemplateError, "Missing template #{name}" if template.nil?
+
+      template.dup.delete_if { |x| SKIPPABLE_TEMPLATE_KEYS.include?(x) }
+    end
+  end
+end

data/lib/ddsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DDSL
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/schemas/build.schema.json

@@ -25,11 +25,24 @@
     "build_docker_options": {
       "type": "object",
       "required": [
-        "type",
-        "context",
-        "file"
+        "type"
+      ],
+      "anyOf": [
+        {
+          "required" : ["templates"]
+        },
+        {
+          "required" : ["file", "context"]
+        }
       ],
       "properties": {
+        "templates": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of templates the build will inherit"
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -89,6 +102,13 @@
         "type"
       ],
       "properties": {
+        "templates": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of templates the build will inherit"
+        },
         "type": {
           "type": "string",
           "enum": [

data/schemas/ddsl.schema.json

@@ -39,6 +39,13 @@
         "$ref": "https://raw.githubusercontent.com/bilby91/ddsl/master/docs/run.schema.json"
       },
       "description": "List of run tasks to run"
+    },
+    "templates": {
+      "type": "array",
+      "items": {
+        "$ref": "https://raw.githubusercontent.com/bilby91/ddsl/master/docs/template.schema.json"
+      },
+      "description": "List of templates to use in builds or runs"
     }
   }
 }

data/schemas/run.schema.json

@@ -28,7 +28,22 @@
         "type",
         "image"
       ],
+      "anyOf": [
+        {
+          "required" : ["templates"]
+        },
+        {
+          "required" : ["image"]
+        }
+      ],
       "properties": {
+        "templates": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of templates the run will inherit"
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -78,7 +93,22 @@
         "type",
         "service"
       ],
+      "anyOf": [
+        {
+          "required" : ["templates"]
+        },
+        {
+          "required" : ["service"]
+        }
+      ],
       "properties": {
+        "templates": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of templates the run will inherit"
+        },
         "type": {
           "type": "string",
           "enum": [

data/schemas/template.schema.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$id": "https://raw.githubusercontent.com/bilby91/ddsl/master/docs/template.schema.json",
+  "title": "Template",
+  "description": "Template for encapsulating common option either docker or docker-compose",
+  "type": "object",
+  "required": [
+    "name"
+  ],
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Unique name to identify the template."
+    }
+  },
+  "additionalProperties": true
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddsl
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Martin Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -143,6 +143,8 @@ files:
 - docs/registry.schema.md
 - docs/run.schema.json
 - docs/run.schema.md
+- docs/template.schema.json
+- docs/template.schema.md
 - lib/ddsl.rb
 - lib/ddsl/cli.rb
 - lib/ddsl/command.rb
@@ -158,14 +160,16 @@ files:
 - lib/ddsl/functions.rb
 - lib/ddsl/parser.rb
 - lib/ddsl/schema.rb
-- lib/ddsl/schema_validator.rb
+- lib/ddsl/schema_parser.rb
 - lib/ddsl/shell.rb
+- lib/ddsl/template_merger.rb
 - lib/ddsl/variable_injector.rb
 - lib/ddsl/version.rb
 - schemas/build.schema.json
 - schemas/ddsl.schema.json
 - schemas/registry.schema.json
 - schemas/run.schema.json
+- schemas/template.schema.json
 - scripts/publish.sh
 - scripts/version.sh
 homepage: https://github.com/bilby91/ddsl

data/lib/ddsl/schema_validator.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'json_schemer'
-require_relative './schema'
-
-module DDSL
-  class SchemaValidator
-    class InvalidError < StandardError; end
-
-    #
-    # Validate given data against DDSL schema. Will add any defaults if nil values are found
-    #
-    # @raise [InvalidError] if data is not compliant with the schema,
-    #
-    # @param [Hash] data
-    #
-    # @return [Hash] data with defaults if appropiate
-    #
-    def validate!(data)
-      errors = json_schema_validator.validate(data).to_a
-      raise InvalidError, 'Invalid schema' if errors&.count&.positive?
-
-      data
-    end
-
-    private def json_schema_validator
-      @json_schema_validator ||= JSONSchemer.schema(
-        DDSL::SCHEMA_PATH,
-        format: true,
-        ref_resolver: DDSL::SCHEMA_RESOLVER
-      )
-    end
-  end
-end