dapp 0.6.1 → 0.6.2

data/lib/dapp/builder/chef/cookbook_metadata.rb

@@ -19,7 +19,7 @@ module Dapp
           end
 
           def depends(dependency, *_a, &_blk)
-            @cookbook_metadata.depends << dependency
+            @cookbook_metadata.depends << dependency.to_s
           end
 
           # rubocop:disable Style/MethodMissing

data/lib/dapp/builder/shell.rb

@@ -2,15 +2,14 @@ module Dapp
   module Builder
     # Shell
     class Shell < Base
-      [:before_install, :before_setup, :install, :setup].each do |stage|
+      [:before_install, :before_setup, :install, :setup, :build_artifact].each do |stage|
         define_method("#{stage}_checksum") do
           [application.config._shell.public_send("_#{stage}"),
            application.config._shell.public_send("_#{stage}_cache_version")].flatten
         end
         define_method("#{stage}?") { !stage_empty?(stage) }
         define_method(stage.to_s) do |image|
-          image.add_command("export DAPP_BUILD_STAGE=#{stage}",
-                            *stage_commands(stage)) unless stage_empty?(stage)
+          image.add_command(*stage_commands(stage)) unless stage_empty?(stage)
         end
       end
 

data/lib/dapp/cli.rb

@@ -1,5 +1,3 @@
-require 'mixlib/cli'
-
 module Dapp
   # CLI
   class CLI
@@ -7,7 +5,7 @@ module Dapp
     include Mixlib::CLI
     include Helper::Trivia
 
-    SUBCOMMANDS = %w(build push spush list run stages cleanup bp).freeze
+    SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image'].freeze
 
     banner <<BANNER.freeze
 Usage: dapp [options] sub-command [sub-command options]
@@ -21,6 +19,8 @@ dapp spush [options] [APPS PATTERN ...] REPO
 dapp list [options] [APPS PATTERN ...]
 dapp run [options] [APP PATTERN] [DOCKER ARGS]
 dapp cleanup [options] [APPS PATTERN ...]
+dapp mrproper [options]
+dapp stage image [options] [APP PATTERN]
 dapp stages
 
 Options:

data/lib/dapp/cli/base.rb

@@ -1,5 +1,3 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # Base of CLI subcommands

data/lib/dapp/cli/bp.rb

@@ -1,11 +1,7 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # CLI bp subcommand
     class Bp < Push
-      include Dapp::Helper::Shellout
-
       banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 

data/lib/dapp/cli/build.rb

@@ -1,11 +1,7 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # CLI build subcommand
     class Build < Base
-      include Dapp::Helper::Shellout
-
       banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
@@ -42,9 +38,9 @@ BANNER
       option :introspect_stage,
              long: '--introspect-stage STAGE',
              proc: proc { |v| v.to_sym },
-             in: [nil, :from, :before_install, :g_a_archive, :g_a_pre_install_patch, :install, :g_a_post_install_patch,
-                  :artifact, :before_setup, :g_a_pre_setup_patch, :chef_cookbooks, :setup, :g_a_post_setup_patch,
-                  :g_a_latest_patch, :docker_instructions]
+             in: [nil, :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,
+                  :chef_cookbooks, :setup, :g_a_post_setup_patch, :after_setup_artifact, :g_a_latest_patch, :docker_instructions]
 
       option :ssh_key,
              long: '--ssh-key SSH_KEY',

data/lib/dapp/cli/cleanup.rb

@@ -1,5 +1,3 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # Cleanup subcommand

data/lib/dapp/cli/list.rb

@@ -1,5 +1,3 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # CLI list subcommand

data/lib/dapp/cli/mrproper.rb

@@ -0,0 +1,22 @@
+module Dapp
+  class CLI
+    # CLI mrprooper subcommand
+    class Mrproper < Base
+      banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp mrprooper [options]
+
+Options:
+BANNER
+      option :proper_all,
+             long: '--all',
+             boolean: true
+
+      option :proper_cache_version,
+             long: '--improper-cache-version-stages',
+             boolean: true
+    end
+  end
+end

data/lib/dapp/cli/push.rb

@@ -1,5 +1,3 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # CLI push subcommand
@@ -11,7 +9,6 @@ Usage:
   dapp push [options] [APP PATTERN] REPO
 
     APP PATTERN                 Applications to process [default: *].
-    REPO                        Pushed image name.
 
 Options:
 BANNER
@@ -50,6 +47,10 @@ BANNER
              description: 'Tag by git commit',
              boolean: true
 
+      option :with_stages,
+             long: '--with-stages',
+             boolean: true
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         repo = self.class.required_argument(self)

data/lib/dapp/cli/run.rb

@@ -1,5 +1,3 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # CLI run subcommand

data/lib/dapp/cli/spush.rb

@@ -1,5 +1,3 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # CLI spush subcommand

data/lib/dapp/cli/stage_image.rb

@@ -0,0 +1,24 @@
+module Dapp
+  class CLI
+    # CLI stage image subcommand
+    class StageImage < Base
+      banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp stage image [options] [APP PATTERN ...]
+
+    APP PATTERN                Application 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,
+                  :chef_cookbooks, :setup, :g_a_post_setup_patch, :after_setup_artifact, :g_a_latest_patch, :docker_instructions]
+    end
+  end
+end

data/lib/dapp/cli/stages.rb

@@ -1,18 +1,20 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     # CLI stages subcommand
     class Stages < CLI
-      SUBCOMMANDS = %w(flush cleanup).freeze
+      SUBCOMMANDS = ['flush local', 'flush repo', 'cleanup local', 'cleanup repo', 'push', 'pull'].freeze
 
       banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
-dapp stages flush
-dapp stages cleanup
+dapp stages cleanup local
+dapp stages cleanup repo
+dapp stages flush local
+dapp stages flush repo
+dapp stages push
+dapp stages pull
 
 Options:
 BANNER

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

@@ -0,0 +1,28 @@
+module Dapp
+  class CLI
+    class Stages
+      # stages cleanup local subcommand
+      class CleanupLocal < Base
+        banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp stages cleanup local [options] [APPS PATTERN ...] REPO
+
+    APPS PATTERN                Applications to process [default: *].
+
+Options:
+BANNER
+        option :proper_cache_version,
+               long: '--improper-cache-version',
+               boolean: true
+
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          repo = self.class.required_argument(self)
+          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_cleanup_local(repo)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Dapp
+  class CLI
+    class Stages
+      # stages cleanup repo subcommand
+      class CleanupRepo < CleanupLocal
+        banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp stages cleanup repo [options] [APPS PATTERN ...] REPO
+
+    APPS PATTERN                Applications to process [default: *].
+
+Options:
+BANNER
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          repo = self.class.required_argument(self)
+          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_cleanup_repo(repo)
+        end
+      end
+    end
+  end
+end

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

@@ -1,15 +1,13 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     class Stages
-      # stages flush subcommand
-      class Flush < Base
+      # stages flush local subcommand
+      class FlushLocal < Base
         banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages flush [options] [APPS PATTERN ...]
+  dapp stages flush local [options] [APPS PATTERN ...]
 
     APPS PATTERN                Applications to process [default: *].
 
@@ -17,7 +15,7 @@ Options:
 BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_flush
+          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_flush_local
         end
       end
     end

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

@@ -1,15 +1,13 @@
-require 'mixlib/cli'
-
 module Dapp
   class CLI
     class Stages
-      # stages cleanup subcommand
-      class Cleanup < Base
+      # stages flush repo subcommand
+      class FlushRepo < Base
         banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages cleanup [options] [APPS PATTERN ...] [REPO]
+  dapp stages flush repo [options] [APPS PATTERN ...] REPO
 
     APPS PATTERN                Applications to process [default: *].
 
@@ -18,7 +16,7 @@ BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
           repo = self.class.required_argument(self)
-          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_cleanup(repo)
+          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_flush_repo(repo)
         end
       end
     end

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

@@ -0,0 +1,28 @@
+module Dapp
+  class CLI
+    class Stages
+      # stages pull subcommand
+      class Pull < Base
+        banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp stages pull [options] [APP PATTERN] REPO
+
+    APP PATTERN                 Applications 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)
+          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_pull(repo)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Dapp
+  class CLI
+    class Stages
+      # stages push subcommand
+      class Push < Base
+        banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp stages push [options] [APP PATTERN] REPO
+
+    APP PATTERN                 Applications to process [default: *].
+
+Options:
+BANNER
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          repo = self.class.required_argument(self)
+          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_push(repo)
+        end
+      end
+    end
+  end
+end

data/lib/dapp/config/application.rb

@@ -2,26 +2,36 @@ module Dapp
   module Config
     # Application
     class Application
-      attr_reader :_builder
       attr_reader :_home_path
       attr_reader :_basename
+      attr_reader :_parent
+      attr_reader :_builder, :_chef, :_shell
+      attr_reader :_install_dependencies, :_setup_dependencies
       attr_reader :_docker
       attr_reader :_git_artifact
-      attr_reader :_artifact
-      attr_reader :_chef
-      attr_reader :_shell
-      attr_reader :_parent
-      attr_reader :_install_dependencies
-      attr_reader :_setup_dependencies
-      attr_reader :_parent
+      attr_reader :_before_install_artifact, :_before_setup_artifact, :_after_install_artifact, :_after_setup_artifact, :_import_artifact
+      attr_reader :_tmp_dir, :_build_dir
 
       def initialize(parent)
-        @_apps   = []
         @_parent = parent
 
-        @_artifact = []
-        @_install_dependencies = []
-        @_setup_dependencies   = []
+        @_docker       = Directive::Docker::Base.new
+        @_git_artifact = Directive::GitArtifact.new
+        @_shell        = Directive::Shell::Base.new
+        @_chef         = Directive::Chef.new
+        @_tmp_dir      = Directive::TmpDir.new
+        @_build_dir    = Directive::BuildDir.new
+
+        @_apps                    = []
+
+        @_before_install_artifact = []
+        @_before_setup_artifact   = []
+        @_after_install_artifact  = []
+        @_after_setup_artifact    = []
+        @_import_artifact         = []
+
+        @_install_dependencies    = []
+        @_setup_dependencies      = []
 
         yield self if block_given?
       end
@@ -35,40 +45,40 @@ module Dapp
       end
 
       def builder(type)
-        project.log_warning(desc: { code: 'excess_builder_instruction', context: 'warning' }) if @_chef.empty? && @_shell.empty?
+        project.log_warning(desc: { code: 'excess_builder_instruction', context: 'warning' }) if @_chef.send(:empty?) && @_shell.send(:empty?)
         raise Error::Config, code: :builder_type_unsupported, data: { type: type } unless [:chef, :shell].include?((type = type.to_sym))
         another_builder = [:chef, :shell].find { |t| t != type }
-        instance_variable_set(:"@_#{another_builder}", Config.const_get(another_builder.capitalize).new)
+        instance_variable_set(:"@_#{another_builder}", instance_variable_get(:"@_#{another_builder}").class.new)
         @_builder = type
       end
 
       def chef
-        raise Error::Config, code: :builder_type_conflict unless _builder == :chef
-        @_chef ||= Chef.new
+        @_chef.tap { raise Error::Config, code: :builder_type_conflict unless _builder == :chef }
       end
 
       def shell
-        raise Error::Config, code: :builder_type_conflict unless _builder == :shell
-        @_shell ||= Shell.new
+        @_shell.tap { raise Error::Config, code: :builder_type_conflict unless _builder == :shell }
       end
 
       def docker
-        @_docker ||= Docker.new
+        @_docker
       end
 
-      def artifact(where_to_add, **options, &blk)
-        @_artifact << begin
-          config = clone.tap do |app|
-            app.instance_variable_set(:'@_artifact', [])
-            app.instance_variable_set(:'@_name', app_name("artifact-#{SecureRandom.hex(2)}"))
-            app.instance_eval(&blk) if block_given?
-          end
-          Artifact::Stage.new(where_to_add, config: config, **options)
-        end
+      def artifact(where_to_add, before: nil, after: nil, **options, &blk)
+        raise Error::Config, code: :stage_artifact_double_associate unless before.nil? || after.nil?
+        artifact_base(instance_variable_get(:"@_#{artifact_variable_name(before, after)}"), where_to_add, **options, &blk)
       end
 
       def git_artifact
-        @_git_artifact ||= GitArtifact.new
+        @_git_artifact ||= Directive::GitArtifact.new
+      end
+
+      def tmp_dir
+        @_tmp_dir
+      end
+
+      def build_dir
+        @_build_dir
       end
 
       def _name
@@ -103,28 +113,37 @@ module Dapp
 
       attr_accessor :project
 
-      private
+      def clone_to_application
+        clone_to(Application.new(self))
+      end
+
+      def clone_to_artifact
+        clone_to(Artifact.new(self))
+      end
 
       # rubocop:disable Metrics/AbcSize
-      def clone
-        Application.new(self).tap do |app|
-          app.instance_variable_set(:'@project', project)
-          app.instance_variable_set(:'@_builder', _builder)
-          app.instance_variable_set(:'@_home_path', _home_path)
-          app.instance_variable_set(:'@_basename', _basename)
-          app.instance_variable_set(:'@_install_dependencies', _install_dependencies)
-          app.instance_variable_set(:'@_setup_dependencies', _setup_dependencies)
-          app.instance_variable_set(:'@_artifact', Marshal.load(Marshal.dump(_artifact)))
-          app.instance_variable_set(:'@_docker', _docker.clone)             unless @_docker.nil?
-          app.instance_variable_set(:'@_git_artifact', _git_artifact.clone) unless @_git_artifact.nil?
-          app.instance_variable_set(:'@_chef', _chef.clone)                 unless @_chef.nil?
-          app.instance_variable_set(:'@_shell', _shell.clone)               unless @_shell.nil?
+      def clone_to(app)
+        app.instance_variable_set(:'@project', project)
+        app.instance_variable_set(:'@_builder', _builder)
+        app.instance_variable_set(:'@_home_path', _home_path)
+        app.instance_variable_set(:'@_basename', _basename)
+        app.instance_variable_set(:'@_install_dependencies', _install_dependencies)
+        app.instance_variable_set(:'@_setup_dependencies', _setup_dependencies)
+        [:_before_install_artifact, :_before_setup_artifact, :_after_install_artifact, :_after_setup_artifact, :_import_artifact].each do |artifact|
+          app.instance_variable_set(:"@#{artifact}", instance_variable_get(:"@#{artifact}").map { |a| a.send(:clone) })
         end
+        app.instance_variable_set(:'@_docker', _docker.send(:clone))
+        app.instance_variable_set(:'@_git_artifact', _git_artifact.send(:clone))
+        app.instance_variable_set(:'@_chef', _chef.send(:clone))
+        app.instance_variable_set(:'@_shell', _shell.send(:clone))
+        app.instance_variable_set(:'@_tmp_dir', _tmp_dir.send(:clone))
+        app.instance_variable_set(:'@_build_dir', _build_dir.send(:clone))
+        app
       end
       # rubocop:enable Metrics/AbcSize
 
       def app(sub_name, &blk)
-        clone.tap do |app|
+        clone_to_application.tap do |app|
           app.instance_variable_set(:'@_name', app_name(sub_name))
           app.instance_eval(&blk) if block_given?
           @_apps += app._apps
@@ -134,6 +153,128 @@ module Dapp
       def app_name(sub_name)
         [_name, sub_name].compact.join('-')
       end
