djin 0.4.0 → 0.8.0

data/lib/djin/interpreter/base_command_builder.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Djin
+  class Interpreter
+    class BaseCommandBuilder
+      def self.call(*options)
+        new.call(*options)
+      end
+
+      private
+
+      def build_run_params(run_params)
+        run_command = run_params
+
+        if run_params.is_a?(Hash)
+          run_command = run_params['commands']
+          run_options = run_params['options']
+        end
+
+        run_command = run_command.join(' && ') if run_command.is_a?(Array)
+
+        [run_command, run_options]
+      end
+    end
+  end
+end

data/lib/djin/interpreter/docker_command_builder.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Djin
+  class Interpreter
+    class DockerCommandBuilder < BaseCommandBuilder
+      def call(params, task_name:)
+        current_folder_name = Pathname.getwd.basename.to_s
+        image = params['image'] || "djin_#{current_folder_name}_#{task_name}"
+
+        build_params = params['build']
+
+        if build_params.is_a?(Hash)
+          build_context = build_params['context']
+          build_options = build_params['options']
+        end
+
+        build_context ||= build_params
+
+        run_command, run_options = build_run_params(params['run'])
+
+        command = %(docker run #{run_options} #{image} sh -c "#{run_command}").squeeze(' ')
+
+        build_command = "docker build #{build_context} #{build_options} -t #{image}".squeeze(' ') if build_context
+
+        [command, build_command]
+      end
+    end
+  end
+end

data/lib/djin/interpreter/docker_compose_command_builder.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Djin
+  class Interpreter
+    class DockerComposeCommandBuilder < BaseCommandBuilder
+      def call(params, **_)
+        service = params['service']
+
+        compose_options = params['options']
+
+        run_command, run_options = build_run_params(params['run'])
+
+        [%(docker-compose #{compose_options} run #{run_options} #{service} sh -c "#{run_command}").squeeze(' '), nil]
+      end
+    end
+  end
+end

data/lib/djin/interpreter/local_command_builder.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Djin
+  class Interpreter
+    class LocalCommandBuilder < BaseCommandBuilder
+      def call(params, **_)
+        build_run_params(params['run'])
+      end
+    end
+  end
+end

data/lib/djin/repositories/task_repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TaskRepository
   def initialize(tasks = [])
     @tasks = tasks

data/lib/djin/task_contract.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Djin
   class TaskContract < Dry::Validation::Contract
-    NOT_EMPTY = -> (value) { ! value.empty? }
-    OK = -> (_) { true }
+    NOT_EMPTY = ->(value) { !value.empty? }
+    OK = ->(_) { true }
+    NOT_OK = ->(_) { false }
 
     BuildSchema = Dry::Schema.Params do
       required(:context).filled(:string)
@@ -13,6 +16,10 @@ module Djin
       required(:options).filled(:string)
     end
 
+    RunLocalSchema = Dry::Schema.Params do
+      required(:commands).filled
+    end
+
     DockerSchema = Dry::Schema.Params do
       optional(:image).maybe(:string)
       optional(:build)
@@ -25,32 +32,50 @@ module Djin
       required(:run).filled
     end
 
+    LocalSchema = Dry::Schema.Params do
+      required(:run).filled
+    end
+
     params do
       optional(:docker).filled do
         hash(DockerSchema)
       end
+
       optional(:"docker-compose").filled do
         hash(DockerComposeSchema)
       end
 
+      optional(:local).filled do
+        hash(LocalSchema)
+      end
+
+      optional(:aliases).each(:str?)
       optional(:depends_on).each(:str?)
     end
 
-    rule(:docker, :"docker-compose", :depends_on) do
-      key.failure('docker, docker-compose or depends_on key is required') unless values[:docker] || values[:"docker-compose"] || values[:depends_on]
+    rule(:docker, :"docker-compose", :local, :depends_on) do
+      unless values[:docker] || values[:"docker-compose"] || values[:depends_on] || values[:local]
+        key.failure('docker, docker-compose, local or depends_on key is required')
+      end
     end
 
-    rule(:depends_on, :'docker-compose',docker: [:image, :build])  do
-      key.failure('image or build param is required for docker tasks') unless values.dig(:docker, :image) || values.dig(:docker, :build) || values[:'docker-compose'] || values[:depends_on]
+    rule(:depends_on, :'docker-compose', :local, docker: %i[image build]) do
+      key.failure('image or build param is required for docker tasks') unless values.dig(:docker, :image) ||
+                                                                              values.dig(:docker, :build) ||
+                                                                              values[:'docker-compose'] ||
+                                                                              values[:depends_on] ||
+                                                                              values.dig(:local, :run)
     end
 
+    # TODO: Extract validations to command builders
+
     rule(docker: :build) do
       result, errors = validate_for(value, Hash => BuildSchema, String => NOT_EMPTY, NilClass => OK)
 
       key.failure(errors) unless result
     end
 
-    rule(:'docker-compose' => :run) do
+    rule('docker-compose': :run) do
       result, errors = validate_for(value, Hash => RunSchema, Array => NOT_EMPTY, NilClass => OK)
 
       key.failure(errors) unless result
@@ -62,6 +87,12 @@ module Djin
       key.failure(errors) unless result
     end
 
+    rule(local: :run) do
+      result, errors = validate_for(value, Hash => RunLocalSchema, Array => NOT_EMPTY, NilClass => OK)
+
+      key.failure(errors) unless result
+    end
+
     private
 
     def validate_for(value, validations)

data/lib/djin/version.rb

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

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: djin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Carlos Atkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-struct
+  name: dry-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: dry-cli
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: vseries
+  name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: vseries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,49 +109,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -161,6 +175,8 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
@@ -179,12 +195,17 @@ files:
 - 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/custom_predicates.rb
 - lib/djin/extensions/hash_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/repositories/task_repository.rb
 - lib/djin/task_contract.rb
 - lib/djin/version.rb
@@ -207,7 +228,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/extensions/custom_predicates.rb

@@ -1,18 +0,0 @@
-module Djin
-  module CustomPredicates
-    refine Dry::Logic::Predicates::Methods do
-      def is_one_of?(value, *options)
-        options.map do |option|
-          return option.call(value) if respond_to?(:call)
-
-          value.is_a?(option)
-        end.any?
-      end
-    end
-
-    refine Dry::Logic::Predicates do
-      extend Dry::Logic::Predicates::Methods
-    end
-  end
-end
-