dapp 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b6165113f304afaf820870c5c598fee4e1479bd
-  data.tar.gz: 88972466d5e6c65afe11935e7f942bb9277053da
+  metadata.gz: 3f7c169bd67fd20777df9d919789eb8a05849e0b
+  data.tar.gz: 6cb60dfa39665c8551ba425cae42a7a3f9513403
 SHA512:
-  metadata.gz: a3f72d1c7e43506f02d5df57543652f1b1d6e33d04552c340cf67b28ae35a2bd5b3e244ae8985ac176d03fdec08c1fb509edf40f1f77880af2ce0e176ef5725b
-  data.tar.gz: 7b51f113c56a01579955a6fb554baa10c69f5a22f8267f0998cc0117a0d2aaff01036971777a2ae849a0b245894df485cf9f4279100c7f90e58e8d1fbec4368a
+  metadata.gz: 380deffddc3206ee8c200015bd71e367f7c9b1b3e04a684acbc2cd539ee75bf9398a09b341ec5ac7f776a34396ccc1f89c203e6bc2c86f8ff370f874b07bf4de
+  data.tar.gz: dcfb3adef54dc705d13a13e1d24c3256d6b1a1d87675a0f3d2fd48db5cb6052fe4da8e5fe184fc58ad399be84087e63f43e6fbe93bdc6fe9e8a818d510f928f6

data/bin/dapp

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

data/config/en/common.yml

@@ -11,20 +11,27 @@ en:
     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}'"
-      chefdk_loading: 'loading chefdk'
-      berks_vendor: 'berks vendor'
+      berks_vendor: 'vendoring cookbooks'
+      chef_cookbooks_stage_berks_vendor: 'vendoring cookbooks for chef cookbooks stage'
       waiting_resouce_lock: "waiting for locked resource '%{name}'"
+      gitartifact_container_loading: 'loading dappdeps/gitartifact container'
+      base_container_loading: 'loading dappdeps/base container'
+      chefdk_container_loading: 'loading dappdeps/chefdk container'
+      system_shellout_container_loading: 'loading system shellout container'
+      image_pull: "pulling image '%{name}'"
+      image_push: "pushing image '%{name}'"
     status:
       process:
         pushing: '[PUSHING]'
+        pulling: '[PULLING]'
         building: '[BUILDING]'
         default: '[RUNNING]'
       success:
         default: '[OK]'
       failed:
+        not_pulled: '[NOT PULLED]'
         default: '[FAILED]'
     state:
       using_cache: '[USING CACHE]'
@@ -32,16 +39,20 @@ en:
       build: '[BUILD]'
       empty: '[EMPTY]'
       push: '[PUSH]'
+      pull: '[PULL]'
     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.'
+      tag_ignored: "WARNING: tag '%{tag}' ignored."
     group:
       install_group: 'Install group'
       setup_group: 'Setup group'
     stage:
       from: 'From'
+      import_artifact: 'Import Artifact'
       before_install: 'Before install'
+      before_install_artifact: 'Before install artifact'
       g_a_archive_dependencies: 'Git artifacts dependencies'
       g_a_archive: 'Git artifacts: create archive'
       install_group:
@@ -50,8 +61,9 @@ en:
         install: 'Install'
         g_a_post_install_patch_dependencies: 'Git artifacts dependencies'
         g_a_post_install_patch: 'Git artifacts: apply patches (after install)'
-      artifact: 'Artifact'
+      after_install_artifact: 'After install artifact'
       before_setup: 'Before setup'
+      before_setup_artifact: 'Before setup artifact'
       setup_group:
         g_a_pre_setup_patch_dependencies: 'Git artifacts dependencies'
         g_a_pre_setup_patch: 'Git artifacts: apply patches (before setup)'
@@ -59,5 +71,8 @@ en:
         chef_cookbooks: 'Сhef сookbooks'
         g_a_post_setup_patch_dependencies: 'Git artifacts dependencies'
         g_a_post_setup_patch: 'Git artifacts: apply patches (after setup)'
