dapp 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5293969d87b7fa3109c27d66ff12ef98b148c096
-  data.tar.gz: 62c6faae424495c50c993eefe5bfd612e58076ed
+  metadata.gz: 8cd65c99fc4cd2ebc304c8de2c5680919199ced5
+  data.tar.gz: 9279deb5fa383a4b907be5888da7db5ee98ff31b
 SHA512:
-  metadata.gz: e0426ec31dc190d4e37a6caec2e1c318bf57bd22a5b60c6e52ea553473c3118467aff455946b9d169534b9dfa2c1992cf6b17ab77809d2bcd79cfe5b95a0efa0
-  data.tar.gz: fe57e06e0a37da02074899f51cade85281431e64736818baa02c90a9bd11534f4efdf9d1026fc19071f5e258270938bf74611dcd0a14e75f4f9847c370b1ebce
+  metadata.gz: a77f2d367d84b1a6ab9bc4aaec24b4a12292f45a39363476e6d8d94305c14c034c5cb029dbd61b97623826e420a638240046094b53cd368ad875305b776aa69c
+  data.tar.gz: 085af446ec514d03769945e77f1888840fdabf370f9e576b995e10ef18b1a0dd052a9875d7fab88dec9d889d363860900e27f05e063b1a75a37d8e484fde8436

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

@@ -8,7 +8,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

@@ -56,7 +56,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 Dapp::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_dimgs_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.7.4'.freeze
+  VERSION = '0.7.5'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

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