dapp 0.7.24 → 0.7.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d5ff393b9a62aa273cec389c96fcbef80d2ad14b
4
- data.tar.gz: 208c4ff07ab82f1568a20650941666bb45502869
3
+ metadata.gz: edf33f0121fa04840347b6b5c1378833a9b8f147
4
+ data.tar.gz: 8ca914be38675be877a226f12e7f845c9dc5d3b1
5
5
  SHA512:
6
- metadata.gz: cf6c726e0477a26497852b4a9ad5842de3ae75cdcd1051670f1258a3a107c1f3dda3a384346bddba518d1db3fec42a2799db6de11f38f28f8df49a6cee0f15c6
7
- data.tar.gz: 4f26f2d25f6d2a361989603f45860cfca08402f4cfb711c144485a4275c3071252675b50d16419965d2e174c2c42a5e8ffb0d5f7b6d5b7e33cfbe875192b2413
6
+ metadata.gz: 8e28d60430d685361cc56eb0fda74c7be4c147eef08967926750ecab92a785f8847ffe5e2b4f38918d52a8a484fcfc4e7973f37fb0706d2f7230395ce24f3e35
7
+ data.tar.gz: 17814dc0723adc95f2a1a0733e2d414e987560f8173e1c2c3998a10d966927d223b9f78f7b46ca8cfcc86331c37302e10ab7cb687e6930de4ba5ffcb79ff735c
@@ -59,8 +59,7 @@ module Dapp
59
59
 
60
60
  def save_in_cache!
61
61
  prev_stage.save_in_cache! if prev_stage
62
- return unless should_be_tagged?
63
- image.save_in_cache! unless dimg.project.dry_run?
62
+ image.save_in_cache! if should_be_tagged? && !dimg.project.dry_run?
64
63
  end
65
64
 
66
65
  def image
@@ -157,12 +156,7 @@ module Dapp
157
156
  end
158
157
 
159
158
  def should_be_tagged?
160
- !(empty? || image.tagged? || should_be_not_present?) && image.built?
161
- end
162
-
163
- def should_be_not_present?
164
- return false if next_stage.nil?
165
- next_stage.image.tagged? || next_stage.should_be_not_present?
159
+ !(empty? || image.tagged?) && image.built?
166
160
  end
167
161
 
168
162
  def image_name
@@ -8,7 +8,6 @@ module Dapp
8
8
  def log_image_build(&image_build)
9
9
  if empty? then log_state(:empty)
10
10
  elsif image.tagged? then log_state(:using_cache)
11
- elsif should_be_not_present? then log_state(:not_present)
12
11
  elsif dimg.project.dry_run? then log_state(:build, styles: { status: :success })
13
12
  else log_image_build_process(&image_build)
14
13
  end
data/lib/dapp/dimg.rb CHANGED
@@ -31,7 +31,9 @@ module Dapp
31
31
  builder.before_build_check
32
32
  last_stage.build!
33
33
  ensure
34
- last_stage.save_in_cache! if last_stage.image.built? || dev_mode?
34
+ last_stage.save_in_cache! if last_stage.image.built? || # after all stages built
35
+ last_stage.image.tagged? || # some stage cache wasn't presented
36
+ dev_mode?
35
37
  end
36
38
  end
37
39
  end
@@ -39,12 +39,6 @@ module Dapp
39
39
  protected
40
40
 
41
41
  attr_reader :url
42
-
43
- def lookup_commit(commit)
44
- super
45
- rescue Rugged::OdbError => _e
46
- raise Error::Rugged, code: :commit_not_found_in_remote_git_repository, data: { commit: commit, url: url }
47
- end
48
42
  end
49
43
  end
50
44
  end
@@ -11,20 +11,24 @@ module Dapp
11
11
 
12
12
  project_dangling_images_flush
13
13
 
14
- flush_by_label('dapp') if proper_all?
15
- flush_by_label('dapp-dev-mode', adding_message: '(dev)') if proper_all? || proper_dev_mode_cache?
16
- log_proper_cache do
17
- proper_cache_images = proper_cache_all_images
18
- remove_images(dapp_images_by_label('dapp').select { |id| !proper_cache_images.include?(id) }.map(&:strip))
19
- end if proper_cache_version?
14
+ if proper_all?
15
+ flush_by_label('dapp')
16
+ elsif proper_dev_mode_cache?
17
+ flush_by_label('dapp-dev-mode')
18
+ elsif proper_cache_version?
19
+ log_proper_cache do
20
+ proper_cache_images = proper_cache_all_images
21
+ remove_images(dapp_images_by_label('dapp').select { |id| !proper_cache_images.include?(id) }.map(&:strip))
22
+ end
23
+ end
20
24
  end
21
25
  end
22
26
 
23
27
  protected
24
28
 
25
- def flush_by_label(label, adding_message: nil)
26
- log_step_with_indent([:containers, adding_message].compact.join(' ')) { dapp_containers_flush_by_label(label) }
27
- log_step_with_indent([:images, adding_message].compact.join(' ')) { dapp_images_flush_by_label(label) }
29
+ def flush_by_label(label)
30
+ log_step_with_indent(:containers) { dapp_containers_flush_by_label(label) }
31
+ log_step_with_indent(:images) { dapp_images_flush_by_label(label) }
28
32
  end
29
33
 
30
34
  def proper_all?
data/lib/dapp/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # Version
2
2
  module Dapp
3
- VERSION = '0.7.24'.freeze
3
+ VERSION = '0.7.25'.freeze
4
4
  BUILD_CACHE_VERSION = 6
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.24
4
+ version: 0.7.25
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov