dapp 0.24.4 → 0.24.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9a285aead0a2e57006e54a0839ab32cf4170529
-  data.tar.gz: cd58972b2de67689e2173bffe9524a0623e79bc1
+  metadata.gz: ed725aab664bfb2ec80a0c818bd83cf216dffadb
+  data.tar.gz: 8b64733931dc8da20c647c400510152fcf4eb044
 SHA512:
-  metadata.gz: 9dbb053e622ce8ac204b9529dbf2c1ca266b22a4f46fec3736963861b5e74148ff19f423e297c1a3a9d0fd44afeeb787c3a448978ab2d0219273a23448eca36f
-  data.tar.gz: f15547e0e17c93ba3e39ec915a1413b6445392212c9779333aa9d6742888b86d1291ee6d4be3f830dc79a21fe7af88001b32a428fbf64111da2d58eba3842772
+  metadata.gz: 6f50ab878df68cd4693eb6682fa9094bcf24bf94b29743daab8853718c0a3c3cc9c2e371a13e0cf3db53914112231f82b0020c07c947664eb8a7b38335e04c93
+  data.tar.gz: a4010b1a1d54582f3ad08368ddc70011f1785d503e15f762f9cf12047329d016c7737c7061d1ae180dd1ba56d2b7a6fcb5222049bb5df42b87152c4c4fb3db3f

data/lib/dapp/dimg/artifact.rb

@@ -16,8 +16,8 @@ module Dapp
         false
       end
 
-      def last_stage
-        @last_stage ||= Build::Stage::BuildArtifact.new(self)
+      def last_stage_class
+        Build::Stage::BuildArtifact
       end
     end # Artifact
   end # Dimg

data/lib/dapp/dimg/dapp/command/common.rb

@@ -83,15 +83,23 @@ module Dapp
           end
 
           def ignore_used_images(images_ids_or_names)
