dapp 0.6.16 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876026d4b44e0e133226070491379a862830e00e
-  data.tar.gz: e2b22a947be59dcef0b43f76f1d603172b51d95a
+  metadata.gz: 9e78ed224c52a413cdceeaacf7877326f47dc1dd
+  data.tar.gz: ec07c5e997ed182b9ccfcf1c8097823ef3294d2e
 SHA512:
-  metadata.gz: 53ddd82966ead8876733adcef218708576845ee385d80e0f4aae84ee6a80822bc72317a1193b2260bdeb94133118164ee8e22d0c2f5bf83029e5598750512872
-  data.tar.gz: 297cf30895ee5f6e9cfaf542cc3b583f07e8f92490763b7962e2fc796f4aba2ebcf3b3257971d72c17dea797058e84cd22c251d03793850ab30bd747d3eb7aef
+  metadata.gz: 7e3e56663b2ee9c215a284a7e59ba2ce71bf1a888c695002f123862d2c8e59676dc5a91ac74fe81082bc1ac4d14498eaab9e7d3e264501912e7f144535a0e0ed
+  data.tar.gz: b105a61fec8f6b30bb9d9d65ed8621bfaba027e299136fd2f739a1f650453c6af6bca4656d63adc64811ccd65a5c3c7205f578da0dbfdc6a56fa17b7c7481e32

data/lib/dapp/config/directive/docker/base.rb

@@ -19,7 +19,7 @@ module Dapp
 
           def from(image, cache_version: nil)
             image = image.to_s
-            raise(Error::Config, code: :docker_from_incorrect, data: { name: image }) unless image =~ Image::Docker.image_regex
+            raise(Error::Config, code: :docker_from_incorrect, data: { name: image }) unless Image::Docker.image_name?(image)
             raise(Error::Config, code: :docker_from_without_tag, data: { name: image }) unless image.include?(':')
             @_from = image
             @_from_cache_version = cache_version

data/lib/dapp/docker_registry.rb

@@ -2,7 +2,7 @@ module Dapp
   # DockerRegistry
   module DockerRegistry
     def self.new(repo)
-      repo_regex =~ repo
+      /^#{repo_name_format}$/ =~ repo
       expected_hostname = Regexp.last_match(:hostname)
       expected_repo_suffix = Regexp.last_match(:repo_suffix)
       expected_hostname_url = expected_hostname ? "http://#{expected_hostname}" : nil
@@ -14,14 +14,18 @@ module Dapp
       end
     end
 
-    def self.repo_regex
+    def self.repo_name_format
       separator = '[_.]|__|[-]*'
       alpha_numeric = '[[:alnum:]]*'
       component = "#{alpha_numeric}[#{separator}#{alpha_numeric}]*"
       port_number = '[[:digit:]]+'
-      hostcomponent = '[[:alnum:]-]*[[:alnum:]]'
-      hostname = "#{hostcomponent}[\.#{hostcomponent}]*(?<port>:#{port_number})?"
-      %r{^(?<hostname>#{hostname}/)?(?<repo_suffix>#{component}[/#{component}]*)$}
+      hostcomponent = '[[:alnum:]_-]*[[:alnum:]]'
+      hostname = "#{hostcomponent}[\\.#{hostcomponent}]*(?<port>:#{port_number})?"
+      "(?<hostname>#{hostname}/)?(?<repo_suffix>#{component}[/#{component}]*)"
+    end
+
+    def self.repo_name?(name)
+      !(/^#{repo_name_format}$/ =~ name).nil?
     end
 
     def self.hostname_exist?(url)

data/lib/dapp/image/docker.rb

@@ -68,8 +68,14 @@ module Dapp
       end
 
       class << self
-        def image_regex
-          /^[a-z0-9]+(?:[._-][a-z0-9]+)*(:[\w][\w.-]{0,127})?$/
+        def image_name_format
+          separator = '[_.]|__|[-]*'
+          tag = "[[:alnum:]][[[:alnum:]]#{separator}]{0,127}"
+          "#{DockerRegistry.repo_name_format}(:(?<tag>#{tag}))?"
+        end
+
+        def image_name?(name)
+          !(/^#{image_name_format}$/ =~ name).nil?
         end
 
         def tag!(id:, tag:)

data/lib/dapp/project/command/common.rb

@@ -64,7 +64,7 @@ module Dapp
         end
 
         def validate_repo_name(repo)
-          raise(Error::Project, code: :repo_name_incorrect, data: { name: repo }) unless repo =~ DockerRegistry.repo_regex
+          raise(Error::Project, code: :repo_name_incorrect, data: { name: repo }) unless DockerRegistry.repo_name?(repo)
         end
 
         def proper_cache_version?

data/lib/dapp/project/command/tag.rb

@@ -7,7 +7,7 @@ module Dapp
       module Tag
         def tag(tag)
           raise Error::Project, code: :tag_command_unexpected_apps_number unless build_configs.one?
-          raise Error::Project, code: :tag_command_incorrect_tag, data: { name: tag } unless tag =~ Image::Docker.image_regex
+          raise Error::Project, code: :tag_command_incorrect_tag, data: { name: tag } unless Image::Docker.image_name?(tag)
           Application.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |app|
             app.tag!(tag)
           end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.6.16'.freeze
+  VERSION = '0.6.17'.freeze
   BUILD_CACHE_VERSION = 5
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.17
 platform: ruby
 authors:
 - Dmitry Stolyarov