dapp 0.24.12 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd3ff0c4bceec9cdd276f5fe5ad81ebf540ff88
-  data.tar.gz: 0757dc0b74af4c3acebfe2143c236e1fb0470f2b
+  metadata.gz: 9feef0467f4a300a3890d8c35fca220590a9fd19
+  data.tar.gz: eb7cb2377a0dd260976a6bbfd08c51cf50e4c4bf
 SHA512:
-  metadata.gz: d3cf61182dba6fdd9c610b5de68fa379c0c58dfc859936751c4744852fe7961ebff2a5d61c1ea9362fe244fd45de04e2e09becada2b5c64aa6efae9477c3681f
-  data.tar.gz: f0e10a6ff4126492b75cc7806bc9cb5c4667cf47a6f7b608e4906ab4b92dd25e40fd6cda72449955c98e4ab289cec7455ecc79a31cc024b26686eb24ca34ddbd
+  metadata.gz: 0050bb050988788005d6af8dd2432ca5b3e9b02dd6f5fbd3203deab1adc36253f0d460ab31bac8c3ba17229a21c00ba1c6c180202496ff76a3e030cb665b360c
+  data.tar.gz: 19cc26da6da554416efa0969d0ccc88e061578cbd8b4147cf6af785eba4169555d7f10ec73fb85ee2a729c12d2795e793e1f6b86bb36d1900ec9154e7b94c23d

data/bin/dapp

@@ -28,10 +28,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/lib/dapp.rb

@@ -26,8 +26,6 @@ require 'zlib'
 require 'slugify'
 require 'base64'
 require 'io/console'
-require 'sentry-raven'
-require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -38,7 +36,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/mod/user'
 require 'dapp/error/base'
@@ -59,7 +56,6 @@ require 'dapp/config/directive/base'
 require 'dapp/config/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'

data/lib/dapp/cli.rb

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

@@ -58,8 +58,6 @@ module Dapp
 
         def run_dapp_command(run_method, options: {}, log_running_time: true, try_host_docker_login: false)
           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
             begin
@@ -76,10 +74,6 @@ module Dapp
           end
         end
 
-        def run_method
-          class_to_lowercase
-        end
-
         def log_dapp_running_time(dapp, ignore: false)
           return yield if ignore
 
@@ -101,7 +95,7 @@ module Dapp
             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, dapp_command: run_method, **kwargs)
+          config.merge(build_dir: dirs.compact.first, **kwargs)
         end
       end
     end

data/lib/dapp/dapp.rb

@@ -17,13 +17,10 @@ module Dapp
     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
@@ -46,18 +43,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
         n = begin
@@ -107,8 +92,8 @@ 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
@@ -116,10 +101,7 @@ module Dapp
           Pathname.new(dir)
         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)

data/lib/dapp/dapp/option_tags.rb

@@ -7,12 +7,6 @@ module Dapp
 
       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/base.rb

@@ -189,10 +189,8 @@ module Dapp
             commits[git_artifact] ||= begin
               if image.built?
                 image.labels[dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash)]
-              elsif g_a_stage? && !empty?
+              else
                 git_artifact.latest_commit
-              elsif prev_stage
-                prev_stage.layer_commit(git_artifact)
               end
             end
           end

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

@@ -10,7 +10,7 @@ module Dapp
               image.add_volume "#{dimg.tmp_path('patches')}:#{dimg.container_tmp_path('patches')}:ro"
 
               dimg.git_artifacts.each do |git_artifact|
-                image.add_service_change_label(dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash).to_sym => layer_commit(git_artifact))
+                image.add_service_change_label(dimg.dapp.dimgstage_g_a_commit_label(git_artifact.paramshash).to_sym => git_artifact.latest_commit)
                 image.add_command git_artifact.send(apply_command_method, self)
               end
             end

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

@@ -28,9 +28,7 @@ module Dapp
           private
 
           def commit_list
-            dimg.git_artifacts
-              .select { |ga| ga.repo.commit_exists?(prev_stage.layer_commit(ga)) && ga.patch_any_changes?(self) }
-              .map(&method(:layer_commit))
+            dimg.git_artifacts.map { |git_artifact| layer_commit(git_artifact) }
           end
 
           def git_artifacts_dev_patch_hashes

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

@@ -9,6 +9,10 @@ module Dapp::Dimg::CLI
         self.class.parse_options(self, argv)
         run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments))
       end
+
+      def run_method
+        class_to_lowercase
+      end
     end
   end
 end

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

@@ -22,6 +22,18 @@ BANNER
           :g_a_pre_setup_patch, :setup, :after_setup_artifact, :g_a_artifact_patch, :build_artifact
         ]
 
+        introspect_stage_proc = proc do |stages|
+          proc { |val| val.to_sym.tap { |v| in_validate!(v, stages) } }
+        end
+
+        introspect_before_proc = proc do |stages|
+          proc do |val|
+            val_sym = val.to_sym
+            introspect_stage_proc.call(stages[1..-1]).call(val_sym)
+            stages[stages.index(val_sym) - 1]
+          end
+        end
+
         option :tmp_dir_prefix,
                long: '--tmp-dir-prefix PREFIX',
                description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
@@ -48,12 +60,22 @@ BANNER
         option :introspect_stage,
                long: '--introspect-stage STAGE',
                description: "Introspect one of the following stages (#{list_msg_format(introspected_stages)})",
-               proc: proc { |val| val.to_sym.tap { |v| in_validate!(v, introspected_stages) } }
+               proc: introspect_stage_proc.call(introspected_stages)
+
+        option :introspect_before,
+               long: '--introspect-before STAGE',
+               description: "Introspect stage before one of the following stages (#{list_msg_format(introspected_stages[1..-1])})",
+               proc: introspect_before_proc.call(introspected_stages)
 
         option :introspect_artifact_stage,
                long: '--introspect-artifact-stage STAGE',
                description: "Introspect one of the following stages (#{list_msg_format(artifact_introspected_stages)})",
-               proc: proc { |val| val.to_sym.tap { |v| in_validate!(v, artifact_introspected_stages) } }
+               proc: introspect_stage_proc.call(artifact_introspected_stages)
+
+        option :introspect_artifact_before,
+               long: '--introspect-artifact-before STAGE',
+               description: "Introspect stage before one of the following stages (#{list_msg_format(artifact_introspected_stages[1..-1])})",
+               proc: introspect_before_proc.call(artifact_introspected_stages)
 
         option :ssh_key,
                long: '--ssh-key SSH_KEY',
@@ -75,6 +97,13 @@ BANNER
                long: '--force-save-cache',
                boolean: true,
                default: false
+
+        def cli_options(**kwargs)
+          super.tap do |config|
+            config[:introspect_stage] ||= config[:introspect_before]
+            config[:introspect_artifact_stage] ||= config[:introspect_artifact_before]
+          end
+        end
       end
     end
   end

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!
@@ -140,13 +138,29 @@ module Dapp
             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])
+              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
+
+              if verifiable_artifact[:include_paths].empty?
+                if artifact[:include_paths].empty? || verifiable_artifact[:exclude_paths].empty?
+                  raise ::Dapp::Error::Config, code: :artifact_conflict
+                else
+                  validate_artifact_path!(verifiable_artifact, artifact[:include_paths])
+                end
               end
-              cases << (verifiable_artifact[:include_paths].empty? && artifact[:include_paths].empty?)
+            end
 
-              raise ::Dapp::Error::Config, code: :artifact_conflict if cases.any?
+            def validate_artifact_path!(verifiable_artifact, potential_conflicts)
+              raise ::Dapp::Error::Config, code: :artifact_conflict unless begin
+                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
+              end
             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

data/lib/dapp/dimg/dimg.rb

@@ -189,8 +189,6 @@ module Dapp
       end
 
       def cleanup_tmp
-        return unless tmp_dir_exists?
-
         # В tmp-директории могли остаться файлы, владельцами которых мы не являемся.
         # Такие файлы могут попасть туда при экспорте файлов артефакта.
         # Чтобы от них избавиться — запускаем docker-контейнер под root-пользователем

data/lib/dapp/dimg/dimg/path.rb

@@ -6,10 +6,6 @@ module Dapp
           dapp.path(*path).expand_path
         end
 
-        def tmp_dir_exists?
-          @tmp_path != nil
-        end
-
         def tmp_path(*path)
           @tmp_path ||= Dir.mktmpdir('dapp-', dapp.tmp_base_dir)
           make_path(@tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }

data/lib/dapp/dimg/docker_registry/base.rb

@@ -35,6 +35,7 @@ module Dapp
         end
 
         def image_delete(tag)
+          image_blobs(tag).each { |hash| blob_delete(hash.values.first) }
           api_request(repo_suffix, "/manifests/#{image_digest(tag)}",
                       method: :delete,
                       expects: [202, 404],
@@ -53,6 +54,10 @@ module Dapp
                           headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' }).headers['Docker-Content-Digest']
         end
 
+        def image_blobs(tag)
+          manifest_v1(tag)['fsLayers']
+        end
+
         def manifest_v1(tag)
           api_request(repo_suffix, "/manifests/#{tag}")
         end
@@ -62,6 +67,11 @@ module Dapp
                       headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' })
         end
 
+        def blob_delete(id)
+          api_request(repo_suffix, "/blobs/#{id}",
+                      method: :delete, expects: [202, 404])
+        end
+
         def api_request(*uri, **options)
           JSON.load(raw_api_request(*uri, **options).body)
         end

data/lib/dapp/dimg/git_artifact.rb

@@ -121,7 +121,7 @@ module Dapp
           last_part_path = path_parts.shift
           test_path      = [test_path, last_part_path].compact.join('/')
 
-          non_match    = !File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
+          non_match    = !File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME)
           part_for_all = (last_part_path == '**')
 
           if non_match || part_for_all

data/lib/dapp/dimg/git_repo/base.rb

@@ -104,12 +104,12 @@ module Dapp
 
         def patches(from, to, paths: [], exclude_paths: [], **kwargs)
           diff(from, to, **kwargs).patches.select do |patch|
-            !ignore_patch?(patch, paths: paths, exclude_paths: exclude_paths)
+            ignore_patch?(patch, paths: paths, exclude_paths: exclude_paths)
           end
         end
 
         def ignore_patch?(patch, paths: [], exclude_paths: [])
-          ignore_path?(patch.delta.new_file[:path], paths: paths, exclude_paths: exclude_paths)
+          !ignore_path?(patch.delta.new_file[:path], paths: paths, exclude_paths: exclude_paths)
         end
 
         def entries(commit, paths: [], exclude_paths: [])
@@ -227,6 +227,22 @@ module Dapp
             paths.empty? || paths.any? { |p| check_path?(path, p) || check_subpath?(path, p) }
           end
         end
+
+        def ignore_path?(path, paths: [], exclude_paths: [])
+          ignore_path_base(path, exclude_paths: exclude_paths) do
+            paths.empty? ||
+              paths.any? do |p|
+                File.fnmatch?(p, path, File::FNM_PATHNAME) ||
+                  File.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME)
+              end
+          end
+        end
+
+        def ignore_path_base(path, exclude_paths: [])
+          is_exclude_path = exclude_paths.any? { |p| check_path?(path, p) }
+          is_include_path = yield
+          is_exclude_path || !is_include_path
+        end
       end
     end
   end

data/lib/dapp/dimg/git_repo/local.rb

@@ -48,9 +48,9 @@ module Dapp
           delta_new_file = patch.delta.new_file
           args = [delta_new_file[:path], paths: paths, exclude_paths: exclude_paths]
           if nested_git_repository_mode?(delta_new_file[:mode])
-            ignore_directory?(*args)
+            !ignore_directory?(*args)
           else
-            ignore_path?(*args)
+            !ignore_path?(*args)
           end
         end
 

data/lib/dapp/helper/trivia.rb

@@ -28,28 +28,12 @@ module Dapp
         Pathname.new(File.join(base.to_s, *path.compact.map(&:to_s)))
       end
 
-      def ignore_path?(path, paths: [], exclude_paths: [])
-        ignore_path_base(path, exclude_paths: exclude_paths) do
-          paths.empty? ||
-            paths.any? do |p|
-              File.fnmatch?(p, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
-                File.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
-            end
-        end
-      end
-
-      def ignore_path_base(path, exclude_paths: [])
-        is_exclude_path = exclude_paths.any? { |p| check_path?(path, p) }
-        is_include_path = yield
-        is_exclude_path || !is_include_path
-      end
-
       def check_path?(path, format)
-        path_checker(path) { |checking_path| File.fnmatch(format, checking_path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
+        path_checker(path) { |checking_path| File.fnmatch(format, checking_path, File::FNM_PATHNAME) }
       end
 
       def check_subpath?(path, format)
-        path_checker(format) { |checking_path| File.fnmatch(checking_path, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
+        path_checker(format) { |checking_path| File.fnmatch(checking_path, path, File::FNM_PATHNAME) }
       end
 
       def path_checker(path)

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

@@ -62,11 +62,53 @@ module Dapp
             end
           end
 
+          def kube_helm_auto_purge_trigger_file_path(release_name)
+            File.join(self.class.home_dir, "helm", release_name, "auto_purge_failed_release_on_next_deploy")
+          end
+
+          def kube_create_helm_auto_purge_trigger_file(release_name)
+            FileUtils.mkdir_p File.dirname(kube_helm_auto_purge_trigger_file_path(release_name))
+            FileUtils.touch kube_helm_auto_purge_trigger_file_path(release_name)
+          end
+
+          def kube_delete_helm_auto_purge_trigger_file(release_name)
+            if File.exists? kube_helm_auto_purge_trigger_file_path(release_name)
+              FileUtils.rm_rf kube_helm_auto_purge_trigger_file_path(release_name)
+            end
+          end
+
           def kube_run_deploy(release)
             log_process("Deploy release #{release.name}") do
-              kube_flush_hooks_jobs(release)
+              helm_status_res = shellout("helm status #{release.name} --output json")
+              helm_status = {}
+              helm_status = JSON.load(helm_status_res.stdout) if helm_status_res.status.success?
+              release_exists = nil
+
+              if not helm_status_res.status.success?
+                # Helm release is not exists.
+                release_exists = false
+
+                # Create purge-trigger for the next run.
+                kube_create_helm_auto_purge_trigger_file(release.name)
+              elsif helm_status.fetch("info", {}).fetch("status", {}).fetch("code", nil) == 4
+                # Helm release is in FAILED state
+                release_exists = true
+
+                if  File.exists? kube_helm_auto_purge_trigger_file_path(release.name)
+                  log_process("Purge helm release #{release.name}") do
+                    shellout!("helm delete --purge #{release.name}")
+                  end
+
+                  # Purge-trigger file remains to exist
+                  release_exists = false
+                end
+              else
+                # Helm release is not in FAILED state
+                release_exists = true
+                kube_delete_helm_auto_purge_trigger_file(release.name)
+              end
 
-              release_exists = shellout("helm status #{release.name}").status.success?
+              kube_flush_hooks_jobs(release)
 
               watch_hooks_by_type = release.jobs.values
                 .reduce({}) do |res, job|
@@ -116,7 +158,6 @@ module Dapp
                     # Поэтому перехватываем и просто отображаем произошедшую
                     # ошибку для информации пользователю без завершения работы dapp.
                     $stderr.puts(::Dapp::Dapp.paint_string(::Dapp::Helper::NetStatus.message(e), :warning))
-                    sentry_exception(e, extra: {"job-spec" => job.spec})
                   end
 
                 end # Thread
@@ -127,18 +168,31 @@ module Dapp
 
               deployment_managers.each(&:before_deploy)
 
-              log_process("Run helm") do
+              log_process("#{release_exists ? "Upgrade" : "Install"} helm release #{release.name}") do
                 watch_hooks_condition_mutex.synchronize do
                   deploy_has_began = true
                   # Фактически гарантируется лишь вывод сообщения log_process перед выводом из потока watch_thr
                   watch_hooks_condition.signal
                 end
 
-                cmd_res = release.helm_upgrade!
+                cmd_res = if release_exists
+                  release.upgrade_helm_release
+                else
+                  release.install_helm_release
+                end
 
                 if cmd_res.error?
+                  if cmd_res.stderr.end_with? "has no deployed releases\n"
+                    log_warning "[WARN] Helm release #{release.name} is in improper state: FAILED state and there was no successful releases yet"
+                    log_warning "[WARN] Helm release #{release.name} will be removed with `helm delete --purge` on the next run of `dapp kube deploy`"
+
+                    kube_create_helm_auto_purge_trigger_file(release.name)
+                  end
+
                   raise ::Dapp::Error::Command, code: :kube_helm_failed, data: {output: (cmd_res.stdout + cmd_res.stderr).strip}
                 else
+                  kube_delete_helm_auto_purge_trigger_file(release.name)
+
                   watch_hooks_thr.join if !dry_run? && watch_hooks_thr && watch_hooks_thr.alive?
                   log_info((cmd_res.stdout + cmd_res.stderr).strip)
                 end

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

@@ -13,8 +13,8 @@ module Dapp
                       template_relative_path_pattern = Pathname(File.expand_path(template_path_pattern)).subpath_of(path('.helm'))
                       template_relative_path_pattern ||= template_path_pattern
 
-                      File.fnmatch?(template_relative_path_pattern, template_path_without_chart_name, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
-                        File.fnmatch?(template_relative_path_pattern, template_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
+                      File.fnmatch?(template_relative_path_pattern, template_path_without_chart_name, File::FNM_PATHNAME) ||
+                        File.fnmatch?(template_relative_path_pattern, template_path, File::FNM_PATHNAME)
                     end
                   end
                 else

data/lib/dapp/kube/helm/release.rb

@@ -49,15 +49,29 @@ module Dapp
         end.to_h
       end
 
-      def helm_upgrade!
-        args = [
-          name, chart_path, additional_values_options,
-          set_options, upgrade_extra_options
-        ].flatten
+      def install_helm_release
+        unless dapp.dry_run?
+          dapp.kubernetes.create_namespace!(namespace) unless dapp.kubernetes.namespace?(namespace)
+        end
+
+        cmd = dapp.shellout([
+          "helm install #{chart_path}",
+          "--name #{name}",
+          *helm_additional_values_options,
+          *helm_set_options,
+          *helm_common_options,
+        ].join(" "))
 
-        dapp.kubernetes.create_namespace!(namespace) unless dapp.kubernetes.namespace?(namespace)
+        return cmd
+      end
 
-        cmd = dapp.shellout "helm upgrade #{args.join(' ')}"
+      def upgrade_helm_release
+        cmd = dapp.shellout([
+          "helm upgrade #{name} #{chart_path}",
+          *helm_additional_values_options,
+          *helm_set_options,
+          *helm_common_options
+        ].join(" "))
 
         return cmd
       end
@@ -93,8 +107,8 @@ module Dapp
             "helm",
             "template",
             chart_path,
-            additional_values_options,
-            set_options(without_registry: true),
+            helm_additional_values_options,
+            helm_set_options(without_registry: true),
             ("--namespace #{namespace}" if namespace),
           ].compact.join(" ")
 
@@ -113,7 +127,7 @@ module Dapp
         end
       end
 
-      def additional_values_options
+      def helm_additional_values_options
         [].tap do |options|
           options.concat(values.map { |p| "--values #{p}" })
         end
@@ -123,7 +137,7 @@ module Dapp
         @dimg_registry ||= dapp.dimg_registry(repo)
       end
 
-      def set_options(without_registry: false)
+      def helm_set_options(without_registry: false)
         [].tap do |options|
           options.concat set.map {|opt| "--set #{opt}"}
 
@@ -132,21 +146,16 @@ module Dapp
         end
       end
 
-      def upgrade_extra_options(dry_run: nil)
+      def helm_common_options(dry_run: nil)
         dry_run = dapp.dry_run? if dry_run.nil?
 
         [].tap do |options|
           options << "--namespace #{namespace}" if namespace
-          options << '--install'
           options << '--dry-run' if dry_run
           options << '--debug'   if dry_run
           options << "--timeout #{deploy_timeout}" if deploy_timeout
         end
       end
-
-      class << self
-
-      end # << self
     end # Helm::Release
   end # Kube
 end # Dapp

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.24.12"
-  BUILD_CACHE_VERSION = 26.2
+  VERSION = "0.25.0"
+  BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.24.12
+  version: 0.25.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -186,34 +186,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
-- !ruby/object:Gem::Dependency
-  name: sentry-raven
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-- !ruby/object:Gem::Dependency
-  name: toml-rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -476,7 +448,6 @@ files:
 - lib/dapp/dapp/logging/paint.rb
 - lib/dapp/dapp/logging/process.rb
 - lib/dapp/dapp/option_tags.rb
-- lib/dapp/dapp/sentry.rb
 - lib/dapp/dapp/shellout/base.rb
 - lib/dapp/dapp/shellout/streaming.rb
 - lib/dapp/dapp/slug.rb
@@ -678,7 +649,6 @@ files:
 - lib/dapp/helper/sha256.rb
 - lib/dapp/helper/tar.rb
 - lib/dapp/helper/trivia.rb
-- lib/dapp/helper/url.rb
 - lib/dapp/helper/yaml.rb
 - lib/dapp/kube.rb
 - lib/dapp/kube/cli/cli.rb

data/lib/dapp/dapp/sentry.rb

@@ -1,112 +0,0 @@
-module Dapp
-  class Dapp
-    module Sentry
-      def sentry_message(msg, **kwargs)
-        return if not ensure_sentry_configured
-        kwargs[:level] ||= "info"
-        Raven.capture_message(msg, _make_sentry_params(**kwargs))
-      end
-
-      def sentry_exception(exception, **kwargs)
-        return if not ensure_sentry_configured
-        (kwargs[:tags] ||= {})['error-code'] = begin
-          net_status = exception.net_status
-          [net_status[:context], net_status[:code]].compact.join('_')
-        end
-        Raven.capture_exception(exception, _make_sentry_params(**kwargs))
-      end
-
-      def ensure_sentry_configured
-        return false unless sentry_settings = settings["sentry"]
-
-        unless @sentry_settings_configured
-          Raven.configure do |config|
-            logger = ::Logger.new(STDOUT)
-            logger.level = ::Logger::WARN
-
-            config.logger = logger
-            config.dsn = sentry_settings["dsn"]
-          end
-
-          @sentry_settings_configured = true
-        end
-
-        return true
-      end
-
-      def _make_sentry_params(level: nil, tags: {}, extra: {}, user: {})
-        {
-          level: level,
-          tags:  _sentry_tags_context.merge(tags),
-          extra: _sentry_extra_context.merge(extra),
-          user:  _sentry_user_context.merge(user),
-        }
-      end
-
-      def _sentry_extra_context
-        @_sentry_extra_context ||= {
-          "pwd" => Dir.pwd,
-          "dapp-dir" => self.work_dir,
-          "options" => self.options,
-          "env-options" => {
-            "DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
-            "DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
-            "ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
-            "DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],
-          },
-        }.tap {|extra|
-          extra["ci-env"] = {"CI" => ENV["CI"]}
-          ENV.select {|k, v| k.start_with?("CI_")}.each do |k, v|
-            extra["ci-env"][k] = v
-          end
-        }
-      end
-
-      def _sentry_tags_context
-        name = options[:name] || 
-        @_sentry_tags_context ||= {
-          "dapp-short-version" => ::Dapp::VERSION.split(".")[0..1].join("."),
-          "dapp-version" => ::Dapp::VERSION,
-          "dapp-build-cache-version" => ::Dapp::BUILD_CACHE_VERSION,
-          "dapp-command" => self.options[:dapp_command],
-        }.tap {|tags|
-          git_config_path = File.join(Dir.pwd, ".git/config")
-
-          tags["dapp-name"] = options[:name]
-
-          if File.exists? git_config_path
-            cfg = IniFile.load(File.join(Dir.pwd, ".git/config"))
-            remote_origin_cfg = cfg['remote "origin"']
-            remote_origin_url = remote_origin_cfg["url"]
-            if remote_origin_url
-              tags["dapp-name"] ||= begin
-                repo_name = remote_origin_url.split('/').last
-                repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
-                repo_name
-              end
-
-              tags["git-host"] = self.get_host_from_git_url(remote_origin_url)
-
-              git_name = self.git_url_to_name(remote_origin_url)
-
-              tags["git-group"] = git_name.partition("/")[0]
-              tags["git-name"] = git_name
-            end
-          end
-
-          tags["dapp-name"] ||= File.basename(Dir.pwd)
-
-          begin
-            ver = self.class.host_docker_minor_version
-            tags["docker-minor-version"] = ver.to_s
-          rescue ::Exception
-          end
-        }
-      end
-
-      def _sentry_user_context
-        @_sentry_user_context ||= {}
-      end
-    end # Sentry
-  end # Dapp
-end # Dapp

data/lib/dapp/helper/url.rb

@@ -1,23 +0,0 @@
-module Dapp
-  module Helper
-    module Url
-      def git_url_to_name(url)
-        url_without_scheme = url.split("://", 2).last
-        # This may be broken, because "@" should delimit creds, not a ":"
-        url_without_creds = url_without_scheme.split(":", 2).last
-        url_without_creds.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
-      end
-
-      def get_host_from_git_url(url)
-        url_without_scheme = url.split("://", 2).last
-        url_without_creds = url_without_scheme.split("@", 2).last
-
-        # Split out part after ":" in this kind of url: github.com:flant/dapp.git
-        url_part = url_without_creds.split(":", 2).first
-
-        # Split out part after first "/": github.com/flant/dapp.git
-        url_part.split("/", 2).first
-      end
-    end # Url
-  end # Helper
-end # Dapp