dapp 0.22.1 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c045374a9efddfa40e6eaf95436a0226f968a11d5c9d8dd4898de44114e1c097
-  data.tar.gz: cd7951c2d9fa47ee3c0453bb27b7a21f1bec83e0aa3e9d8685c0435dacf3e72a
+  metadata.gz: 6772c46b21f3e433f04fb8c2c1d3ebc12cd48d41783c70751ba2eb90ae8dc0d5
+  data.tar.gz: f4a098cc19c7357ec473d3167b6b793d1e6197a6592e4abdca449a6d78674273
 SHA512:
-  metadata.gz: 9eef997b64338768d8f7f37aa579a3e4c332335b4ade9538fec69e0db7330a6c2b86574ec5192eb510bbca058079601aecca977346cf45e85521a94ecfea9b1c
-  data.tar.gz: 8a9ef60b34392efe292a5caa02834b0109eb5ef786fc07680ac640050fcc08256a525f194217d395917b3f628a568f31d7f11f1c5064738a52c4e2a02500f8f3
+  metadata.gz: 10534955c4393d6241001a96d90e20bc667f6ae09a5d4a1a2f4a15caced9b928646d53aa53598ac0c5132559305546a7f802548e30156a7ad5a24f967d70f111
+  data.tar.gz: 01cf0cbf46224eb0c5b95269e681fe5e73703a0a216f3f898faaa5d5471bc6c536fd396caa1fbee873d81f9e606679028849fc3b01e290dcb6ca9094e20ca219

data/lib/dapp.rb

@@ -43,6 +43,7 @@ require 'dapp/exception/base'
 require 'dapp/cli'
 require 'dapp/cli/command/base'
 require 'dapp/cli/command/update'
+require 'dapp/cli/command/slug'
 require 'dapp/cli/cli'
 require 'dapp/config/directive/base'
 require 'dapp/config/config'
@@ -54,6 +55,7 @@ require 'dapp/dapp/dappfile'
 require 'dapp/dapp/chef'
 require 'dapp/dapp/dapp_config'
 require 'dapp/dapp/option_tags'
+require 'dapp/dapp/slug'
 require 'dapp/dapp/logging/base'
 require 'dapp/dapp/logging/process'
 require 'dapp/dapp/logging/paint'
@@ -64,6 +66,7 @@ require 'dapp/dapp/deps/gitartifact'
 require 'dapp/dapp/shellout/streaming'
 require 'dapp/dapp/shellout/base'
 require 'dapp/dapp/command/common'
+require 'dapp/dapp/command/slug'
 require 'dapp/dapp'
 require 'dapp/deployment'
 require 'dapp/deployment/config/directive/mod/group'

data/lib/dapp/cli.rb

@@ -5,7 +5,7 @@ module Dapp
     extend Helper::Cli
     include Helper::Trivia
 
-    SUBCOMMANDS = ['dimg', 'deployment', 'kube', 'update'].freeze
+    SUBCOMMANDS = ['dimg', 'deployment', 'kube', 'update', 'slug'].freeze
 
     banner <<BANNER.freeze
 Usage: dapp subcommand [subcommand options]
@@ -16,6 +16,7 @@ Available subcommands: (for details, dapp SUB-COMMAND --help)
   dapp deployment
   dapp kube
   dapp update
+  dapp slug STRING
 
 Options:
 BANNER

data/lib/dapp/cli/command/base.rb

@@ -7,9 +7,13 @@ module Dapp
                description: 'Change to directory',
                on: :head
 
-        option :build_dir,
-               long: '--build-dir PATH',
-               description: 'Directory where build cache stored (DIR/.dapp_build by default)'
+        %w(run_dir build_dir deploy_dir).tap do |dirs|
+          dirs.each do |dir|
+            option dir.to_sym,
+                  long: "--#{dir.gsub("_", "-")} PATH",
+                  description: "Directory where reside: build cache, lock files for concurrent dapp operations (DIR/.dapp_build by default). Alias for #{(dirs - [dir]).map{|d| "--" + d.gsub("_", "-")}.join(", ")}."
+          end
+        end
 
         option :name,
                long: "--name NAME",
@@ -88,7 +92,12 @@ module Dapp
         end
 
         def cli_options(**kwargs)
-          config.merge(**kwargs)
+          dirs = [config[:build_dir], config[:run_dir], config[:deploy_dir]]
+          if dirs.compact.size > 1
+            self.class.print_error_with_help_and_die! self, "cannot use alias options --run-dir, --build-dir, --deploy-dir at the same time"
+          end
+
+          config.merge(build_dir: dirs.compact.first, **kwargs)
         end
       end
     end

data/lib/dapp/cli/command/slug.rb

@@ -0,0 +1,22 @@
+module Dapp
+  class CLI
+    module Command
+      class Slug < Base
+        banner <<BANNER.freeze
+Usage:
+
+  dapp slug STRING
+
+Options:
+BANNER
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          str = self.class.required_argument(self, 'string')
+          run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+            dapp.slug([cli_arguments, str].flatten.join(' '))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/cli/command/update.rb

@@ -2,7 +2,17 @@ module Dapp
   class CLI
     module Command
       class Update < ::Dapp::CLI
-        def run(_argv)
+        banner <<BANNER.freeze
+Usage:
+
+  dapp update
+
+Options:
+BANNER
+
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+
           spec = Gem::Specification.find do |s|
             File.fnmatch?(File.join(s.full_gem_path, '**', '*'), __FILE__, File::FNM_PATHNAME)
           end

data/lib/dapp/dapp.rb

@@ -6,8 +6,10 @@ module Dapp
     include Chef
     include DappConfig
     include OptionTags
+    include Slug
 
     include Command::Common
+    include Command::Slug
 
     include Logging::Base
     include Logging::Process
@@ -41,17 +43,20 @@ module Dapp
 
     def name
       @name ||= begin
-        if name = options[:name]
-          name
-        elsif git_url
-          repo_name = git_url.split('/').last
-          repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
-          repo_name
-        elsif git_path
-          File.basename(File.dirname(git_path)).to_s
-        else
-          path.basename.to_s
+        n = begin
+          if (name = options[:name])
+            name
+          elsif git_url
+            repo_name = git_url.split('/').last
+            repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
+            repo_name
+          elsif git_path
+            File.basename(File.dirname(git_path)).to_s
+          else
+            path.basename.to_s
+          end
         end
+        consistent_uniq_slugify(n)
       end
     end
 

data/lib/dapp/dapp/command/slug.rb

@@ -0,0 +1,11 @@
+module Dapp
+  class Dapp
+    module Command
+      module Slug
+        def slug(str)
+          puts consistent_uniq_slugify(str)
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dapp/option_tags.rb

@@ -14,6 +14,9 @@ module Dapp
           [simple_tags, branch_tags, commit_tags, build_tags, ci_tags].reduce({}) do |some_tags_by_scheme, tags_by_scheme|
             tags_by_scheme.in_depth_merge(some_tags_by_scheme)
           end.tap do |tags_by_scheme|
+            [:git_branch, :git_tag].each do |scheme|
+              tags_by_scheme[scheme].map!(&method(:consistent_uniq_slugify)) unless tags_by_scheme[scheme].nil?
+            end
             tags_by_scheme[:custom] = [:latest] if tags_by_scheme.values.flatten.empty?
           end
         end

data/lib/dapp/dapp/slug.rb

