djin 0.8.0 → 0.11.2

data/lib/djin/entities/include_config.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Djin
+  class IncludeConfig < Dry::Struct
+    attribute :file, Types::String
+    attribute :base_directory, Types::String
+    attribute :context, Types::Hash.default({}.freeze)
+    attribute :git, Types::String.optional.default(nil)
+    attribute :version, Types::String.default('master')
+    attribute :missing, Types::Bool.optional.default(nil)
+
+    using Djin::ObjectExtensions
+
+    include Dry::Equalizer(:git, :version, :file, :context)
+
+    def type
+      @type ||= git.present? ? :remote : :local
+    end
+
+    def present?
+      !missing?
+    end
+
+    def missing?
+      missing
+    end
+
+    def full_path
+      base_directory_pathname.join(file).expand_path
+    end
+
+    def repository_fetched?
+      @repository_fetched ||= base_directory_pathname.join(folder_name).exist?
+    end
+
+    # TODO: Rethink
+    def folder_name
+      @folder_name ||= "#{git.split('/').last.chomp('.git')}@#{version}"
+    end
+
+    private
+
+    def base_directory_pathname
+      @base_directory_pathname ||= Pathname.new(base_directory)
+    end
+  end
+end

data/lib/djin/entities/include_config/base.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Djin
+  module IncludeConfig
+    class Base < Dry::Struct
+      attribute :file, Types::String
+      attribute :context, Types::Hash.default({}.freeze)
+
+      include Dry::Equalizer(:file, :context)
+
+      def type
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/djin/entities/include_config/local.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Djin
+  module IncludeConfig
+    class Local < Dry::Struct
+      attribute :file, Types::String
+      attribute :context, Types::Hash.default({}.freeze)
+
+      include Dry::Equalizer(:file, :context)
+
+      def type
+        :local
+      end
+    end
+  end
+end

data/lib/djin/entities/{file_config.rb → main_config.rb}

@@ -1,17 +1,32 @@
 # frozen_string_literal: true
 
 module Djin
-  class FileConfig < Dry::Struct
+  class MainConfig < 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
+    attribute :include_configs, Types::Array.of(Djin::IncludeConfig).default([].freeze)
 
     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)
+
+      MainConfig.new(merged_hash)
+    end
+
+    def deep_merge(file_config)
+      merged_hash = to_h.deep_merge(file_config.to_h)
+
+      MainConfig.new(merged_hash)
+    end
   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/include_resolver.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Djin
