dapp 0.7.24 → 0.7.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5ff393b9a62aa273cec389c96fcbef80d2ad14b
-  data.tar.gz: 208c4ff07ab82f1568a20650941666bb45502869
+  metadata.gz: edf33f0121fa04840347b6b5c1378833a9b8f147
+  data.tar.gz: 8ca914be38675be877a226f12e7f845c9dc5d3b1
 SHA512:
-  metadata.gz: cf6c726e0477a26497852b4a9ad5842de3ae75cdcd1051670f1258a3a107c1f3dda3a384346bddba518d1db3fec42a2799db6de11f38f28f8df49a6cee0f15c6
-  data.tar.gz: 4f26f2d25f6d2a361989603f45860cfca08402f4cfb711c144485a4275c3071252675b50d16419965d2e174c2c42a5e8ffb0d5f7b6d5b7e33cfbe875192b2413
+  metadata.gz: 8e28d60430d685361cc56eb0fda74c7be4c147eef08967926750ecab92a785f8847ffe5e2b4f38918d52a8a484fcfc4e7973f37fb0706d2f7230395ce24f3e35
+  data.tar.gz: 17814dc0723adc95f2a1a0733e2d414e987560f8173e1c2c3998a10d966927d223b9f78f7b46ca8cfcc86331c37302e10ab7cb687e6930de4ba5ffcb79ff735c

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

@@ -59,8 +59,7 @@ module Dapp
 
         def save_in_cache!
           prev_stage.save_in_cache! if prev_stage
-          return unless should_be_tagged?
-          image.save_in_cache! unless dimg.project.dry_run?
+          image.save_in_cache! if should_be_tagged? && !dimg.project.dry_run?
         end
 
         def image
@@ -157,12 +156,7 @@ module Dapp
         end
 
         def should_be_tagged?
-          !(empty? || image.tagged? || should_be_not_present?) && image.built?
-        end
-
-        def should_be_not_present?
-          return false if next_stage.nil?
-          next_stage.image.tagged? || next_stage.should_be_not_present?
+          !(empty? || image.tagged?) && image.built?
         end
 
         def image_name

data/lib/dapp/build/stage/mod/logging.rb

@@ -8,7 +8,6 @@ module Dapp
           def log_image_build(&image_build)
             if empty?                            then log_state(:empty)
             elsif image.tagged?                  then log_state(:using_cache)
-            elsif should_be_not_present?         then log_state(:not_present)
             elsif dimg.project.dry_run?          then log_state(:build, styles: { status: :success })
             else log_image_build_process(&image_build)
             end

data/lib/dapp/dimg.rb

@@ -31,7 +31,9 @@ module Dapp
               builder.before_build_check
               last_stage.build!
             ensure
-              last_stage.save_in_cache! if last_stage.image.built? || dev_mode?
+              last_stage.save_in_cache! if last_stage.image.built? ||    # after all stages built
+                                             last_stage.image.tagged? || # some stage cache wasn't presented
+                                             dev_mode?
             end
           end
         end

data/lib/dapp/git_repo/remote.rb

@@ -39,12 +39,6 @@ module Dapp
       protected
 
       attr_reader :url
-
-      def lookup_commit(commit)
-        super
-      rescue Rugged::OdbError => _e
-        raise Error::Rugged, code: :commit_not_found_in_remote_git_repository, data: { commit: commit, url: url }
-      end
     end
   end
 end

data/lib/dapp/project/command/mrproper.rb

@@ -11,20 +11,24 @@ module Dapp
 
             project_dangling_images_flush
 
-            flush_by_label('dapp') if proper_all?
-            flush_by_label('dapp-dev-mode', adding_message: '(dev)') if proper_all? || proper_dev_mode_cache?
-            log_proper_cache do
-              proper_cache_images = proper_cache_all_images
-              remove_images(dapp_images_by_label('dapp').select { |id| !proper_cache_images.include?(id) }.map(&:strip))
-            end if proper_cache_version?
+            if proper_all?
+              flush_by_label('dapp')
+            elsif proper_dev_mode_cache?
+              flush_by_label('dapp-dev-mode')
+            elsif proper_cache_version?
+              log_proper_cache do
+                proper_cache_images = proper_cache_all_images
+                remove_images(dapp_images_by_label('dapp').select { |id| !proper_cache_images.include?(id) }.map(&:strip))
+              end
+            end
           end
         end
 
         protected
 
-        def flush_by_label(label, adding_message: nil)
-          log_step_with_indent([:containers, adding_message].compact.join(' ')) { dapp_containers_flush_by_label(label) }
-          log_step_with_indent([:images, adding_message].compact.join(' ')) { dapp_images_flush_by_label(label) }
+        def flush_by_label(label)
+          log_step_with_indent(:containers) { dapp_containers_flush_by_label(label) }
+          log_step_with_indent(:images) { dapp_images_flush_by_label(label) }
         end
 
         def proper_all?

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.24'.freeze
+  VERSION = '0.7.25'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.24
+  version: 0.7.25
 platform: ruby
 authors:
 - Dmitry Stolyarov