dapp 0.10.2 → 0.36.24

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

@@ -0,0 +1,36 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class FlushRepo < Base
+        banner <<BANNER.freeze
+Usage:
+
+  dapp dimg flush repo [options] [DIMG ...] REPO
+
+Options:
+BANNER
+
+        option :lock_timeout,
+               long: '--lock-timeout TIMEOUT',
+               description: 'Redefine resource locking timeout (in seconds)',
+               proc: ->(v) { v.to_i }
+
+        option :with_stages,
+               long: '--with-stages',
+               boolean: true
+
+        option :registry_username,
+               long: '--registry-username USERNAME'
+
+        option :registry_password,
+               long: '--registry-password PASSWORD'
+
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          repo = self.class.required_argument(self, 'repo')
+          run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repo, verbose: true))
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class List < Base
         banner <<BANNER.freeze
 Usage:
@@ -11,6 +11,9 @@ Usage:
 
 Options:
 BANNER
+        def log_running_time
+          false
+        end
       end
     end
   end

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

@@ -1,11 +1,11 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Mrproper < Base
         banner <<BANNER.freeze
 Usage:
 
-  dapp dimg mrprooper [options]
+  dapp dimg mrproper [options]
 
 Options:
 BANNER

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

@@ -0,0 +1,39 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Push < Base
+        banner <<BANNER.freeze
+Usage:
+
+  dapp dimg push [options] [DIMG ...] REPO
+
+    DIMG                        Dapp image to process [default: *].
+
+Options:
+BANNER
+        extend ::Dapp::CLI::Options::Tag
+
+        option :lock_timeout,
+               long: '--lock-timeout TIMEOUT',
+               description: 'Redefine resource locking timeout (in seconds)',
+               proc: ->(v) { v.to_i }
+
+        option :with_stages,
+               long: '--with-stages',
+               boolean: true
+
+        option :registry_username,
+               long: '--registry-username USERNAME'
+
+        option :registry_password,
+               long: '--registry-password PASSWORD'
+
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          repo = self.class.required_argument(self, 'repo')
+          run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Run < Base
         banner <<BANNER.freeze
 Usage:
@@ -12,14 +12,15 @@ Usage:
 
 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)
+
+        extend ::Dapp::CLI::Options::Ssh
+
+        option :stage,
+               long:        '--stage STAGE',
+               description: "Run one of the following stages (#{list_msg_format(DIMG_STAGES)})",
+               proc:        STAGE_PROC.call(DIMG_STAGES)
+
+        def read_options(args)
           self.class.cli_wrapper(self) do
             args.each_with_index do |arg, i|
               next if arg == '--'
@@ -31,7 +32,7 @@ BANNER
                 cli_option << args.slice!(i)
               end
               parse_options(cli_option)
-              return read_cli_options(args)
+              return read_options(args)
             end
           end
         end
@@ -46,12 +47,26 @@ BANNER
         end
 
         def run(argv = ARGV)
-          filtered_args = read_cli_options(argv)
-          pattern = filtered_args.any? && !filtered_args.first.start_with?('-') ? [filtered_args.shift] : []
+          filtered_args = read_options(argv)
+          patterns = 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)
+
+          if docker_options.empty? && command.empty?
+            docker_options = %w(-ti --rm)
+            command = %w(/bin/bash)
+          end
+
+          stage_name = config.delete(:stage)
+
+          run_dapp_command(nil, options: cli_options(dimgs_patterns: patterns)) do |dapp|
+            dapp.run(stage_name, docker_options, command)
+          end
+        end
+
+        def log_running_time
+          false
         end
       end
     end

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

@@ -1,12 +1,12 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Spush < Push
         banner <<BANNER.freeze
 Usage:
 
   dapp dimg spush [options] [DIMG] REPO
-
+  
     DIMG                        Dapp image to process [default: *].
     REPO                        Pushed image name.
 

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:
@@ -18,6 +18,15 @@ BANNER
                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]
+        def log_running_time
+          false
+        end
+
+        def cli_options(**kwargs)
+          super.tap do |config|
+            config[:quiet] ||= !config[:verbose]
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,13 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
+        class Base < Base
+          def run_dapp_command(run_command, options: {}, **extra_options)
+            super(run_command, options: options.merge(verbose: true), **extra_options)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,14 +1,12 @@
-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:
 
-  dapp dimg stages cleanup local [options] [DIMG ...] [REPO]
-
-    DIMG                        Dapp image to process [default: *].
+  dapp dimg stages cleanup local [options] [REPO]
 
 Options:
 BANNER
@@ -24,14 +22,20 @@ BANNER
                  long: '--improper-repo-cache',
                  boolean: true
 
+          option :registry_username,
+                 long: '--registry-username USERNAME'
+
+          option :registry_password,
+                 long: '--registry-password PASSWORD'
+
           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)
+            run_dapp_command(run_method, options: cli_options(repo: repository))
           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,14 +1,12 @@
-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:
 
-  dapp dimg stages cleanup repo [options] [DIMG ...] REPO
-
-    DIMG                        Dapp image to process [default: *].
+  dapp dimg stages cleanup repo [options] REPO
 
 Options:
 BANNER
@@ -17,7 +15,7 @@ BANNER
           end
 
           def repo
-            self.class.required_argument(self)
+            self.class.required_argument(self, 'repo')
           end
         end
       end

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

@@ -0,0 +1,21 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
+        class FlushLocal < Base
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages flush local [options]
+
+Options:
+BANNER
+          def run(argv = ARGV)
+            self.class.parse_options(self, argv)
+            run_dapp_command(:stages_flush_local, options: cli_options)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
+        class FlushRepo < Base
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages flush repo [options] REPO
+
+Options:
+BANNER
+          option :registry_username,
+                 long: '--registry-username USERNAME'
+
+          option :registry_password,
+                 long: '--registry-password PASSWORD'
+
+          def run(argv = ARGV)
+            self.class.parse_options(self, argv)
+            repo = self.class.required_argument(self, 'repo')
+            run_dapp_command(:stages_flush_repo, options: cli_options(repo: repo))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
+        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
+
+          option :registry_username,
+                 long: '--registry-username USERNAME'
+
+          option :registry_password,
+                 long: '--registry-password PASSWORD'
+
+          def run(argv = ARGV)
+            self.class.parse_options(self, argv)
+            repo = self.class.required_argument(self, 'repo')
+            run_dapp_command(:stages_pull, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
+        class Push < Base
+          banner <<BANNER.freeze
+Usage:
+
+  dapp dimg stages push [options] [DIMG ...] REPO
+
+    DIMG                        Dapp image to process [default: *].
+
+Options:
+BANNER
+          option :registry_username,
+                 long: '--registry-username USERNAME'
+
+          option :registry_password,
+                 long: '--registry-password PASSWORD'
+
+          def run(argv = ARGV)
+            self.class.parse_options(self, argv)
+            repo = self.class.required_argument(self, 'repo')
+            run_dapp_command(:stages_push, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+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
+
+        banner <<BANNER.freeze
+Available subcommands: (for details, dapp dimg stages SUB-COMMAND --help)
+
+  dapp dimg stages cleanup local [options] [REPO]
+  dapp dimg stages cleanup repo [options] REPO
+  dapp dimg stages flush local [options]
+  dapp dimg stages flush repo [options] 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/command/dimg/tag.rb

@@ -0,0 +1,24 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Tag < Base
+        banner <<BANNER.freeze
+Usage:
+
+  dapp dimg tag [options] [DIMG ...] REPO
+  
+    DIMG                        Dapp image to process [default: *].
+
+Options:
+BANNER
+        extend ::Dapp::CLI::Options::Tag
+
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          repo = self.class.required_argument(self, 'repo')
+          run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repo, ignore_try_host_docker_login: true))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image', 'tag', 'build-context', 'cleanup repo', 'flush local', 'flush repo'].freeze
+
+      banner <<BANNER.freeze
+Usage: dapp dimg [options] subcommand [subcommand options]
+
+Available subcommands: (for details, dapp dimg SUB-COMMAND --help)
+
+  dapp dimg build [options] [DIMG ...]
+  dapp dimg bp [options] [DIMG ...] REPO
+  dapp dimg push [options] [DIMG ...] REPO
+  dapp dimg spush [options] [DIMG] REPO
+  dapp dimg tag [options] [DIMG ...] REPO
+  dapp dimg list [options] [DIMG ...]
+  dapp dimg run [options] [DIMG] [DOCKER ARGS]
+  dapp dimg cleanup repo [options] [DIMG ...] REPO
+  dapp dimg flush local [options] [DIMG ...]
+  dapp dimg flush repo [options] [DIMG ...] REPO
+  dapp dimg cleanup [options]
+  dapp dimg mrproper [options]
+  dapp dimg stage image [options] [DIMG]
+  dapp dimg stages
+  dapp dimg build-context
+
+Options:
+BANNER
+    end
+  end
+end

