dapp 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d611af62545ae4ad1322d6534e2ecb72f8e9ff5
-  data.tar.gz: 2df141836542876fb905510294f9ccdc1349f5c0
+  metadata.gz: 272df4bf11a8835a28a24c7c07d6267b1621ed69
+  data.tar.gz: 8b938f63edb0d4c2ccceffc8e901ab23432ad46f
 SHA512:
-  metadata.gz: 268e5c5c069fb04af95505e33c835cc7c305a55756944444ee5964b34407e1a5b05b8c4bff0e3d7f3f0bca8d26e70ddba99e995e659935a740074d38adcd76d6
-  data.tar.gz: 406cadcaa4493ed0b6654651281ee0a31b71a9281bfb061239fc8731805cbf0e8ada7a99008e4026b827dc9a3e3523b307c84cf8197930ca2a3b929f75546a50
+  metadata.gz: 263b8f2dae547e2d70b6bae8b3ae4977f030df3436208237e5b2eb55814d2795d021b73606ad5e7696827173930eb5fcd1fdc4e03efc4623baa4f513331c1c9b
+  data.tar.gz: 1f24ef716042766765497256794bafd8b3d99f17d546852bce63e430ac84cbba1e78e18fc04269c4a48590e28e6278e8bbbd6b0938923c05b7209b0d1732d2d3

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:
       wrong_using_base_directive: "WARNING: Directive '%{directive}' has declared after dimg_group|dimg|artifact!"
       wrong_using_directive: "WARNING: Directive '%{directive}' has declared after dimg_group|dimg!"

data/config/en/net_status.yml

@@ -21,6 +21,9 @@ en:
       spush_command_unexpected_dimgs_number: "Command 'spush' can process only one dimg!"
       command_unexpected_dimgs_number: "Command can process only one dimg!"
       no_such_dimg: "No such dimg: '%{dimgs_patterns}'!"
+      tag_command_unexpected_dimgs_number: "Command 'tag' can process only one dimg!"
+      tag_command_incorrect_tag: "Incorrect tag ('%{name}') given!"
+      repo_name_incorrect: "Incorrect repo ('%{name}') given!"
       dappfile_not_found: "Dappfile not found!"
       cannot_run_ssh_agent: "Cannot run ssh-agent"
       ssh_key_not_found: "Ssh key '%{path}' not exist!"

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'
@@ -129,6 +130,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/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 dimg.project.dry_run?
+          image.save_in_cache! unless dimg.project.dry_run?
         end
 
         def image
@@ -101,10 +101,10 @@ module Dapp
         end
 
         def image_add_default_volumes(type)
-          (dimg.config.public_send("_#{type}_mount").map(&:to) +
+          (dimg.config.public_send("_#{type}_mount").map(&:_to) +
             from_image.labels.select { |l, _| l == "dapp-#{type}-dir" }.map { |_, value| value.split(';') }.flatten).each do |path|
             absolute_path = File.expand_path(File.join('/', path))
-            tmp_path = dimg.send("#{type}_path", 'mount', absolute_path[1..-1]).tap(&:mkpath)
+            tmp_path = dimg.send(type, 'mount', absolute_path[1..-1]).tap(&:mkpath)
             image.add_volume "#{tmp_path}:#{absolute_path}"
           end
         end

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] [DIMGS PATTERN ...]
 dapp bp [options] [DIMGS PATTERN ...] REPO
 dapp push [options] [DIMGS PATTERN] REPO
 dapp spush [options] [DIMG PATTERN ...] REPO
+dapp tag [options] [DIMG PATTERN ...] TAG
 dapp list [options] [DIMGS PATTERN ...]
 dapp run [options] [DIMG PATTERN] [DOCKER ARGS]
 dapp cleanup [options] [DIMGS 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] [DIMG PATTERN ...] TAG
+
+    DIMG PATTERN                Dapp image 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, dimgs_patterns: cli_arguments).public_send(class_to_lowercase, tag)
+      end
+    end
+  end
+end

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

@@ -7,7 +7,9 @@ module Dapp
           attr_reader :_from, :_from_cache_version
 
           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/dimg.rb

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

data/lib/dapp/dimg/path.rb

@@ -28,6 +28,9 @@ module Dapp
         container_dapp_path('tmp', *path)
       end
 
+      alias_method :build_dir, :build_path
+      alias_method :tmp_dir, :tmp_path
+
       private
 
       def make_path(base, *path)

data/lib/dapp/dimg/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/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

@@ -55,6 +55,10 @@ module Dapp
           name
         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_dimg_name_with_indent(config) 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_dimgs_number unless build_configs.one?
           Dimg.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |dimg|
             dimg.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_dimg_name_with_indent(config) do
                 Dimg.new(config: config, project: self, ignore_git_fetch: true).tap do |dimg|

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_dimg_name_with_indent(config) do
                 Dimg.new(config: config, project: self, ignore_git_fetch: true, should_be_built: true).tap do |dimg|

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_dimgs_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.7.2'.freeze
+  VERSION = '0.7.3'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 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
@@ -404,6 +404,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/artifact_dimg.rb
 - lib/dapp/config/artifact_group.rb
 - lib/dapp/config/base.rb
@@ -483,6 +484,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