dapp 0.6.15 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f0884efd0541d21fd325805dc5ba6d7535f201a
-  data.tar.gz: 914ac50dbc5187261ecd478dbdb482341fd8af67
+  metadata.gz: 876026d4b44e0e133226070491379a862830e00e
+  data.tar.gz: e2b22a947be59dcef0b43f76f1d603172b51d95a
 SHA512:
-  metadata.gz: 3c651d89a94ba32ffbf960ff8e71b9642148e9b6c848e843ebc29772c1ef7b90207d1ad083ad0c184952ce6f054ac2e02dd4508f3ee847a9ca682b508bad2231
-  data.tar.gz: 20089b576bb1130822602048a2ab5d763f7e58ed2059db135b2fbae6f6245269f034e0671469402358d50129e2f8524b7d3149975eb21f477eea8dcb879f9e2c
+  metadata.gz: 53ddd82966ead8876733adcef218708576845ee385d80e0f4aae84ee6a80822bc72317a1193b2260bdeb94133118164ee8e22d0c2f5bf83029e5598750512872
+  data.tar.gz: 297cf30895ee5f6e9cfaf542cc3b583f07e8f92490763b7962e2fc796f4aba2ebcf3b3257971d72c17dea797058e84cd22c251d03793850ab30bd747d3eb7aef

data/config/en/common.yml

@@ -28,6 +28,7 @@ en:
         pulling: '[PULLING]'
         building: '[BUILDING]'
         default: '[RUNNING]'
+        tagging: '[TAGGING]'
       success:
         default: '[OK]'
       failed:
@@ -40,6 +41,7 @@ en:
       empty: '[EMPTY]'
       push: '[PUSH]'
       pull: '[PULL]'
+      tag: '[TAG]'
     warning:
       excess_builder_instruction: "WARNING: Excessive use of the 'builder' instruction. Builder type will be automatically determined by the first use of any builder."
       excess_name_instruction: "WARNING: Excessive use of the 'name' instruction. Given name corresponds to default name."

data/config/en/net_status.yml

@@ -19,6 +19,9 @@ en:
       from_image_not_found: 'Image `%{name}` not found!'
     project:
       spush_command_unexpected_apps_number: "Command 'spush' can process only one application!"
+      tag_command_unexpected_apps_number: "Command 'tag' can process only one application!"
+      tag_command_incorrect_tag: "Incorrect tag ('%{name}') given!"
+      repo_name_incorrect: "Incorrect repo ('%{name}') given!"
       command_unexpected_apps_number: "Command can process only one application!"
       no_such_app: "No such app: '%{apps_patterns}'!"
       dappfile_not_found: "Dappfile not found!"
@@ -39,6 +42,7 @@ en:
       stage_artifact_not_supported_associated_stage: "Artifact not supported associated stage '%{stage}'!"
       git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't has attribute '%{attr}'!"
       docker_from_incorrect: "`docker.from` has incorrect value `%{name}`: expected format `image_name:tag`!"
+      docker_from_without_tag: "`docker.from` has incorrect value `%{name}`: expected format `image_name:tag`!"
       app_name_incorrect: "Application has incorrect name '%{name}': doesn't match regex '%{reg}'!"
     chef:
       stage_path_overlap: "Cannot install '%{cookbook}' cookbook's path %{from} into %{to}: already exists"

data/lib/dapp.rb

@@ -42,6 +42,7 @@ require 'dapp/cli/base'
 require 'dapp/cli/build'
 require 'dapp/cli/push'
 require 'dapp/cli/spush'
+require 'dapp/cli/tag'
 require 'dapp/cli/list'
 require 'dapp/cli/stages'
 require 'dapp/cli/stages/flush_local'
@@ -119,6 +120,7 @@ require 'dapp/project/command/list'
 require 'dapp/project/command/push'
 require 'dapp/project/command/run'
 require 'dapp/project/command/spush'
+require 'dapp/project/command/tag'
 require 'dapp/project/command/stages/common'
 require 'dapp/project/command/stages/cleanup_local'
 require 'dapp/project/command/stages/cleanup_repo'

data/lib/dapp/application.rb

@@ -39,6 +39,19 @@ module Dapp
       FileUtils.rm_rf(tmp_path)
     end
 
+    def tag!(tag)
+      project.lock("#{config._basename}.images", readonly: true) do
+        applicaion_name = config._name
+        if project.dry_run?
+          project.log_state(applicaion_name, state: project.t(code: 'state.tag'), styles: { status: :success })
+        else
+          project.log_process(applicaion_name, process: project.t(code: 'status.process.tagging')) do
+            last_stage.image.tag!(tag)
+          end
+        end
+      end
+    end
+
     def export!(repo, format:)
       project.lock("#{config._basename}.images", readonly: true) do
         tags.each do |tag|

data/lib/dapp/application/stages.rb

@@ -17,14 +17,14 @@ module Dapp
 
       def images
         (@images ||= []).tap do |images|
-          stages.map do |stage|
+          stages.each do |stage|
             if stage.respond_to?(:images)
               images.concat(stage.images)
             else
               images << stage.image
             end
-          end.uniq(&:name)
-        end
+          end
+        end.uniq!(&:name)
       end
 
       protected

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

@@ -60,7 +60,7 @@ module Dapp
         def save_in_cache!
           prev_stage.save_in_cache! if prev_stage
           return unless should_be_tagged?
-          image.tag! unless application.project.dry_run?
+          image.save_in_cache! unless application.project.dry_run?
         end
 
         def image

data/lib/dapp/cli.rb

@@ -5,7 +5,7 @@ module Dapp
     include Mixlib::CLI
     include Helper::Trivia
 
-    SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image'].freeze
+    SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image', 'tag'].freeze
 
     banner <<BANNER.freeze
 Usage: dapp [options] sub-command [sub-command options]
@@ -16,6 +16,7 @@ dapp build [options] [APPS PATTERN ...]
 dapp bp [options] [APPS PATTERN ...] REPO
 dapp push [options] [APP PATTERN] REPO
 dapp spush [options] [APPS PATTERN ...] REPO
+dapp tag [options] [APP PATTERN ...] TAG
 dapp list [options] [APPS PATTERN ...]
 dapp run [options] [APP PATTERN] [DOCKER ARGS]
 dapp cleanup [options] [APPS PATTERN ...]

data/lib/dapp/cli/tag.rb

@@ -0,0 +1,24 @@
+module Dapp
+  class CLI
+    # CLI tag subcommand
+    class Tag < Base
+      banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp tag [options] [APP PATTERN ...] TAG
+
+    APP PATTERN                 Application to process [default: *].
+    REPO                        Pushed image name.
+
+Options:
+BANNER
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        tag = self.class.required_argument(self)
+        Project.new(cli_options: config, apps_patterns: cli_arguments).public_send(class_to_lowercase, tag)
+      end
+    end
+  end
+end

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

@@ -18,7 +18,9 @@ module Dapp
           end
 
           def from(image, cache_version: nil)
-            raise(Error::Config, code: :docker_from_incorrect, data: { name: image }) unless image =~ /^[[^ ].]+:[[^ ].]+$/
+            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_without_tag, data: { name: image }) unless image.include?(':')
             @_from = image
             @_from_cache_version = cache_version
           end

data/lib/dapp/docker_registry.rb

@@ -3,8 +3,8 @@ module Dapp
   module DockerRegistry
     def self.new(repo)
       repo_regex =~ repo
-      expected_hostname = Regexp.last_match(1)
-      expected_repo_suffix = Regexp.last_match(2)
+      expected_hostname = Regexp.last_match(:hostname)
+      expected_repo_suffix = Regexp.last_match(:repo_suffix)
       expected_hostname_url = expected_hostname ? "http://#{expected_hostname}" : nil
 
       if hostname_exist?(expected_hostname_url)
@@ -15,13 +15,13 @@ module Dapp
     end
 
     def self.repo_regex
-      separator = /[_.]|__|[-]*/
-      alpha_numeric = /[[:alnum:]]*/
-      component = /#{alpha_numeric}[#{separator}#{alpha_numeric}]*/
-      port_number = /[0-9]+/
-      hostcomponent = /[[:alnum:]-]*[[:alnum:]]/
-      hostname = /#{hostcomponent}[\.#{hostcomponent}]*[:#{port_number}]?/
-      %r{^(#{hostname}/)?(#{component}[/#{component}]*)$}
+      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}]*)$}
     end
 
     def self.hostname_exist?(url)

data/lib/dapp/image/docker.rb

@@ -68,6 +68,15 @@ module Dapp
       end
 
       class << self
+        def image_regex
+          /^[a-z0-9]+(?:[._-][a-z0-9]+)*(:[\w][\w.-]{0,127})?$/
+        end
+
+        def tag!(id:, tag:)
+          Project.shellout!("docker tag #{id} #{tag}")
+          cache_reset
+        end
+
         def cache
           @cache ||= (@cache = {}).tap { cache_reset }
         end

data/lib/dapp/image/stage.rb

@@ -33,24 +33,30 @@ module Dapp
       end
 
       def export!(name)
-        image = self.class.new(name: name, project: project, built_id: built_id)
-        image.tag!
-        image.push!
-        image.untag!
+        tag!(name).tap do |image|
+          image.push!
+          image.untag!
+        end
+      end
+
+      def tag!(name)
+        clone!(name).tap do |image|
+          self.class.tag!(id: image.built_id, tag: image.name)
+        end
       end
 
       def import!(name)
-        image = self.class.new(name: name, project: project)
-        image.pull!
-        @built_id = image.built_id
-        tag!
-        image.untag!
+        clone!(name).tap do |image|
+          image.pull!
+          @built_id = image.built_id
+          save_in_cache!
+          image.untag!
+        end
       end
 
-      def tag!
+      def save_in_cache!
         project.log_warning(desc: { code: :another_image_already_tagged }) if !(existed_id = id).nil? && built_id != existed_id
-        project.shellout!("docker tag #{built_id} #{name}")
-        cache_reset
+        self.class.tag!(id: built_id, tag: name)
       end
 
       def labels
@@ -77,6 +83,10 @@ module Dapp
       def commit!
         project.shellout!("docker commit #{prepared_change} #{container_name}").stdout.strip
       end
+
+      def clone!(name)
+        self.class.new(name: name, project: project, built_id: built_id)
+      end
     end # Stage
   end # Image
 end # Dapp

data/lib/dapp/project.rb

@@ -10,6 +10,7 @@ module Dapp
     include Command::Bp
     include Command::Push
     include Command::Spush
+    include Command::Tag
     include Command::List
     include Command::Stages::CleanupLocal
     include Command::Stages::CleanupRepo

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

@@ -63,6 +63,10 @@ module Dapp
           basename
         end
 
+        def validate_repo_name(repo)
+          raise(Error::Project, code: :repo_name_incorrect, data: { name: repo }) unless repo =~ DockerRegistry.repo_regex
+        end
+
         def proper_cache_version?
           !!cli_options[:proper_cache_version]
         end

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

@@ -6,6 +6,7 @@ module Dapp
       # Push
       module Push
         def push(repo)
+          validate_repo_name(repo)
           log_step_with_indent(:stages) { stages_push(repo) } if with_stages?
           build_configs.each do |config|
             log_step_with_indent(config._name) do

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

@@ -6,6 +6,7 @@ module Dapp
       # Spush
       module Spush
         def spush(repo)
+          validate_repo_name(repo)
           raise Error::Project, code: :spush_command_unexpected_apps_number unless build_configs.one?
           Application.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |app|
             app.export!(repo, format: '%{repo}:%{tag}')

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

@@ -9,6 +9,7 @@ module Dapp
           protected
 
           def registry(repo)
+            validate_repo_name(repo)
             DockerRegistry.new(repo)
           end
 

data/lib/dapp/project/command/stages/pull.rb

@@ -7,6 +7,7 @@ module Dapp
         # Pull
         module Pull
           def stages_pull(repo)
+            validate_repo_name(repo)
             build_configs.each do |config|
               log_step_with_indent(config._name) do
                 Application.new(config: config, project: self, ignore_git_fetch: true).tap do |app|

data/lib/dapp/project/command/stages/push.rb

@@ -7,6 +7,7 @@ module Dapp
         # Push
         module Push
           def stages_push(repo)
+            validate_repo_name(repo)
             build_configs.each do |config|
               log_step_with_indent(config._name) do
                 Application.new(config: config, project: self, ignore_git_fetch: true, should_be_built: true).tap do |app|

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

@@ -0,0 +1,18 @@
+module Dapp
+  # Project
+  class Project
+    # Command
+    module Command
+      # Tag
+      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
+          Application.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |app|
+            app.tag!(tag)
+          end
+        end
+      end
+    end
+  end # Project
+end # Dapp

data/lib/dapp/project/logging/process.rb

@@ -48,7 +48,7 @@ module Dapp
         # rubocop:enable Metrics/ParameterLists
 
         def log_secondary_process(message, **kwargs, &blk)
-          log_process(message, **kwargs.merge(style: { message: :secondary, success: :secondary }), &blk)
+          log_process(message, **kwargs.merge(style: { message: :secondary, success: :secondary }, quiet: !log_verbose?), &blk)
         end
 
         protected

data/lib/dapp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -408,6 +408,7 @@ files:
 - lib/dapp/cli/stages/flush_repo.rb
 - lib/dapp/cli/stages/pull.rb
 - lib/dapp/cli/stages/push.rb
+- lib/dapp/cli/tag.rb
 - lib/dapp/config/application.rb
 - lib/dapp/config/artifact.rb
 - lib/dapp/config/directive/artifact.rb
@@ -473,6 +474,7 @@ files:
 - lib/dapp/project/command/stages/flush_repo.rb
 - lib/dapp/project/command/stages/pull.rb
 - lib/dapp/project/command/stages/push.rb
+- lib/dapp/project/command/tag.rb
 - lib/dapp/project/dappfile.rb
 - lib/dapp/project/deps/base.rb
 - lib/dapp/project/deps/gitartifact.rb