dapp 0.31.10 → 0.31.11

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
- SHA1:
3
- metadata.gz: 694eb48fc2804c27d295fb7a5ba39aa7ae3124db
4
- data.tar.gz: 1a2131680db02ca4d20c748023b1d3eeac4a0720
2
+ SHA256:
3
+ metadata.gz: f6d33ae2a3a71b3597375c0a89a61c5481c571424dfac572c172027fac7a68cc
4
+ data.tar.gz: 3c8f7beb793466764b3a98ea02a5efcf869890ec02feca57aec1c971bcd4f449
5
5
  SHA512:
6
- metadata.gz: 59e3627ddc707a065e47feb1e20ba10e84316dc6c20c8c0a914df3afae3125ec4629593da873b29da258b70e03c920dc43e97c3bccf8e3c4c0997c04235da9dc
7
- data.tar.gz: 1f6d0d57c3c3f1b099a053f866641adb8fb5cf068af5493e35e5ecdb7f00eb127393a6ef0427deb2efc2574c468228375f987f42a13ab1367bdb6ac58e68d468
6
+ metadata.gz: 7a372ae26601c8cafcc31c00b1bcf6997e624c509a412f6eda7ad0798e3858977fe334b76a433959bafd6165e266ebdb4f8ef7a3830d8d1e92e3f6cd29eadbc3
7
+ data.tar.gz: 9e957758e5fde76456f98f790bd138aa2bc96dce8d3802fcf2f8a2617aa99f2f19c318bca6a8b4b57de7cd1fd365de0d88b4467b1751a19182c4823373fdb6e8
@@ -1,16 +1,23 @@
1
1
  module Dapp
2
2
  class Dapp
3
3
  module Slug
4
+ SLUG_SEPARATOR = '-'.freeze
5
+ SLUG_V2_LIMIT_LENGTH = 53
6
+
4
7
  def consistent_uniq_slugify(s)
5
- if should_be_slugged?(s)
6
- consistent_uniq_slug_reg =~ s.gsub("/", "-").slugify.squeeze('--')
7
- [].tap do |slug|
8
- slug << Regexp.last_match(1) unless Regexp.last_match(1).nil?
9
- slug << MurmurHash3::V32.str_hexdigest(s)
10
- end.compact.join('-')
11
- else
12
- s
13
- end
8
+ return s unless should_be_slugged?(s)
9
+ consistent_uniq_slug_reg =~ s.tr('/', '-').slugify.squeeze('--')
10
+ consistent_uniq_slug = Regexp.last_match(1)
11
+ murmur_hash = MurmurHash3::V32.str_hexdigest(s)
12
+ [].tap do |slug|
13
+ slug << begin
14
+ unless consistent_uniq_slug.nil?
15
+ index = ENV['DAPP_SLUG_V2'] ? SLUG_V2_LIMIT_LENGTH - murmur_hash.length - SLUG_SEPARATOR.length - 1 : -1
16
+ consistent_uniq_slug[0..index]
17
+ end
18
+ end
19
+ slug << murmur_hash
20
+ end.compact.join(SLUG_SEPARATOR)
14
21
  end
15
22
 
16
23
  def should_be_slugged?(s)
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = "0.31.10"
2
+ VERSION = "0.31.11"
3
3
  BUILD_CACHE_VERSION = 30
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.31.10
4
+ version: 0.31.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-07-11 00:00:00.000000000 Z
11
+ date: 2018-07-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout
@@ -744,7 +744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
744
744
  version: 2.5.0
745
745
  requirements: []
746
746
  rubyforge_project:
747
- rubygems_version: 2.5.1
747
+ rubygems_version: 2.7.7
748
748
  signing_key:
749
749
  specification_version: 4
750
750
  summary: Build docker packaged apps using chef or shell