+
+      def artifact_variable_name(before, after)
+        return :import_artifact if before.nil? && after.nil?
+
+        if before.nil?
+          prefix = :after
+          stage  = after
+        else
+          prefix = :before
+          stage  = before
+        end
+
+        return [prefix, stage, :artifact].join('_') if [:install, :setup].include?(stage.to_sym)
+        raise Error::Config, code: :stage_artifact_not_supported_associated_stage, data: { stage: stage }
+      end
+
+      def artifact_base(artifact, where_to_add, **options, &blk)
+        artifact << begin
+          config = clone_to_artifact.tap do |app|
+            app.instance_variable_set(:'@_shell', _shell.send(:clone_to_artifact))
+            app.instance_variable_set(:'@_docker', _docker.send(:clone_to_artifact))
+            app.instance_variable_set(:'@_name', app_name("artifact-#{SecureRandom.hex(2)}"))
+            app.instance_eval(&blk) if block_given?
+          end
+          Directive::Artifact::Stage.new(where_to_add, config: config, **options)
+        end
+      end
+
+      def validate!
+        if _docker._from.nil?
+          validate_scratch_directives!
+          validate_scratch_artifacts!
+        else
+          raise Error::Config, code: :stage_artifact_not_associated unless _import_artifact.empty?
+        end
+        validate_artifacts!
+        validate_artifacts_artifacts!
+      end
+
+      def validate_scratch_directives!
+        raise Error::Config, code: :scratch_unsupported_directive, data: { directive: :app } unless _apps.length == 1
+
+        directives = [:_shell, :_chef, :_git_artifact, :_install_dependencies, :_setup_dependencies, :_tmp_dir, :_build_dir]
+        directives.each do |directive|
+          raise Error::Config,
+                code: :scratch_unsupported_directive,
+                data: { directive: directive[1..-1] } unless public_send(directive).send(: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[1..-1]}" } unless value.nil? || value.send(: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!
+        associated_artifacts.each { |artifact| artifact._config.validate! }
+      end
+
+      def associated_artifacts
+        _before_install_artifact + _before_setup_artifact + _after_install_artifact + _after_setup_artifact
+      end
+
+      def validate_artifacts!
+        artifacts = validate_artifact_format(associated_artifacts + _import_artifact + _git_artifact._remote + _git_artifact._local)
+        loop do
+          break if artifacts.empty?
+          verifiable_artifact = artifacts.shift
+          artifacts.select { |artifact| artifact[:where_to_add] == verifiable_artifact[:where_to_add] }.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._where_to_add) =~ %r{^([^\/]*)\/?(.*)$}
+          where_to_add = Regexp.last_match(1)
+          includes = a._paths
+          includes << Regexp.last_match(2) unless Regexp.last_match(2).empty?
+          excludes = a._exclude_paths
+
+          {
+            index: artifacts.index(a),
+            where_to_add: where_to_add,
+            includes: includes.map(&path_format),
+            excludes: excludes.map(&path_format)
+          }
+        end
+      end
+
+      def validate_artifact!(verifiable_artifact, artifact)
+        verifiable_artifact[:includes].each do |verifiable_path|
+          potential_conflicts = artifact[:includes].select { |path| path.start_with?(verifiable_path) }
+          validate_artifact_path!(verifiable_artifact, potential_conflicts)
+        end.empty? && verifiable_artifact[:excludes].empty? && raise(Error::Config, code: :artifact_conflict)
+        validate_artifact_path!(verifiable_artifact, artifact[:includes]) if verifiable_artifact[:includes].empty?
+      end
+
+      def validate_artifact_path!(verifiable_artifact, potential_conflicts)
+        potential_conflicts.all? do |path|
+          loop do
+            break if verifiable_artifact[:excludes].include?(path) || ((path = File.dirname(path)) == '.')
+          end
+          verifiable_artifact[:excludes].include?(path)
+        end.tap { |res| res || raise(Error::Config, code: :artifact_conflict) }
+      end
     end
   end
 end