dapp 0.26.14 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c8e71b2112018034b155f90f7fe43bb40efd2d
-  data.tar.gz: 69f57e4c27bb9b4463f460a704c3b9cf161b1718
+  metadata.gz: 745c76163ba1b96d6a8a73c478d7ea9de5a9aa32
+  data.tar.gz: d3ec2e586c4828ecd4044a7abf69109eb64f2cbc
 SHA512:
-  metadata.gz: 61488411fb2ba6e430bb252f35dac9246e8fc4de17fba41c53c7532cea1c381da6bb87da4c7893a76f8724f9071f8f0640d4b21e580f081d5f77af65018b0728
-  data.tar.gz: d92e4046236d70e43a0c3d9a143fa98ae2ad0cbc871c51c7d4f891ee9ad668caed676741bc86646ed5e46fe71f1a321024f9c65740d2de705f6ebf7a31b366b7
+  metadata.gz: 32391a66ad27f57986540b813cec39d279cd549224cc1d8b3fbc9b8fcbb50f50a5aae2692f90948e7fff2594668b5ba245dcb62d1f3b4ae31f242d9b35fba3be
+  data.tar.gz: 33b1e5a759aacd3f183d45869eedb475462b52615b7182f5931e25835ae0f0368f5726d6026c0f2d6d95487b8a39b65a5ce16502dee38999f68d385b6044358c

data/bin/dapp

@@ -28,10 +28,6 @@ begin
       $stderr.puts "\033[1m\033[90mStacktrace dumped to #{filename}\033[0m"
     end
 
-    if Dapp::CLI.dapp_object
-      Dapp::CLI.dapp_object.sentry_exception(e)
-    end
-
     raise
   end
 rescue Dapp::Error::Shellout => e

data/config/en/common.yml

@@ -13,6 +13,7 @@ en:
     process:
       artifact_copy: "copying artifact `%{name}`"
       artifact_building: "building artifact `%{name}`"
+      layer_building: "building layer `%{name}`"
       git_artifact_clone: "cloning remote git_artifact `%{url}`"
       git_artifact_fetch: "fetching remote git_artifact `%{url}`"
       vendoring_builder_cookbooks: 'vendoring builder cookbooks'

data/config/en/net_status.yml

@@ -5,6 +5,7 @@ en:
       shell_command_failed: ">>> START STREAM\n%{stream}\n>>> END STREAM"
     dimg:
       dimg_not_built: "Dimg hasn't been built yet!"
+      dimg_stage_not_built: "Dimg stage `%{stage_name}` hasn't been built yet!"
       dimg_not_run: "Dimg run failed!"
     dappfile:
       incorrect: "Dappfile with `%{error}`:\n%{message}"
@@ -36,6 +37,7 @@ en:
       no_helm_chart_spec_name: "Bad name `%{name}` in helm chart spec %{path}:\n%{raw_spec}"
       file_not_exist: "File `%{path}` doesn't exist!"
       helm_directory_not_exist: "Helm directory doesn't exist in project!"
+      chart_yaml_not_found: "Chart.yaml file `%{path}` not found!"
       values_file_not_found: "Values file `%{path}` not found!"
       secret_file_not_found: "Secret file `%{path}` not found!"
       secret_file_empty: "Secret file `%{path}` can't be empty!"

data/lib/dapp.rb

@@ -28,8 +28,6 @@ require 'base64'
 require 'io/console'
 require 'net/http'
 require 'progressbar'
-require 'sentry-raven'
-require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -40,7 +38,6 @@ require 'dapp/helper/sha256'
 require 'dapp/helper/net_status'
 require 'dapp/helper/tar'
 require 'dapp/helper/yaml'
-require 'dapp/helper/url'
 require 'dapp/prctl'
 require 'dapp/error/mod/user'
 require 'dapp/error/base'
@@ -61,7 +58,6 @@ require 'dapp/config/directive/base'
 require 'dapp/config/config'
 require 'dapp/dapp/lock'
 require 'dapp/dapp/ssh_agent'
