dapp 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61669969d0c0069587fe8b3b438573e777d40450
-  data.tar.gz: d26f59272e00d9264e7f28b1ead547e7e28e3b30
+  metadata.gz: c1c1c851ed5f27bd25dd4b3cf8bc1b27431fe81c
+  data.tar.gz: 32d35c1a530a102622ad85129d74d790a5711e4b
 SHA512:
-  metadata.gz: 90324bbf0cf86dc6f3d8fa40db48f43e60184204ac612acec5e435fefad10e64e5d52f49623218f2ca1e5a27c3556a00ba7fef51e929e338e53fde1405d023a8
-  data.tar.gz: fefdf1c404d802696005ee1246cdaf69dc7a9593c0e5d0ea0cda7eea391c658dd2c0ba01e197f92d3941485d471d0989e44dd024b26b4aabffaf54b7bb8b24d4
+  metadata.gz: 1ed7f72ee220ac672365bd00b5a1bc2b62ea10132816439b627c5df61a1297f66b7e008410bcf5f23257ee5e6e845a9c54f0361c79607c5c99faea352ba0c523
+  data.tar.gz: 495cf5dc364223895564aa19c99a6590cfe58a44f0a6c492c04aabd35c8111601cc49ac8a7ef8a20f27c96d519227706f57e4796dd701c9d33d40761ae4b5fee

data/config/en/net_status.yml

@@ -17,6 +17,7 @@ en:
       built_id_not_defined: '`from.built_id` not defined!'
       from_image_not_found: 'Image `%{name}` not found!'
       unsupported_patch_format: "Unsupported patch format:\n\n%{patch}"
+      unsupported_docker_image_size_format: "Unsupported docker image size format `%{value}`"
     command:
       command_unexpected_dimgs_number: "Command can process only one dimg!\nAmbiguous dimg pattern: `%{dimgs_names}`!"
       mrproper_required_option: "Expected command option `--improper-dev-mode-cache`, `--improper-cache-version-stages` or `--all`!"

data/lib/dapp/dimg/build/stage/ga_artifact_patch.rb

@@ -8,6 +8,10 @@ module Dapp
             super
           end
 
+          def empty?
+            dimg.git_artifacts.empty? || dependencies_empty?
+          end
+
           def dependencies
             dimg.stage_by_name(:build_artifact).context
           end

data/lib/dapp/dimg/image/docker.rb

@@ -105,18 +105,24 @@ module Dapp
                         .stdout
                         .lines
                         .each do |l|
-              name, id, created_at, size_field = l.split(';')
+              name, id, created_at, size_field = l.split(';').map(&:strip)
               name = name.reverse.chomp('docker.io/'.reverse).reverse
               size = begin
-                number, unit = size_field.split
-                coef = case unit.to_s.downcase
-                       when 'b'  then return number.to_f
+                match = size_field.match(/^(\d+(\.\d+)?)\ ?(b|kb|mb|gb|tb)$/i)
+                raise Error::Build, code: :unsupported_docker_image_size_format, data: {value: size_field} unless match and match[1] and match[3]
+
+                number = match[1].to_f
+                unit = match[3].downcase
+
+                coef = case unit
+                       when 'b'  then 0
                        when 'kb' then 1
                        when 'mb' then 2
                        when 'gb' then 3
                        when 'tb' then 4
                        end
-                number.to_f * (1000**coef)
+
+                number * (1000**coef)
               end
               cache[name] = { id: id, created_at: created_at, size: size }
             end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.10.2'.freeze
   BUILD_CACHE_VERSION = 7
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout