dapp 0.6.17 → 0.7.1

data/lib/dapp/builder/none.rb

@@ -0,0 +1,45 @@
+module Dapp
+  module Builder
+    # None
+    class None < Base
+      def before_dimg_should_be_built_check
+      end
+
+      def before_install(_image)
+      end
+
+      def before_install_checksum
+      end
+
+      def before_setup(_image)
+      end
+
+      def before_setup_checksum
+      end
+
+      def install(_image)
+      end
+
+      def install_checksum
+      end
+
+      def setup(_image)
+      end
+
+      def setup_checksum
+      end
+
+      def build_artifact(_image)
+      end
+
+      def build_artifact_checksum
+      end
+
+      def chef_cookbooks(_image)
+      end
+
+      def chef_cookbooks_checksum
+      end
+    end # Base
+  end # Builder
+end # Dapp

data/lib/dapp/builder/shell.rb

@@ -4,8 +4,8 @@ module Dapp
     class Shell < Base
       [: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
+          [dimg.config._shell.public_send("_#{stage}_command"),
+           dimg.config._shell.public_send("_#{stage}_version")].flatten
         end
         define_method("#{stage}?") { !stage_empty?(stage) }
         define_method(stage.to_s) do |image|
@@ -18,7 +18,7 @@ module Dapp
       end
 
       def stage_commands(stage)
-        application.config._shell.public_send("_#{stage}")
+        dimg.config._shell.public_send("_#{stage}_command")
       end
     end
   end

data/lib/dapp/cli.rb

@@ -5,23 +5,22 @@ module Dapp
     include Mixlib::CLI
     include Helper::Trivia
 
-    SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image', 'tag'].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]
 
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
-dapp build [options] [APPS PATTERN ...]
-dapp bp [options] [APPS PATTERN ...] REPO
-dapp push [options] [APP PATTERN] REPO
-dapp spush [options] [APPS PATTERN ...] REPO
-dapp tag [options] [APP PATTERN ...] TAG
-dapp list [options] [APPS PATTERN ...]
-dapp run [options] [APP PATTERN] [DOCKER ARGS]
-dapp cleanup [options] [APPS PATTERN ...]
+dapp build [options] [DIMGS PATTERN ...]
+dapp bp [options] [DIMGS PATTERN ...] REPO
+dapp push [options] [DIMGS PATTERN] REPO
+dapp spush [options] [DIMG PATTERN ...] REPO
+dapp list [options] [DIMGS PATTERN ...]
+dapp run [options] [DIMG PATTERN] [DOCKER ARGS]
+dapp cleanup [options] [DIMGS PATTERN ...]
 dapp mrproper [options]
-dapp stage image [options] [APP PATTERN]
+dapp stage image [options] [DIMG PATTERN]
 dapp stages
 
 Options:

data/lib/dapp/cli/base.rb

@@ -30,6 +30,11 @@ module Dapp
              default: false,
              boolean: true
 
+      option :ignore_config_warning,
+             long: '--ignore-config-sequential-processing-warnings',
+             default: false,
+             boolean: true
+
       option :log_color,
              long: '--color MODE',
              description: 'Display output in color on the terminal',
@@ -53,7 +58,7 @@ module Dapp
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        Project.new(cli_options: config, apps_patterns: cli_arguments).public_send(class_to_lowercase)
+        Project.new(cli_options: config, dimgs_patterns: cli_arguments).public_send(class_to_lowercase)
       end
     end
   end

data/lib/dapp/cli/bp.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp bp [options] [APPS PATTERNS] REPO
+  dapp bp [options] [DIMGS PATTERNS] REPO
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images to process [default: *].
     REPO                        Pushed image name.
 
 Options:

data/lib/dapp/cli/build.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp build [options] [APPS PATTERN ...]
+  dapp build [options] [DIMGS PATTERN ...]
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/cleanup.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp cleanup [options] [APPS PATTERN ...]
+  dapp cleanup [options] [DIMGS PATTERN ...]
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/list.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp list [options] [APPS PATTERN ...]
+  dapp list [options] [DIMGS PATTERN ...]
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/mrproper.rb

@@ -17,10 +17,6 @@ BANNER
       option :proper_cache_version,
              long: '--improper-cache-version-stages',
              boolean: true
-
-      option :proper_dev_mode_cache,
-             long: '--improper-dev-mode-cache',
-             boolean: true
     end
   end
 end

data/lib/dapp/cli/push.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp push [options] [APP PATTERN] REPO
+  dapp push [options] [DIMG PATTERN] REPO
 
-    APP PATTERN                 Applications to process [default: *].
+    DIMG PATTERN                Dapp images to process [default: *].
 
 Options:
 BANNER
@@ -54,7 +54,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).public_send(class_to_lowercase, repo)
+        Project.new(cli_options: config, dimgs_patterns: cli_arguments).public_send(class_to_lowercase, repo)
       end
     end
   end

data/lib/dapp/cli/run.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp run [options] [APP PATTERN] [DOCKER ARGS]
+  dapp run [options] [DIMG PATTERN] [DOCKER ARGS]
 
-    APP PATTERN                 Application to process [default: *].
+    DIMG PATTERN                Dapp image to process [default: *].
     DOCKER ARGS                 Docker run options and command separated by '--'
 
 Options:
