dapp 0.11.0 → 0.12.0

data/lib/dapp/dimg/cli/{stage_image.rb → command/dimg/stage_image.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class StageImage < Base
         banner <<BANNER.freeze
 Usage:

data/lib/dapp/dimg/cli/{stages.rb → command/dimg/stages.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Stages < ::Dapp::CLI
         SUBCOMMANDS = ['flush local', 'flush repo', 'cleanup local', 'cleanup repo', 'push', 'pull'].freeze
 

data/lib/dapp/dimg/cli/{stages → command/dimg/stages}/cleanup_local.rb

@@ -1,7 +1,7 @@
-module Dapp
-  module Dimg
-    module CLI
-      class Stages
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
         class CleanupLocal < Base
           banner <<BANNER.freeze
 Usage:
@@ -27,11 +27,11 @@ BANNER
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
             repository = repo
-            ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: cli_arguments).send(run_method, repository)
+            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repository)).send(run_method)
           end
 
           def repo
-            config[:proper_repo_cache] ? self.class.required_argument(self) : nil
+            config[:proper_repo_cache] ? self.class.required_argument(self, 'repo') : nil
           end
 
           def run_method

data/lib/dapp/dimg/cli/{stages → command/dimg/stages}/cleanup_repo.rb

@@ -1,7 +1,7 @@
-module Dapp
-  module Dimg
-    module CLI
-      class Stages
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
         class CleanupRepo < CleanupLocal
           banner <<BANNER.freeze
 Usage:
@@ -17,7 +17,7 @@ BANNER
           end
 
           def repo
-            self.class.required_argument(self)
+            self.class.required_argument(self, 'repo')
           end
         end
       end

data/lib/dapp/dimg/cli/{stages → command/dimg/stages}/flush_local.rb

@@ -1,7 +1,7 @@
-module Dapp
-  module Dimg
-    module CLI
-      class Stages
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
         class FlushLocal < Base
           banner <<BANNER.freeze
 Usage:
@@ -14,7 +14,7 @@ Options:
 BANNER
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
-            ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: cli_arguments).stages_flush_local
+            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments)).stages_flush_local
           end
         end
       end

data/lib/dapp/dimg/cli/{stages → command/dimg/stages}/flush_repo.rb

@@ -1,7 +1,7 @@
-module Dapp
-  module Dimg
-    module CLI
-      class Stages
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
         class FlushRepo < Base
           banner <<BANNER.freeze
 Usage:
@@ -14,8 +14,8 @@ Options:
 BANNER
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
-            repo = self.class.required_argument(self)
-            ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: cli_arguments).stages_flush_repo(repo)
+            repo = self.class.required_argument(self, 'repo')
+            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repo)).stages_flush_repo
           end
         end
       end

data/lib/dapp/dimg/cli/{stages → command/dimg/stages}/pull.rb

@@ -1,7 +1,7 @@
-module Dapp
-  module Dimg
-    module CLI
-      class Stages
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
         class Pull < Base
           banner <<BANNER.freeze
 Usage:
@@ -18,8 +18,8 @@ BANNER
 
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
-            repo = self.class.required_argument(self)
-            ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: cli_arguments).stages_pull(repo)
+            repo = self.class.required_argument(self, 'repo')
+            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repo)).stages_pull
           end
         end
       end

data/lib/dapp/dimg/cli/{stages → command/dimg/stages}/push.rb

@@ -1,7 +1,7 @@
-module Dapp
-  module Dimg
-    module CLI
-      class Stages
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
         class Push < Base
           banner <<BANNER.freeze
 Usage:
@@ -14,8 +14,8 @@ Options:
 BANNER
           def run(argv = ARGV)
             self.class.parse_options(self, argv)
-            repo = self.class.required_argument(self)
-            ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: cli_arguments).stages_push(repo)
+            repo = self.class.required_argument(self, 'repo')
+            ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repo)).stages_push
           end
         end
       end

data/lib/dapp/dimg/cli/{tag.rb → command/dimg/tag.rb}

@@ -1,12 +1,12 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Tag < Base
         banner <<BANNER.freeze
 Usage:
 
   dapp dimg tag [options] [DIMG] TAG
-
+  
     DIMG                        Dapp image to process [default: *].
     REPO                        Pushed image name.
 
@@ -15,8 +15,8 @@ BANNER
 
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          tag = self.class.required_argument(self)
-          ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: cli_arguments).public_send(class_to_lowercase, tag)
+          tag = self.class.required_argument(self, 'tag')
+          ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments)).public_send(class_to_lowercase, tag)
         end
       end
     end

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

@@ -0,0 +1,20 @@
+module Dapp
+  module Dimg
+    module Config
+      module Config
+        def self.included(base)
+          base.include(Directive::DimgGroupBase)
+        end
+
+        protected
+
+        def dimg_config_validate!
+          raise Error::Config, code: :dimg_name_required if _dimg.any? { |dimg| dimg._name.nil? } && _dimg.size > 1
+          _dimg.each(&:validate!)
+        end
+      end
+    end
+  end
+end
+
+::Dapp::Config::Config.send(:include, ::Dapp::Dimg::Config::Config)

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