-            images_ids_or_names.select do |image_id_or_name|
-              res = run_command(%(#{host_docker} ps -a -q --filter=ancestor=#{image_id_or_name}))
-              if res && !res.stdout.strip.empty? && !dry_run?
-                log_info("Skip `#{image_id_or_name}` (used by containers: #{res.stdout.strip.split.join(' ')})")
-                false
-              else
+            not_used_images = proc do |*image_id_or_name, log: true|
+              images = image_id_or_name.flatten
+              filters = images.map { |iion| "--filter=ancestor=#{iion}" }.join(' ')
+              res = shellout!(%(#{host_docker} ps -a -q #{filters})).stdout.strip
+              if res.empty?
                 true
+              else
+                log_info("Skip `#{images.join('`, `')}` (used by containers: #{res.split.join(' ')})") if log
+                false
               end
             end
+
+            if not_used_images.call(images_ids_or_names, log: false)
+              images_ids_or_names
+            else
+              images_ids_or_names.select(&not_used_images)
+            end
           end
 
           def remove_containers_by_query(containers_query)

data/lib/dapp/dimg/dimg/git_artifact.rb

@@ -9,7 +9,7 @@ module Dapp
         def local_git_artifacts
           @local_git_artifact_list ||= [].tap do |artifacts|
             break artifacts if (local_git_artifacts = Array(config._git_artifact._local)).empty?
-            repo = GitRepo::Own.new(self)
+            repo = GitRepo::Own.new(dapp)
             local_git_artifacts.map do |ga_config|
               artifacts.concat(generate_git_artifacts(repo, **ga_config._artifact_options))
             end
@@ -19,7 +19,10 @@ module Dapp
         def remote_git_artifacts
           @remote_git_artifact_list ||= [].tap do |artifacts|
             Array(config._git_artifact._remote).each do |ga_config|
-              repo = GitRepo::Remote.new(self, ga_config._name, url: ga_config._url).tap { |r| r.fetch!(ga_config._branch) }
+              repo = GitRepo::Remote.get_or_create(dapp, ga_config._name,
+                                                   url: ga_config._url,
+                                                   branch: ga_config._branch,
+                                                   ignore_git_fetch: ignore_git_fetch)
               artifacts.concat(generate_git_artifacts(repo, **ga_config._artifact_options))
             end
           end
@@ -27,7 +30,7 @@ module Dapp
 
         def generate_git_artifacts(repo, **git_artifact_options)
           [].tap do |artifacts|
-            artifacts << (artifact = ::Dapp::Dimg::GitArtifact.new(repo, **git_artifact_options))
+            artifacts << (artifact = ::Dapp::Dimg::GitArtifact.new(repo, self, **git_artifact_options))
             artifacts.concat(generate_git_embedded_artifacts(artifact))
           end
         end

data/lib/dapp/dimg/dimg/stages.rb

@@ -31,13 +31,25 @@ module Dapp
           stages + artifacts.map(&:all_stages).flatten
         end
 
+        def last_stage
+          @last_stage || begin
+            (self.last_stage = last_stage_class.new(self)).tap do |stage|
+              dapp.log_secondary_process("#{config._name || 'nameless'}: calculating stages signatures") do
+                stage.signature
+              end
+            end
+          end
+        end
+
         protected
 
-        def last_stage
-          @last_stage ||= if scratch?
-            Build::Stage::ImportArtifact.new(self)
+        attr_writer :last_stage
+
+        def last_stage_class
+          if scratch?
+            Build::Stage::ImportArtifact
           else
-            Build::Stage::DockerInstructions.new(self)
+            Build::Stage::DockerInstructions
           end
         end
 

data/lib/dapp/dimg/git_artifact.rb

@@ -12,10 +12,11 @@ module Dapp
       # FIXME: переименовать cwd в from
 
       # rubocop:disable Metrics/ParameterLists
-      def initialize(repo, to:, name: nil, branch: nil, commit: nil,
+      def initialize(repo, dimg, to:, name: nil, branch: nil, commit: nil,
                      cwd: nil, include_paths: nil, exclude_paths: nil, owner: nil, group: nil, as: nil,
                      stages_dependencies: {})
         @repo = repo
+        @dimg = dimg
         @name = name
 
         @branch = branch || repo.dapp.options[:git_artifact_branch] || repo.branch
@@ -69,17 +70,19 @@ module Dapp
         embedded_rel_path = embedded_params[:path]
         embedded_repo     = begin
           if embedded_params[:type] == :remote
-            GitRepo::Remote.new(repo.dimg, embedded_rel_path,
-                                url: embedded_params[:url]).tap { |r| r.fetch!(embedded_params[:branch]) }
+            GitRepo::Remote.get_or_create(repo.dapp, embedded_rel_path,
+                                          url: embedded_params[:url],
+                                          branch: embedded_params[:branch],
+                                          ignore_git_fetch: dimg.ignore_git_fetch )
           elsif embedded_params[:type] == :local
             embedded_path = File.join(repo.workdir_path, embedded_params[:path])
-            GitRepo::Local.new(repo.dimg, embedded_rel_path, embedded_path)
+            GitRepo::Local.new(repo.dapp, embedded_rel_path, embedded_path)
           else
             raise
           end
         end
 
-        self.class.new(embedded_repo, embedded_artifact_options(embedded_params))
+        self.class.new(embedded_repo, dimg, embedded_artifact_options(embedded_params))
       end
 
       def embedded_artifact_options(embedded_params)
@@ -293,6 +296,7 @@ module Dapp
         Digest::SHA256.hexdigest args.compact.map {|arg| arg.to_s.force_encoding("ASCII-8BIT")}.join(":::")
       end
 
+      attr_reader :dimg
       attr_reader :to
       attr_reader :commit
       attr_reader :branch
@@ -316,11 +320,11 @@ module Dapp
         else
           archive_file_with_tar_writer(stage, commit)
         end
-        repo.dimg.container_tmp_path('archives', archive_file_name(commit))
+        dimg.container_tmp_path('archives', archive_file_name(commit))
       end
 
       def archive_file_with_tar_writer(stage, commit)
-        tar_write(repo.dimg.tmp_path('archives', archive_file_name(commit))) do |tar|
+        tar_write(dimg.tmp_path('archives', archive_file_name(commit))) do |tar|
           each_archive_entry(stage, commit) do |path, content, mode|
             if mode == 0o120000 # symlink
               tar.add_symlink path, content, mode
@@ -336,10 +340,10 @@ module Dapp
       end
 
       def archive_file_with_system_tar(stage, commit)
-        repo.dimg.tmp_path('archives', archive_file_name(commit)).tap do |archive_path|
+        dimg.tmp_path('archives', archive_file_name(commit)).tap do |archive_path|
           relative_archive_file_path = File.join('archives_files', file_name(commit))
           each_archive_entry(stage, commit) do |path, content, mode|
-            file_path = repo.dimg.tmp_path(relative_archive_file_path, path)
+            file_path = dimg.tmp_path(relative_archive_file_path, path)
 
             if mode == 0o120000 # symlink
               FileUtils.symlink(content, file_path)
@@ -349,7 +353,7 @@ module Dapp
             end
           end
 
-          repo.dapp.shellout!("tar -C #{repo.dimg.tmp_path(relative_archive_file_path)} -cf #{archive_path} .")
+          repo.dapp.shellout!("tar -C #{dimg.tmp_path(relative_archive_file_path)} -cf #{archive_path} .")
         end
       end
 
@@ -375,10 +379,10 @@ module Dapp
       end
 
       def patch_file(stage, from_commit, to_commit)
-        File.open(repo.dimg.tmp_path('patches', patch_file_name(from_commit, to_commit)), File::RDWR | File::CREAT) do |f|
+        File.open(dimg.tmp_path('patches', patch_file_name(from_commit, to_commit)), File::RDWR | File::CREAT) do |f|
           diff_patches(from_commit, to_commit).each { |patch| f.write change_patch_new_file_path(stage, patch) }
         end
-        repo.dimg.container_tmp_path('patches', patch_file_name(from_commit, to_commit))
+        dimg.container_tmp_path('patches', patch_file_name(from_commit, to_commit))
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -548,7 +552,7 @@ module Dapp
       end
 
       def dev_mode?
-        local? && repo.dimg.dev_mode?
+        local? && dimg.dev_mode?
       end
 
       def local?

data/lib/dapp/dimg/git_repo/base.rb

@@ -6,32 +6,13 @@ module Dapp
         include Helper::Trivia
 
         attr_reader :name
+        attr_reader :dapp
 
-        def initialize(manager, name)
-          @manager = manager
+        def initialize(dapp, name)
+          @dapp = dapp
           @name = name
         end
 
-        def dapp
-          @dapp ||= begin
-            if manager.is_a? ::Dapp::Dapp
-              manager
-            else
-              dimg.dapp
-            end
-          end
-        end
-
-        def dimg
-          @dimg ||= begin
-            if manager.is_a? ::Dapp::Dimg::Dimg
-              manager
-            else
-              raise
-            end
-          end
-        end
-
         def exclude_paths
           []
         end
@@ -208,8 +189,6 @@ module Dapp
 
         protected
 
-        attr_reader :manager
-
         def git(**kwargs)
           @git ||= Rugged::Repository.new(path.to_s, **kwargs)
         end

data/lib/dapp/dimg/git_repo/local.rb

@@ -4,8 +4,8 @@ module Dapp
       class Local < Base
         attr_reader :path
 
-        def initialize(manager, name, path)
-          super(manager, name)
+        def initialize(dapp, name, path)
+          super(dapp, name)
           self.path = path
         end
 

data/lib/dapp/dimg/git_repo/own.rb

@@ -2,12 +2,8 @@ module Dapp
   module Dimg
     module GitRepo
       class Own < Local
-        def initialize(manager)
-          super(manager, 'own', nil)
-        end
-
-        def path=(_)
-          super(dapp.path.to_s)
+        def initialize(dapp)
+          super(dapp, 'own', dapp.path.to_s)
         end
 
         def exclude_paths

data/lib/dapp/dimg/git_repo/remote.rb

@@ -5,9 +5,31 @@ module Dapp
         CACHE_VERSION = 1
 
         attr_reader :url
+        attr_reader :path
+
+        class << self
+          def get_or_create(dapp, name, url:, branch:, ignore_git_fetch: false)
+            key         = [url, branch, ignore_git_fetch]
+            inverse_key = [url, branch, !ignore_git_fetch]
+
+            repositories[key] ||= begin
+              if repositories.key?(inverse_key)
+                repositories[inverse_key]
+              else
+                new(dapp, name, url: url)
+              end.tap do |repo|
+                repo.fetch!(branch, ignore_git_fetch: ignore_git_fetch) unless ignore_git_fetch
+              end
+            end
+          end
+
+          def repositories
+            @repositories ||= {}
+          end
+        end
 
-        def initialize(dimg, name, url:)
-          super(dimg, name)
+        def initialize(dapp, name, url:)
+          super(dapp, name)
 
           @url = url
 
@@ -41,10 +63,10 @@ module Dapp
         end
 
         def path
-          Pathname(dimg.build_path("remote_git_repo", CACHE_VERSION.to_s, name).to_s)
+          Pathname(dapp.build_path("remote_git_repo", CACHE_VERSION.to_s, name).to_s)
         end
 
-        def fetch!(branch = nil)
+        def fetch!(branch = nil, ignore_git_fetch: false)
           _with_lock do
             branch ||= self.branch
 
@@ -66,7 +88,7 @@ module Dapp
               end
               raise Error::Rugged, code: :branch_not_exist_in_remote_git_repository, data: { branch: branch, url: url } unless branch_exist?(branch)
             end
-          end unless dimg.ignore_git_fetch || dapp.dry_run?
+          end unless ignore_git_fetch || dapp.dry_run?
         end
 
         def branch_exist?(name)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.24.4"
+  VERSION = "0.24.5"
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.24.4
+  version: 0.24.5
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout