djin 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 626c84b6931a23c78952835ba8fe34b9c33a9cb37b174539804b32f052e2af21
-  data.tar.gz: 4dd41c1ced7edc3b662edd8eb0c53c32866c686e156744f78e93b723260ebbbe
+  metadata.gz: 20d3e4379f1a66394b34708a76c8c362b4ce996bea8fba4a449856260533c288
+  data.tar.gz: e6d6713bc9a6a81f7bdc34ae56a75fc962a6c0c76719747c044e9557f8ff6f42
 SHA512:
-  metadata.gz: 241a5cc08af93622125bfe228384b3920221e24da7f74b13d404d7a74b3b2c5b7b2fb435a3e3803f61e9d5d10166bef7629f70b40553d5059916d9fdd30abf53
-  data.tar.gz: 6e7253e6bdf3a1c85b8b29163d28db67031dff8bd31dac2b6f0d8d10b8e9de3a94e1b9a3669598549a77bb59171b471327a3ea294dd98916878fb756b95df8cc
+  metadata.gz: 2e809bb84de4f96ad4054e07020460502b6fded297074356d2255b649298986c06881f1719946e7fd3731bccf6d6f23cb2b6c0597a9255a629837028e9866eb1
+  data.tar.gz: ddb2334bfa660b5114bf8dd5eb83c3aebcedd32087bf880f616e5630e6259c34ad2e9c264cc0c8e2ce04fd9d3b05ad5d89b89c212059cc71ce40007837a47838

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.11.4 - 12/02/2021
+ * [PATCH] Include Config Validations
+
 ## 0.11.3 - 29/01/2021
  * [FIX] --version, -v
 

data/Dockerfile

@@ -2,6 +2,7 @@ ARG RUBY_VERSION
 FROM ruby:${RUBY_VERSION:-2.6.5}-alpine AS builder
 
 ENV BUILD_PACKAGES build-base git
+ENV DEV_PACKAGES bash
 
 RUN mkdir /bundle
 
@@ -20,6 +21,9 @@ RUN bundle install
 
 FROM builder AS dev
 
+RUN apk add $DEV_PACKAGES && \
+    rm -rf /var/cache/apk/*
+
 WORKDIR /usr/src/djin
 
 COPY . .
@@ -45,4 +49,4 @@ RUN rake install
 
 WORKDIR /usr/src/project
 
-ENTRYPOINT ["/usr/src/verto/docker-entrypoint.sh"]
+ENTRYPOINT ["/usr/src/djin/docker-entrypoint.sh"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    djin (0.11.3)
+    djin (0.11.4)
       dry-cli (~> 0.6.0)
       dry-equalizer (~> 0.3.0)
       dry-struct (~> 1.3.0)
@@ -40,7 +40,7 @@ GEM
     dry-logic (1.1.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.6.0)
+    dry-schema (1.6.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.5, >= 0.5)

data/README.md

@@ -27,7 +27,7 @@ If you use Rbenv you can install djin only once and create an alias in your .bas
 To use djin first you need to create a djin.yml file:
 
 ```yaml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 tasks:
   # With a docker image
@@ -54,7 +54,7 @@ You can also set task dependencies with depends_on option:
 
 
 ```yaml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -83,7 +83,7 @@ tasks:
 Or mix local commands and docker/docker-compose commands:
 
 ```yaml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -122,7 +122,7 @@ After that you can run `djin {{task_name}}`, like `djin script` or `djin test`
 You can also use environment variables using the '{{YOUR_ENV_HERE}}' syntax, like so:
 
 ```yaml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -139,7 +139,7 @@ tasks:
 
 Or define some variables to use in multiple locations
 ```yaml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -163,7 +163,7 @@ tasks:
 It's also possible to pass custom arguments to the command, which means is possible to make a djin task act like the command itself:
 
 ```yaml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -189,7 +189,7 @@ Under the hood djin uses [Mustache](https://mustache.github.io/), so you can use
 If you have multiple tasks with similar behavior and with small differences you can use the `include` keyword, so this:
 
 ```yaml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 tasks:
   "host1:ssh":
@@ -228,7 +228,7 @@ can become this:
 
 ```yaml
 # djin.yml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 include:
   - file: '.djin/server_tasks.yml'
@@ -250,7 +250,7 @@ include:
 
 ```yaml
 # .djin/server_tasks.yml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 tasks:
   "{{namespace}}:ssh":
@@ -272,7 +272,7 @@ tasks:
 You can also reuse tasks in some git repository, to do that you need to declare a git source and optionally a version:
 
 ```yaml
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 include:
   - git: 'https://github.com/catks/djin.git'

data/djin.yml

@@ -1,4 +1,4 @@
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 _default_run_options: &default_run_options
   options: "--rm --entrypoint=''"

data/docker-entrypoint.sh

@@ -4,4 +4,6 @@ set -e
 
 bundle check || bundle install
 
+./wait-for-it.sh gitserver:80 -t 10
+
 exec bundle exec "$@"

data/examples/djin.yml

@@ -1,5 +1,5 @@
 ---
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 include:
   - file: 'djin_lib/test.yml'

data/examples/djin_lib/test.yml

@@ -1,4 +1,4 @@
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 _default_run_options: &default_run_options
   options: "--rm --entrypoint=''"

data/examples/local_tasks/djin.yml

@@ -1,4 +1,4 @@
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 include:
   - file: '.djin/server_tasks.yml'

data/examples/remote_tasks/djin.yml

@@ -1,4 +1,4 @@
-djin_version: '0.11.3'
+djin_version: '0.11.4'
 
 include:
   - git: 'https://gitserver/myrepo.git'

data/lib/djin.rb

@@ -10,18 +10,20 @@ require 'dry/cli'
 require 'mustache'
 require 'optparse'
 require 'git'
+require 'djin/errors'
 require 'djin/extensions/hash_extensions'
 require 'djin/extensions/object_extensions'
 require 'djin/entities/types'
 require 'djin/entities/task'
 require 'djin/entities/include_config.rb'
 require 'djin/entities/main_config'
+require 'djin/include_contract'
 require 'djin/interpreter/base_command_builder'
 require 'djin/interpreter/docker_command_builder'
 require 'djin/interpreter/docker_compose_command_builder'
 require 'djin/interpreter/local_command_builder'
 require 'djin/interpreter'
-require 'djin/include_resolver'
+require 'djin/include_config_loader'
 require 'djin/config_loader'
 require 'djin/executor'
 require 'djin/root_cli_parser'
@@ -51,7 +53,7 @@ module Djin
       @remote_config_repository = RemoteConfigRepository.new(remote_configs)
 
       CLI.load_tasks!(tasks)
-    rescue Djin::Interpreter::InvalidConfigurationError => e
+    rescue Djin::InvalidConfigurationError => e
       error_name = e.class.name.split('::').last
       abort("[#{error_name}] #{e.message}")
     end

data/lib/djin/config_loader.rb

@@ -1,36 +1,33 @@
 # frozen_string_literal: true
 
 module Djin
-  # TODO: Refactor this class to be the Interpreter
-  #       class and use the current interpreter as
-  #       a TaskLoader
+  # TODO: Refactor this class to delegate the responsability of complex fields
+  #       to a specific Loader (like include for IncludeConfigLoader),
+  #       maybe renaming to RootConfigLoader
 
   # rubocop:disable Metrics/ClassLength
   class ConfigLoader
     using Djin::HashExtensions
     RESERVED_WORDS = %w[djin_version variables tasks include].freeze
 
-    # Change Base Error
-    FileNotFoundError = Class.new(Interpreter::InvalidConfigurationError)
-
-    def self.load_files!(*files, runtime_config: {}, base_directory: '.')
+    def self.load_files!(*files, context_config: {}, base_directory: '.')
       files.map do |file_path|
-        ConfigLoader.load!(file_path, runtime_config: runtime_config, base_directory: base_directory)
+        ConfigLoader.load!(file_path, context_config: context_config, base_directory: base_directory)
       end&.reduce(:deep_merge)
     end
 
-    def self.load!(template_file_path, runtime_config: {}, base_directory: '.')
-      new(template_file_path, runtime_config: runtime_config, base_directory: base_directory).load!
+    def self.load!(template_file_path, context_config: {}, base_directory: '.')
+      new(template_file_path, context_config: context_config, base_directory: base_directory).load!
     end
 
-    def initialize(template_file_path, runtime_config: {}, base_directory: '.')
+    def initialize(template_file_path, context_config: {}, base_directory: '.')
       @base_directory = Pathname.new(base_directory)
       @template_file = @base_directory.join(template_file_path)
 
       file_not_found!(@template_file) unless @template_file.exist?
 
       @template_file_content = Djin.cache.fetch(@template_file.realpath.to_s) { @template_file.read }
-      @runtime_config = runtime_config
+      @context_config = context_config
     end
 
     def load!
@@ -107,7 +104,7 @@ module Djin
                              present_include_configs&.map do |present_include|
                                ConfigLoader.load!(present_include.file, base_directory: @template_file.dirname,
                                                                         # TODO: Rename to context_config
-                                                                        runtime_config: present_include.context)
+                                                                        context_config: present_include.context)
                              end&.reduce(:deep_merge)
                            end
     end
@@ -120,18 +117,9 @@ module Djin
       include_configs&.select(&:missing?)
     end
 
-    # TODO: Refactor to move include methods to a specific IncludeConfigLoader, maybe rename IncludeResolver
     def include_configs
-      @include_configs ||= begin
-                             # TODO: Rename the resolved variables
-                             resolver = IncludeResolver.new(base_directory: @template_file.dirname)
-
-                             include_djin_config = raw_djin_config['include'] || []
-
-                             include_djin_config.map do |include_config|
-                               resolver.call(include_config)
-                             end
-                           end
+      @include_configs ||= Djin::IncludeConfigLoader.load!(raw_djin_config['include'],
+                                                           base_directory: @template_file.dirname)
     end
 
     def args
@@ -147,9 +135,9 @@ module Djin
     end
 
     def raw_djin_config
-      @raw_djin_config ||= yaml_load(@template_file_content).deep_merge(@runtime_config)
+      @raw_djin_config ||= yaml_load(@template_file_content).deep_merge(@context_config)
     rescue Psych::SyntaxError => e
-      raise Interpreter::InvalidConfigFileError, "File: #{@template_file.realpath}\n  #{e.message}"
+      raise InvalidConfigFileError, "File: #{@template_file.realpath}\n  #{e.message}"
     end
 
     def rendered_djin_config
@@ -160,7 +148,7 @@ module Djin
                                                                   args: args.join(' '),
                                                                   args?: args.any?,
                                                                   **locals)
-                                  yaml_load(rendered_yaml).merge(@runtime_config)
+                                  yaml_load(rendered_yaml).merge(@context_config)
                                 end
     end
 
@@ -169,11 +157,11 @@ module Djin
     end
 
     def validate_version!
-      raise Interpreter::MissingVersionError, 'Missing djin_version' unless version
+      raise MissingVersionError, 'Missing djin_version' unless version
 
       return if file_config.version_supported?
 
-      raise Interpreter::VersionNotSupportedError, "Version #{version} is not supported, use #{Djin::VERSION} or higher"
+      raise VersionNotSupportedError, "Version #{version} is not supported, use #{Djin::VERSION} or higher"
     end
 
     def validate_missing_config!

data/lib/djin/errors.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Djin
+  InvalidConfigurationError = Class.new(StandardError)
+  InvalidConfigFileError = Class.new(InvalidConfigurationError)
+  MissingVersionError = Class.new(InvalidConfigurationError)
+  VersionNotSupportedError = Class.new(InvalidConfigurationError)
+  InvalidSyntaxError = Class.new(InvalidConfigurationError)
+  FileNotFoundError = Class.new(InvalidConfigurationError)
+end

data/lib/djin/{include_resolver.rb → include_config_loader.rb}

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 module Djin
-  class IncludeResolver
+  class IncludeConfigLoader
     using ObjectExtensions
     using HashExtensions
 
+    def self.load!(include_djin_config, **options)
+      new(**options).load!(include_djin_config)
+    end
+
     def initialize(base_directory: '.', remote_directory: '~/.djin/remote', entity_class: Djin::IncludeConfig)
       # TODO: Use chain of responsability
       @base_directory = Pathname.new(base_directory)
@@ -12,15 +16,33 @@ module Djin
       @entity_class = entity_class
     end
 
-    def call(params)
+    def load!(include_djin_config)
+      load_configs(include_djin_config)
+    end
+
+    private
+
+    def load_configs(include_djin_config)
+      include_djin_config ||= []
+
+      include_contract = IncludeContract.new
+
+      include_djin_config.map do |include_params|
+        result = include_contract.call(include_params)
+
+        raise InvalidSyntaxError, { include: result.errors.to_h } if result.failure?
+
+        resolve_include(include_params)
+      end
+    end
+
+    def resolve_include(params)
       include_config_params = remote_handler(params)
       include_config_params ||= local_handler(params)
 
       build_entity(include_config_params)
     end
 
-    private
-
     def remote_handler(params)
       return if params['git'].blank?
 

data/lib/djin/include_contract.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Djin
+  class IncludeContract < Dry::Validation::Contract
+    using Djin::ObjectExtensions
+
+    GIT_URI_REGEXP = Regexp.new('(\w+://)(.+@)*([\w\d\.]+)(:[\d]+){0,1}/*(.*)')
+
+    ContextSchema = Dry::Schema.Params do
+      optional(:variables).filled(:hash)
+      # TODO: Add the rest
+    end
+
+    params do
+      optional(:context).filled do
+        hash(ContextSchema)
+      end
+      required(:file).filled(:string)
+      optional(:git).filled(:string)
+      optional(:version).filled(:string)
+    end
+
+    rule(:git) do
+      key.failure("Invalid git uri in: #{value}") if value.present? && !GIT_URI_REGEXP.match?(value)
+    end
+
+    # TODO: Add more validations to file and to restricted unespected keys
+  end
+end

data/lib/djin/interpreter.rb

@@ -1,16 +1,10 @@
 # frozen_string_literal: true
 
 module Djin
+  # TODO: Refactor to TaskConfigLoader and make COnfigLoader to use this class
   class Interpreter
     using Djin::HashExtensions
 
-    # TODO: Move Errors to ConfigLoader
-    InvalidConfigurationError = Class.new(StandardError)
-    InvalidConfigFileError = Class.new(InvalidConfigurationError)
-    MissingVersionError = Class.new(InvalidConfigurationError)
-    VersionNotSupportedError = Class.new(InvalidConfigurationError)
-    InvalidSyntaxError = Class.new(InvalidConfigurationError)
-
     class << self
       # rubocop:disable Metrics/AbcSize
       def load!(file_config)

data/lib/djin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Djin
-  VERSION = '0.11.3'
+  VERSION = '0.11.4'
 end

data/wait-for-it.sh

@@ -0,0 +1,183 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+# Credits: https://github.com/vishnubob/wait-for-it
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+
+wait_for()
+{
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    else
+        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+    fi
+    WAITFORIT_start_ts=$(date +%s)
+    while :
+    do
+        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+            WAITFORIT_result=$?
+        else
+            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+            WAITFORIT_result=$?
+        fi
+        if [[ $WAITFORIT_result -eq 0 ]]; then
+            WAITFORIT_end_ts=$(date +%s)
+            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    else
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    fi
+    WAITFORIT_PID=$!
+    trap "kill -INT -$WAITFORIT_PID" INT
+    wait $WAITFORIT_PID
+    WAITFORIT_RESULT=$?
+    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    fi
+    return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        WAITFORIT_hostport=(${1//:/ })
+        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        shift 1
+        ;;
+        --child)
+        WAITFORIT_CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        WAITFORIT_QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        WAITFORIT_STRICT=1
+        shift 1
+        ;;
+        -h)
+        WAITFORIT_HOST="$2"
+        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        WAITFORIT_HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        WAITFORIT_PORT="$2"
+        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        WAITFORIT_PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        WAITFORIT_TIMEOUT="$2"
+        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        WAITFORIT_TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        WAITFORIT_CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
+        WAITFORIT_BUSYTIMEFLAG="-t"
+    fi
+else
+    WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+    wait_for
+    WAITFORIT_RESULT=$?
+    exit $WAITFORIT_RESULT
+else
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        WAITFORIT_RESULT=$?
+    else
+        wait_for
+        WAITFORIT_RESULT=$?
+    fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+        exit $WAITFORIT_RESULT
+    fi
+    exec "${WAITFORIT_CLI[@]}"
+else
+    exit $WAITFORIT_RESULT
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -236,10 +236,12 @@ files:
 - lib/djin/entities/main_config.rb
 - lib/djin/entities/task.rb
 - lib/djin/entities/types.rb
+- lib/djin/errors.rb
 - lib/djin/executor.rb
 - lib/djin/extensions/hash_extensions.rb
 - lib/djin/extensions/object_extensions.rb
-- lib/djin/include_resolver.rb
+- lib/djin/include_config_loader.rb
+- lib/djin/include_contract.rb
 - lib/djin/interpreter.rb
 - lib/djin/interpreter/base_command_builder.rb
 - lib/djin/interpreter/docker_command_builder.rb
@@ -251,6 +253,7 @@ files:
 - lib/djin/root_cli_parser.rb
 - lib/djin/task_contract.rb
 - lib/djin/version.rb
+- wait-for-it.sh
 homepage: https://github.com/catks/djin
 licenses:
 - MIT