@@ -0,0 +1,19 @@
+module Dapp
+  module Dimg
+    module Config
+      module Directive
+        class ArtifactDimg < Dimg
+          def validate_scratch!
+          end
+
+          def validate_artifacts_artifacts!
+          end
+
+          def validated_artifacts
+            _git_artifact._local + _git_artifact._remote
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Dapp
+  module Dimg
+    module Config
+      module Directive
+        class ArtifactGroup < DimgGroup
+          def export(*args, &blk)
+            artifact_config = pass_to(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", dapp: dapp))
+            artifact = Artifact.new(dapp: dapp, config: artifact_config)
+            artifact.export(*args, &blk).tap do
+              _export.concat artifact._export
+            end
+          end
+
+          def _shell(&blk)
+            @_shell ||= Shell::Artifact.new(dapp: dapp, &blk)
+          end
+
+          def _docker(&blk)
+            @_docker ||= Docker::Artifact.new(dapp: dapp, &blk)
+          end
+
+          def _export
+            @_export ||= []
+          end
+
+          def validate!
+            _export.each(&:validate!)
+          end
+
+          undef :artifact
+          undef :dimg
+          undef :dimg_group
+
+          protected
+
+          def check_dimg_directive_order(_directive)
+          end
+
+          def check_dimg_group_directive_order(_directive)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Dapp
+  module Dimg
+    module Config
+      module Directive
+        class Dimg < Base
+          include Validation
+          include InstanceMethods
+
+          attr_reader :_name
+
+          def initialize(name, dapp:)
+            self._name = name
+            super(dapp: dapp)
+          end
+
+          def _name=(name)
+            sub_directive_eval do
+              return self if name.nil?
+              name = name.to_s
+              validate_compliance!(dimg_name_pattern, name, :dimg_name_incorrect)
+              @_name = name
+            end
+          end
+
+          protected
+
+          def dimg_name_pattern
+            separator = '[_\.]|(__)|(-*)'
+            alpha_numeric = '[a-z0-9]'
+            "^#{alpha_numeric}(#{separator}#{alpha_numeric})*$"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,149 @@
+module Dapp
+  module Dimg
+    module Config
+      module Directive
+        class Dimg < Base
+          module InstanceMethods
+            attr_reader :_builder
+            attr_reader :_chef, :_shell, :_docker, :_git_artifact, :_mount, :_artifact
+            attr_reader :_artifact_groups
+
+            def chef(&blk)
+              builder(:chef)
+              directive_eval(_chef, &blk)
+            end
+
+            def shell(&blk)
+              builder(:shell)
+              directive_eval(_shell, &blk)
+            end
+
+            def docker(&blk)
+              directive_eval(_docker, &blk)
+            end
+
+            def artifact(&blk)
+              pass_to(ArtifactGroup.new(dapp: dapp), :clone_to_artifact).tap do |artifact_group|
+                _artifact_groups << directive_eval(artifact_group, &blk)
+              end
+            end
+
+            def git(url = nil, &blk)
+              type = url.nil? ? :local : :remote
+              _git_artifact.public_send(type, url.to_s, &blk)
+            end
+
+            def mount(to, &blk)
+              Mount.new(to, dapp: dapp, &blk).tap do |mount|
+                _mount << mount
+              end
+            end
+
+            def _builder
+              @_builder || :none
+            end
+
+            def _chef
+              @_chef ||= Chef.new(dapp: dapp)
+            end
+
+            def _shell
+              @_shell ||= Shell::Dimg.new(dapp: dapp)
+            end
+
+            def _docker
+              @_docker ||= Docker::Dimg.new(dapp: dapp)
+            end
+
+            def _mount
+              @_mount ||= []
+            end
+
+            def _git_artifact
+              @_git_artifact ||= GitArtifact.new(dapp: dapp)
+            end
+
+            [:build_dir, :tmp_dir].each do |mount_type|
+              define_method "_#{mount_type}_mount" do
+                _mount.select { |m| m._type == mount_type }
+              end
+            end
+
+            def _artifact_groups
+              @_artifact_groups ||= []
+            end
+
+            def _artifact
+              _artifact_groups.map(&:_export).flatten
+            end
+
+            [:before, :after].each do |order|
+              [:setup, :install].each do |stage|
+                define_method "_#{order}_#{stage}_artifact" do
+                  _artifact.select do |art|
+                    art.public_send("_#{order}") == stage
+                  end
+                end
+              end
+            end
+
+            def _import_artifact
+              _artifact.select(&:not_associated?)
+            end
+
+            class GitArtifact < Base
+              attr_reader :_local, :_remote
+
+              def initialize(**kwargs, &blk)
+                @_local = []
+                @_remote = []
+
+                super(**kwargs, &blk)
+              end
+
+              def local(_, &blk)
+                GitArtifactLocal.new(dapp: dapp, &blk).tap do |git|
+                  @_local << git
+                end
+              end
+
+              def remote(repo_url, &blk)
+                GitArtifactRemote.new(repo_url, dapp: dapp, &blk).tap do |git|
+                  @_remote << git
+                end
+              end
+
+              def _local
+                @_local.map(&:_export).flatten
+              end
+
+              def _remote
+                @_remote.map(&:_export).flatten
+              end
+
+              def empty?
+                (_local + _remote).empty?
+              end
+
+              def validate!
+                (_local + _remote).each(&:validate!)
+              end
+            end
+
+            protected
+
+            def builder(type)
+              @_builder = type if _builder == :none
+              raise Error::Config, code: :builder_type_conflict unless @_builder == type
+            end
+
+            def passed_directives
+              [:@_chef, :@_shell, :@_docker, :@_git_artifact, :@_mount, :@_artifact_groups, :@_builder]
+            end
+          end # InstanceMethods
+          # rubocop:enable Metrics/ModuleLength
+        end # Dimg
+      end # Directive
+    end # Config
+  end # Dimg
+end # Dapp