data/lib/dapp/dimg/cli/options/introspection.rb

@@ -0,0 +1,45 @@
+module Dapp::Dimg::CLI
+  module Options
+    module Introspection
+      def self.extended(klass)
+        artifact_stages = [
+          :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, :after_setup_artifact, :g_a_artifact_patch, :build_artifact
+        ]
+
+        klass.class_eval do
+          option :introspect_error,
+                 long: '--introspect-error',
+                 boolean: true,
+                 default: false
+
+          option :introspect_before_error,
+                 long: '--introspect-before-error',
+                 boolean: true,
+                 default: false
+
+          option :introspect_stage,
+                 long:        '--introspect-stage STAGE',
+                 description: "Introspect one of the following stages (#{list_msg_format(klass.const_get(:DIMG_STAGES))})",
+                 proc:        klass.const_get(:STAGE_PROC).call(klass.const_get(:DIMG_STAGES))
+
+          option :introspect_before,
+                 long:        '--introspect-before STAGE',
+                 description: "Introspect stage before one of the following stages (#{list_msg_format(klass.const_get(:DIMG_STAGES))})",
+                 proc:        klass.const_get(:STAGE_PROC).call(klass.const_get(:DIMG_STAGES))
+
+          option :introspect_artifact_stage,
+                 long:        '--introspect-artifact-stage STAGE',
+                 description: "Introspect one of the following stages (#{list_msg_format(artifact_stages)})",
+                 proc:        klass.const_get(:STAGE_PROC).call(artifact_stages)
+
+          option :introspect_artifact_before,
+                 long:        '--introspect-artifact-before STAGE',
+                 description: "Introspect stage before one of the following stages (#{list_msg_format(artifact_stages)})",
+                 proc:        klass.const_get(:STAGE_PROC).call(artifact_stages)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Dapp
+  module Dimg
+    module Config
+      module Config
+        def self.included(base)
+          base.include(Directive::DimgGroupBase)
+        end
+
+        protected
+
+        def dimg_after_parsing!
+          _dimg.each(&:artifacts_after_parsing!)
+        end
+
+        def dimg_config_validate!
+          raise ::Dapp::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.rb

@@ -22,6 +22,14 @@ module Dapp
             attr_accessor :_config
             attr_accessor :_before, :_after
 
+            def _cwd
+              @_cwd ||= @_to
+            end
+
+            def _to
+              @_to ||= @_cwd
+            end
+
             def before(stage)
               sub_directive_eval do
                 stage = stage.to_sym
@@ -48,22 +56,12 @@ module Dapp
               conflict_type = [:before, :after].find { |t| t != type }
               conflict_stage = public_send("_#{conflict_type}")
 
-              raise Error::Config, code: :stage_artifact_not_supported_associated_stage,
-                                   data: { stage: "#{type} #{stage.inspect}" } unless [:install, :setup].include? stage
-
-              raise Error::Config, code: :stage_artifact_double_associate,
-                                   data: { stage: "#{type} #{stage.inspect}",
-                                           conflict_stage: "#{conflict_type} #{conflict_stage.inspect}" } if conflict_stage
+              raise ::Dapp::Error::Config, code: :stage_artifact_not_supported_associated_stage,
+                                           data: { stage: "#{type} #{stage.inspect}" } unless [:install, :setup].include? stage
 
-              defined_stage = public_send("_#{type}")
-              dapp.log_config_warning(
-                desc: {
-                  code: :stage_artifact_rewritten,
-                  context: :warning,
-                  data: { stage: "#{type} #{stage.inspect}",
-                          conflict_stage: "#{type} #{defined_stage.inspect}" }
-                }
-              ) if defined_stage
+              raise ::Dapp::Error::Config, code: :stage_artifact_double_associate,
+                                           data: { stage: "#{type} #{stage.inspect}",
+                                                   conflict_stage: "#{conflict_type} #{conflict_stage.inspect}" } if conflict_stage
             end
           end
         end