+      after_setup_artifact: 'After setup artifact'
       g_a_latest_patch: 'Git artifacts: latest patch'
       docker_instructions: 'Docker instructions'
+      g_a_artifact_patch: 'Git artifacts: artifact patch'
+      build_artifact: 'Build artifact'

data/config/en/net_status.yml

@@ -8,7 +8,7 @@ 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"
+      cookbooks_stage_checksum_not_calculated: "Cookbooks checksum not calculated for stage '%{stage}', run build first"
     dappfile:
       incorrect: "Dappfile with '%{error}':\n%{message}"
     build:
@@ -19,26 +19,35 @@ en:
       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!"
+      command_unexpected_apps_number: "Command 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!"
+      mrproper_required_option: "Expected command option '--all' or '--improper-cache-version-stages'!"
     config:
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
-      docker_from_not_defined: "`docker.from` not defined!"
       artifact_unexpected_attribute: "Artifact doesn't has attribute '%{attr}'!"
+      artifact_conflict: "Conflict between artifacts paths!"
+      scratch_unsupported_directive: "Scratch application has unsupported directive '%{directive}'!"
+      scratch_artifact_required: "Scratch application without artifacts!"
+      scratch_artifact_associated: "Scratch artifact cannot be associated: not expected 'before'/'after' option!"
+      scratch_artifact_docker_from: "Scratch artifact must have directive 'docker.from'!"
+      stage_artifact_not_associated: "Artifact not associated with any stage: expected 'before' or 'after' option!"
+      stage_artifact_double_associate: "Artifact cannot use with both associated options 'before' and 'after'!"
+      stage_artifact_not_supported_associated_stage: "Artifact not supported associated stage '%{stage}'!"
       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"
+      mdapp_dependency_in_metadata_forbidden: "Using mdapp as dependency in metadata.rb forbidden: detected '%{dependency}'"
     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!'
+      page_not_found: "Page '%{url}' 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}')"

data/lib/dapp.rb

@@ -4,6 +4,7 @@ require 'tmpdir'
 require 'digest'
 require 'timeout'
 require 'base64'
+require 'mixlib/cli'
 require 'mixlib/shellout'
 require 'securerandom'
 require 'excon'
@@ -16,13 +17,10 @@ require 'paint'
 require 'net_status'
 
 require 'dapp/version'
+require 'dapp/core_ext/hash'
 require 'dapp/helper/cli'
 require 'dapp/helper/trivia'
 require 'dapp/helper/sha256'
-require 'dapp/helper/i18n'
-require 'dapp/helper/paint'
-require 'dapp/helper/streaming'
-require 'dapp/helper/shellout'
 require 'dapp/helper/net_status'
 require 'dapp/prctl'
 require 'dapp/error/base'
@@ -46,33 +44,47 @@ require 'dapp/cli/push'
 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/stages/flush_local'
+require 'dapp/cli/stages/flush_repo'
+require 'dapp/cli/stages/cleanup_local'
+require 'dapp/cli/stages/cleanup_repo'
+require 'dapp/cli/stages/push'
+require 'dapp/cli/stages/pull'
 require 'dapp/cli/run'
 require 'dapp/cli/cleanup'
 require 'dapp/cli/bp'
+require 'dapp/cli/mrproper'
+require 'dapp/cli/stage_image'
 require 'dapp/filelock'
+require 'dapp/config/directive/artifact'
+require 'dapp/config/directive/chef'
+require 'dapp/config/directive/git_artifact'
+require 'dapp/config/directive/tmp_dir'
+require 'dapp/config/directive/build_dir'
+require 'dapp/config/directive/docker/base'
+require 'dapp/config/directive/docker/artifact'
+require 'dapp/config/directive/shell/base'
+require 'dapp/config/directive/shell/artifact'
 require 'dapp/config/application'
 require 'dapp/config/main'
