djin 0.6.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35900c4ab60e94710d24194ea2192edbf4e806527af87fe9d53e693bcec03704
-  data.tar.gz: 53a1b1caabf4ff2e7a708fa1e31ccd7b552514cc6eb882d7152ba015bb58db01
+  metadata.gz: 5e44393cb2f47b9b3a68d2ce59ae997e5e1d6b252e68778293b5e62a7600374b
+  data.tar.gz: 5c02ed7dc956357e31b07c6ade84c5f660cb26469f7434ea0128b42f0ebec74f
 SHA512:
-  metadata.gz: 3cb346575e3426446ad0c2ea2043d386a6112b9414d84927b24a5f0e3dec6062c361a9a6f0910c34fb13819d978d1721d882f53fe36fcf4a5aa5231eac4b6cc3
-  data.tar.gz: 34888b78f7f7af5792fc75f373870792d41986f818bfef643ad8d27f954b9f5e92791226c282933e0f3d7fa57acc42a0f71838df45acff47d48b424d53c24051
+  metadata.gz: 1d8d9dbd993757586e35679c12e1d03b98c940e5bca58e6ab2b3b8955c84c78b2fad6ae2053a0430b85aa580217a8540b3196ab3489c0ae76c4426e712142822
+  data.tar.gz: be25638d743e46c62a452891298003d3dd93905ea38b6bbe51420d44549ba001785f7b9a631cc4e4b83c61ffa541688420df9bd9339023b1cb86747ad2ae87c4

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.10.0 - 08/10/2020
+ * [FEATURE] -f command option
+
+## 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
 

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    djin (0.6.0)
+    djin (0.10.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)
@@ -28,12 +29,12 @@ GEM
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-initializer (3.0.3)
-    dry-logic (1.0.6)
+    dry-initializer (3.0.4)
+    dry-logic (1.0.8)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-schema (1.5.2)
+    dry-schema (1.5.5)
       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.2)
+    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

@@ -26,7 +26,7 @@ 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.6.0'
+djin_version: '0.10.0'
 
 tasks:
   # With a docker image
@@ -40,18 +40,20 @@ tasks:
 
   # Using a docker-compose service
   test:
-  docker-compose:
-    service: app
-    run:
-      commands: rspec
-      options: "--rm"
+    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.6.0'
+djin_version: '0.10.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -80,7 +82,7 @@ tasks:
 Or mix local commands and docker/docker-compose commands:
 
 ```yaml
-djin_version: '0.6.0'
+djin_version: '0.10.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -119,7 +121,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.6.0'
+djin_version: '0.10.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -136,7 +138,7 @@ tasks:
 
 Or define some variables to use in multiple locations
 ```yaml
-djin_version: '0.6.0'
+djin_version: '0.10.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -160,7 +162,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.6.0'
+djin_version: '0.10.0'
 
 _default_run_options: &default_run_options
   options: "--rm"
@@ -172,12 +174,117 @@ tasks:
       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.10.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.10.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.10.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
