dapp 0.5.13 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01676cf63c920ea0e92fe63a31a56b6675bc6292
-  data.tar.gz: 3301444d6c80446d4c1e692e941627db4ed3b60f
+  metadata.gz: 01ccef0d1d810b43eca5b590a2b2509eb66ef5f0
+  data.tar.gz: 6b78e52904754a66a6789d73e9db2a3ecd4e1fe9
 SHA512:
-  metadata.gz: dc8a5ab0d2441d9382e7cd4a1f2f6f1d5cec834c040e31130ce47f76cbfbc2e632d4f557066655bb40e6f0201edf5a4ad54eb701c7c10e99c913d30ee24e8ef0
-  data.tar.gz: cc7078af0e3daa91ab5062538d64ad72cff9b4e87eeee7a0668ed33c19442c4cee2f1a44025265d7d44ff4656c1d176d519cbb80f91a99924d6fe03f52bcf4d4
+  metadata.gz: 4a013f7409fc4a7a543d5cfc12d978dcc38d015b076e49f00161ab8e3012f58527c93d4cf22b44ff5d2401761afc4f5225be0812b4271acfc2cddb597c528aa8
+  data.tar.gz: c7e382cd7d9010cb78bfb380e4fab60b7392cca4fc53596979ab56749dfb765c8a00f28bd1993faffa6c16a5549892c7712bd6811cea01fd70894cbc8222ba1f

data/bin/dapp

@@ -16,4 +16,7 @@ rescue Dapp::Error::Base, NetStatus::Exception => e
 rescue Interrupt => _e
   $stderr.puts(Dapp::Helper::Paint.paint_string('Interrupted', :warning))
   exit 1
+rescue Errno::EACCES => _e
+  $stderr.puts(Dapp::Helper::Paint.paint_string('Permission denied!', :warning))
+  exit 1
 end

data/config/en/common.yml

@@ -3,20 +3,20 @@ en:
     image:
       signature: "signature: %{signature}"
       info:
-        date: "date: %{value}"
+        created_at: "date: %{value}"
         size: "size: %{value} MB"
         difference: "difference: %{value} MB"
       commands: "commands:"
+      instructions: "instructions:"
     process:
       artifact_copy: "copying artifact '%{name}'"
       artifact_building: "building artifact '%{name}'"
+      git_artifact_loading: 'loading git_artifact'
       git_artifact_clone: "cloning remote git_artifact '%{name}'"
       git_artifact_fetch: "fetching remote git_artifact '%{name}'"
-      berks_vendor: 'vendoring cookbooks'
-      chef_cookbooks_stage_berks_vendor: 'vendoring cookbooks for chef cookbooks stage'
-      gitartifact_container_loading: 'loading dappdeps/gitartifact container'
-      chefdk_container_loading: 'loading dappdeps/chefdk container'
-      system_shellout_container_loading: 'loading system shellout container'
+      chefdk_loading: 'loading chefdk'
+      berks_vendor: 'berks vendor'
+      waiting_resouce_lock: "waiting for locked resource '%{name}'"
     status:
       process:
         pushing: '[PUSHING]'
@@ -32,3 +32,32 @@ en:
       build: '[BUILD]'
       empty: '[EMPTY]'
       push: '[PUSH]'
+    warning:
+      excess_builder_instruction: "WARNING: Excessive use of the 'builder' instruction. Builder type will be automatically determined by the first use of any builder."
+      excess_name_instruction: "WARNING: Excessive use of the 'name' instruction. Given name corresponds to default name."
+      another_image_already_tagged: 'WARNING: image with other id already exist.'
+    group:
+      install_group: 'Install group'
+      setup_group: 'Setup group'
+    stage:
+      from: 'From'
+      before_install: 'Before install'
+      g_a_archive_dependencies: 'Git artifacts dependencies'
+      g_a_archive: 'Git artifacts: create archive'
+      install_group:
+        g_a_pre_install_patch_dependencies: 'Git artifacts dependencies'
+        g_a_pre_install_patch: 'Git artifacts: apply patches (before install)'
+        install: 'Install'
+        g_a_post_install_patch_dependencies: 'Git artifacts dependencies'
+        g_a_post_install_patch: 'Git artifacts: apply patches (after install)'
+      artifact: 'Artifact'
+      before_setup: 'Before setup'
+      setup_group:
+        g_a_pre_setup_patch_dependencies: 'Git artifacts dependencies'
+        g_a_pre_setup_patch: 'Git artifacts: apply patches (before setup)'
+        setup: 'Setup'
+        chef_cookbooks: 'Сhef сookbooks'
+        g_a_post_setup_patch_dependencies: 'Git artifacts dependencies'
+        g_a_post_setup_patch: 'Git artifacts: apply patches (after setup)'
+      g_a_latest_patch: 'Git artifacts: latest patch'
+      docker_instructions: 'Docker instructions'