-require 'dapp/config/chef'
-require 'dapp/config/shell'
 require 'dapp/config/artifact'
-require 'dapp/config/git_artifact'
-require 'dapp/config/docker'
 require 'dapp/builder/base'
 require 'dapp/builder/chef'
 require 'dapp/builder/chef/error'
 require 'dapp/builder/chef/cookbook_metadata'
 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/ga_base'
 require 'dapp/build/stage/ga_dependencies_base'
+require 'dapp/build/stage/artifact_base'
+require 'dapp/build/stage/artifact_default'
 require 'dapp/build/stage/from'
+require 'dapp/build/stage/import_artifact'
 require 'dapp/build/stage/before_install'
+require 'dapp/build/stage/before_install_artifact'
 require 'dapp/build/stage/ga_archive_dependencies'
 require 'dapp/build/stage/ga_archive'
 require 'dapp/build/stage/install/ga_pre_install_patch_dependencies'
@@ -80,32 +92,49 @@ 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/after_install_artifact'
 require 'dapp/build/stage/before_setup'
+require 'dapp/build/stage/before_setup_artifact'
 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/after_setup_artifact'
 require 'dapp/build/stage/ga_latest_patch'
 require 'dapp/build/stage/docker_instructions'
+require 'dapp/build/stage/ga_artifact_patch'
+require 'dapp/build/stage/build_artifact'
 require 'dapp/project/lock'
 require 'dapp/project/ssh_agent'
 require 'dapp/project/dappfile'
-require 'dapp/project/paint'
+require 'dapp/project/command/common'
 require 'dapp/project/command/build'
 require 'dapp/project/command/bp'
 require 'dapp/project/command/cleanup'
-require 'dapp/project/command/common'
+require 'dapp/project/command/mrproper'
+require 'dapp/project/command/stage_image'
 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/command/stages/common'
+require 'dapp/project/command/stages/cleanup_local'
+require 'dapp/project/command/stages/cleanup_repo'
+require 'dapp/project/command/stages/flush_local'
+require 'dapp/project/command/stages/flush_repo'
+require 'dapp/project/command/stages/push'
+require 'dapp/project/command/stages/pull'
 require 'dapp/project/logging/base'
 require 'dapp/project/logging/process'
+require 'dapp/project/logging/paint'
+require 'dapp/project/logging/i18n'
+require 'dapp/project/deps/base'
+require 'dapp/project/deps/gitartifact'
+require 'dapp/project/shellout/streaming'
+require 'dapp/project/shellout/base'
+require 'dapp/project/shellout/system'
 require 'dapp/project'
 require 'dapp/docker_registry'
 require 'dapp/docker_registry/mod/request'
@@ -115,10 +144,13 @@ require 'dapp/docker_registry/default'
 require 'dapp/application/git_artifact'
 require 'dapp/application/path'
 require 'dapp/application/tags'
+require 'dapp/application/stages'
 require 'dapp/application'
+require 'dapp/artifact'
 require 'dapp/image/argument'
 require 'dapp/image/docker'
 require 'dapp/image/stage'
+require 'dapp/image/scratch'
 require 'dapp/git_repo/base'
 require 'dapp/git_repo/own'
 require 'dapp/git_repo/remote'

data/lib/dapp/application.rb

@@ -4,32 +4,28 @@ module Dapp
     include GitArtifact
     include Path
     include Tags
+    include Stages
 
     include Helper::Sha256
 
     attr_reader :config
     attr_reader :ignore_git_fetch
     attr_reader :should_be_built
-    attr_reader :is_artifact
     attr_reader :project
 
-    def initialize(config:, project:, should_be_built: false, ignore_git_fetch: false, is_artifact: false)
+    def initialize(config:, project:, should_be_built: false, ignore_git_fetch: false)
       @config = config
       @project = project
 
-      @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
+
+      raise Error::Application, code: :application_not_built if should_be_built?
     end
 
     def build!
-      raise Error::Application, code: :application_not_built if should_be_built && !last_stage.image.tagged?
-
       with_introspection do
