dapp 0.8.0 → 0.9.0

data/lib/dapp/dimg/cli/run.rb

@@ -0,0 +1,59 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Run < Base
+        banner <<BANNER.freeze
+Usage:
+
+  dapp dimg run [options] [DIMG] [DOCKER ARGS]
+
+    DIMG                        Dapp image to process [default: *].
+    DOCKER ARGS                 Docker run options and command separated by '--'
+
+Options:
+BANNER
+        option :ssh_key,
+               long: '--ssh-key SSH_KEY',
+               description: ['Enable only specified ssh keys ',
+                             '(use system ssh-agent by default)'].join,
+               default: nil,
+               proc: ->(v) { composite_options(:ssh_key) << v }
+
+        def read_cli_options(args)
+          self.class.cli_wrapper(self) do
+            args.each_with_index do |arg, i|
+              next if arg == '--'
+              next if (key = find_option(arg)).nil?
+              cli_option = []
+              cli_option << args.slice!(i)
+              if key[:with_arg]
+                raise OptionParser::InvalidOption if args.count < i + 1
+                cli_option << args.slice!(i)
+              end
+              parse_options(cli_option)
+              return read_cli_options(args)
+            end
+          end
+        end
+
+        def find_option(arg)
+          expected_options.each { |hash| return hash if hash[:formats].any? { |f| f.start_with? arg } }
+          nil
+        end
+
+        def expected_options
+          @expected_options ||= options.values.map { |opt| { formats: [opt[:long], opt[:short]].compact, with_arg: !opt[:long].split.one? } }
+        end
+
+        def run(argv = ARGV)
+          filtered_args = read_cli_options(argv)
+          pattern = filtered_args.any? && !filtered_args.first.start_with?('-') ? [filtered_args.shift] : []
+          index = filtered_args.index('--') || filtered_args.count
+          docker_options = index.nonzero? ? filtered_args.slice(0..index - 1) : []
+          command = filtered_args.slice(index + 1..-1) || []
+          ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: pattern).run(docker_options, command)
+        end
+      end
+    end
+  end
+end

data/lib/dapp/{cli → dimg/cli}/spush.rb

@@ -1,18 +1,18 @@
 module Dapp
-  class CLI
-    # CLI spush subcommand
-    class Spush < Push
-      banner <<BANNER.freeze
-Version: #{Dapp::VERSION}
-
+  module Dimg
+    module CLI
+      class Spush < Push
+        banner <<BANNER.freeze
 Usage:
-  dapp spush [options] [DIMG] REPO
+
+  dapp dimg spush [options] [DIMG] REPO
 
     DIMG                        Dapp image to process [default: *].
     REPO                        Pushed image name.
 
 Options:
 BANNER
+      end
     end
   end
 end

data/lib/dapp/dimg/cli/stage_image.rb

@@ -0,0 +1,24 @@
+module Dapp
+  module Dimg
+    module CLI
+      class StageImage < Base
+        banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stage image [options] [DIMG]
+
+    DIMG                        Dapp image to process [default: *].
+
+Options:
+BANNER
+        option :stage,
+               long: '--stage STAGE',
+               proc: proc { |v| v.to_sym },
+               default: :docker_instructions,
+               in: [:from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
+                    :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact, :g_a_pre_setup_patch,
+                    :setup, :g_a_post_setup_patch, :after_setup_artifact, :g_a_latest_patch, :docker_instructions]
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/stages.rb

@@ -0,0 +1,22 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Stages < ::Dapp::CLI
+        SUBCOMMANDS = ['flush local', 'flush repo', 'cleanup local', 'cleanup repo', 'push', 'pull'].freeze
+
+        banner <<BANNER.freeze
+Available subcommands: (for details, dapp dimg stages SUB-COMMAND --help)
+
+dapp dimg stages cleanup local [options] [DIMG ...] [REPO]
+dapp dimg stages cleanup repo [options] [DIMG ...] REPO
+dapp dimg stages flush local [options] [DIMG ...]
+dapp dimg stages flush repo [options] [DIMG ...] REPO
+dapp dimg stages push [options] [DIMG ...] REPO
+dapp dimg stages pull [options] [DIMG ...] REPO
+
+Options:
+BANNER
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/stages/cleanup_local.rb

@@ -0,0 +1,44 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Stages
+        class CleanupLocal < Base
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages cleanup local [options] [DIMG ...] [REPO]
+
+    DIMG                        Dapp image to process [default: *].
+
+Options:
+BANNER
+          option :proper_cache_version,
+                 long: '--improper-cache-version',
+                 boolean: true
+
+          option :proper_git_commit,
+                 long: '--improper-git-commit',
+                 boolean: true
+
+          option :proper_repo_cache,
+                 long: '--improper-repo-cache',
+                 boolean: true
+
+          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)
+          end
+
+          def repo
+            config[:proper_repo_cache] ? self.class.required_argument(self) : nil
+          end
+
+          def run_method
+            :stages_cleanup_local
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/stages/cleanup_repo.rb

@@ -0,0 +1,26 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Stages
+        class CleanupRepo < CleanupLocal
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages cleanup repo [options] [DIMG ...] REPO
+
+    DIMG                        Dapp image to process [default: *].
+
+Options:
+BANNER
+          def run_method
+            :stages_cleanup_repo
+          end
+
+          def repo
+            self.class.required_argument(self)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/stages/flush_local.rb

@@ -0,0 +1,23 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Stages
+        class FlushLocal < Base
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages flush local [options] [DIMG ...]
+
+    DIMG                        Dapp image to process [default: *].
+
+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
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/stages/flush_repo.rb

@@ -0,0 +1,24 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Stages
+        class FlushRepo < Base
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages flush repo [options] [DIMG ...] REPO
+
+    DIMG                        Dapp image to process [default: *].
+
+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)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/stages/pull.rb

@@ -0,0 +1,28 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Stages
+        class Pull < Base
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages pull [options] [DIMG ...] REPO
+
+    DIMG                        Dapp image to process [default: *].
+
+Options:
+BANNER
+          option :pull_all_stages,
+                 long: '--all',
+                 boolean: true
+
+          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)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/stages/push.rb

@@ -0,0 +1,24 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Stages
+        class Push < Base
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages push [options] [DIMG ...] REPO
+
+    DIMG                        Dapp image to process [default: *].
+
+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)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/tag.rb

@@ -0,0 +1,24 @@
+module Dapp
+  module Dimg
+    module CLI
+      class Tag < Base
+        banner <<BANNER.freeze
+Usage:
+
+  dapp dimg tag [options] [DIMG] TAG
+
+    DIMG                        Dapp image to process [default: *].
+    REPO                        Pushed image name.
+
+Options:
+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)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Dapp
+  module Dimg
+    module Config
+      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

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

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

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

@@ -0,0 +1,7 @@
+module Dapp
+  module Dimg
+    module Config
+      class Base < ::Dapp::Config::Base; end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Dapp
+  module Dimg
+    module Config
+      class Dimg < Base
+        include Validation
+        include InstanceMethods
+
+        attr_reader :_name
+
+        def initialize(name, dapp:)
+          self._name = name
+          super(dapp: dapp)
+        end
+
+        def _name=(name)
+          return if name.nil?
+          reg = '^[[[:alnum:]]_.-]*$'
+          raise Error::Config, code: :dimg_name_incorrect, data: { name: name, reg: reg } unless name =~ /#{reg}/
+          @_name = name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,177 @@
+module Dapp
+  module Dimg
+    module Config
+      class Dimg < Base
+        module InstanceMethods
+          attr_reader :_builder
+          attr_reader :_chef, :_shell, :_docker, :_git_artifact, :_mount, :_artifact
+
+          def dev_mode
+            @_dev_mode = true
+          end
+
+          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)
+            _artifact.concat begin
+                               pass_to_custom(ArtifactGroup.new(dapp: dapp), :clone_to_artifact).tap do |artifact_group|
+                                 artifact_group.instance_eval(&blk) if block_given?
+                               end._export
+                             end
+          end
+
+          def git(url = nil, &blk)
+            type = url.nil? ? :local : :remote
+            _git_artifact.send(type, url.to_s, &blk)
+          end
+
+          def mount(to, &blk)
+            _mount << Directive::Mount.new(to, dapp: dapp, &blk)
+          end
+
+          def _dev_mode
+            !!@_dev_mode
+          end
+
+          def _builder
+            @_builder || :none
+          end
+
+          def _chef
+            @_chef ||= Directive::Chef.new(dapp: dapp)
+          end
+
+          def _shell
+            @_shell ||= Directive::Shell::Dimg.new(dapp: dapp)
+          end
+
+          def _docker
+            @_docker ||= Directive::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
+            @_artifact ||= []
+          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 < Directive::Base
+            attr_reader :_local, :_remote
+
+            def initialize(**kwargs, &blk)
+              @_local = []
+              @_remote = []
+
+              super(**kwargs, &blk)
+            end
+
+            def local(_, &blk)
+              @_local << Directive::GitArtifactLocal.new(dapp: dapp, &blk)
+            end
+
+            def remote(repo_url, &blk)
+              @_remote << Directive::GitArtifactRemote.new(repo_url, dapp: dapp, &blk)
+            end
+
+            def _local
+              @_local.map(&:_export).flatten
+            end
+
+            def _remote
+              @_remote.map(&:_export).flatten
+            end
+
+            protected
+
+            def empty?
+              (_local + _remote).empty?
+            end
+
+            def validate!
+              (_local + _remote).each { |exp| exp.send(:validate!) }
+            end
+          end
+
+          protected
+
+          def builder(type)
+            @_builder = type if _builder == :none
+            raise Error::Config, code: :builder_type_conflict unless @_builder == type
+          end
+
+          def directive_eval(directive, &blk)
+            directive.instance_eval(&blk) if block_given?
+            directive
+          end
+
+          def pass_to_default(dimg)
+            pass_to_custom(dimg, :clone)
+          end
+
+          def pass_to_custom(obj, clone_method)
+            passed_directives.each do |directive|
+              next if (variable = instance_variable_get(directive)).nil?
+
+              obj.instance_variable_set(directive, begin
+                case variable
+                when Directive::Base, GitArtifact then variable.send(clone_method)
+                when Symbol then variable
+                when Array then variable.dup
+                when TrueClass, FalseClass then variable
+                else
+                  raise
+                end
+              end)
+            end
+            obj
+          end
+
+          def passed_directives
+            [:@_chef, :@_shell, :@_docker,
+             :@_git_artifact, :@_mount,
+             :@_artifact, :@_builder, :@_dev_mode]
+          end
+        end # InstanceMethods
+        # rubocop:enable Metrics/ModuleLength
+      end # Dimg
+    end # Config
+  end # Dimg
+end # Dapp