data/config/en/net_status.yml

@@ -8,25 +8,39 @@ en:
       application_not_run: "Application run failed!"
       git_branch_without_name: "Application has specific revision that isn't associated with a branch name!"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
+      cookbooks_stage_checksum_not_caclculated: "Cookbooks checksum not calculated for stage '%{stage}', run build first"
     dappfile:
       incorrect: "Dappfile with '%{error}':\n%{message}"
     build:
       from_image_required: 'Missing from_image!'
       image_already_untagged: "Image `%{name}` already untagged!"
       image_not_exist: "Image `%{name}` not exist!"
-      another_image_already_tagged: 'Image with other id already tagged!'
       built_id_not_defined: '`from.built_id` not defined!'
-    controller:
-      push_command_unexpected_apps_number: "Push command can process only one application!"
-      run_command_unexpected_apps_number: "Run command can process only one application!"
-      no_such_app: "No such app: '%{patterns}'!"
+      from_image_not_found: 'Image `%{name}` not found!'
+    project:
+      spush_command_unexpected_apps_number: "Command 'spush' can process only one application!"
+      run_command_unexpected_apps_number: "Command 'run' can process only one application!"
+      no_such_app: "No such app: '%{apps_patterns}'!"
       dappfile_not_found: "Dappfile not found!"
+      cannot_run_ssh_agent: "Cannot run ssh-agent"
+      ssh_key_not_found: "Ssh key '%{path}' not exist!"
     config:
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
-      docker_from_not_defined: "Docker `from` not defined!"
+      docker_from_not_defined: "`docker.from` not defined!"
       artifact_unexpected_attribute: "Artifact doesn't has attribute '%{attr}'!"
       git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't has attribute '%{attr}'!"
+      docker_from_incorrect: "`docker.from` has incorrect value `%{name}`: expected format `image_name:tag`!"
       app_name_incorrect: "Application has incorrect name '%{name}': doesn't match regex '%{reg}'!"
     chef:
       stage_path_overlap: "Cannot install '%{cookbook}' cookbook's path %{from} into %{to}: already exists"
+    registry:
+      incorrect_repo: 'Incorrect repository!'
+      no_such_app: 'No such app in registry!'
+      authenticate_type_not_supported: 'Registry authenticate type not supported!'
+      not_found: 'Registry not found!'
+      user_not_authorized: 'User not authorized!'
+      response_with_error_status: 'Response with error status!'
+      berksfile_absolute_path_forbidden: "Absolute paths in Berksfile are not allowed (cookbook '%{cookbook}', path: '%{path}')"
+    lock:
+      timeout: "Could not obtain lock for '%{name}' within %{timeout} seconds"

data/lib/dapp.rb

@@ -20,28 +20,37 @@ require 'dapp/helper/cli'
 require 'dapp/helper/trivia'
 require 'dapp/helper/sha256'
 require 'dapp/helper/i18n'
-require 'dapp/helper/log'
 require 'dapp/helper/paint'
 require 'dapp/helper/streaming'
 require 'dapp/helper/shellout'
 require 'dapp/helper/net_status'
+require 'dapp/prctl'
 require 'dapp/error/base'
 require 'dapp/error/application'
 require 'dapp/error/dappfile'
 require 'dapp/error/build'
 require 'dapp/error/config'
-require 'dapp/error/controller'
+require 'dapp/error/project'
 require 'dapp/error/shellout'
+require 'dapp/error/registry'
+require 'dapp/exception/base'
+require 'dapp/exception/introspect_image'
+require 'dapp/exception/registry'
+require 'dapp/lock/error'
+require 'dapp/lock/base'
+require 'dapp/lock/file'
 require 'dapp/cli'
 require 'dapp/cli/base'
 require 'dapp/cli/build'
 require 'dapp/cli/push'
-require 'dapp/cli/smartpush'
+require 'dapp/cli/spush'
 require 'dapp/cli/list'
 require 'dapp/cli/stages'
 require 'dapp/cli/stages/flush'
 require 'dapp/cli/stages/cleanup'
 require 'dapp/cli/run'
+require 'dapp/cli/cleanup'
+require 'dapp/cli/bp'
 require 'dapp/filelock'
 require 'dapp/config/application'
 require 'dapp/config/main'
@@ -58,35 +67,54 @@ require 'dapp/builder/chef/berksfile'
 require 'dapp/builder/shell'
 require 'dapp/build/stage/mod/artifact'
 require 'dapp/build/stage/mod/logging'
+require 'dapp/build/stage/mod/group'
 require 'dapp/build/stage/base'
-require 'dapp/build/stage/source_base'
-require 'dapp/build/stage/source_dependencies_base'
+require 'dapp/build/stage/ga_base'
+require 'dapp/build/stage/ga_dependencies_base'
 require 'dapp/build/stage/from'
-require 'dapp/build/stage/infra_install'
-require 'dapp/build/stage/infra_setup'
-require 'dapp/build/stage/install'
+require 'dapp/build/stage/before_install'
+require 'dapp/build/stage/ga_archive_dependencies'
+require 'dapp/build/stage/ga_archive'
+require 'dapp/build/stage/install/ga_pre_install_patch_dependencies'
+require 'dapp/build/stage/install/ga_pre_install_patch'
+require 'dapp/build/stage/install/install'
+require 'dapp/build/stage/install/ga_post_install_patch_dependencies'
+require 'dapp/build/stage/install/ga_post_install_patch'
 require 'dapp/build/stage/artifact'
-require 'dapp/build/stage/setup'
-require 'dapp/build/stage/chef_cookbooks'
-require 'dapp/build/stage/source_1_archive'
-require 'dapp/build/stage/source_1_archive_dependencies'
-require 'dapp/build/stage/source_1'
-require 'dapp/build/stage/source_1_dependencies'
-require 'dapp/build/stage/source_2'
-require 'dapp/build/stage/source_2_dependencies'
-require 'dapp/build/stage/source_3'
-require 'dapp/build/stage/source_3_dependencies'
-require 'dapp/build/stage/source_4'
-require 'dapp/build/stage/source_4_dependencies'
-require 'dapp/build/stage/source_5'
+require 'dapp/build/stage/before_setup'
+require 'dapp/build/stage/setup/ga_pre_setup_patch_dependencies'
+require 'dapp/build/stage/setup/ga_pre_setup_patch'
+require 'dapp/build/stage/setup/setup'
+require 'dapp/build/stage/setup/chef_cookbooks'
+require 'dapp/build/stage/setup/ga_post_setup_patch_dependencies'
+require 'dapp/build/stage/setup/ga_post_setup_patch'
+require 'dapp/build/stage/ga_latest_patch'
 require 'dapp/build/stage/docker_instructions'
-require 'dapp/controller'
+require 'dapp/project/lock'
+require 'dapp/project/ssh_agent'
+require 'dapp/project/dappfile'
+require 'dapp/project/paint'
+require 'dapp/project/command/build'
+require 'dapp/project/command/bp'
+require 'dapp/project/command/cleanup'
+require 'dapp/project/command/common'
+require 'dapp/project/command/list'
+require 'dapp/project/command/push'
+require 'dapp/project/command/run'
+require 'dapp/project/command/spush'
+require 'dapp/project/command/stages_flush'
+require 'dapp/project/command/stages_cleanup'
+require 'dapp/project/logging/base'
+require 'dapp/project/logging/process'
+require 'dapp/project'
+require 'dapp/docker_registry'
+require 'dapp/docker_registry/mod/request'
+require 'dapp/docker_registry/mod/authorization'
+require 'dapp/docker_registry/base'
+require 'dapp/docker_registry/default'
 require 'dapp/application/git_artifact'
-require 'dapp/application/logging'
 require 'dapp/application/path'
 require 'dapp/application/tags'
-require 'dapp/application/deps/gitartifact'
-require 'dapp/application/system_shellout'
 require 'dapp/application'
 require 'dapp/image/argument'
 require 'dapp/image/docker'
@@ -95,8 +123,6 @@ require 'dapp/git_repo/base'
 require 'dapp/git_repo/own'
 require 'dapp/git_repo/remote'
 require 'dapp/git_artifact'
-require 'dapp/exception/base'
-require 'dapp/exception/introspect_image'
 
 # Dapp
 module Dapp

data/lib/dapp/application.rb

@@ -1,54 +1,63 @@
 module Dapp
   # Application
   class Application
-    include Helper::Log
-    include Helper::Shellout
-    include Helper::I18n
-    include Helper::Sha256
-    include Logging
     include GitArtifact
     include Path
     include Tags
-    include Deps::Gitartifact
-    include SystemShellout
-    include Dapp::Filelock
+
+    include Helper::Sha256
 
     attr_reader :config
-    attr_reader :cli_options
     attr_reader :ignore_git_fetch
+    attr_reader :should_be_built
     attr_reader :is_artifact
+    attr_reader :project
 
-    def initialize(config:, cli_options:, ignore_git_fetch: false, is_artifact: false)
+    def initialize(config:, project:, should_be_built: false, ignore_git_fetch: false, is_artifact: false)
       @config = config
-      @cli_options = cli_options
+      @project = project
 
-      @tmp_path = Dir.mktmpdir(cli_options[:tmp_dir_prefix] || 'dapp-')
-      @build_path = cli_options[:build_dir] || home_path('.dapps-build')
+      @tmp_path = Dir.mktmpdir(project.cli_options[:tmp_dir_prefix] || 'dapp-')
 
       @last_stage = Build::Stage::DockerInstructions.new(self)
       @ignore_git_fetch = ignore_git_fetch
+      @should_be_built = should_be_built
       @is_artifact = is_artifact
     end
 
     def build!
+      raise Error::Application, code: :application_not_built if should_be_built && !last_stage.image.tagged?
+
       with_introspection do
-        last_stage.build!
-        last_stage.save_in_cache!
+        project.lock("#{config._basename}.images", shared: true) do
+          last_stage.build_lock! do
+            last_stage.build!
+            last_stage.save_in_cache!
+          end
+        end
       end
     ensure
       FileUtils.rm_rf(tmp_path)
     end
 
-    def export!(repo)
-      raise Error::Application, code: :application_not_built unless last_stage.image.tagged? || dry_run?
+    def export!(repo, format:)
+      builder.before_application_export
+
+      raise Error::Application, code: :application_not_built unless last_stage.image.tagged? || project.dry_run?
 
-      tags.each do |tag|
-        image_name = [repo, tag].join(':')
-        if dry_run?
-          log_state(image_name, state: t(code: 'state.push'), styles: { status: :success })
-        else
-          log_process(image_name, process: t(code: 'status.process.pushing')) do
-            last_stage.image.export!(image_name, log_verbose: log_verbose?, log_time: log_time?, force: cli_options[:force])
+      project.lock("#{config._basename}.images", shared: true) do
+        tags.each do |tag|
+          image_name = format % { repo: repo, application_name: config._name, tag: tag }
+          if project.dry_run?
+            project.log_state(image_name, state: project.t(code: 'state.push'), styles: { status: :success })
+          else
+            project.lock("image.#{image_name.gsub('/', '__')}") do
+              Dapp::Image::Stage.cache_reset(image_name)
+              project.log_process(image_name, process: project.t(code: 'status.process.pushing')) do
+                last_stage.image.export!(image_name, log_verbose: project.log_verbose?,
+                                                     log_time: project.log_time?)
+              end
+            end
           end
         end
       end
@@ -57,8 +66,8 @@ module Dapp
     def run(docker_options, command)
       raise Error::Application, code: :application_not_built unless last_stage.image.tagged?
       cmd = "docker run #{[docker_options, last_stage.image.name, command].flatten.compact.join(' ')}"
-      if dry_run?
-        log_info(cmd)
+      if project.dry_run?
+        project.log_info(cmd)
       else
         system(cmd) || raise(Error::Application, code: :application_not_run)
       end
@@ -68,6 +77,18 @@ module Dapp
       last_stage.send(:signature)
     end
 
+    def stage_cache_format
+      "#{project.cache_format % { application_name: config._basename }}:%{signature}"
+    end
+
+    def stage_dapp_label
+      project.stage_dapp_label_format % { application_name: config._basename }
+    end
+
+    def artifact(config)
+      self.class.new(config: config, project: project, ignore_git_fetch: ignore_git_fetch, is_artifact: true, should_be_built: should_be_built)
+    end
+
     def builder
       @builder ||= Builder.const_get(config._builder.capitalize).new(self)
     end
@@ -80,7 +101,7 @@ module Dapp
       data = e.net_status[:data]
       cmd = "docker run -ti --rm --entrypoint /bin/bash #{data[:options]} #{data[:built_id]}"
       system(cmd).tap do |res|
-        shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
+        project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
         res || raise(Error::Application, code: :application_not_run)
       end
       exit 0

data/lib/dapp/application/git_artifact.rb

@@ -16,7 +16,7 @@ module Dapp
 
       def remote_git_artifacts
         @remote_git_artifact_list ||= Array(config._git_artifact._remote).map do |ga_config|
-          repo = GitRepo::Remote.new(self, ga_config._name, url: ga_config._url, ssh_key_path: ga_config._ssh_key_path)
+          repo = GitRepo::Remote.new(self, ga_config._name, url: ga_config._url)
           repo.fetch!(ga_config._branch)
           Dapp::GitArtifact.new(repo, **ga_config._artifact_options)
         end

data/lib/dapp/application/path.rb

@@ -11,18 +11,8 @@ module Dapp
         make_path(@tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }
       end
 
-      def build_path(*path)
-        make_path(@build_path, home_path.basename, *path).expand_path.tap { |p| p.parent.mkpath }
-      end
-
-      def project_path
-        @project_path ||= begin
-          if File.basename(expand_path(home_path, 1)) == '.dapps'
-            expand_path(home_path, 2)
-          else
-            home_path
-          end
-        end
+      def build_path
+        project.build_path.join(config._basename)
       end
 
       def container_dapp_path(*path)
@@ -38,12 +28,6 @@ module Dapp
       def make_path(base, *path)
         path.compact.map(&:to_s).inject(Pathname.new(base), &:+)
       end
-
-      def expand_path(path, number = 1)
-        path = File.expand_path(path)
-        number.times.each { path = File.dirname(path) }
-        path
-      end
     end # Path
   end # Application
 end # Dapp

data/lib/dapp/application/tags.rb

@@ -16,23 +16,23 @@ module Dapp
       end
 
       def simple_tags
-        cli_options[:tag]
+        project.cli_options[:tag]
       end
 
       def branch_tags
-        return [] unless cli_options[:tag_branch]
+        return [] unless project.cli_options[:tag_branch]
         raise Error::Application, code: :git_branch_without_name if (branch = git_repo.branch) == 'HEAD'
         [branch]
       end
 
       def commit_tags
-        return [] unless cli_options[:tag_commit]
+        return [] unless project.cli_options[:tag_commit]
         commit = git_repo.latest_commit
         [commit]
       end
 
       def build_tags
-        return [] unless cli_options[:tag_build_id]
+        return [] unless project.cli_options[:tag_build_id]
 
         if ENV['GITLAB_CI']
           build_id = ENV['CI_BUILD_ID']
@@ -46,7 +46,7 @@ module Dapp
       end
 
       def ci_tags
-        return [] unless cli_options[:tag_ci]
+        return [] unless project.cli_options[:tag_ci]
 
         if ENV['GITLAB_CI']
           branch = ENV['CI_BUILD_REF_NAME']