-        project.lock("#{config._basename}.images", shared: true) do
+        project.lock("#{config._basename}.images", readonly: true) do
           last_stage.build_lock! do
             last_stage.build!
             last_stage.save_in_cache!
@@ -41,72 +37,111 @@ module Dapp
     end
 
     def export!(repo, format:)
-      builder.before_application_export
-
-      raise Error::Application, code: :application_not_built unless last_stage.image.tagged? || project.dry_run?
-
-      project.lock("#{config._basename}.images", shared: true) do
+      project.lock("#{config._basename}.images", readonly: 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
+          export_base!(last_stage.image, image_name)
+        end
+      end
+    end
+
+    def export_stages!(repo, format:)
+      project.lock("#{config._basename}.images", readonly: true) do
+        export_images.each do |image|
+          image_name = format % { repo: repo, signature: image.name.split(':').last }
+          export_base!(image, image_name)
+        end
+      end
+    end
+
+    def export_base!(image, image_name)
+      if project.dry_run?
+        project.log_state(image_name, state: project.t(code: 'state.push'), styles: { status: :success })
+      else
+        project.lock("image.#{hashsum image_name}") do
+          Dapp::Image::Stage.cache_reset(image_name)
+          project.log_process(image_name, process: project.t(code: 'status.process.pushing')) do
+            project.with_log_indent do
+              image.export!(image_name)
             end
           end
         end
       end
     end
 
+    def import_stages!(repo, format:)
+      project.lock("#{config._basename}.images", readonly: true) do
+        import_images.each do |image|
+          begin
+            image_name = format % { repo: repo, signature: image.name.split(':').last }
+            import_base!(image, image_name)
+          rescue Error::Shellout
+            next
+          end
+          break unless project.pull_all_stages?
+        end
+      end
+    end
+
+    def import_base!(image, image_name)
+      if project.dry_run?
+        project.log_state(image_name, state: project.t(code: 'state.pull'), styles: { status: :success })
+      else
+        project.lock("image.#{hashsum image_name}") do
+          project.log_process(image_name,
+                              process: project.t(code: 'status.process.pulling'),
+                              status: { failed: project.t(code: 'status.failed.not_pulled') },
+                              style: { failed: :secondary }) do
+            image.import!(image_name)
+          end
+        end
+      end
+    end
+
     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 project.dry_run?
-        project.log_info(cmd)
+        project.log(cmd)
       else
         system(cmd) || raise(Error::Application, code: :application_not_run)
       end
     end
 
-    def signature
-      last_stage.send(:signature)
-    end
-
-    def stage_cache_format
-      "#{project.cache_format % { application_name: config._basename }}:%{signature}"
+    def stage_image_name(stage_name)
+      stages.find { |stage| stage.send(:name) == stage_name }.image.name
     end
 
-    def stage_dapp_label
-      project.stage_dapp_label_format % { application_name: config._basename }
+    def builder
+      @builder ||= Builder.const_get(config._builder.capitalize).new(self)
     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)
+    def artifact?
+      false
     end
 
-    def builder
-      @builder ||= Builder.const_get(config._builder.capitalize).new(self)
+    def scratch?
+      config._docker._from.nil?
     end
 
     protected
 
+    def should_be_built?
+      should_be_built && begin
+        builder.before_application_should_be_built_check
+        !last_stage.image.tagged?
+      end
+    end
+
     def with_introspection
       yield
     rescue Exception::IntrospectImage => e
       data = e.net_status[:data]
-      cmd = "docker run -ti --rm --entrypoint /bin/bash #{data[:options]} #{data[:built_id]}"
+      cmd = "docker run -ti --rm --entrypoint #{project.bash_path} #{data[:options]} #{data[:built_id]}"
       system(cmd).tap do |res|
         project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
         res || raise(Error::Application, code: :application_not_run)
       end
       exit 0
     end
-
-    attr_reader :last_stage
   end # Application
 end # Dapp