dapp 0.14.4 → 0.14.5

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: 71be83fae4a7b73eb9fc99e8ade1d01fe3c2e065
4
- data.tar.gz: 9398756ccdbb05b3b974004acee399ecc0bcdc06
3
+ metadata.gz: 1f156a2a8fd12076cfdb4ed122d58115f8932d7a
4
+ data.tar.gz: d37a2be5147b8c25a428d4e1c0325e5b053574f3
5
5
  SHA512:
6
- metadata.gz: a9d9c45d50fb53df425bc48525dec384a2d9a5de6f707d79735d41e9c0549ca4a56cca60da49906b28fcdac7685b9839a7fe8496d1558947aba5f1faea91b1ea
7
- data.tar.gz: 81245d82a56f9dd15bff96a5121d8ff17f91b03b338516a94e8e71a241afab55d58195cd925ec56314575e2d86fb23402438eca41f6182915660ec3cab2cdb59
6
+ metadata.gz: ca4fb260aed0041407e88a0cd3405b44ba221f0380a608fd03d4e6723d9fe057080c57f30628440f107963c444cf6acb50c676b0d7ae4f1cf91cb39b7945df47
7
+ data.tar.gz: b3b33b434cd8aba36bd2ba31340862f834fd680acba437dc54fb63401315056f2b38e5e29f2259c7bd1bfb957900844c5a15d37595ad3777367fab8dfc55c035
data/config/en/common.yml CHANGED
@@ -57,6 +57,7 @@ en:
57
57
  introspect_image_impossible: "WARNING: You can't introspect stage `%{name}`!"
58
58
  stage_dependencies_not_found: "WARNING: Stage dependencies `%{dependencies}` haven't been found in repo `%{repo}`!"
59
59
  unsupported_dapp_config_options: "WARNING: .dapp_config includes unsupported options [%{options}]: use only following options [%{supported_options}]"
60
+ secret_key_dappfile_not_found: "WARNING: Project root directory can't be initialized: Dappfile not found!"
60
61
  group:
61
62
  install: 'Install group'
62
63
  setup: 'Setup group'
@@ -35,7 +35,7 @@ module Dapp
35
35
  return if images_ids.empty?
36
36
  log_step_with_indent(:'check user containers') do
37
37
  run_command(%(#{host_docker_bin} ps -a -q #{images_ids.uniq.map { |image_id| "--filter=ancestor=#{image_id}" }.join(' ')})).tap do |res|
38
- raise Error::Command, code: :user_containers_detected, data: { ids: res.stdout.strip } if !res.stdout.strip.empty? && !dry_run?
38
+ raise Error::Command, code: :user_containers_detected, data: { ids: res.stdout.strip } if res && !res.stdout.strip.empty? && !dry_run?
39
39
  end
40
40
  end
41
41
  end
@@ -114,11 +114,11 @@ module Dapp
114
114
  name, id, created_at, size_field = l.split(';').map(&:strip)
115
115
  name = name.reverse.chomp('docker.io/'.reverse).reverse
116
116
  size = begin
117
- match = size_field.match(/^(\d+(\.\d+)?)\ ?(b|kb|mb|gb|tb)$/i)
118
- raise Error::Build, code: :unsupported_docker_image_size_format, data: {value: size_field} unless match and match[1] and match[3]
117
+ match = size_field.match(/^(\S+)\ ?(b|kb|mb|gb|tb)$/i)
118
+ raise Error::Build, code: :unsupported_docker_image_size_format, data: {value: size_field} unless match and match[1] and match[2]
119
119
 
120
120
  number = match[1].to_f
121
- unit = match[3].downcase
121
+ unit = match[2].downcase
122
122
 
123
123
  coef = case unit
124
124
  when 'b' then 0
@@ -81,6 +81,8 @@ module Dapp
81
81
  else
82
82
  secret_key_not_found_in << "`#{file_path}`"
83
83
  end
84
+ else
85
+ log_warning(desc: { code: :secret_key_dappfile_not_found })
84
86
  end
85
87
  end
86
88
 
data/lib/dapp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = '0.14.4'.freeze
2
+ VERSION = '0.14.5'.freeze
3
3
  BUILD_CACHE_VERSION = 16
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.14.4
4
+ version: 0.14.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-23 00:00:00.000000000 Z
11
+ date: 2017-08-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout