dapp 0.7.21 → 0.7.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f9e155a712a0ed1bf5eee4f2eb9eb3ee058e38d
-  data.tar.gz: f490000499dcdb9654ed0afb7d92b2bd6d8d5073
+  metadata.gz: e1d331bc07f3e624682ffd414440632af1539623
+  data.tar.gz: fb78b3ad52f34339480699c0732f3257e591c679
 SHA512:
-  metadata.gz: 0ecc323bb36092b93fb788ee1ac3fb152b42891f64b7e4d904c905f55fdc6d4393252763789f03c1484fd4df06d35c3c1d6e3a0efafe930ae8508289cd195b3f
-  data.tar.gz: 0e3bac35a542c600f1cd39d561ddcef7c41899faecdbefc94aeca8b53e25b251f6c3324238529583889c2d386843d53b81ce84153561d11c891395e7bcca543c
+  metadata.gz: 2645b1233f00e1cdf09f22f42da53659df25b187e89e93541eb9a35f281bda3e1fa860396e36404671ddd5953c23e11677a41bf07a6a400abfc7c067304c7e6c
+  data.tar.gz: d9360bf403e44a3c5dd96bd3d65c4c036b9e74c6f6f256f78c0aa4c34527e5274fee9b5d9bf343d2211785061b38f241d605ebb0e9f7d812c295586341290bea

data/config/en/common.yml

@@ -4,8 +4,8 @@ en:
       signature: "signature: %{signature}"
       info:
         created_at: "date: %{value}"
-        size: "size: %{value} MB"
-        difference: "difference: %{value} MB"
+        mb_size: "size: %{mb} MB"
+        difference: "difference: %{mb} MB"
       commands: "commands:"
       instructions: "instructions:"
     container:

data/config/en/net_status.yml

@@ -64,6 +64,7 @@ en:
       page_not_found: "Registry `%{registry}`: page `%{url}` not found!"
       user_not_authorized: 'Registry `%{registry}`: user not authorized!'
     rugged:
-      rugged_network_error: "Remote git repo `%{url}`: `%{message}`!"
+      rugged_remote_error: "Remote git repo `%{url}`: `%{message}`!"
+      local_git_repository_does_not_exist: "Local git repo: doesn't exist!"
     lock:
       timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds"

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

@@ -39,9 +39,9 @@ module Dapp
           copy_files = proc do |from_, path_ = ''|
             "if [[ -d #{File.join(from_, path_)} ]] || [[ -f #{File.join(from_, path_)} ]]; then " \
             "#{dimg.project.find_bin} #{File.join(from_, path_)} #{excludes} -type f -exec " \
-            "#{dimg.project.bash_bin} -ec '#{dimg.project.install_bin} -D #{credentials} {} " \
-            "#{File.join(to, '$(echo {} | ' \
-            "#{dimg.project.sed_bin} -e \"s/#{from_.gsub('/', '\\/')}//g\")")}' \\; ;" \
+            "#{dimg.project.bash_bin} -ec '#{dimg.project.install_bin} -D #{credentials} \"{}\" " \
+            "\"#{File.join(to, "$(echo \"{}\" | " \
+            "#{dimg.project.sed_bin} -e \"s/^#{from_.gsub('/', '\\/')}\\///g\")")}\"' \\; ;" \
             'fi'
           end
 

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

@@ -45,13 +45,13 @@ module Dapp
 
           def log_image_size
             if !prev_stage.nil? && from_image.tagged?
-              size = image.size.to_f - from_image.size.to_f
+              bytes = image.size - from_image.size
               code = 'image.info.difference'
             else
-              size = image.size
-              code = 'image.info.size'
+              bytes = image.size
+              code = 'image.info.mb_size'
             end
-            dimg.project.log_info dimg.project.t(code: code, data: { value: size.to_f.round(2) })
+            dimg.project.log_info dimg.project.t(code: code, data: { mb: (bytes / 1000 / 1000).round(3) })
           end
 
           def log_image_commands

data/lib/dapp/config/directive/artifact_base.rb

@@ -26,7 +26,7 @@ module Dapp
 
           def initialize(cwd = '/', **kwargs, &blk)
             raise Error::Config, code: :export_cwd_absolute_path_required unless Pathname(cwd).absolute?
-            @_cwd = cwd
+            @_cwd = path_format(cwd)
             @_include_paths ||= []
             @_exclude_paths ||= []
 
@@ -48,17 +48,17 @@ module Dapp
 
           def to(absolute_path)
             raise Error::Config, code: :export_to_absolute_path_required unless Pathname(absolute_path).absolute?
-            @_to = absolute_path
+            @_to = path_format(absolute_path)
           end
 
           def include_paths(*relative_paths)
             raise Error::Config, code: :export_include_paths_relative_path_required unless relative_paths.all? { |path| Pathname(path).relative? }
-            _include_paths.concat(relative_paths)
+            _include_paths.concat(relative_paths.map(&method(:path_format)))
           end
 
           def exclude_paths(*relative_paths)
             raise Error::Config, code: :export_exclude_paths_relative_path_required unless relative_paths.all? { |path| Pathname(path).relative? }
-            _exclude_paths.concat(relative_paths)
+            _exclude_paths.concat(relative_paths.map(&method(:path_format)))
           end
 
           def owner(owner)
@@ -72,6 +72,10 @@ module Dapp
           def validate!
             raise Error::Config, code: :export_to_required if _to.nil?
           end
+
+          def path_format(path)
+            path.chomp('/')
+          end
         end
 
         protected

data/lib/dapp/git_repo/own.rb

@@ -12,6 +12,8 @@ module Dapp
 
       def path
         @path ||= Rugged::Repository.discover(dimg.home_path.to_s).path
+      rescue Rugged::RepositoryError => _e
+        raise Error::Rugged, code: :local_git_repository_does_not_exist
       end
 
       def latest_commit(branch = nil)

data/lib/dapp/git_repo/remote.rb

@@ -11,7 +11,9 @@ module Dapp
           begin
             Rugged::Repository.clone_at(url, path, bare: true)
           rescue Rugged::NetworkError => e
-            raise Error::Rugged, code: :rugged_network_error, data: { message: e.message, url: url }
+            raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
+          rescue Rugged::SslError => e
+            raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
           end
         end unless File.directory?(path)
       end

data/lib/dapp/image/docker.rb

@@ -90,7 +90,18 @@ module Dapp
         def cache_reset(name = '')
           cache.delete(name)
           Project.shellout!("docker images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' --no-trunc #{name}").stdout.lines.each do |l|
-            name, id, created_at, size = l.split(';')
+            name, id, created_at, size_field = l.split(';')
+            size = begin
+              number, unit = size_field.split
+              coef = case unit.to_s.downcase
+                     when 'b'  then return number.to_f
+                     when 'kb' then 1
+                     when 'mb' then 2
+                     when 'gb' then 3
+                     when 'tb' then 4
+                     end
+              number.to_f * (1000 ** coef)
+            end
             cache[name] = { id: id, created_at: created_at, size: size }
           end
         end

data/lib/dapp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.21
+  version: 0.7.22
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout