dapp 0.11.0 → 0.12.0

data/lib/dapp/dimg/config/directive/dimg/validation.rb

@@ -0,0 +1,128 @@
+module Dapp
+  module Dimg
+    module Config
+      module Directive
+        class Dimg < Base
+          module Validation
+            def validate!
+              directives_validate!
+              validate_scratch!
+              validate_artifacts!
+              validate_artifacts_artifacts!
+            end
+
+            protected
+
+            def validate_scratch!
+              if _docker._from.nil?
+                validate_scratch_directives!
+                validate_scratch_artifacts!
+              else
+                raise Error::Config, code: :stage_artifact_not_associated unless _import_artifact.empty?
+              end
+            end
+
+            def directives_validate!
+              passed_directives.each do |v|
+                next if (value = instance_variable_get(v)).nil?
+                Array(value).each do |elm|
+                  elm.validate! if elm.respond_to?(:validate!)
+                end
+              end
+            end
+
+            def validate_scratch_directives!
+              directives = [[:_shell, :shell], [:_chef, :chef], [:_git_artifact, :git],
+                            [:_tmp_dir_mount, :mount], [:_build_dir_mount, :mount]]
+              directives.each do |name, user_name|
+                raise Error::Config,
+                      code: :scratch_unsupported_directive,
+                      data: { directive: user_name } unless public_send(name).empty?
+              end
+
+              docker_directives = [:_expose, :_env, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint]
+              docker_directives.each do |directive|
+                value = _docker.public_send(directive)
+                raise Error::Config,
+                      code: :scratch_unsupported_directive,
+                      data: { directive: "docker.#{directive}" } unless value.nil? || value.empty?
+              end
+            end
+
+            def validate_scratch_artifacts!
+              raise Error::Config, code: :scratch_artifact_associated unless _associated_artifacts.empty?
+              raise Error::Config, code: :scratch_artifact_required if _import_artifact.empty?
+              _import_artifact.each do |artifact|
+                raise Error::Config, code: :scratch_artifact_docker_from if artifact._config._docker._from.nil?
+              end
+            end
+
+            def validate_artifacts_artifacts!
+              _artifact.each { |artifact_dimg| artifact_dimg._config.validate! }
+            end
+
+            def validate_artifacts!
+              artifacts = validate_artifact_format(validated_artifacts)
+              loop do
+                break if artifacts.empty?
+                verifiable_artifact = artifacts.shift
+                artifacts.select { |a| a[:to] == verifiable_artifact[:to] }.each do |artifact|
+                  next if verifiable_artifact[:index] == artifact[:index]
+                  validate_artifact!(verifiable_artifact, artifact)
+                  validate_artifact!(artifact, verifiable_artifact)
+                end
+              end
+            end
+
+            def validate_artifact_format(artifacts)
+              artifacts.map do |a|
+                path_format = proc { |path| File.expand_path(File.join('/', path, '/'))[1..-1] }
+
+                path_format.call(a._to) =~ %r{^([^\/]*)\/?(.*)$}
+                to = Regexp.last_match(1)
+                include_paths = a._include_paths.dup
+                include_paths << Regexp.last_match(2) unless Regexp.last_match(2).empty?
+                exclude_paths = a._exclude_paths.dup
+
+                {
+                  index: artifacts.index(a),
+                  to: to,
+                  include_paths: include_paths.map(&path_format),
+                  exclude_paths: exclude_paths.map(&path_format)
+                }
+              end
+            end
+
+            def validate_artifact!(verifiable_artifact, artifact)
+              verifiable_artifact[:include_paths].each do |verifiable_path|
+                potential_conflicts = artifact[:include_paths].select { |path| path.start_with?(verifiable_path) }
+                validate_artifact_path!(verifiable_artifact, potential_conflicts)
+              end.empty? && verifiable_artifact[:exclude_paths].empty? && raise(Error::Config, code: :artifact_conflict)
+              validate_artifact_path!(verifiable_artifact, artifact[:include_paths]) if verifiable_artifact[:include_paths].empty?
+            end
+
+            def validate_artifact_path!(verifiable_artifact, potential_conflicts)
+              potential_conflicts.all? do |path|
+                loop do
+                  break if verifiable_artifact[:exclude_paths].include?(path) || ((path = File.dirname(path)) == '.')
+                end
+                verifiable_artifact[:exclude_paths].include?(path)
+              end.tap { |res| res || raise(Error::Config, code: :artifact_conflict) }
+            end
+
+            def _associated_artifacts
+              _artifact.select do |art|
+                !(art._before.nil? && art._after.nil?)
+              end
+            end
+
+            def validated_artifacts
+              _artifact + _git_artifact._local + _git_artifact._remote
+            end
+          end # Validation
+          # rubocop:enable Metrics/ModuleLength
+        end # Dimg
+      end # Directive
+    end # Config
+  end # Dimg
+end # Dapp

data/lib/dapp/dimg/config/directive/dimg_group.rb

@@ -0,0 +1,64 @@
+module Dapp
+  module Dimg
+    module Config
+      module Directive
+        class DimgGroup < Base
+          include DimgGroupBase
+          include Dimg::InstanceMethods
+
+          def chef(&blk)
+            check_dimg_directive_order(:chef)
+            super
+          end
+
+          def shell(&blk)
+            check_dimg_directive_order(:shell)
+            super
+          end
+
+          def docker(&blk)
+            check_dimg_directive_order(:docker)
+            super
+          end
+
+          def artifact(&blk)
+            check_dimg_group_directive_order(:artifact)
+            super
+          end
+
+          def git(url = nil, &blk)
+            check_dimg_directive_order(:git)
+            super
+          end
+
+          def mount(to, &blk)
+            check_dimg_directive_order(:mount)
+            super
+          end
+
+          protected
+
+          def before_dimg_eval(dimg)
+            pass_to(dimg)
+          end
+
+          def before_dimg_group_eval(dimg_group)
+            pass_to(dimg_group)
+          end
+
+          def check_dimg_directive_order(directive)
+            dapp.log_config_warning(desc: { code: 'wrong_using_base_directive',
+                                            data: { directive: directive },
+                                            context: 'warning' }) if _dimg.any? || _dimg_group.any? || _artifact.any?
+          end
+
+          def check_dimg_group_directive_order(directive)
+            dapp.log_config_warning(desc: { code: 'wrong_using_directive',
+                                            data: { directive: directive },
+                                            context: 'warning' }) if _dimg.any? || _dimg_group.any?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/config/directive/dimg_group_base.rb

@@ -0,0 +1,46 @@
+module Dapp
+  module Dimg
+    module Config
+      module Directive
+        module DimgGroupBase
+          def dimg(name = nil, &blk)
+            Dimg.new(name, dapp: dapp).tap do |dimg|
+              before_dimg_eval(dimg)
+              dimg.instance_eval(&blk) if block_given?
+              @_dimg << dimg
+            end
+          end
+
+          def dimg_group(&blk)
+            DimgGroup.new(dapp: dapp).tap do |dimg_group|
+              before_dimg_group_eval(dimg_group)
+              dimg_group.instance_eval(&blk) if block_given?
+              @_dimg_group << dimg_group
+            end
+          end
+
+          def _dimg
+            (@_dimg + @_dimg_group.map(&:_dimg)).flatten
+          end
+
+          def _dimg_group
+            @_dimg_group
+          end
+
+          protected
+
+          def before_dimg_eval(dimg)
+          end
+
+          def before_dimg_group_eval(dimg_group)
+          end
+
+          def dimg_group_init_variables!
+            @_dimg       = []
+            @_dimg_group = []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/config/directive/docker/dimg.rb

@@ -18,11 +18,11 @@ module Dapp
             end
 
             def volume(*args)
-              sub_directive_eval { @_volume.concat(args) }
+              sub_directive_eval { @_volume.concat(args.flatten) }
             end
 
             def expose(*args)
-              sub_directive_eval { @_expose.concat(args) }
+              sub_directive_eval { @_expose.concat(args.flatten) }
             end
 
             def env(**options)
@@ -34,11 +34,11 @@ module Dapp
             end
 
             def cmd(*args)
-              sub_directive_eval { @_cmd.concat(args) }
+              sub_directive_eval { @_cmd.concat(args.flatten) }
             end
 
             def onbuild(*args)
-              sub_directive_eval { @_onbuild.concat(args) }
+              sub_directive_eval { @_onbuild.concat(args.flatten) }
             end
 
             def workdir(path)

data/lib/dapp/dimg/config/directive/shell/dimg.rb

@@ -48,7 +48,7 @@ module Dapp
               end
 
               def run(*args)
-                sub_directive_eval { @_run.concat(args) }
+                sub_directive_eval { @_run.concat(args.flatten) }
               end
 
               def version(value)

data/lib/dapp/dimg/dapp/command/bp.rb

@@ -1,12 +1,12 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Bp
-          def bp(repo)
+          def bp
             bp_step(:build)
-            bp_step(:push, repo)
-            bp_step(:stages_cleanup_by_repo, repo)
+            bp_step(:push)
+            bp_step(:stages_cleanup_by_repo)
             bp_step(:cleanup)
           end
 

data/lib/dapp/dimg/dapp/command/build.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Build
           def build
@@ -12,7 +12,7 @@ module Dapp
               end
             end
           rescue ::Dapp::Error::Shellout, Error::Base
-            build_context_export unless cli_options[:build_context_directory].nil?
+            build_context_export unless options[:build_context_directory].nil?
             raise
           end
         end

data/lib/dapp/dimg/dapp/command/build_context/common.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module BuildContext
           module Common
@@ -17,7 +17,7 @@ module Dapp
             end
 
             def build_context_directory
-              File.expand_path(cli_options[:build_context_directory].to_s)
+              File.expand_path(options[:build_context_directory].to_s)
             end
           end
         end

data/lib/dapp/dimg/dapp/command/build_context/export.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module BuildContext
           module Export

data/lib/dapp/dimg/dapp/command/build_context/import.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module BuildContext
           module Import

data/lib/dapp/dimg/dapp/command/cleanup.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Cleanup
           def cleanup

data/lib/dapp/dimg/dapp/command/common.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Common
           protected
@@ -61,12 +61,20 @@ module Dapp
             name
           end
 
-          def validate_repo_name(repo)
-            raise(Error::Command, code: :repo_name_incorrect, data: { name: repo }) unless ::Dapp::Dimg::DockerRegistry.repo_name?(repo)
+          def validate_repo_name!(repo)
+            raise Error::Command, code: :repo_name_incorrect, data: { name: repo } unless ::Dapp::Dimg::DockerRegistry.repo_name?(repo)
+          end
+
+          def validate_image_name!(image)
+            raise Error::Command, code: :image_name_incorrect, data: { name: image } unless ::Dapp::Dimg::Image::Docker.image_name?(image)
+          end
+
+          def validate_tag_name!(tag)
+            raise Error::Command, code: :tag_name_incorrect, data: { name: tag } unless ::Dapp::Dimg::Image::Docker.tag?(tag)
           end
 
           def proper_cache_version?
-            !!cli_options[:proper_cache_version]
+            !!options[:proper_cache_version]
           end
 
           def log_proper_cache(&blk)
@@ -89,6 +97,13 @@ module Dapp
           def spush_format
             '%{repo}:%{tag}'
           end
+
+          def option_repo
+            unless options[:repo].nil?
+              return "localhost:5000/#{name}" if options[:repo] == ':minikube'
+              options[:repo]
+            end
+          end
         end
       end
     end

data/lib/dapp/dimg/dapp/command/list.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module List
           def list

data/lib/dapp/dimg/dapp/command/mrproper.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Mrproper
           # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
@@ -32,11 +32,11 @@ module Dapp
           end
 
           def proper_all?
-            !!cli_options[:proper_all]
+            !!options[:proper_all]
           end
 
           def proper_dev_mode_cache?
-            !!cli_options[:proper_dev_mode_cache]
+            !!options[:proper_dev_mode_cache]
           end
 
           def dapp_containers_flush_by_label(label)

data/lib/dapp/dimg/dapp/command/push.rb

@@ -1,11 +1,12 @@
 module Dapp
   module Dimg
-    class Dapp
+    module Dapp
       module Command
         module Push
-          def push(repo)
-            validate_repo_name(repo)
-            log_step_with_indent(:stages) { stages_push(repo) } if with_stages?
+          def push
+            repo = option_repo
+            validate_repo_name!(repo)
+            log_step_with_indent(:stages) { stages_push } if with_stages?
             build_configs.each do |config|
               log_dimg_name_with_indent(config) do
                 Dimg.new(config: config, dapp: self, ignore_git_fetch: true, should_be_built: true).tap do |dimg|
@@ -18,7 +19,7 @@ module Dapp
           protected
 
           def with_stages?
-            !!cli_options[:with_stages]
+            !!options[:with_stages]
           end
         end
       end