djin 0.5.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a40e01844f1a9b034d592696cf6af915622c834a9e231f0c56209c03d11660ad
-  data.tar.gz: facbe98a7362ec81b5f819af27a554807790a1445c7cc47161a85d5f0d5b7276
+  metadata.gz: e763f1dad923699c768e998f4dd5caa53ac7a8b0ad4d7acd84c708effdcb627c
+  data.tar.gz: 9ab841b39557b775ec7832a3c1cd0befaf983e89ba931459b89a52d5a5df0bda
 SHA512:
-  metadata.gz: 72f5ea393c498311acf74a482b02670d94f11704a75032e31e914e68b947de694bec077ba03e22b75fd73c9307f9f98242ea35009f5341c2ab9b3d1af0314901
-  data.tar.gz: 4bf6650c80d7defc1dd3b2850c21b74c54ecdb7f4dd374c0a98dd3bfe2610c7175f7102a71de53d6367a4dfd1fcdae47437a2db24bee83bc1c195a4c0fea9da7
+  metadata.gz: e22bc8b7d3deb635180db1d5c49f1e7d5df1eef3f1b4184b13d65b24eaa45b6f716edfae1bb4799abfe4d4255387958f5f078d931c72cf0b5e407abf9d85ee51
+  data.tar.gz: e603ff5f1bab170ed9758331e7c64e39f1832424fc2c0e069aeef2ce85372081ccc15e1a2080cae3c5edc4c8d8fd1286643e4aaa02616249f7173c6d660ffcf2

data/.github/workflows/ruby.yml

@@ -14,10 +14,12 @@ jobs:
       - uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: |
+      - name: Install Gems
+        run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-          bundle exec rake
+      - name: Run tests
+        run: bundle exec rake
 
   lint:
     runs-on: ubuntu-16.04
@@ -27,8 +29,10 @@ jobs:
       - uses: actions/setup-ruby@v1
         with:
           ruby-version: '2.6'
-      - run: |
+      - name: Install Gems
+        run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-          bundle exec rubocop
+      - name: Rubocop
+        run: bundle exec rubocop
 

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.9.0 - 17/09/2020
+ * [FEATURE] Include Option
+
+## 0.8.0 - 31/08/2020
+ * [FEATURE] Adds aliases option
+
+## 0.7.0 - 20/08/2020
+ * [FEATURE] Adds description option
+
+## 0.6.1 - 11/08/2020
+ * [TECH] Better Error Handling
+
+## 0.6.0 - 22/07/2020
+ * [FEATURE] Djin Variables
+
 ## 0.5.0 - 13/07/2020
  * [FEATURE] Adds local command task
  * [FEATURE] Template Args for entire djin.yml

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    djin (0.5.0)
+    djin (0.9.0)
       dry-cli (~> 0.6.0)
+      dry-equalizer (~> 0.3.0)
       dry-struct (~> 1.3.0)
       dry-validation (~> 1.5.1)
       mustache (~> 1.1.1)
@@ -13,7 +14,7 @@ GEM
   specs:
     ast (2.4.1)
     byebug (11.1.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     dry-cli (0.6.0)
       concurrent-ruby (~> 1.0)
@@ -29,11 +30,11 @@ GEM
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
     dry-initializer (3.0.3)
-    dry-logic (1.0.6)
+    dry-logic (1.0.7)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-schema (1.5.2)
+    dry-schema (1.5.4)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
@@ -53,13 +54,13 @@ GEM
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.5.1)
+    dry-validation (1.5.6)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.5)
+      dry-schema (~> 1.5, >= 1.5.2)
     ice_nine (0.11.2)
     mustache (1.1.1)
     parallel (1.19.2)

data/README.md

