dapp 0.35.11 → 0.35.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62eb5fd2e7a6324d98290c5088e08f6e9bedd1786d02486275b8fbcf2b7df9f6
-  data.tar.gz: 4b4dd677718ac548d16245ed9033c3c367e43be5ab10d7cfc220d4e9a13a86e0
+  metadata.gz: 0adb4bf08173793c4f4375818281b923c2e52fdea88fbfda96588477769f3db1
+  data.tar.gz: c544df40040b7030ded5800bd1ac05950fcd0648af0077d7a8a1681356e843d1
 SHA512:
-  metadata.gz: 240225dcd27cda0c0a02da38db75e28e30fd80db1f80fcf6ada0d84b0093ac50a10b37e52107ccb2e55af45323dcc52bb3080f7a009c76691e790809b0ce453a
-  data.tar.gz: 27b6be75d2fe4998ac8f137a32143d928f8b3a3809c87453e58e7d1100abfb5856ae976d395dba5c2c9086266544abc0991a57a28ad6f5b20aeb165bdc9c7a31
+  metadata.gz: 8c5c13d95cf94a69c7c24cf9baeff7600b2adf4d90b4382083b16f39ab9e19d13be9a13d12ed68eb881bd8c294d38f3e1395d27de0e117661f97300dfdd6b263
+  data.tar.gz: b87cf2e5d650993e26739b18e950b6b4c06ecd0bcdae4bec714729aa2d82a45a775029606d9059813cbc6bd98e393cf8c55689a785a9a02ab04dc8f1f6f604da

data/lib/dapp/dapp/option_tags.rb

@@ -60,7 +60,7 @@ module Dapp
         return {} unless options[:tag_build_id]
 
         if ENV['GITLAB_CI']
-          build_id = ENV['CI_BUILD_ID']
+          build_id = ENV['CI_BUILD_ID'] || ENV['CI_JOB_ID']
         elsif ENV['TRAVIS']
           build_id = ENV['TRAVIS_BUILD_NUMBER']
         else
@@ -75,10 +75,10 @@ module Dapp
 
         {}.tap do |tags_by_scheme|
           if ENV['GITLAB_CI']
-            if ENV['CI_BUILD_TAG']
-              tags_by_scheme[:git_tag] = [ENV['CI_BUILD_TAG']]
-            elsif ENV['CI_BUILD_REF_NAME']
-              tags_by_scheme[:git_branch] = [ENV['CI_BUILD_REF_NAME']]
+            if ENV['CI_BUILD_TAG'] || ENV['CI_COMMIT_TAG']
+              tags_by_scheme[:git_tag] = [ENV['CI_BUILD_TAG'] || ENV['CI_COMMIT_TAG']]
+            elsif ENV['CI_BUILD_REF_NAME'] || ENV['CI_COMMIT_REF_NAME']
+              tags_by_scheme[:git_branch] = [ENV['CI_BUILD_REF_NAME'] || ENV['CI_COMMIT_REF_NAME']]
             end
           elsif ENV['TRAVIS']
             if ENV['TRAVIS_TAG']

data/lib/dapp/dapp/slug.rb

@@ -4,28 +4,75 @@ module Dapp
       SLUG_SEPARATOR = '-'.freeze
       SLUG_V2_LIMIT_LENGTH = 53
 
-      def consistent_uniq_slugify(s)
-        return s unless should_be_slugged?(s)
-        consistent_uniq_slug_reg =~ s.tr('/', '-').slugify.squeeze('--')
-        consistent_uniq_slug = Regexp.last_match(1)
-        murmur_hash = MurmurHash3::V32.str_hexdigest(s)
-        [].tap do |slug|
-          slug << begin
-            unless consistent_uniq_slug.nil?
-              index = ENV['DAPP_SLUG_V2'] ? SLUG_V2_LIMIT_LENGTH - murmur_hash.length - SLUG_SEPARATOR.length - 1 : -1
-              consistent_uniq_slug[0..index]
-            end
-          end
-          slug << murmur_hash
-        end.compact.join(SLUG_SEPARATOR)
+      def self.included(base)
+        if ENV['DAPP_SLUG_V3']
+          base.include(V3)
+        else
+          base.include(V1V2)
+        end
       end
 
-      def should_be_slugged?(s)
-        !(/^#{consistent_uniq_slug_reg}$/ =~ s)
+      module V1V2
+        def consistent_uniq_slugify(s)
+          return s unless should_be_slugged?(s)
+          consistent_uniq_slug_reg =~ s.tr('/', '-').slugify.squeeze('--')
+          consistent_uniq_slug = Regexp.last_match(1)
+          murmur_hash = MurmurHash3::V32.str_hexdigest(s)
+          [].tap do |slug|
+            slug << begin
+              unless consistent_uniq_slug.nil?
+                index = ENV['DAPP_SLUG_V2'] ? SLUG_V2_LIMIT_LENGTH - murmur_hash.length - SLUG_SEPARATOR.length - 1 : -1
+                consistent_uniq_slug[0..index]
+              end
+            end
+            slug << murmur_hash
+          end.compact.join(SLUG_SEPARATOR)
+        end
+
+        def should_be_slugged?(s)
+          !(/^#{consistent_uniq_slug_reg}$/ =~ s)
+        end
+
+        def consistent_uniq_slug_reg
+          /(?!-)((-?[a-z0-9]+)+)(?<!-)/
+        end
       end
 
-      def consistent_uniq_slug_reg
-        /(?!-)((-?[a-z0-9]+)+)(?<!-)/
+      module V3
+        def consistent_uniq_slugify(s)
+          return s unless should_be_slugged?(s)
+          slug = consistent_uniq_slug(s)
+          murmur_hash = MurmurHash3::V32.str_hexdigest(s)
+          [].tap do |res|
+            res << begin
+              unless slug.empty?
+                index = SLUG_V2_LIMIT_LENGTH - murmur_hash.length - SLUG_SEPARATOR.length - 1
+                slug[0..index]
+              end
+            end
+            res << murmur_hash
+          end.compact.join(SLUG_SEPARATOR)
+        end
+
+        def should_be_slugged?(s)
+          consistent_uniq_slug(s) != s || s.length > SLUG_V2_LIMIT_LENGTH
+        end
+
+        def consistent_uniq_slug(s)
+          ''.tap do |res|
+            status = :empty
+            s.to_s.chars.each do |ch|
+              next if (s_ch = ch.slugify).empty?
+
+              if s_ch !~ /[[:punct:]|[:blank:]]/
+                res << s_ch
+                status = :non_empty if status == :empty
+              elsif status == :non_empty && res[-1] != '-'
+                res << '-'
+              end
+            end
+          end.chomp('-')
+        end
       end
     end # Slug
   end # Dapp

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

@@ -125,29 +125,43 @@ module Dapp
           end
 
           def image_add_mounts
+            image_add_service_mounts
+            image_add_custom_mounts
+
+            image_add_mounts_labels
+          end
+
+          def image_add_service_mounts
             [:tmp_dir, :build_dir].each do |type|
               next if (mounts = adding_mounts_by_type(type)).empty?
 
               mounts.each do |path|
                 absolute_path = File.expand_path(File.join('/', path))
-                tmp_path = dimg.send(type, 'mount', absolute_path[1..-1]).tap(&:mkpath)
+                tmp_path = dimg.send(type, 'mount', dimg.dapp.consistent_uniq_slugify(absolute_path)).tap(&:mkpath)
                 image.add_volume "#{tmp_path}:#{absolute_path}"
               end
-
-              image.add_service_change_label :"dapp-mount-#{type.to_s.tr('_', '-')}" => mounts.join(';')
             end
-
-            image_add_custom_mounts
           end
 
           def image_add_custom_mounts
             adding_custom_dir_mounts.each do |from, to_pathes|
-              FileUtils.mkdir_p(from)
+              FileUtils.mkdir_p(from) unless File.exist?(from)
               to_pathes.tap(&:uniq!).map { |to_path| image.add_volume "#{from}:#{to_path}" }
               image.add_service_change_label :"dapp-mount-custom-dir-#{from.gsub('/', '--')}" => to_pathes.join(';')
             end
           end
 
+          def image_add_mounts_labels
+            [:tmp_dir, :build_dir].each do |type|
+              next if (mounts = adding_mounts_by_type(type)).empty?
+              image.add_service_change_label :"dapp-mount-#{type.to_s.tr('_', '-')}" => mounts.join(';')
+            end
+
+            adding_custom_dir_mounts.each do |from, to_pathes|
+              image.add_service_change_label :"dapp-mount-custom-dir-#{from.gsub('/', '--')}" => to_pathes.join(';')
+            end
+          end
+
           def adding_mounts_by_type(type)
             (config_mounts_by_type(type) + labels_mounts_by_type(type)).uniq
           end

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

@@ -45,7 +45,8 @@ module Dapp
           def add_cleanup_mounts_dirs_command
             return if config_mounts_dirs.empty?
             image.add_service_command ["#{dimg.dapp.rm_bin} -rf %s",
-                                       "#{dimg.dapp.mkdir_bin} -p %s"].map { |c| format(c, config_mounts_dirs.join(' ')) }
+                                       "#{dimg.dapp.mkdir_bin} -p %s",
+                                       "#{dimg.dapp.rm_bin} -rf %s"].map { |c| format(c, config_mounts_dirs.join(' ')) }
           end
 
           def config_mounts
@@ -59,12 +60,8 @@ module Dapp
             config_mounts.values.flatten.uniq
           end
 
-          def adding_mounts_by_type(_type)
-            []
-          end
-
-          def adding_custom_dir_mounts
-            []
+          def image_add_mounts
+            image_add_mounts_labels
           end
 
           def image_should_be_untagged_condition

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

@@ -85,7 +85,7 @@ module Dapp
         end
 
         def labels
-          built_image_inspect!.fetch('Config', {}).fetch('Labels', {})
+          built_image_inspect!.fetch('Config', {}).fetch('Labels', {}) || {}
         end
 
         def created_at

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.11"
+  VERSION = "0.35.12"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.11
+  version: 0.35.12
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout