ddsl 0.0.3 → 0.0.4

data/lib/ddsl/command.rb

@@ -2,6 +2,7 @@
 
 require_relative './command/docker/build'
 require_relative './command/docker/push'
+require_relative './command/docker/pull'
 require_relative './command/docker/run'
 require_relative './command/docker/login'
 require_relative './command/docker_compose/run'

data/lib/ddsl/command/base.rb

@@ -14,6 +14,8 @@ module DDSL
       end
 
       def run(spec)
+        exec_before_block(spec)
+
         argv = [
           executable,
           executable_options.call(spec),
@@ -27,6 +29,10 @@ module DDSL
         exec_after_block(spec)
       end
 
+      def exec_before_block(spec)
+        instance_exec(spec, &before_block) unless before_block.nil?
+      end
+
       def exec_after_block(spec)
         instance_exec(spec, &after_block) unless after_block.nil?
       end

data/lib/ddsl/command/docker/build.rb

@@ -28,6 +28,12 @@ module DDSL
           accept_keys(['context'])
         end
 
+        before do |spec|
+          if spec['pull'] && spec['cache_from'].count.positive?
+            spec['cache_from'].each { |t| Pull.new(shell).run('image' => t) }
+          end
+        end
+
         after do |spec|
           spec['tags'].each { |t| Push.new(shell).run('image' => t) } if spec['push'] && spec['tags'].count.positive?
         end

data/lib/ddsl/command/docker/pull.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+
+module DDSL
+  module Command
+    module Docker
+      class Pull < Base
+        executable 'docker'
+        command 'pull'
+
+        arguments do
+          accept_keys(['image'])
+        end
+      end
+    end
+  end
+end

data/lib/ddsl/command/dsl.rb

@@ -39,6 +39,12 @@ module DDSL
           end
         end
 
+        def before(&block)
+          singleton_class.class_eval do
+            @before_block = block
+          end
+        end
+
         def after(&block)
           singleton_class.class_eval do
             @after_block = block
@@ -62,6 +68,10 @@ module DDSL
           search_ancestor_tree_variable(:@arguments) || DEFAULT_ARGUMENTS_TRANSFORMER
         end
 
+        def before_block
+          search_ancestor_tree_variable(:@before_block)
+        end
+
         def after_block
           search_ancestor_tree_variable(:@after_block)
         end

data/lib/ddsl/schema.rb

@@ -1,176 +1,13 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ModuleLength
 module DDSL
-  SCHEMA_VERSION = :draft4
-  SCHEMA = {
-    type: :object,
-    required: [:version],
-    additionalProperties: false,
-    properties: {
-      version: {
-        type: :integer,
-        enum: [1]
-      },
-      registries: {
-        type: :array,
-        items: { '$ref': '#/definitions/registry' },
-        default: []
-      },
-      builds: {
-        type: :array,
-        items: { '$ref': '#/definitions/build' }
-      },
-      runs: {
-        type: :array,
-        items: { '$ref': '#/definitions/run' }
-      }
-    },
-    definitions: {
-      registry: {
-        type: :object,
-        required: %i[url username password],
-        properties: {
-          url: { type: :string },
-          username: { type: :string },
-          password: { type: :string },
-          use_cache: { type: :boolean }
-        }
-      },
-      build: {
-        type: :object,
-        required: [:name],
-        oneOf: [
-          { "$ref": '#/definitions/build_docker_options' },
-          { "$ref": '#/definitions/build_docker_compose_options' }
-        ],
-        properties: {
-          name: {
-            type: :string
-          }
-        }
-      },
-      run: {
-        type: :object,
-        oneOf: [
-          { "$ref": '#/definitions/run_docker_options' },
-          { "$ref": '#/definitions/run_docker_compose_options' }
-        ]
-      },
-      build_docker_options: {
-        type: :object,
-        required: %i[type context file],
-        properties: {
-          type: {
-            type: :string,
-            enum: [:docker]
-          },
-          context: { type: :string },
-          file: { type: :string },
-          build_args: {
-            type: :object,
-            additionalProperties: {
-              type: :string
-            }
-          },
-          tags: {
-            type: :array,
-            items: { type: :string }
-          },
-          labels: {
-            type: :array,
-            items: { type: :string }
-          },
-          cache_from: {
-            type: :array,
-            items: { type: :string }
-          },
-          push: { type: :boolean }
-        }
-      },
-      build_docker_compose_options: {
-        type: :object,
-        required: %i[type],
-        properties: {
-          type: {
-            type: :string,
-            enum: [:'docker-compose']
-          },
-          file: { type: :string },
-          service: { type: :string },
-          no_cache: { type: :boolean },
-          pull: { type: :boolean },
-          force_rm: { type: :boolean },
-          compress: { type: :boolean },
-          parallel: { type: :boolean },
-          memory: { type: :string },
-          build_args: {
-            type: :object,
-            additionalProperties: {
-              type: :string
-            }
-          }
-        }
-      },
-      run_docker_options: {
-        type: :object,
-        required: %i[type image],
-        properties: {
-          type: {
-            type: :string,
-            enum: [:docker]
-          },
-          image: { type: :string },
-          cmd: { type: :string },
-          user: { type: :string },
-          workdir: { type: :string },
-          rm: { type: :boolean },
-          env: {
-            type: :object,
-            additionalProperties: {
-              type: :string
-            }
-          },
-          volumes: {
-            type: :object,
-            additionalProperties: {
-              type: :string
-            }
-          }
-        }
-      },
-      run_docker_compose_options: {
-        type: :object,
-        required: %i[type service],
-        properties: {
-          type: {
-            type: :string,
-            enum: [:'docker-compose']
-          },
-          service: { type: :string },
-          file: { type: :string },
-          cmd: { type: :string },
-          rm: { type: :boolean },
-          user: { type: :string },
-          workdir: { type: :string },
-          service_ports: { type: :string },
-          detach: { type: :boolean },
-          no_deps: { type: :boolean },
-          env: {
-            type: :object,
-            additionalProperties: {
-              type: :string
-            }
-          },
-          volumes: {
-            type: :object,
-            additionalProperties: {
-              type: :string
-            }
-          }
-        }
-      }
-    }
-  }.freeze
+  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))
+  }
 end