-require 'dapp/dapp/sentry'
 require 'dapp/dapp/git_artifact'
 require 'dapp/dapp/dappfile'
 require 'dapp/dapp/chef'
@@ -140,6 +136,7 @@ require 'dapp/dimg/builder/chef/berksfile'
 require 'dapp/dimg/builder/chef/cookbook'
 require 'dapp/dimg/builder/shell'
 require 'dapp/dimg/builder/ansible'
+require 'dapp/dimg/builder/ansible/assets'
 require 'dapp/dimg/builder/none'
 require 'dapp/dimg/build/stage/mod/logging'
 require 'dapp/dimg/build/stage/mod/group'

data/lib/dapp/cli.rb

@@ -38,10 +38,6 @@ BANNER
            show_options: true,
            exit: 0
 
-    class << self
-      attr_accessor :dapp_object
-    end
-
     def initialize(*args)
       super(*args)
 

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

@@ -58,8 +58,6 @@ module Dapp
 
         def run_dapp_command(run_method, options: {}, log_running_time: true, try_host_docker_login: false)
           dapp = ::Dapp::Dapp.new(options: options)
-          ::Dapp::CLI.dapp_object = dapp
-          dapp.sentry_message("Manual usage: `#{options[:dapp_command]}` command") unless ENV['CI']
 
           log_dapp_running_time(dapp, ignore: !log_running_time) do
             begin
@@ -76,10 +74,6 @@ module Dapp
           end
         end
 
-        def run_method
-          class_to_lowercase
-        end
-
         def log_dapp_running_time(dapp, ignore: false)
           return yield if ignore
 
@@ -101,7 +95,7 @@ module Dapp
             self.class.print_error_with_help_and_die! self, "cannot use alias options --run-dir, --build-dir, --deploy-dir at the same time"
           end
 
-          config.merge(build_dir: dirs.compact.first, dapp_command: run_method, **kwargs)
+          config.merge(build_dir: dirs.compact.first, **kwargs)
         end
       end
     end

data/lib/dapp/dapp.rb

@@ -17,13 +17,10 @@ module Dapp
     include Logging::Paint
 
     include SshAgent
-    include Sentry
-
     include Helper::Sha256
-    extend  Helper::Trivia
+    extend Helper::Trivia
     include Helper::Trivia
     include Helper::Tar
-    include Helper::Url
 
     include Deps::Toolchain
     include Deps::Gitartifact
@@ -46,18 +43,6 @@ module Dapp
       self.class.options
     end
 
-    def settings
-      @settings ||= begin
-        settings_path = File.join(self.class.home_dir, "settings.toml")
-
-        if File.exists? settings_path
-          TomlRB.load_file(settings_path)
-        else
-          {}
-        end
-      end
-    end
-
     def name
       @name ||= begin
         n = begin
@@ -111,8 +96,8 @@ module Dapp
       self.class.tmp_base_dir
     end
 
-    def build_dir
-      @build_dir ||= begin
+    def build_path(*path)
+      @build_path ||= begin
         if option_build_dir
           Pathname.new(option_build_dir)
         else
@@ -120,10 +105,7 @@ module Dapp
           Pathname.new(dir)
         end.expand_path.tap(&:mkpath)
       end
-    end
-
-    def build_path(*path)
-      make_path(build_dir, *path)
+      make_path(@build_path, *path)
     end
 
     def local_git_artifact_exclude_paths(&blk)

data/lib/dapp/dapp/dappfile.rb

@@ -124,12 +124,12 @@ module Dapp
           return if File.exists? dappfile_yml_bin_path
 
           log_process("Downloading dappfile-yml dapp dependency") do
-            location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml")
+            location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml")
 
             tmp_bin_path = File.join(self.class.tmp_base_dir, "dappfile-yml-#{SecureRandom.uuid}")
             ::Dapp::Downloader.download(location, tmp_bin_path, show_progress: true, progress_titile: dappfile_yml_bin_path)
 
-            checksum_location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml.sha")
+            checksum_location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml.sha")
             tmp_bin_checksum_path = tmp_bin_path + ".checksum"
             ::Dapp::Downloader.download(checksum_location, tmp_bin_checksum_path)
 

data/lib/dapp/dapp/deps/base.rb

@@ -2,7 +2,7 @@ module Dapp
   class Dapp
     module Deps
       module Base
-        BASE_VERSION = "0.2.1"
+        BASE_VERSION = "0.2.3"
 
         def base_container_name # FIXME: hashsum(image) or dockersafe()
           "dappdeps_base_#{BASE_VERSION}"
@@ -28,11 +28,15 @@ module Dapp
           end
         end
 
+        def dappdeps_base_path
+          "/.dapp/deps/base/#{BASE_VERSION}/embedded/bin:/.dapp/deps/base/#{BASE_VERSION}/embedded/sbin"
+        end
+
         %w(rm rsync diff date cat
            stat readlink test sleep mkdir
            install sed cp true find
            bash tar sudo base64).each do |cmd|
-          define_method("#{cmd}_bin") { "/.dapp/deps/base/#{BASE_VERSION}/bin/#{cmd}" }
+          define_method("#{cmd}_bin") { "/.dapp/deps/base/#{BASE_VERSION}/embedded/bin/#{cmd}" }
         end
 
         def sudo_command(owner: nil, group: nil)

data/lib/dapp/dapp/option_tags.rb

@@ -7,12 +7,6 @@ module Dapp
 
       def tags_by_scheme
         @tags_by_scheme_name ||= begin
-          if slug_tags[:custom].any?
-            if settings.fetch("sentry", {}).fetch("detect-push-tag-usage", false)
-              sentry_message("--tag or --tag-slug usage detected", extra: {"slug_tags" => slug_tags})
-            end
-          end
-
           {}.tap do |tags_by_scheme|
             [slug_tags, branch_tags, ci_tags].each do |_tags_by_scheme|
               _tags_by_scheme.each do |scheme, tags|
@@ -95,4 +89,4 @@ module Dapp
       end
     end # Tags
   end # Dapp
-end # Dapp
+end # Dapp

data/lib/dapp/dimg/artifact.rb

@@ -1,6 +1,10 @@
 module Dapp
   module Dimg
     class Artifact < Dimg
+      def name
+        dapp.consistent_uniq_slugify(config._name) unless config._name.nil?
+      end
+
       def after_stages_build!
       end
 

data/lib/dapp/dimg/build/stage/artifact_base.rb

@@ -13,7 +13,7 @@ module Dapp
               artifacts_labels = {}
               artifacts.each do |artifact|
                 apply_artifact(artifact, image)
-                artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:dimg].last_stage.image.built_id
+                artifacts_labels["dapp-artifact-#{artifact[:dimg].name}".to_sym] = artifact[:dimg].last_stage.image.built_id
               end
               image.add_service_change_label artifacts_labels
             end
@@ -24,7 +24,7 @@ module Dapp
               dimg.config.public_send("_#{name}").map do |artifact|
                 artifact_dimg = dimg.dapp.artifact_dimg(config: artifact._config,
                                                         ignore_git_fetch: dimg.ignore_git_fetch)
-                { name: artifact._config._name, options: artifact._artifact_options, dimg: artifact_dimg }
+                { options: artifact._artifact_options, dimg: artifact_dimg }
               end
             end
           end
@@ -49,23 +49,23 @@ module Dapp
 
           def artifacts_dimgs_build!
             artifacts.uniq { |artifact| artifact[:dimg] }.each do |artifact|
-              process = dimg.dapp.t(code: 'process.artifact_building', data: { name: artifact[:name] })
+              process = dimg.dapp.t(code: 'process.artifact_building', data: { name: artifact[:dimg].name })
               dimg.dapp.log_secondary_process(process) { artifact[:dimg].build! }
             end
           end
 
-          def run_artifact_dimg(artifact_dimg, artifact_name, commands)
+          def run_artifact_dimg(artifact_dimg, commands)
             docker_options = ['--rm',
-                              "--volume #{dimg.tmp_path('artifact', artifact_name)}:#{artifact_dimg.container_tmp_path(artifact_name)}",
+                              "--volume #{dimg.tmp_path('artifact', artifact_dimg.name )}:#{artifact_dimg.container_tmp_path(artifact_dimg.name)}",
                               "--volumes-from #{dimg.dapp.toolchain_container}",
                               "--volumes-from #{dimg.dapp.base_container}",
                               "--entrypoint #{dimg.dapp.bash_bin}"]
-            dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
+            dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.artifact_copy', data: { name: artifact_dimg.name }), short: true) do
               artifact_dimg.run(docker_options, [%(-ec '#{dimg.dapp.shellout_pack(commands)}')])
             end
           rescue Error::Dimg => e
             raise unless e.net_status[:code] == :dimg_not_run
-            raise Error::Build, code: :export_failed, data: { artifact_name: artifact_name }
+            raise Error::Build, code: :export_failed, data: { artifact_name: artifact_dimg.name }
           end
           # rubocop:enable Metrics/AbcSize
         end # ArtifactBase

data/lib/dapp/dimg/build/stage/artifact_default.rb

@@ -8,7 +8,6 @@ module Dapp
           def apply_artifact(artifact, image)
             return if dimg.dapp.dry_run?
 
-            artifact_name = artifact[:name]
             artifact_dimg = artifact[:dimg]
             cwd = artifact[:options][:cwd]
             include_paths = artifact[:options][:include_paths]
@@ -17,12 +16,12 @@ module Dapp
             group = artifact[:options][:group]
             to = artifact[:options][:to]
 
-            command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_name, 'data').to_s, nil, nil, include_paths, exclude_paths)
-            run_artifact_dimg(artifact_dimg, artifact_name, command)
+            command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_dimg.name, 'data').to_s, nil, nil, include_paths, exclude_paths)
+            run_artifact_dimg(artifact_dimg, command)
 
-            command = safe_cp(dimg.container_tmp_path('artifact', artifact_name, 'data').to_s, to, owner, group, include_paths, exclude_paths)
+            command = safe_cp(dimg.container_tmp_path('artifact', artifact_dimg.name, 'data').to_s, to, owner, group, include_paths, exclude_paths)
             image.add_command command
-            image.add_volume "#{dimg.tmp_path('artifact', artifact_name)}:#{dimg.container_tmp_path('artifact', artifact_name)}:ro"
+            image.add_volume "#{dimg.tmp_path('artifact', artifact_dimg.name)}:#{dimg.container_tmp_path('artifact', artifact_dimg.name)}:ro"
           end
           # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 

data/lib/dapp/dimg/build/stage/base.rb

@@ -189,10 +189,8 @@ module Dapp
             commits[git_artifact] ||= begin
               if image.built?
                 image.labels[dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash)]
-              elsif g_a_stage? && !empty?
+              else
                 git_artifact.latest_commit
-              elsif prev_stage
-                prev_stage.layer_commit(git_artifact)
               end
             end
           end

data/lib/dapp/dimg/build/stage/before_install.rb

@@ -9,13 +9,12 @@ module Dapp
           end
 
           def empty?
-            super && !dimg.builder.before_install?
+            !dimg.builder.before_install?
           end
 
-          def context
+          def dependencies
             [builder_checksum]
           end
-          alias dependencies context
 
           def builder_checksum
             dimg.builder.before_install_checksum

data/lib/dapp/dimg/build/stage/from.rb

@@ -10,13 +10,29 @@ module Dapp
           protected
 
           def prepare_image
-            try_host_docker_login
-            from_image.pull!
-            raise Error::Build, code: :from_image_not_found, data: { name: from_image_name } unless from_image.tagged?
+            if !from_dimg.nil?
+              process = dimg.dapp.t(code: 'process.layer_building', data: { name: from_dimg.name })
+              dimg.dapp.log_secondary_process(process) { from_dimg.build! }
+            else
+              try_host_docker_login
+              from_image.pull!
+              raise Error::Build, code: :from_image_not_found, data: { name: from_image_name } unless from_image.tagged?
+            end
+
             add_cleanup_mounts_dirs_command
             super
           end
 
+          def from_dimg
+            @from_dimg ||= begin
+              if !dimg.config._from_dimg.nil?
+                dimg.dapp.dimg_layer(config: dimg.config._from_dimg, ignore_git_fetch: dimg.ignore_git_fetch)
+              elsif !dimg.config._from_dimg_artifact.nil?
+                dimg.dapp.artifact_dimg_layer(config: dimg.config._from_dimg_artifact, ignore_git_fetch: dimg.ignore_git_fetch)
+              end
+            end
+          end
+
           def try_host_docker_login
             return unless registry_from_image_name?
             dimg.dapp.host_docker_login(ENV['CI_REGISTRY'])
@@ -55,11 +71,21 @@ module Dapp
           private
 
           def from_image_name
-            dimg.config._docker._from
+            if !from_dimg.nil?
+              from_dimg.signature
+            else
+              dimg.config._docker._from
+            end
           end
 
           def from_image
-            @from_image ||= Image::Stage.image_by_name(name: from_image_name, dapp: dimg.dapp)
+            @from_image ||= begin
+              if !from_dimg.nil?
+                from_dimg.last_stage.image
+              else
+                Image::Stage.image_by_name(name: from_image_name, dapp: dimg.dapp)
+              end
+            end
           end
         end # Prepare
       end # Stage

data/lib/dapp/dimg/build/stage/ga_base.rb

@@ -10,7 +10,7 @@ module Dapp
               image.add_volume "#{dimg.tmp_path('patches')}:#{dimg.container_tmp_path('patches')}:ro"
 
               dimg.git_artifacts.each do |git_artifact|
-                image.add_service_change_label(dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash).to_sym => layer_commit(git_artifact))
+                image.add_service_change_label(dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash).to_sym => git_artifact.latest_commit)
                 image.add_command git_artifact.send(apply_command_method, self)
               end
             end

data/lib/dapp/dimg/build/stage/ga_latest_patch.rb

@@ -28,9 +28,7 @@ module Dapp
           private
 
           def commit_list
-            dimg.git_artifacts
-              .select { |ga| ga.repo.commit_exists?(prev_stage.layer_commit(ga)) && ga.patch_any_changes?(self) }
-              .map(&method(:layer_commit))
+            dimg.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
           end
 
           def git_artifacts_dev_patch_hashes

data/lib/dapp/dimg/build/stage/import_artifact.rb

@@ -31,7 +31,6 @@ module Dapp
           def apply_artifact(artifact, image)
             return if dimg.dapp.dry_run?
 
-            artifact_name = artifact[:name]
             artifact_dimg = artifact[:dimg]
             cwd = artifact[:options][:cwd]
             to = artifact[:options][:to]
@@ -46,15 +45,15 @@ module Dapp
             credentials += "--group=#{group} " if group
             credentials += '--numeric-owner'
 
-            archive_path = dimg.tmp_path('artifact', artifact_name, 'archive.tar.gz')
-            container_archive_path = File.join(artifact_dimg.container_tmp_path(artifact_name), 'archive.tar.gz')
+            archive_path = dimg.tmp_path('artifact', artifact_dimg.name, 'archive.tar.gz')
+            container_archive_path = File.join(artifact_dimg.container_tmp_path(artifact_dimg.name), 'archive.tar.gz')
 
             exclude_paths = artifact[:options][:exclude_paths].map { |path| "--exclude=#{path}" }.join(' ')
             include_paths = include_paths.empty? ? [File.join(cwd, '*')] : include_paths.map { |path| File.join(cwd, path, '*') }
             include_paths.map! { |path| path[1..-1] } # relative path
 
             command = "#{sudo} #{dimg.dapp.tar_bin} #{tar_option_transform(cwd, to)} -czf #{container_archive_path} #{exclude_paths} #{include_paths.join(' ')} #{credentials}"
-            run_artifact_dimg(artifact_dimg, artifact_name, command)
+            run_artifact_dimg(artifact_dimg, command)
 
             image.add_archive archive_path
           end