@@ -46,7 +46,7 @@ BANNER
         index = filtered_args.index('--') || filtered_args.count
         docker_options = index.nonzero? ? filtered_args.slice(0..index - 1) : []
         command = filtered_args.slice(index + 1..-1) || []
-        Project.new(cli_options: config, apps_patterns: pattern).run(docker_options, command)
+        Project.new(cli_options: config, dimgs_patterns: pattern).run(docker_options, command)
       end
     end
   end

data/lib/dapp/cli/spush.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp spush [options] [APPS PATTERN ...] REPO
+  dapp spush [options] [DIMGS PATTERN ...] REPO
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images to process [default: *].
     REPO                        Pushed image name.
 
 Options:

data/lib/dapp/cli/stage_image.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stage image [options] [APP PATTERN ...]
+  dapp stage image [options] [DIMG PATTERN ...]
 
-    APP PATTERN                Application to process [default: *].
+    DIMG PATTERN                Dapp image to process [default: *].
 
 Options:
 BANNER

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

@@ -7,9 +7,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages cleanup local [options] [APPS PATTERN ...] REPO
+  dapp stages cleanup local [options] [DIMGS PATTERN ...] REPO
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images to process [default: *].
 
 Options:
 BANNER
@@ -20,7 +20,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_local(repo)
+          Project.new(cli_options: config, dimgs_patterns: cli_arguments).stages_cleanup_local(repo)
         end
       end
     end

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

@@ -7,16 +7,16 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages cleanup repo [options] [APPS PATTERN ...] REPO
+  dapp stages cleanup repo [options] [DIMGS PATTERN ...] REPO
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images 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)
+          Project.new(cli_options: config, dimgs_patterns: cli_arguments).stages_cleanup_repo(repo)
         end
       end
     end

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

@@ -7,15 +7,15 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages flush local [options] [APPS PATTERN ...]
+  dapp stages flush local [options] [DIMGS PATTERN ...]
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images to process [default: *].
 
 Options:
 BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_flush_local
+          Project.new(cli_options: config, dimgs_patterns: cli_arguments).stages_flush_local
         end
       end
     end

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

@@ -7,16 +7,16 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages flush repo [options] [APPS PATTERN ...] REPO
+  dapp stages flush repo [options] [DIMGS PATTERN ...] REPO
 
-    APPS PATTERN                Applications to process [default: *].
+    DIMGS PATTERN               Dapp images 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_flush_repo(repo)
+          Project.new(cli_options: config, dimgs_patterns: cli_arguments).stages_flush_repo(repo)
         end
       end
     end

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

@@ -7,9 +7,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages pull [options] [APP PATTERN] REPO
+  dapp stages pull [options] [DIMG PATTERN] REPO
 
-    APP PATTERN                 Applications to process [default: *].
+    DIMG PATTERN                Dapp image to process [default: *].
 
 Options:
 BANNER
@@ -20,7 +20,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_pull(repo)
+          Project.new(cli_options: config, dimgs_patterns: cli_arguments).stages_pull(repo)
         end
       end
     end

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

@@ -7,16 +7,16 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages push [options] [APP PATTERN] REPO
+  dapp stages push [options] [DIMG PATTERN] REPO
 
-    APP PATTERN                 Applications to process [default: *].
+    DIMG PATTERN                Dapp image 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)
+          Project.new(cli_options: config, dimgs_patterns: cli_arguments).stages_push(repo)
         end
       end
     end

data/lib/dapp/config/artifact_dimg.rb

@@ -0,0 +1,18 @@
+module Dapp
+  module Config
+    # ArtifactDimg
+    class ArtifactDimg < Dimg
+      attr_reader :_artifact_dependencies
+
+      def validate_scratch!
+      end
+
+      def validate_artifacts_artifacts!
+      end
+
+      def validated_artifacts
+        _git_artifact._local + _git_artifact._remote
+      end
+    end
+  end
+end

data/lib/dapp/config/artifact_group.rb

@@ -0,0 +1,54 @@
+module Dapp
+  module Config
+    # ArtifactGroup
+    class ArtifactGroup < DimgGroup
+      attr_reader :_artifact_dependencies, :_export
+
+      def initialize(project:)
+        @_artifact_dependencies = []
+        @_export = []
+
+        super(project: project)
+      end
+
+      def _shell(&blk)
+        @_shell ||= Directive::Shell::Artifact.new(&blk)
+      end
+
+      def _docker(&blk)
+        @_docker ||= Directive::Docker::Artifact.new(&blk)
+      end
+
+      undef :artifact
+      undef :dimg
+      undef :dimg_group
+
+      protected
+
+      def artifact_depends_on(*args)
+        @_artifact_dependencies.concat(args)
+      end
+
+      def export(*args, &blk)
+        @_export.concat begin
+                          artifact_config = pass_to_default(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", project: project))
+                          artifact = Directive::Artifact.new(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
+
+      def pass_to_default(obj)
+        super(obj).tap do |artifact_dimg|
+          artifact_dimg.instance_variable_set(:@_artifact_dependencies, marshal_dup(_artifact_dependencies))
+        end
+      end
+    end
+  end
+end