+  class IncludeResolver
+    using ObjectExtensions
+    using HashExtensions
+
+    def initialize(base_directory: '.', remote_directory: '~/.djin/remote', entity_class: Djin::IncludeConfig)
+      # TODO: Use chain of responsability
+      @base_directory = Pathname.new(base_directory)
+      @remote_directory = Pathname.new(remote_directory)
+      @entity_class = entity_class
+    end
+
+    def call(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?
+
+      version = params['version'] || 'master'
+      # TODO: Extract RemoteConfig git_folder in IncludeConfig to another place and use it here
+      # Maybe create a optional git_folder attribute and fill it in here?
+      git_folder = "#{params['git'].split('/').last.chomp('.git')}@#{version}"
+
+      # TODO: Use RemoteConfigRepository
+      remote_file = @remote_directory.join(git_folder).join(params['file']).expand_path
+
+      missing = !remote_file.exist?
+
+      params.merge(missing: missing, file: remote_file.to_s, base_directory: @remote_directory.expand_path.to_s)
+    end
+
+    def local_handler(params)
+      # TODO: Mark not existing files as missing and handle all the missing files
+      missing = !@base_directory.join(params['file']).exist?
+      params.merge(missing: missing, base_directory: @base_directory.expand_path.to_s)
+    end
+
+    def build_entity(params)
+      @entity_class.new(**params.symbolize_keys)
+    end
+  end
+end

data/lib/djin/interpreter.rb

@@ -12,22 +12,28 @@ module Djin
     InvalidSyntaxError = Class.new(InvalidConfigurationError)
 
     class << self
+      # rubocop:disable Metrics/AbcSize
       def load!(file_config)
-        contract = TaskContract.new
+        # TODO: Move task validation to ConfigLoader and add variables/include validations
+        task_contract = TaskContract.new
 
         file_config.tasks.map do |task_name, options|
-          result = contract.call(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)
 
-          raw_command, = build_commands(file_config.raw_tasks[task_name], 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,
-            description: options['description'] || "Runs: #{raw_command}",
+            # TODO: Remove `|| command` after FIXME(1)
+            description: options['description'] || "Runs: #{raw_command || command}",
             command: command,
             raw_command: raw_command,
             aliases: options['aliases'],
@@ -37,6 +43,7 @@ module Djin
           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/repositories/remote_config_repository.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Djin
+  class RemoteConfigRepository
+    attr_accessor :base_path
+
+    def initialize(remote_configs, base_path: Pathname.new('~/.djin/remote'), stderr: Djin.stderr)
+      @remote_configs = remote_configs
+      @base_path = base_path
+      @stderr = stderr
+    end
+
+    def add(remote_config)
+      remote_configs << remote_config
+    end
+
+    def find(**filters)
+      remote_configs.select do |remote_config|
+        filters.reduce(true) do |memo, (filter_key, filter_value)|
+          memo && remote_config.public_send(filter_key) == filter_value
+        end
+      end
+    end
+
+    def fetch_all
+      remote_configs_by_folders.each do |rc|
+        git_folder = base_path.join(rc.folder_name).expand_path
+
+        # TODO: Extract STDEER Output, maybe publishing events and subscribing a observer for the logs.
+        stderr.puts "Remote Path: #{base_path.expand_path}"
+
+        git_repo = rc.missing? ? clone_repo(git_folder, rc) : fetch_repo(git_folder, rc)
+
+        stderr.puts "Checking out to '#{rc.version}'"
+        git_repo.checkout(rc.version)
+        git_repo.pull('origin', rc.version)
+      end
+    end
+
+    def clear
+      remote_configs_by_folders.each do |rc|
+        git_folder = base_path.join(rc.folder_name)
+
+        stderr.puts "Removing #{rc.folder_name} repository..."
+        `rm -rf #{git_folder}`
+      end
+    end
+
+    def clear_all
+      remove_remote_folder
+    end
+
+    def remote_configs
+      @remote_configs ||= []
+    end
+
+    private
+
+    attr_accessor :stderr
+
+    def remote_configs_by_folders
+      @remote_configs_by_folders ||= remote_configs
+                                     .group_by(&:folder_name)
+                                     .values
+                                     .map(&:first)
+    end
+
+    def remove_remote_folder
+      stderr.puts "Removing #{base_path}..."
+      `rm -rf #{base_path}`
+    end
+
+    def clone_repo(git_folder, remote_config)
+      stderr.puts "Missing #{remote_config.folder_name} repository, cloning in #{git_folder}"
+      Git.clone(remote_config.git.to_s, git_folder.to_s, branch: remote_config.version)
+    end
+
+    def fetch_repo(git_folder, remote_config)
+      stderr.puts "#{remote_config.git} repository already cloned, fetching..."
+      git_repo = Git.open(git_folder)
+      git_repo.fetch
+
+      git_repo
+    end
+  end
+end

data/lib/djin/root_cli_parser.rb

@@ -0,0 +1,46 @@
+# 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
+
+            opts.on('--all') 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
 description: 
 email:
 - carlos.atks@gmail.com
@@ -174,6 +202,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".irbrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -191,22 +220,35 @@ files:
 - djin.gemspec
 - djin.yml
 - docker-compose.yml
+- docker-entrypoint.sh
 - examples/djin.yml
+- examples/djin_lib/test.yml
+- examples/local_tasks/.djin/server_tasks.yml
+- examples/local_tasks/djin.yml
+- examples/remote_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/include_config.rb
+- lib/djin/entities/include_config/base.rb
+- lib/djin/entities/include_config/local.rb
+- lib/djin/entities/main_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/include_resolver.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/remote_config_repository.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