@@ -0,0 +1,25 @@
+module Dapp
+  class Dapp
+    module Slug
+      def consistent_uniq_slugify(s)
+        if should_be_slugged?(s)
+          consistent_uniq_slug_reg =~ s.slugify.squeeze('--')
+          [].tap do |slug|
+            slug << Regexp.last_match(1) unless Regexp.last_match(1).nil?
+            slug << MurmurHash3::V32.str_hexdigest(s)
+          end.compact.join('-')
+        else
+          s
+        end
+      end
+
+      def should_be_slugged?(s)
+        !(/^#{consistent_uniq_slug_reg}$/ =~ s)
+      end
+
+      def consistent_uniq_slug_reg
+        /(?!-)((-?[a-z0-9]+)+)(?<!-)/
+      end
+    end # Slug
+  end # Dapp
+end # Dapp

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

@@ -247,7 +247,7 @@ module Dapp
           end
 
           def image_should_be_prepared?
-            (!image.built? && !should_be_not_present? || image_should_be_introspected?) && !dimg.dapp.dry_run?
+            (!image.built? && !should_be_not_present? || image_should_be_introspected? && image.tagged?) && !dimg.dapp.dry_run?
           end
 
           def should_be_renewed?

data/lib/dapp/dimg/cli/command/dimg/cleanup_repo.rb

@@ -19,6 +19,10 @@ BANNER
                long: '--with-stages',
                boolean: true
 
+        option :without_kube,
+               long: '--without-kube',
+               boolean: true
+
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
           repo = self.class.required_argument(self, 'repo')

data/lib/dapp/dimg/dapp/command/cleanup_repo.rb

@@ -42,8 +42,8 @@ module Dapp
               cleanup_repo_by_nonexistent_git_base(detailed_dimgs_images_by_scheme, scheme) do |detailed_dimg_image|
                 delete_repo_image(registry, detailed_dimg_image) unless begin
                   case scheme
-                    when 'git_tag'    then git_local_repo.tags.include?(detailed_dimg_image[:tag])
-                    when 'git_branch' then git_local_repo.remote_branches.include?(detailed_dimg_image[:tag])
+                    when 'git_tag'    then consistent_git_tags.include?(detailed_dimg_image[:tag])
+                    when 'git_branch' then consistent_git_remote_branches.include?(detailed_dimg_image[:tag])
                     when 'git_commit' then git_local_repo.commit_exists?(detailed_dimg_image[:tag])
                     else
                       raise
@@ -53,6 +53,14 @@ module Dapp
             end
           end
 
+          def consistent_git_tags
+            git_tag_by_consistent_tag_name.keys
+          end
+
+          def consistent_git_remote_branches
+            @consistent_git_remote_branches ||= git_local_repo.remote_branches.map(&method(:consistent_uniq_slugify))
+          end
+
           def cleanup_repo_by_nonexistent_git_base(repo_dimgs_images_by_scheme, dapp_tag_scheme)
             return if repo_dimgs_images_by_scheme[dapp_tag_scheme].empty?
             log_step_with_indent(:"nonexistent #{dapp_tag_scheme.split('_').join(' ')}") do
@@ -98,6 +106,14 @@ module Dapp
               end
           end
 
+          def git_tag_by_consistent_git_tag(consistent_git_tag)
+            git_tag_by_consistent_tag_name[consistent_git_tag]
+          end
+
+          def git_tag_by_consistent_tag_name
+            @git_consistent_tags ||= git_local_repo.tags.map { |t| [consistent_uniq_slugify(t), t] }.to_h
+          end
+
           def repo_detailed_dimgs_images(registry)
             repo_dimgs_images(registry).each do |dimg|
               image_history = registry.image_history(dimg[:tag], dimg[:dimg])
@@ -107,6 +123,8 @@ module Dapp
           end
 
           def deployed_docker_images
+            return [] if without_kube?
+
             # open kube client, get all pods and select containers' images
             ::Dapp::Kube::Kubernetes::Client.tap do |kube|
               config_file = kube.kube_config_path
@@ -138,6 +156,10 @@ module Dapp
               image.start_with?(option_repo)
             end
           end
+
+          def without_kube?
+            !!options[:without_kube]
+          end
         end
       end
     end

data/lib/dapp/dimg/image/argument.rb

@@ -110,7 +110,7 @@ module Dapp
         end
 
         def all_options
-          service_options.merge(options)
+          service_options.in_depth_merge(options)
         end
 
         def all_bash_commands
@@ -118,7 +118,12 @@ module Dapp
         end
 
         def service_options
-          { entrypoint: dapp.bash_bin, name: container_name, user: '0:0' }
+          {
+            entrypoint: dapp.bash_bin,
+            name: container_name,
+            user: '0:0',
+            :'volumes-from' => [dapp.base_container, dapp.toolchain_container]
+          }
         end
 
         def prepared_change

data/lib/dapp/dimg/image/stage.rb

@@ -22,18 +22,12 @@ module Dapp
         end
 
         def build!
-          add_build_service_volumes
           run!
           @built_id = commit!
         ensure
           dapp.shellout("#{dapp.host_docker} rm #{container_name}")
         end
 
-        def add_build_service_volumes
-          add_volumes_from dapp.toolchain_container
-          add_volumes_from dapp.base_container
-        end
-
         def built?
           !built_id.nil?
         end

data/lib/dapp/helper/cli.rb

@@ -10,22 +10,23 @@ module Dapp
       def cli_wrapper(cli)
         yield
       rescue OptionParser::MissingArgument, OptionParser::InvalidOption, OptionParser::InvalidArgument, OptionParser::AmbiguousOption => e
-        STDERR.puts "Error: #{e.message}"
-        puts
-        puts cli.opt_parser
-        exit 1
+        print_error_with_help_and_die!(cli, e.message)
       end
 
       def required_argument(cli, argument)
         unless (arg = cli.cli_arguments.pop)
-          STDERR.puts "Error: required argument `#{argument.upcase}`"
-          puts
-          puts cli.opt_parser
-          exit 1
+          print_error_with_help_and_die!(cli, "required argument `#{argument.upcase}`")
         end
         arg
       end
 
+      def print_error_with_help_and_die!(cli, error_message)
+        STDERR.puts "Error: #{error_message}"
+        puts
+        puts cli.opt_parser
+        exit 1
+      end
+
       def parse_subcommand(cli, args)
         argv = args
         divided_subcommand = []

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

@@ -3,6 +3,10 @@ module Dapp
     module Dapp
       module Command
         module Common
+          def lock_helm_release(&blk)
+            lock("helm_release.#{kube_release_name}", &blk)
+          end
+
           def helm_release
             kube_check_helm!
             kube_check_helm_template_plugin!
@@ -260,7 +264,7 @@ image: {{ tuple $name $context | include "_dimg2" }}
           end
 
           def kube_release_name
-            "#{name}-#{kube_namespace}".slugify
+            consistent_uniq_slugify("#{name}-#{kube_namespace}")
           end
 
           { encode: :generate, decode: :extract }.each do |type, secret_method|

data/lib/dapp/kube/dapp/command/deploy.rb

@@ -5,8 +5,16 @@ module Dapp
         module Deploy
           def kube_deploy
             helm_release do |release|
-              kube_flush_hooks_jobs(release)
-              kube_run_deploy(release)
+              do_deploy = proc do
+                kube_flush_hooks_jobs(release)
+                kube_run_deploy(release)
+              end
+
+              if dry_run?
+                do_deploy.call
+              else
+                lock_helm_release &do_deploy
+              end
             end
           end
 

data/lib/dapp/kube/dapp/command/dismiss.rb

@@ -4,11 +4,13 @@ module Dapp
       module Command
         module Dismiss
           def kube_dismiss
-            kube_check_helm!
-            kube_check_helm_release!
-            log_process("Delete release #{kube_release_name}") do
-              shellout! "helm delete #{kube_release_name} --purge"
-              kubernetes.delete_namespace!(kube_namespace) if options[:with_namespace]
+            lock_helm_release do
+              kube_check_helm!
+              kube_check_helm_release!
+              log_process("Delete release #{kube_release_name}") do
+                shellout! "helm delete #{kube_release_name} --purge"
+                kubernetes.delete_namespace!(kube_namespace) if options[:with_namespace]
+              end
             end
           end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.22.1'.freeze
+  VERSION = '0.22.2'.freeze
   BUILD_CACHE_VERSION = 25
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -425,6 +425,7 @@ files:
 - lib/dapp/cli.rb
 - lib/dapp/cli/cli.rb
 - lib/dapp/cli/command/base.rb
+- lib/dapp/cli/command/slug.rb
 - lib/dapp/cli/command/update.rb
 - lib/dapp/config/config.rb
 - lib/dapp/config/directive/base.rb
@@ -434,6 +435,7 @@ files:
 - lib/dapp/dapp.rb
 - lib/dapp/dapp/chef.rb
 - lib/dapp/dapp/command/common.rb
+- lib/dapp/dapp/command/slug.rb
 - lib/dapp/dapp/dapp_config.rb
 - lib/dapp/dapp/dappfile.rb
 - lib/dapp/dapp/deps/base.rb
@@ -448,6 +450,7 @@ files:
 - lib/dapp/dapp/option_tags.rb
 - lib/dapp/dapp/shellout/base.rb
 - lib/dapp/dapp/shellout/streaming.rb
+- lib/dapp/dapp/slug.rb
 - lib/dapp/dapp/ssh_agent.rb
 - lib/dapp/deployment.rb
 - lib/dapp/deployment/app.rb