+  ```
+
+### Loading custom files
+
+You can also specify a file to be read by djin with `-f`, eg: 
+
+```bash
+djin -f my_file.yml # Returns the help for all tasks in my_file
+djin -f my_file.yml build # Execute the build task defined in my_file.yml
+```
+
+You can also specify multiple files to join tasks between files:
+
+```bash
+# Mix the tasks
+djin -f my_file.yml -f my_file2.yml # Returns the help for all tasks in my_file
+djin -f my_file.yml -f my_file2.yml build # Execute the build task defined in my_file.yml or my_file2.yml
+```
+
 
 ## Development
 
@@ -185,9 +292,13 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 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:
 
-1. Adds a `-f` option to load custom djin files
+## TODO
+
+1. Enable multiple -f options to merge configuration between files
+2. Option to export tasks to Makefile
+3. djin-export docker image to create and sync makefiles
+4. include key option to add tasks in git repositories files (maybe with a local cache)
 
 ## Contributing
 

data/Vertofile

@@ -28,12 +28,15 @@ context(branch('master')) {
     file('CHANGELOG.md').prepend(version_changes)
     git!('add CHANGELOG.md')
 
-    file('lib/djin/version.rb').replace(latest_version.to_s, new_version.to_s)
-    file('djin.yml').replace(latest_version.to_s, new_version.to_s)
-    file('examples/djin.yml').replace(latest_version.to_s, new_version.to_s)
+    files_to_change_version_once = %w[lib/djin/version.rb djin.yml] + Dir['examples/**/*.yml'] + Dir['spec/support/fixtures/**/*.yml']
+
+    files_to_change_version_once.each do |filename|
+      file(filename).replace(latest_version.to_s, new_version.to_s)
+    end
+
     file('README.md').replace_all(latest_version.to_s, new_version.to_s)
 
-    git!('add lib/djin/version.rb djin.yml examples/djin.yml README.md')
+    git!("add #{files_to_change_version_once.join(' ')} README.md")
 
     sh!('bundle install')
     sh!('rake install')

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,17 +1,21 @@
-djin_version: '0.6.0'
+djin_version: '0.10.0'
 
 _default_run_options: &default_run_options
   options: "--rm --entrypoint=''"
 
 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:

data/examples/djin.yml

@@ -1,5 +1,17 @@
 ---
-djin_version: '0.6.0'
+djin_version: '0.10.0'
+
+include:
+  - file: 'djin_lib/test.yml'
+    context:
+      variables:
+        namespace: 'test:'
+
+  - file: 'djin_lib/test.yml'
+    context:
+      variables:
+        namespace: 'test2:'
+
 
 tasks:
   default:
@@ -7,12 +19,6 @@ tasks:
       image: "ruby:2.5"
       run:
         - "ruby -e 'puts \\\" Hello\\\"'"
-  test:
-    docker-compose:
-      service: app
-      run:
-        commands: rspec
-        options: "--rm"
 
   script:
     docker:

data/examples/djin_lib/test.yml

@@ -0,0 +1,12 @@
+djin_version: '0.10.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.10.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

@@ -8,9 +8,12 @@ require 'dry-validation'
 require 'vseries'
 require 'dry/cli'
 require 'mustache'
+require 'optparse'
 require 'djin/extensions/hash_extensions'
+require 'djin/extensions/object_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'
@@ -18,25 +21,30 @@ require 'djin/interpreter/local_command_builder'
 require 'djin/interpreter'
 require 'djin/config_loader'
 require 'djin/executor'
+require 'djin/root_cli_parser'
 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?
+  using Djin::ObjectExtensions
 
-    djin_config = ConfigLoader.load!(path.read)
+  def self.load_tasks!(*file_paths)
+    files = file_paths.presence || RootCliParser.parse![:files] || ['djin.yml']
+
+    file_config = ConfigLoader.load_files!(*files)
 
     # TODO: Make all tasks be under 'tasks' key, passing only the tasks here
-    tasks = Interpreter.load!(djin_config)
+    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 +54,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
 
@@ -28,6 +28,16 @@ module Djin
       end
     end
 
+    class File < Dry::CLI::Command
+      desc 'Specify a djin file to load (default: djin.yml)'
+      argument :filepath, required: true, desc: 'The file path to load'
+
+      def call(filename:, **)
+        # The actual behaviour is on RootCliParser
+      end
+    end
+
+    register '-f', File, aliases: ['--file']
     register '--version', Version, aliases: ['-v']
   end
 end

data/lib/djin/config_loader.rb

@@ -6,39 +6,46 @@ module Djin
   #       a TaskLoader
   class ConfigLoader
     using Djin::HashExtensions
-    RESERVED_WORDS = %w[djin_version variables tasks].freeze
+    RESERVED_WORDS = %w[djin_version variables tasks include].freeze
 
-    def self.load!(template_file)
-      new(template_file).load!
+    # CHange Base Error
+    FileNotFoundError = Class.new(Interpreter::InvalidConfigurationError)
+
+    def self.load_files!(*files, runtime_config: {}, base_directory: '.')
+      files.map do |file_path|
+        ConfigLoader.load!(file_path, runtime_config: runtime_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!
     end
 
-    def initialize(template_file)
-      @template_file = template_file
+    def initialize(template_file_path, runtime_config: {}, base_directory: '.')
+      @base_directory = Pathname.new(base_directory)
+      @template_file = @base_directory.join(template_file_path)
+
+      raise FileNotFoundError, "File '#{@template_file}' not found" unless @template_file.exist?
+
+      @template_file_content = Djin.cache.fetch(@template_file.realpath.to_s) { @template_file.read }
+      @runtime_config = runtime_config
     end
 
     def load!
       validate_version!
 
-      # TODO: Return a DjinConfig Entity
-      tasks
+      file_config
     end
 
     private
 
-    def raw_djin_config
-      @raw_djin_config ||= yaml_load(@template_file)
-    end
-
-    def rendered_djin_config
-      @rendered_djin_config ||= begin
-                                  locals = env.merge(variables)
-
-                                  rendered_yaml = Mustache.render(@template_file,
-                                                                  args: args.join(' '),
-                                                                  args?: args.any?,
-                                                                  **locals)
-                                  yaml_load(rendered_yaml)
-                                end
+    def file_config
+      FileConfig.new(
+        djin_version: version,
+        variables: variables,
+        tasks: tasks,
+        raw_tasks: raw_tasks
+      )
     end
 
     def version
@@ -47,11 +54,15 @@ module Djin
     end
 
     def variables
-      @variables ||= raw_djin_config['variables']&.symbolize_keys || {}
+      @variables ||= included_variables.merge(raw_djin_config['variables']&.symbolize_keys || {})
     end
 
     def tasks
-      rendered_djin_config['tasks'] || legacy_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
@@ -61,6 +72,35 @@ module Djin
       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|
+        ConfigLoader.load!(tasks_reference['file'], base_directory: @template_file.dirname,
+                                                    runtime_config: tasks_reference['context'] || {})
+      end&.reduce(:deep_merge)
+    end
+
     def args
       index = ARGV.index('--')
 
@@ -73,18 +113,32 @@ module Djin
       @env ||= ENV.to_h.symbolize_keys
     end
 
-    def yaml_load(text)
-      YAML.safe_load(text, [], [], true)
+    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 version_supported?
-      Vseries::SemanticVersion.new(Djin::VERSION) >= Vseries::SemanticVersion.new(version)
+    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 version_supported?
+      return if file_config.version_supported?
 
       raise Interpreter::VersionNotSupportedError, "Version #{version} is not supported, use #{Djin::VERSION} or higher"
     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

@@ -10,6 +10,20 @@ module Djin
       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/extensions/object_extensions.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Djin
+  module ObjectExtensions
+    refine Object do
+      def presence(default = nil)
+        present? ? self : default
+      end
+
+      def present?
+        !blank?
+      end
+
+      def blank?
+        return true unless self
+
+        # TODO: Improve Validations
+        return empty? if respond_to?(:empty?)
+
+        false
+      end
+    end
+  end
+end

data/lib/djin/interpreter.rb

@@ -6,31 +6,44 @@ module Djin
 
     # 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!(tasks_params)
-        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
 

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/root_cli_parser.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Djin
+  ## This class is responsible to handle options that must be evaluated
+  #  before the load of tasks in djin file(eg: djin.yml)
+  class RootCliParser
+    class << self
+      def parse!(args = ARGV)
+        options = {}
+
+        # TODO: Find a better way to handle -f/--file option,
+        #       throw, catch and delete in ARGV are necessary
+        #       to only remove the -f/--file option
+        #       and bypass everything else to Dry::CLI
+        catch(:root_cli_exit) do
+          OptionParser.new do |opts|
+            opts.on('-f FILE', '--file FILE') do |v|
+              options[:files] ||= []
+              options[:files] << v
+            end
+
+            opts.on('-h', '--help') do
+              throw :root_cli_exit
+            end
+          end.parse(args)
+        end
+
+        remove_file_args!(args)
+        options
+      end
+
+      def remove_file_args!(args)
+        file_option = ['-f', '--file']
+        args_indexes_to_remove = args.each_with_index.map do |value, index|
+          index if (file_option.include?(args[index - 1]) && index.positive?) || file_option.include?(value)
+        end.compact
+
+        args_indexes_to_remove.reverse.each { |index| args.delete_at(index) }
+      end
+    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.6.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-10-09 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,20 +192,27 @@ 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
 - lib/djin/extensions/hash_extensions.rb
+- lib/djin/extensions/object_extensions.rb
 - lib/djin/interpreter.rb
 - lib/djin/interpreter/base_command_builder.rb
 - 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/root_cli_parser.rb
 - lib/djin/task_contract.rb
 - lib/djin/version.rb
 homepage: https://github.com/catks/djin
@@ -213,7 +234,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