dapp 0.31.10 → 0.31.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 694eb48fc2804c27d295fb7a5ba39aa7ae3124db
-  data.tar.gz: 1a2131680db02ca4d20c748023b1d3eeac4a0720
+SHA256:
+  metadata.gz: f6d33ae2a3a71b3597375c0a89a61c5481c571424dfac572c172027fac7a68cc
+  data.tar.gz: 3c8f7beb793466764b3a98ea02a5efcf869890ec02feca57aec1c971bcd4f449
 SHA512:
-  metadata.gz: 59e3627ddc707a065e47feb1e20ba10e84316dc6c20c8c0a914df3afae3125ec4629593da873b29da258b70e03c920dc43e97c3bccf8e3c4c0997c04235da9dc
-  data.tar.gz: 1f6d0d57c3c3f1b099a053f866641adb8fb5cf068af5493e35e5ecdb7f00eb127393a6ef0427deb2efc2574c468228375f987f42a13ab1367bdb6ac58e68d468
+  metadata.gz: 7a372ae26601c8cafcc31c00b1bcf6997e624c509a412f6eda7ad0798e3858977fe334b76a433959bafd6165e266ebdb4f8ef7a3830d8d1e92e3f6cd29eadbc3
+  data.tar.gz: 9e957758e5fde76456f98f790bd138aa2bc96dce8d3802fcf2f8a2617aa99f2f19c318bca6a8b4b57de7cd1fd365de0d88b4467b1751a19182c4823373fdb6e8

data/lib/dapp/dapp/slug.rb

@@ -1,16 +1,23 @@
 module Dapp
   class Dapp
     module Slug
+      SLUG_SEPARATOR = '-'.freeze
+      SLUG_V2_LIMIT_LENGTH = 53
+
       def consistent_uniq_slugify(s)
-        if should_be_slugged?(s)
-          consistent_uniq_slug_reg =~ s.gsub("/", "-").slugify.squeeze('--')
-          [].tap do |slug|
-            slug << Regexp.last_match(1) unless Regexp.last_match(1).nil?
-            slug << MurmurHash3::V32.str_hexdigest(s)
-          end.compact.join('-')
-        else
-          s
-        end
+        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)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.10"
+  VERSION = "0.31.11"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.10
+  version: 0.31.11
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -744,7 +744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell