dapp 0.21.16 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50ec328ea740514c549d2366d96d8889f3e29940
-  data.tar.gz: 3f1af717f6dbb3813cf8d0be4bdcc2940027859c
+SHA256:
+  metadata.gz: 77598b3aaf53c25bda513349cdd1d04f7bbb3b0381553c674753926cd9422ecc
+  data.tar.gz: c921eb3a8041c2c4bdb86b28ba6179b6cdefb17095558d44ebc87f79518a726c
 SHA512:
-  metadata.gz: 9eaa078ee0428cf2463326539e06038ac9defcac0e688e700167257b6c9d3e1db1b75a08ca6f7bdffbc4dd5fd92e77b9e66838347cc92940ae625fe21a91b958
-  data.tar.gz: 2a9fd62aeafd9d26218dd5013f45d9fc6f46d100cf3dd53e22140be42275761468061e5cc5c5ae19139761a95a63fc77dd446c5db47e4c1083f4c3127117092e
+  metadata.gz: 27a73294f4dc0bc778bad4f766f30ae6bd717258b920bf55a0c85a52274c8b7042f02c3c5b55fff308e870026b698cac55e69fe428802db9971972b475299a55
+  data.tar.gz: 27e40f37ffd4d68f06f573840b2c5d72bd5405dca1f8a0de691fd71abcc080db432cb5259c69884eaecca6abb26b43a351b545eff10060bc4c5556907a377728

data/bin/dapp

@@ -26,10 +26,6 @@ begin
       $stderr.puts "\033[1m\033[90mStacktrace dumped to #{filename}\033[0m"
     end
 
-    if Dapp::CLI.dapp_object
-      Dapp::CLI.dapp_object.sentry_exception(e)
-    end
-
     raise
   end
 rescue Dapp::Error::Shellout => e

data/config/en/net_status.yml

@@ -8,6 +8,7 @@ en:
       dimg_not_run: "Dimg run failed!"
     kube:
       deploy_timeout: "Deploy timeout!"
+      connect_timeout: "Connect timeout when connecting to kube API."
     dappfile:
       incorrect: "Dappfile with `%{error}`:\n%{message}"
     build:
@@ -51,7 +52,7 @@ en:
       cannot_run_ssh_agent: "Can't run ssh-agent!"
       ssh_key_not_found: "Ssh key `%{path}` doesn't exist!"
       docker_not_found: "Docker not found!"
-      docker_version: "Required docker version (`%{version}`): VERSION must be newer than `%{min_version}`!"
+      docker_version: "Required docker version (`%{version}`): `%{min_version}` <= VERSION <= `%{max_version}`!"
       dapp_config_file_incorrect: "%{message}"
       yaml_file_incorrect: "Yaml file `%{file}`: `%{message}`"
       yaml_incorrect: "`%{message}`"
@@ -80,7 +81,7 @@ en:
       stage_artifact_double_associate: "Can't use `%{stage}` stage for artifact; already used in `%{conflict_stage}` stage!"
       stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"
       git_artifact_remote_branch_with_commit: "Remote git repo: use `commit` or `branch` directive!"
-      artifact_conflict: "Conflict between artifacts!\n\n%{dappfile_context}"
+      artifact_conflict: "Conflict between artifacts paths!"
       scratch_unsupported_directive: "Scratch dimg has unsupported directive `%{directive}`!"
       scratch_artifact_required: "Scratch dimg without artifacts!"
       scratch_artifact_associated: "Scratch artifact can't be associated: not expected `before`/`after` attribute!"

data/lib/dapp.rb

@@ -24,8 +24,6 @@ require 'openssl'
 require 'etc'
 require 'zlib'
 require 'slugify'
-require 'sentry-raven'
-require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -36,7 +34,6 @@ require 'dapp/helper/sha256'
 require 'dapp/helper/net_status'
 require 'dapp/helper/tar'
 require 'dapp/helper/yaml'
-require 'dapp/helper/url'
 require 'dapp/prctl'
 require 'dapp/error/base'
 require 'dapp/error/dapp'
@@ -52,7 +49,6 @@ require 'dapp/config/config'
 require 'dapp/config/error/config'
 require 'dapp/dapp/lock'
 require 'dapp/dapp/ssh_agent'
-require 'dapp/dapp/sentry'
 require 'dapp/dapp/git_artifact'
 require 'dapp/dapp/dappfile'
 require 'dapp/dapp/chef'
@@ -67,6 +63,7 @@ require 'dapp/dapp/deps/base'
 require 'dapp/dapp/deps/gitartifact'
 require 'dapp/dapp/shellout/streaming'
 require 'dapp/dapp/shellout/base'
+require 'dapp/dapp/command/common'
 require 'dapp/dapp'
 require 'dapp/deployment'
 require 'dapp/deployment/config/directive/mod/group'

data/lib/dapp/cli.rb

@@ -37,10 +37,6 @@ BANNER
            show_options: true,
            exit: 0
 
-    class << self
-      attr_accessor :dapp_object
-    end
-
     def initialize(*args)
       super(*args)
 

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

@@ -62,8 +62,6 @@ module Dapp
 
         def run_dapp_command(run_method, options: {}, log_running_time: true)
           dapp = ::Dapp::Dapp.new(options: options)
-          ::Dapp::CLI.dapp_object = dapp
-          dapp.sentry_message("Manual usage: `#{options[:dapp_command]}` command") unless ENV['CI']
 
           log_dapp_running_time(dapp, ignore: !log_running_time) do
             if block_given?
@@ -74,10 +72,6 @@ module Dapp
           end
         end
 
-        def run_method
-          class_to_lowercase
-        end
-
         def log_dapp_running_time(dapp, ignore: false)
           return yield if ignore
 
@@ -94,7 +88,7 @@ module Dapp
         end
 
         def cli_options(**kwargs)
-          config.merge(dapp_command: run_method, **kwargs)
+          config.merge(**kwargs)
         end
       end
     end

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

@@ -4,7 +4,7 @@ module Dapp
       class Update < ::Dapp::CLI
         def run(_argv)
           spec = Gem::Specification.find do |s|
-            File.fnmatch?(File.join(s.full_gem_path, '**', '*'), __FILE__, File::FNM_PATHNAME)
+            File.fnmatch(File.join(s.full_gem_path, '*'), __FILE__)
           end
           unless (latest_version = latest_beta_version(spec)).nil?
             try_lock do

data/lib/dapp/dapp.rb

@@ -7,19 +7,18 @@ module Dapp
     include DappConfig
     include OptionTags
 
+    include Command::Common
+
     include Logging::Base
     include Logging::Process
     include Logging::I18n
     include Logging::Paint
 
     include SshAgent
-    include Sentry
-
     include Helper::Sha256
-    extend  Helper::Trivia
+    extend Helper::Trivia
     include Helper::Trivia
     include Helper::Tar
-    include Helper::Url
 
     include Deps::Toolchain
     include Deps::Gitartifact
@@ -40,18 +39,6 @@ module Dapp
       self.class.options
     end
 
-    def settings
-      @settings ||= begin
-        settings_path = File.join(self.class.home_dir, "settings.toml")
-
-        if File.exists? settings_path
-          TomlRB.load_file(settings_path)
-        else
-          {}
-        end
-      end
-    end
-
     def name
       @name ||= begin
         if name = options[:name]
@@ -94,18 +81,15 @@ module Dapp
       self.class.tmp_base_dir
     end
 
-    def build_dir
-      @build_dir ||= begin
+    def build_path(*path)
+      @build_path ||= begin
         if option_build_dir
           Pathname.new(option_build_dir)
         else
           path('.dapp_build')
         end.expand_path.tap(&:mkpath)
       end
-    end
-
-    def build_path(*path)
-      make_path(build_dir, *path)
+      make_path(@build_path, *path)
     end
 
     def local_git_artifact_exclude_paths(&blk)
@@ -151,38 +135,33 @@ module Dapp
     end
 
     class << self
-      def home_dir
-        File.join(Dir.home, ".dapp")
-      end
-
       def options
         @options ||= {}
       end
 
       def host_docker
         @host_docker ||= begin
-          min_docker_minor_version = Gem::Version.new('1.10')
-          unless host_docker_minor_version > min_docker_minor_version
-            raise Error::Dapp, code: :docker_version, data: { min_version: min_docker_minor_version.to_s,
-                                                              version:     host_docker_minor_version.to_s }
+          raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
+          docker_bin = res.stdout.strip
+
+          current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
+          required_min_docker_version = '1.10.0'
+          required_max_docker_version = '17.09.0'
+
+          if Gem::Version.new(required_min_docker_version) > Gem::Version.new(current_docker_version[/(\d+\.)+\d+/]) ||
+              Gem::Version.new(required_max_docker_version) < Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
+            raise Error::Dapp, code: :docker_version, data: { min_version: required_min_docker_version,
+                                                              max_version: required_max_docker_version,
+                                                              version: current_docker_version[/(\d+\.)+\d+/] }
           end
 
           [].tap do |cmd|
-            cmd << host_docker_bin
+            cmd << docker_bin
             cmd << "--config #{host_docker_config_dir}"
           end.join(' ')
         end
       end
 
-      def host_docker_bin
-        raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
-        res.stdout.strip
-      end
-
-      def host_docker_minor_version
-        Gem::Version.new(shellout!("#{host_docker_bin} --version").stdout.strip[/\d+\.\d+/])
-      end
-
       def host_docker_config_dir
         if options_with_docker_credentials? && !options[:repo].nil?
           host_docker_tmp_config_dir

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

@@ -0,0 +1,19 @@
+module Dapp
+  class Dapp
+    module Command
+      module Common
+        def option_repo
+          unless options[:repo].nil?
+            return "localhost:5000/#{name}" if options[:repo] == ':minikube'
+            options[:repo]
+          end
+        end
+
+        def dimg_registry(repo)
+          validate_repo_name!(repo)
+          ::Dapp::Dimg::DockerRegistry.new(repo)
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dapp/option_tags.rb

@@ -5,14 +5,12 @@ module Dapp
         @git_repo ||= ::Dapp::Dimg::GitRepo::Own.new(self)
       end
 
+      def tagging_schemes
+        %w(git_tag git_branch git_commit custom ci)
+      end
+
       def tags_by_scheme
         @tags_by_scheme_name ||= begin
-          if simple_tags[:custom].any?
-            if settings.fetch("sentry", {}).fetch("detect-push-tag-usage", false)
-              sentry_message("--tag or --tag-slug usage detected", extra: {"slug_tags" => simple_tags})
-            end
-          end
-
           [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|

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

@@ -32,7 +32,7 @@ module Dapp
           def safe_cp(from, to, owner, group, include_paths = [], exclude_paths = [])
             ''.tap do |cmd|
               cmd << dimg.dapp.rsync_bin
-              cmd << ' --archive --links --inplace'
+              cmd << ' --archive --links'
               cmd << " --chown=#{owner}:#{group}" if owner or group
 
               if include_paths.any?

data/lib/dapp/dimg/builder/chef/cookbook.rb

@@ -87,7 +87,7 @@ module Dapp
             "#{builder.dimg.dapp.mkdir_bin} -p ~/.ssh",
             'echo "Host *" >> ~/.ssh/config',
             'echo "    StrictHostKeyChecking no" >> ~/.ssh/config',
-            *local_paths.map {|path| "#{builder.dimg.dapp.rsync_bin} --inplace --archive --relative #{path} /tmp/local_cookbooks"},
+            *local_paths.map {|path| "#{builder.dimg.dapp.rsync_bin} --archive --relative #{path} /tmp/local_cookbooks"},
             "cd /tmp/local_cookbooks/#{path}",
             "cp #{tmp_berksfile_path} Berksfile",
             "cp #{tmp_metadata_path} metadata.rb",

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

@@ -20,6 +20,10 @@ module Dapp::Dimg::CLI
           end
         end
       end
+
+      def run_method
+        class_to_lowercase
+      end
     end
   end
 end

data/lib/dapp/dimg/config/directive/artifact_dimg.rb

@@ -5,6 +5,13 @@ module Dapp
         class ArtifactDimg < Dimg
           def validate_scratch!
           end
+
+          def validate_artifacts_artifacts!
+          end
+
+          def validated_artifacts
+            _git_artifact._local + _git_artifact._remote
+          end
         end
       end
     end

data/lib/dapp/dimg/config/directive/dimg/instance_methods.rb

@@ -132,7 +132,6 @@ module Dapp
 
             def artifacts_after_parsing!
               _artifacts_auto_excluding!
-              _artifact.map(&:_config).each(&:artifacts_after_parsing!)
             end
 
             protected

data/lib/dapp/dimg/config/directive/dimg/validation.rb

@@ -4,8 +4,6 @@ module Dapp
       module Directive
         class Dimg < Base
           module Validation
-            include Helper::Trivia
-
             def validate!
               directives_validate!
               validate_scratch!
@@ -75,39 +73,12 @@ module Dapp
                 verifiable_artifact = artifacts.shift
                 artifacts.select { |a| a[:to] == verifiable_artifact[:to] }.each do |artifact|
                   next if verifiable_artifact[:index] == artifact[:index]
-                  begin
-                    validate_artifact!(verifiable_artifact, artifact)
-                    validate_artifact!(artifact, verifiable_artifact)
-                  rescue Error::Config => e
-                    conflict_between_artifacts!(artifact, verifiable_artifact) if e.net_status[:code] == :artifact_conflict
-                    raise
-                  end
+                  validate_artifact!(verifiable_artifact, artifact)
+                  validate_artifact!(artifact, verifiable_artifact)
                 end
               end
             end
 
-            def conflict_between_artifacts!(*formatted_artifacts)
-              artifacts = formatted_artifacts.flatten.map { |formatted_artifact| formatted_artifact[:related_artifact] }
-              dappfile_context = artifacts.map do |artifact|
-                artifact_directive = []
-                artifact_directive << begin
-                  if artifact.is_a? Artifact::Export
-                    "artifact.export('#{artifact._cwd}') do"
-                  else
-                    "git#{"('#{artifact._url}')" if artifact.respond_to?(:_url)}.add('#{artifact._cwd}') do"
-                  end
-                end
-                [:include_paths, :exclude_paths].each do |directive|
-                  next if (paths = artifact.send("_#{directive}")).empty?
-                  artifact_directive << "  #{directive} '#{paths.join("', '")}'"
-                end
-                artifact_directive << "  to '#{artifact._to}'"
-                artifact_directive << 'end'
-                artifact_directive.join("\n")
-              end.join("\n\n")
-              raise Error::Config, code: :artifact_conflict, data: { dappfile_context: dappfile_context }
-            end
-
             def validate_artifact_format(artifacts)
               artifacts.map do |a|
                 path_format = proc { |path| File.expand_path(File.join('/', path, '/'))[1..-1] }
@@ -135,20 +106,26 @@ module Dapp
                   index: artifacts.index(a),
                   to: to,
                   include_paths: include_paths,
-                  exclude_paths: exclude_paths,
-                  related_artifact: a
+                  exclude_paths: exclude_paths
                 }
               end
             end
 
             def validate_artifact!(verifiable_artifact, artifact)
-              cases = []
-              cases << verifiable_artifact[:include_paths].any? do |verifiable_path|
-                !ignore_path?(verifiable_path, paths: artifact[:include_paths], exclude_paths: artifact[:exclude_paths])
-              end
-              cases << (verifiable_artifact[:include_paths].empty? && artifact[:include_paths].empty?)
+              verifiable_artifact[:include_paths].each do |verifiable_path|
+                potential_conflicts = artifact[:include_paths].select { |path| path.start_with?(verifiable_path) }
+                validate_artifact_path!(verifiable_artifact, potential_conflicts)
+              end.empty? && verifiable_artifact[:exclude_paths].empty? && raise(Error::Config, code: :artifact_conflict)
+              validate_artifact_path!(verifiable_artifact, artifact[:include_paths]) if verifiable_artifact[:include_paths].empty?
+            end
 
-              raise Error::Config, code: :artifact_conflict if cases.any?
+            def validate_artifact_path!(verifiable_artifact, potential_conflicts)
+              potential_conflicts.all? do |path|
+                loop do
+                  break if verifiable_artifact[:exclude_paths].include?(path) || ((path = File.dirname(path)) == '.')
+                end
+                verifiable_artifact[:exclude_paths].include?(path)
+              end.tap { |res| res || raise(Error::Config, code: :artifact_conflict) }
             end
 
             def _associated_artifacts

data/lib/dapp/dimg/config/directive/git_artifact_remote.rb

@@ -3,13 +3,14 @@ module Dapp
     module Config
       module Directive
         class GitArtifactRemote < GitArtifactLocal
-          include ::Dapp::Helper::Url
-
           attr_reader :_url, :_name, :_branch, :_commit
 
           def initialize(url, **kwargs, &blk)
             @_url  = url
-            @_name = git_url_to_name(url)
+
+            url_without_scheme = url.split("://", 2).last
+            url_without_creds = url_without_scheme.split(":", 2).last
+            @_name = url_without_creds.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
 
             super(**kwargs, &blk)
           end
@@ -19,7 +20,7 @@ module Dapp
           end
 
           def commit(value)
-            sub_directive_eval { @_commit = value.to_s }
+            sub_directive_eval { @_commit = value }
           end
 
           def _export
@@ -39,11 +40,11 @@ module Dapp
             end
 
             def branch(value)
-              sub_directive_eval { @_branch = value.to_s }
+              sub_directive_eval { @_branch = value }
             end
 
             def commit(value)
-              sub_directive_eval { @_commit = value.to_s }
+              sub_directive_eval { @_commit = value }
             end
 
             def validate!