-# rubocop:enable Metrics/ModuleLength

data/lib/ddsl/schema_validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json-schema'
+require 'json_schemer'
 require_relative './schema'
 
 module DDSL
@@ -17,13 +17,18 @@ module DDSL
     # @return [Hash] data with defaults if appropiate
     #
     def validate!(data)
-      errors = JSON::Validator.fully_validate(DDSL::SCHEMA, data,
-                                              version: DDSL::SCHEMA_VERSION,
-                                              insert_defaults: true)
-
-      raise InvalidError, errors.join('\n') if errors.count.positive?
+      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

data/lib/ddsl/version.rb

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

data/schemas/build.schema.json

@@ -0,0 +1,141 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$id": "https://raw.githubusercontent.com/bilby91/ddsl/master/docs/build.schema.json",
+  "title": "Build",
+  "description": "Build task to perform using either docker or docker-compose",
+  "type": "object",
+  "required": [
+    "name"
+  ],
+  "oneOf": [
+    {
+      "$ref": "#/definitions/build_docker_options"
+    },
+    {
+      "$ref": "#/definitions/build_docker_compose_options"
+    }
+  ],
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Unique name to identify the build task."
+    }
+  },
+  "definitions": {
+    "build_docker_options": {
+      "type": "object",
+      "required": [
+        "type",
+        "context",
+        "file"
+      ],
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "docker"
+          ],
+          "description": "Type of builder to use"
+        },
+        "context": {
+          "type": "string",
+          "description": "Path for the `docker build` context"
+        },
+        "file": {
+          "type": "string",
+          "description": "Path to the Dockerfile to build"
+        },
+        "build_args": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Set build-time variables"
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Name and optionally a tag in the ‘name:tag’ format"
+        },
+        "labels": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Set metadata for an image"
+        },
+        "cache_from": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Images to consider as cache sources"
+        },
+        "push": {
+          "type": "boolean",
+          "description": "If true, push any configured tag to the appropiate registry"
+        },
+        "pull": {
+          "type": "boolean",
+          "description": "If true, all images specified in `cache_from` will be pulled before building"
+        }
+      }
+    },
+    "build_docker_compose_options": {
+      "type": "object",
+      "required": [
+        "type"
+      ],
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "docker-compose"
+          ],
+          "description": "Type of builder to use"
+        },
+        "file": {
+          "type": "string",
+          "description": "Path to the docker-compose file"
+        },
+        "service": {
+          "type": "string",
+          "description": "Name of the docker-compose service to build"
+        },
+        "no_cache": {
+          "type": "boolean",
+          "description": "Do not use cache when building the image"
+        },
+        "pull": {
+          "type": "boolean",
+          "description": "Always attempt to pull a newer version of the image"
+        },
+        "force_rm": {
+          "type": "boolean",
+          "description": "Always remove intermediate containers"
+        },
+        "compress": {
+          "type": "boolean",
+          "description": "Compress the build context using gzip"
+        },
+        "parallel": {
+          "type": "boolean",
+          "description": "Build images in parallel"
+        },
+        "memory": {
+          "type": "string",
+          "description": "Sets memory limit for the build container."
+        },
+        "build_args": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Set build-time variables for services"
+        }
+      }
+    }
+  }
+}