@@ -1,6 +1,7 @@
 # Djin
 
 ![](https://github.com/catks/djin/workflows/Ruby/badge.svg?branch=master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/824a2e78399813543212/maintainability)](https://codeclimate.com/github/catks/djin/maintainability)
 
 Djin is a make-like utility for docker containers
 
@@ -25,139 +26,253 @@ If you use Rbenv you can install djin only once and create a alias in your .basr
 To use djin first you need to create a djin.yml file:
 
 ```yaml
-djin_version: '0.5.0'
-
-# With a docker image
-script:
-  docker:
-    image: "ruby:2.6"
-    run:
-      commands:
-        - "ruby /scripts/my_ruby_script.rb"
-      options: "--rm -v $(pwd)/my_ruby_script.rb:/scripts/my_ruby_script.rb"
-
-# Using a docker-compose service
-test:
-  docker-compose:
-    service: app
-    run:
-      commands: rspec
-      options: "--rm"
-
+djin_version: '0.9.0'
+
+tasks:
+  # With a docker image
+  script:
+    docker:
+      image: "ruby:2.6"
+      run:
+        commands:
+          - "ruby /scripts/my_ruby_script.rb"
+        options: "--rm -v $(pwd)/my_ruby_script.rb:/scripts/my_ruby_script.rb"
+
+  # Using a docker-compose service
+  test:
+    docker-compose:
+      service: app
+      run:
+        commands: rspec
+        options: "--rm"
+    aliases: # Optional Array of strings
+      - rspec
 ```
 
 You can also set task dependencies with depends_on option:
 
 
 ```yaml
-djin_version: '0.5.0'
+djin_version: '0.9.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
 
-"db:create":
-  docker-compose:
-    service: app
-    run:
-      commands: rake db:create
-      <<: *default_run_options
-
-"db:migrate":
-  docker-compose:
-    service: app
-    run:
-      commands: rake db:migrate
-      <<: *default_run_options
-
-"db:setup":
-  depends_on:
-    - "db:create"
-    - "db:migrate"
-
+tasks: 
+  "db:create":
+    docker-compose:
+      service: app
+      run:
+        commands: rake db:create
+        <<: *default_run_options
+
+  "db:migrate":
+    docker-compose:
+      service: app
+      run:
+        commands: rake db:migrate
+        <<: *default_run_options
+
+  "db:setup":
+    depends_on:
+      - "db:create"
+      - "db:migrate"
 ```
 
 Or mix local commands and docker/docker-compose commands:
 
 ```yaml
-djin_version: '0.5.0'
+djin_version: '0.9.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
 
-"db:create":
-  docker-compose:
-    service: app
-    run:
-      commands: rake db:create
-      <<: *default_run_options
-
-"db:migrate":
-  docker-compose:
-    service: app
-    run:
-      commands: rake db:migrate
-      <<: *default_run_options
-
-"setup:copy_samples":
-  local:
-    run:
-      - cp config/database.yml.sample config/database.yml
-
-"setup":
-  depends_on:
-    - "setup:copy_samples"
-    - "db:create"
-    - "db:migrate"
-
+tasks:
+  "db:create":
+    docker-compose:
+      service: app
+      run:
+        commands: rake db:create
+        <<: *default_run_options
+
+  "db:migrate":
+    docker-compose:
+      service: app
+      run:
+        commands: rake db:migrate
+        <<: *default_run_options
+
+  "setup:copy_samples":
+    local:
+      run:
+        - cp config/database.yml.sample config/database.yml
+
+  "setup":
+    depends_on:
+      - "setup:copy_samples"
+      - "db:create"
+      - "db:migrate"
 ```
 
 After that you can run `djin {{task_name}}`, like `djin script` or `djin test`
 
-## Using Environment variables and custom args in djin.yml run tasks
+## Using Environment variables, custom variables and custom args in djin.yml tasks
 
 You can also use environment variables using the '{{YOUR_ENV_HERE}}' syntax, like so:
 
 ```yaml
-djin_version: '0.5.0'
+djin_version: '0.9.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
 
-"db:migrate":
-  docker-compose:
-    service: app
-    run:
-      commands: ENV={{ENV}} rake db:migrate
-      <<: *default_run_options
+tasks:
+  "db:migrate":
+    docker-compose:
+      service: app
+      run:
+        commands: ENV={{ENV}} rake db:migrate
+        <<: *default_run_options
 
 ```
 
-It's also possible to pass custom arguments to the command, wich means is possible to make a djin task act like the command itself:
+Or define some variables to use in multiple locations
+```yaml
+djin_version: '0.9.0'
+
+_default_run_options: &default_run_options
+  options: "--rm"
+
+variables:
+  my_ssh_user: user
+  some_host: test.local
+
+tasks:
+  "some_host:ssh":
+    local:
+      run:
+        - ssh {{my_ssh_user}}@{{some_host}}
+
+  "some_host:logs":
+    local:
+      run:
+        - ssh -t {{my_ssh_user}}@{{some_host}} 'tail -f /var/log/syslog'
+```
+
+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.5.0'
+djin_version: '0.9.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
 
-"rubocop":
-  docker-compose:
-    service: app
-    run:
-      commands: rubocop {{args}}
-      <<: *default_run_options
+tasks:
+  "rubocop":
+    docker-compose:
+      service: app
+      run:
+        commands: rubocop {{args}}
+        <<: *default_run_options
+    aliases:
+      - lint
 
 ```
 
 With that you can pass custom args after `--`, eg: `djin rubocop -- --parallel`, which wil make djin runs `rubocop --parallel` inside the service `app`.
 
-Under the hood djin uses [Mustache](https://mustache.github.io/), so you can use other features like conditionals: `{{#IS_ENABLE}} Enabled {{/IS_ENABLE}}` (for args use the `args?`, eg: {{#args} {{args}} --and-other-thing{{/args?}}), to see more more options you can access this [Link](https://mustache.github.io/mustache.5.html)
+Under the hood djin uses [Mustache](https://mustache.github.io/), so you can use other features like conditionals: `{{#IS_ENABLE}} Enabled {{/IS_ENABLE}}` (for args use the `args?`, eg: `{{#args?}} {{args}} --and-other-thing{{/args?}}`), to see more more options you can access this [Link](https://mustache.github.io/mustache.5.html)
+
+### Reusing tasks
+
+If you have multiple tasks with similar behaviour and with small differences you can use the `include` keyword, so this:
+
+```yaml
+djin_version: '0.9.0'
+
+tasks:
+  "host1:ssh":
+    local:
+      run:
+        - ssh my_user@host1.com.br
+
+  "host1:restart":
+    local:
+      run:
+        - ssh -t my_user@host1.com.br restart
+
+  "host1:logs":
+    local:
+      run:
+        - ssh -t my_user@host1.com.br tail -f /var/log/my_log
+
+  "host2:ssh":
+    local:
+      run:
+        - ssh my_user@host2.com.br
+
+  "host2:restart":
+    local:
+      run:
+        - ssh -t my_user@host2.com.br restart
+
+  "host2:logs":
+    local:
+      run:
+        - ssh -t my_user@host2.com.br tail -f /var/log/my_file
+
+```
+
+can become this:
+
+```yaml
+# djin.yml
+djin_version: '0.9.0'
+
+include:
+  - file: '.djin/server_tasks.yml'
+    context:
+      variables:
+        namespace: host1
+        host: host1.com
+        ssh_user: my_user
+
+  - file: '.djin/server_tasks.yml'
+    context:
+      variables:
+        namespace: host2
+        host: host2.com
+        ssh_user: my_user
+
+```
+
+
+```yaml
+# .djin/server_tasks.yml
+djin_version: '0.9.0'
+
+tasks:
+  "{{namespace}}:ssh":
+    local:
+      run:
+        - ssh {{ssh_user}}@{{host}}
+
+  "{{namespace}}:restart":
+    local:
+      run:
+        - ssh -t {{ssh_user}}@{{host}} restart
+
+  "{{namespace}}:logs":
+    local:
+      run:
+        - ssh -t {{ssh_user}}@{{host}} tail -f /var/log/my_log
+  ```
 
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, run `djin release -- {{increment_option}}` (where {{incremment_option}} can be `--patch`, `--minor` or `major`), which will change version, update the CHANGELOG.md, create a new commit, create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## TODO:
 

data/djin.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-cli', '~> 0.6.0'
+  spec.add_dependency 'dry-equalizer', '~> 0.3.0'
   spec.add_dependency 'dry-struct', '~> 1.3.0'
   spec.add_dependency 'dry-validation', '~> 1.5.1'
   spec.add_dependency 'mustache', '~> 1.1.1'

data/djin.yml

@@ -1,33 +1,35 @@
-djin_version: '0.5.0'
+djin_version: '0.9.0'
 
 _default_run_options: &default_run_options
   options: "--rm --entrypoint=''"
 
-test:
-  docker-compose:
-    service: app
-    run:
-      commands: "cd /usr/src/djin && rspec {{args}}"
-      <<: *default_run_options
-
-sh:
-  docker-compose:
-    service: app
-    run:
-      commands: "sh"
-      <<: *default_run_options
-run:
-  docker-compose:
-    service: app
-    run:
-      commands: "sh -c '{{args}}'"
-      <<: *default_run_options
-
-release:
-  local:
-    run:
-      - verto tag up {{args}}
-      - rake release
-
+tasks:
+  test:
+    description: Runs Specs
+    docker-compose:
+      service: app
+      run:
+        commands: "cd /usr/src/djin && rspec {{args}}"
+        <<: *default_run_options
+    aliases:
+      - rspec
 
+  sh:
+    description: Enter app service shell
+    docker-compose:
+      service: app
+      run:
+        commands: "sh"
+        <<: *default_run_options
+  run:
+    docker-compose:
+      service: app
+      run:
+        commands: "sh -c '{{args}}'"
+        <<: *default_run_options
 
+  release:
+    local:
+      run:
+        - verto tag up {{args}}
+        - bundle exec rake release

data/examples/djin.yml

@@ -1,29 +1,35 @@
 ---
-djin_version: '0.5.0'
+djin_version: '0.9.0'
 
-default:
-  docker:
-    image: "ruby:2.5"
-    run:
-      - "ruby -e 'puts \\\" Hello\\\"'"
-test:
-  docker-compose:
-    service: app
-    run:
-      commands: rspec
-      options: "--rm"
+include:
+  - file: 'djin_lib/test.yml'
+    context:
+      variables:
+        namespace: 'test:'
 
-script:
-  docker:
-    image: "ruby:2.6"
-    run:
-      commands:
-        - "ruby /scripts/my_ruby_script.rb"
-      options: "--rm -v $(pwd)/my_ruby_script.rb:/scripts/my_ruby_script.rb"
+  - file: 'djin_lib/test.yml'
+    context:
+      variables:
+        namespace: 'test2:'
 
 
-with_build:
-  docker:
-    build: .
-    run:
-      - "ruby -e 'puts \" Hello\"'"
+tasks:
+  default:
+    docker:
+      image: "ruby:2.5"
+      run:
+        - "ruby -e 'puts \\\" Hello\\\"'"
+
+  script:
+    docker:
+      image: "ruby:2.6"
+      run:
+        commands:
+          - "ruby /scripts/my_ruby_script.rb"
+        options: "--rm -v $(pwd)/my_ruby_script.rb:/scripts/my_ruby_script.rb"
+
+  with_build:
+    docker:
+      build: .
+      run:
+        - "ruby -e 'puts \" Hello\"'"

data/examples/djin_lib/test.yml

@@ -0,0 +1,12 @@
+djin_version: '0.9.0'
+
+_default_run_options: &default_run_options
+  options: "--rm --entrypoint=''"
+
+tasks:
+  "{{namespace}}unit":
+    docker-compose:
+      service: app
+      run:
+        commands: "cd /usr/src/djin && rspec {{args}}"
+        <<: *default_run_options

data/examples/local_tasks/.djin/server_tasks.yml

@@ -0,0 +1,17 @@
+djin_version: '0.8.0'
+
+tasks:
+  "{{namespace}}:ssh":
+    local:
+      run:
+        - ssh {{ssh_user}}@{{host}}
+
+  "{{namespace}}:restart":
+    local:
+      run:
+        - ssh -t {{ssh_user}}@{{host}} restart
+
+  "{{namespace}}:logs":
+    local:
+      run:
+        - ssh -t {{ssh_user}}@{{host}} tail -f /var/log/my_log

data/examples/local_tasks/djin.yml

@@ -0,0 +1,22 @@
+djin_version: '0.9.0'
+
+include:
+  - file: '.djin/server_tasks.yml'
+    context:
+      variables:
+        namespace: host1
+        host: host1.com
+        ssh_user: my_user
+
+  - file: '.djin/server_tasks.yml'
+    context:
+      variables:
+        namespace: host2
+        host: host2.com
+        ssh_user: my_user
+
+tasks:
+  hello_command:
+    local:
+      run:
+        - echo 'Hello Djin'

data/lib/djin.rb

@@ -11,32 +11,35 @@ require 'mustache'
 require 'djin/extensions/hash_extensions'
 require 'djin/entities/types'
 require 'djin/entities/task'
+require 'djin/entities/file_config'
 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/template_renderer'
+require 'djin/config_loader'
 require 'djin/executor'
 require 'djin/cli'
 require 'djin/task_contract'
 require 'djin/repositories/task_repository'
+require 'djin/memory_cache'
 
 module Djin
   class Error < StandardError; end
 
-  def self.load_tasks!(path = Pathname.getwd.join('djin.yml'))
-    abort 'Error: djin.yml not found' unless path.exist?
+  def self.load_tasks!(file_path = Pathname.getwd.join('djin.yml'))
+    abort 'Error: djin.yml not found' unless file_path.exist?
 
-    rendered_djin_file = TemplateRenderer.render(path.read)
-    djin_config = YAML.safe_load(rendered_djin_file, [], [], true)
+    file_config = ConfigLoader.load!(file_path)
 
-    tasks = Interpreter.load!(djin_config)
+    # TODO: Make all tasks be under 'tasks' key, passing only the tasks here
+    tasks = Interpreter.load!(file_config)
 
     @task_repository = TaskRepository.new(tasks)
     CLI.load_tasks!(tasks)
   rescue Djin::Interpreter::InvalidConfigurationError => e
-    abort(e.message)
+    error_name = e.class.name.split('::').last
+    abort("[#{error_name}] #{e.message}")
   end
 
   def self.tasks
@@ -46,4 +49,12 @@ module Djin
   def self.task_repository
     @task_repository ||= TaskRepository.new
   end
+
+  def self.cache
+    @cache ||= MemoryCache.new
+  end
+
+  def self.root_path
+    Pathname.new File.expand_path(File.dirname(__FILE__) + '/..')
+  end
 end

data/lib/djin/cli.rb

@@ -7,7 +7,7 @@ module Djin
     def self.load_tasks!(tasks)
       tasks.each do |task|
         command = Class.new(Dry::CLI::Command) do
-          desc "Runs: #{task.command}"
+          desc task.description
 
           define_method(:task) { task }
 
@@ -16,7 +16,7 @@ module Djin
           end
         end
 
-        register task.name, command
+        register(task.name, command, aliases: task.aliases)
       end
     end
 

data/lib/djin/config_loader.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+module Djin
+  # TODO: Refactor this class to be the Interpreter
+  #       class and use the current interpreter as
+  #       a TaskLoader
+  class ConfigLoader
+    using Djin::HashExtensions
+    RESERVED_WORDS = %w[djin_version variables tasks include].freeze
+
+    def self.load!(template_file, runtime_config: {})
+      new(template_file, runtime_config: runtime_config).load!
+    end
+
+    def initialize(template_file, runtime_config: {})
+      @template_file = template_file
+      @template_file_content = Djin.cache.fetch(template_file.realpath.to_s) { template_file.read }
+      @runtime_config = runtime_config
+    end
+
+    def load!
+      validate_version!
+
+      file_config
+    end
+
+    private
+
+    def file_config
+      FileConfig.new(
+        djin_version: version,
+        variables: variables,
+        tasks: tasks,
+        raw_tasks: raw_tasks
+      )
+    end
+
+    def version
+      # TODO: Deprecates djin_version and use version instead
+      @version || raw_djin_config['djin_version']
+    end
+
+    def variables
+      @variables ||= included_variables.merge(raw_djin_config['variables']&.symbolize_keys || {})
+    end
+
+    def tasks
+      included_tasks.merge(rendered_djin_config['tasks'] || legacy_tasks)
+    end
+
+    def raw_tasks
+      included_raw_tasks.merge(raw_djin_config['tasks'] || legacy_raw_tasks)
+    end
+
+    def legacy_tasks
+      warn '[DEPRECATED] Root tasks are deprecated and will be removed in Djin 1.0.0,' \
+           ' put the tasks under \'tasks\' keyword'
+
+      rendered_djin_config.except(*RESERVED_WORDS).reject { |task| task.start_with?('_') }
+    end
+
+    def legacy_raw_tasks
+      raw_djin_config.except(*RESERVED_WORDS).reject { |task| task.start_with?('_') }
+    end
+
+    def included_variables
+      return {} unless included_config
+
+      included_config.variables
+    end
+
+    def included_tasks
+      return {} unless included_config
+
+      included_config.tasks
+    end
+
+    def included_raw_tasks
+      return {} unless included_config
+
+      included_config.raw_tasks
+    end
+
+    def included_config
+      @included_config ||= raw_djin_config['include']&.map do |tasks_reference|
+        external_config_file = Pathname.new(tasks_reference['file'])
+
+        ConfigLoader.load!(external_config_file, runtime_config: tasks_reference['context'] || {})
+      end&.reduce(:deep_merge)
+    rescue Errno::ENOENT => e
+      raise Interpreter::InvalidConfigFileError, e.message
+    end
+
+    def args
+      index = ARGV.index('--')
+
+      return [] unless index
+
+      ARGV.slice((index + 1)..ARGV.size)
+    end
+
+    def env
+      @env ||= ENV.to_h.symbolize_keys
+    end
+
+    def raw_djin_config
+      @raw_djin_config ||= yaml_load(@template_file_content).deep_merge(@runtime_config)
+    rescue Psych::SyntaxError => e
+      raise Interpreter::InvalidConfigFileError, "File: #{@template_file.realpath}\n  #{e.message}"
+    end
+
+    def rendered_djin_config
+      @rendered_djin_config ||= begin
+                                  locals = env.merge(variables)
+
+                                  rendered_yaml = Mustache.render(@template_file_content,
+                                                                  args: args.join(' '),
+                                                                  args?: args.any?,
+                                                                  **locals)
+                                  yaml_load(rendered_yaml).merge(@runtime_config)
+                                end
+    end
+
+    def yaml_load(text)
+      YAML.safe_load(text, [], [], true)
+    end
+
+    def validate_version!
+      raise Interpreter::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"
+    end
+  end
+end

data/lib/djin/entities/file_config.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Djin
+  class FileConfig < Dry::Struct
+    using HashExtensions
+
+    attribute :djin_version, Types::String
+    attribute :variables, Types::Hash.optional.default({}.freeze)
+    attribute :tasks, Types::Hash
+    attribute :raw_tasks, Types::Hash
+    # TODO: Add env and args
+
+    include Dry::Equalizer(:djin_version, :variables, :tasks, :raw_tasks)
+
+    def version_supported?
+      Vseries::SemanticVersion.new(Djin::VERSION) >= Vseries::SemanticVersion.new(djin_version)
+    end
+
+    def merge(file_config)
+      merged_hash = to_h.merge(file_config.to_h)
+
+      FileConfig.new(merged_hash)
+    end
+
+    def deep_merge(file_config)
+      merged_hash = to_h.deep_merge(file_config.to_h)
+
+      FileConfig.new(merged_hash)
+    end
+  end
+end

data/lib/djin/entities/task.rb

@@ -6,12 +6,10 @@ module Djin
     attribute :description, Types::String.optional.default(nil)
     attribute :build_command, Types::String.optional.default(nil)
     attribute :command, Types::String.optional.default(nil)
+    attribute :raw_command, Types::String.optional.default(nil)
+    attribute :aliases, Types::Array.of(Types::String).optional.default([].freeze)
     attribute :depends_on, Types::Array.of(Types::String).optional.default([].freeze)
 
-    def ==(other)
-      name == other.name &&
-        command == other.command &&
-        build_command == other.build_command
-    end
+    include Dry::Equalizer(:name, :command, :build_command)
   end
 end

data/lib/djin/extensions/hash_extensions.rb

@@ -6,6 +6,24 @@ module Djin
       def except(*keys)
         reject { |key, _| keys.include?(key) }
       end
+
+      def symbolize_keys
+        map { |key, value| [key.to_sym, value] }.to_h
+      end
+
+      def deep_merge(other_hash)
+        dup.deep_merge!(other_hash)
+      end
+
+      def deep_merge!(other_hash)
+        merge!(other_hash) do |_, this_val, other_val|
+          if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+            this_val.deep_merge(other_val)
+          else
+            other_val
+          end
+        end
+      end
     end
   end
 end

data/lib/djin/interpreter.rb

@@ -4,41 +4,46 @@ module Djin
   class Interpreter
     using Djin::HashExtensions
 
-    RESERVED_WORDS = %w[djin_version _default_options].freeze
-
+    # 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
-      def load!(params)
-        version = params['djin_version']
-        raise MissingVersionError, 'Missing djin_version' unless version
-        unless version_supported?(version)
-          raise VersionNotSupportedError, "Version #{version} is not supported, use #{Djin::VERSION} or higher"
-        end
-
-        tasks_params = params.except(*RESERVED_WORDS).reject { |task| task.start_with?('_') }
-        contract = TaskContract.new
+      # rubocop:disable Metrics/AbcSize
+      def load!(file_config)
+        # TODO: Move task validation to ConfigLoader and add variables/include validations
+        task_contract = TaskContract.new
 
-        tasks_params.map do |task_name, options|
-          result = contract.call(options)
+        file_config.tasks.map do |task_name, options|
+          result = task_contract.call(options)
 
           raise InvalidSyntaxError, { task_name.to_sym => result.errors.to_h } if result.failure?
 
           command, build_command = build_commands(options, task_name: task_name)
 
+          # FIXME(1): Handle dynamic named tasks, eg: {{namespace}}unit and remove condition
+          if file_config.raw_tasks[task_name]
+            raw_command, = build_commands(file_config.raw_tasks[task_name], task_name: task_name)
+          end
+
           task_params = {
             name: task_name,
             build_command: build_command,
+            # TODO: Remove `|| command` after FIXME(1)
+            description: options['description'] || "Runs: #{raw_command || command}",
             command: command,
+            raw_command: raw_command,
+            aliases: options['aliases'],
             depends_on: options['depends_on']
           }.compact
 
           Djin::Task.new(**task_params)
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 
@@ -54,10 +59,6 @@ module Djin
 
         LocalCommandBuilder.call(local_params) if local_params
       end
-
-      def version_supported?(version)
-        Vseries::SemanticVersion.new(Djin::VERSION) >= Vseries::SemanticVersion.new(version)
-      end
     end
   end
 end

data/lib/djin/interpreter/base_command_builder.rb

@@ -17,6 +17,7 @@ module Djin
           run_options = run_params['options']
         end
 
+        # TODO: Remove empty values
         run_command = run_command.join(' && ') if run_command.is_a?(Array)
 
         [run_command, run_options]

data/lib/djin/memory_cache.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Djin
+  class MemoryCache
+    def initialize(hash_store = {})
+      @hash_store = hash_store
+    end
+
+    def fetch(key)
+      @hash_store[key] || @hash_store[key] = yield
+    end
+
+    def clear
+      @hash_store = {}
+    end
+  end
+end

data/lib/djin/task_contract.rb

@@ -49,6 +49,7 @@ module Djin
         hash(LocalSchema)
       end
 
+      optional(:aliases).each(:str?)
       optional(:depends_on).each(:str?)
     end
 

data/lib/djin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: dry-equalizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -178,9 +192,14 @@ files:
 - djin.yml
 - docker-compose.yml
 - examples/djin.yml
+- examples/djin_lib/test.yml
+- examples/local_tasks/.djin/server_tasks.yml
+- examples/local_tasks/djin.yml
 - exe/djin
 - lib/djin.rb
 - lib/djin/cli.rb
+- lib/djin/config_loader.rb
+- lib/djin/entities/file_config.rb
 - lib/djin/entities/task.rb
 - lib/djin/entities/types.rb
 - lib/djin/executor.rb
@@ -190,9 +209,9 @@ files:
 - lib/djin/interpreter/docker_command_builder.rb
 - lib/djin/interpreter/docker_compose_command_builder.rb
 - lib/djin/interpreter/local_command_builder.rb
+- lib/djin/memory_cache.rb
 - lib/djin/repositories/task_repository.rb
 - lib/djin/task_contract.rb
-- lib/djin/template_renderer.rb
 - lib/djin/version.rb
 homepage: https://github.com/catks/djin
 licenses:
@@ -213,7 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: djin is a make-like utility for docker containers

data/lib/djin/template_renderer.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Djin
-  class TemplateRenderer
-    def self.render(template_file)
-      new(template_file).render
-    end
-
-    def initialize(template_file)
-      @template_file = template_file
-    end
-
-    def render
-      Mustache.render(@template_file,
-                      args: args.join(' '),
-                      args?: args.any?,
-                      **env)
-    end
-
-    private
-
-    def args
-      index = ARGV.index('--')
-
-      return [] unless index
-
-      ARGV.slice((index + 1)..ARGV.size)
-    end
-
-    def env
-      @env ||= ENV.to_h.map { |k, v| [k.to_sym, v] }.to_h
-    end
-  end
-end