dapp 0.17.4 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 383aa5782985c5ec53607b5c9d802cb1213cdbc4
-  data.tar.gz: a5c8847516cb0359fb82c17731ddd56244860214
+SHA256:
+  metadata.gz: d6f675f931b5b79d8637e493f875973f718547a6f77978bd1d8b3e5bc6c606c3
+  data.tar.gz: fe73c28ca5d6962a19deb01778b420f23c5169bcf5fd1aa31a2e65c460c49bfc
 SHA512:
-  metadata.gz: 065aa5ccf4a7cd01db71db4a05364db97cc3177fc3781920a95d000c963c3286bffd193e5ee45e91e3b0ed6e52ab682b32c812d7fd9d6e53a07fbba08a4253f5
-  data.tar.gz: a30bf5b6583baa077adf31c316b3796bf0688aa5d722eadea1a4bcf580208087d7dce1cc9507ca1ff783a1c4f56813408e040e5d6d1108250f926cb539f52280
+  metadata.gz: 2589954a540ca69262a3af36ae7e7532e7830a5b59feafd2dce0b32b66798eef968aad7518610556815fe26654fb332dce94c424865b39461e297d25a82da77e
+  data.tar.gz: 218644c687bc41cb81977a08ffdf6ebbdc64411e9d4b34bfeb4766f2378eafbb7ffec58a71b19d9e759bbd3c7eea230a0fe5c82d694ae5d601ead60627d9b093

data/bin/dapp

@@ -2,71 +2,42 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-def with_dapp_running_lock(&blk)
-  return yield
-
-  file = nil
-
-  begin
-    file = ::File.open("/tmp/dapp-running.lock", ::File::RDWR | ::File::CREAT, 0777)
-
-    if ARGV[0] == 'update'
-      unless file.flock(::File::LOCK_EX | ::File::LOCK_NB)
-        puts "There are other active dapp processes, exiting without update"
-        exit(0)
-      end
-    else
-      file.flock(::File::LOCK_SH)
-    end
-
-    yield
-  ensure
-    file.close if file
-  end
-end
-
-with_dapp_running_lock do
-  require 'rubygems'
-  require 'dapp'
+require 'rubygems'
+require 'dapp'
 
+begin
   begin
     begin
-      begin
-        Dapp::CLI.new.run
-      rescue Dapp::Error::Base => e
-        unless (message = Dapp::Helper::NetStatus.before_error_message(e)).empty?
-          $stderr.puts(message)
-        end
-
-        raise
-      end
-    rescue ::SystemExit
-      raise
-    rescue ::Exception => e
-      "/tmp/dapp-stacktrace-#{SecureRandom.uuid}.out".tap do |filename|
-        ::File.open(filename, 'w') do |dapp_stacktrace|
-          dapp_stacktrace.write "#{e.backtrace.join("\n")}\n"
-        end
-        $stderr.puts "\033[1m\033[90mStacktrace dumped to #{filename}\033[0m"
-      end
-
-      if Dapp::CLI.dapp_object
-        Dapp::CLI.dapp_object.sentry_exception(e)
+      Dapp::CLI.new.run
+    rescue Dapp::Error::Base => e
+      unless (message = Dapp::Helper::NetStatus.before_error_message(e)).empty?
+        $stderr.puts(message)
       end
 
       raise
     end
-  rescue Dapp::Error::Shellout => e
-    $stderr.puts(Dapp::Helper::NetStatus.message(e))
-    exit 1
-  rescue Dapp::Error::Base, NetStatus::Exception => e
-    $stderr.puts(Dapp::Dapp.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
-    exit 1
-  rescue Interrupt => _e
-    $stderr.puts(Dapp::Dapp.paint_string('Interrupted', :warning))
-    exit 1
-  rescue Errno::EACCES => _e
-    $stderr.puts(Dapp::Dapp.paint_string('Permission denied!', :warning))
-    exit 1
+  rescue ::SystemExit
+    raise
+  rescue ::Exception => e
+    "/tmp/dapp-stacktrace-#{SecureRandom.uuid}.out".tap do |filename|
+      ::File.open(filename, 'w') do |dapp_stacktrace|
+        dapp_stacktrace.write "#{e.backtrace.join("\n")}\n"
+      end
+      $stderr.puts "\033[1m\033[90mStacktrace dumped to #{filename}\033[0m"
+    end
+
+    raise
   end
+rescue Dapp::Error::Shellout => e
+  $stderr.puts(Dapp::Helper::NetStatus.message(e))
+  exit 1
+rescue Dapp::Error::Base, NetStatus::Exception => e
+  $stderr.puts(Dapp::Dapp.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
+  exit 1
+rescue Interrupt => _e
+  $stderr.puts(Dapp::Dapp.paint_string('Interrupted', :warning))
+  exit 1
+rescue Errno::EACCES => _e
+  $stderr.puts(Dapp::Dapp.paint_string('Permission denied!', :warning))
+  exit 1
 end

data/config/en/net_status.yml

@@ -50,7 +50,7 @@ en:
       cannot_run_ssh_agent: "Cannot run ssh-agent"
       ssh_key_not_found: "Ssh key `%{path}` not exist!"
       docker_not_found: "Docker not found!"
-      docker_version: "Required docker version: >= %{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}`"

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'

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

@@ -58,9 +58,6 @@ module Dapp
 
         def run_dapp_command(run_method, *args)
           dapp = ::Dapp::Dapp.new(*args)
-          ::Dapp::CLI.dapp_object = dapp
-          dapp.sentry_message("Manual usage: `#{self.run_method}` command") unless ENV['CI']
-
           begin
             if block_given?
               yield dapp
@@ -70,16 +67,12 @@ module Dapp
           end
         end
 
-        def run_method
-          class_to_lowercase
-        end
-
         def run(_argv = ARGV)
           raise
         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

@@ -6,14 +6,48 @@ module Dapp
           spec = Gem::Specification.find do |s|
             File.fnmatch(File.join(s.full_gem_path, '*'), __FILE__)
           end
-          Gem.install(spec.name, approximate_recommendation(spec.version))
+          unless (latest_version = latest_beta_version(spec)).nil?
+            try_lock do
+              Gem.install(spec.name, latest_version)
+            end
+          end
         rescue Gem::FilePermissionError => e
           raise Errno::EACCES, e.message
         end
 
-        # get latest beta-version
-        def approximate_recommendation(version)
-          [version.approximate_recommendation, 0].join('.')
+        def latest_beta_version(current_spec)
+          minor_version = current_spec.version.approximate_recommendation
+          url = "https://rubygems.org/api/v1/versions/#{current_spec.name}.json"
+          response = Excon.get(url)
+          if response.status == 200
+            JSON.parse(response.body)
+              .reduce([]) { |versions, spec| versions << Gem::Version.new(spec['number']) }
+              .reject { |spec_version| minor_version != spec_version.approximate_recommendation || current_spec.version >= spec_version }
+              .first
+          else
+            warn "Cannot get `#{url}`: got bad http status `#{response.status}`"
+          end
+        end
+
+        def try_lock
+          old_umask = File.umask(0)
+          file = nil
+
+          begin
+            begin
+              file = ::File.open('/tmp/dapp-update-running.lock', ::File::RDWR | ::File::CREAT, 0777)
+            ensure
+              File.umask(old_umask)
+            end
+
+            if file.flock(::File::LOCK_EX | ::File::LOCK_NB)
+              yield
+            else
+              puts 'There are other active dapp update process, exiting without update'
+            end
+          ensure
+            file.close unless file.nil?
+          end
         end
       end
     end

data/lib/dapp/dapp.rb

@@ -12,13 +12,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::Gitartifact
     include Deps::Base
@@ -38,18 +35,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 git_url
@@ -90,18 +75,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)
@@ -147,10 +129,6 @@ module Dapp
     end
 
     class << self
-      def home_dir
-        File.join(Dir.home, ".dapp")
-      end
-
       def options
         @options ||= {}
       end
@@ -161,10 +139,14 @@ module Dapp
           docker_bin = res.stdout.strip
 
           current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
-          required_docker_version = '1.10.0'
-
-          if Gem::Version.new(required_docker_version) >= Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
-            raise Error::Dapp, code: :docker_version, data: { version: required_docker_version }
+          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|

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/git_artifact_remote.rb

@@ -3,13 +3,11 @@ 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)
+            @_name = url.gsub(%r{.*?([^\/ ]+)\.git}, '\\1')
 
             super(**kwargs, &blk)
           end

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

@@ -75,7 +75,7 @@ module Dapp
             if (scheme = URI.parse(url).scheme).nil?
               :noname
             else
-              scheme
+              scheme.to_sym
             end
           rescue URI::InvalidURIError
             :ssh

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

@@ -5,20 +5,20 @@ module Dapp
         module ChartCreate
           def kube_chart_create
             with_kube_tmp_chart_dir do
-              FileUtils.cp_r kube_chart_path, kube_tmp_chart_path(name) if kube_chart_path.directory? && !options[:force]
+              FileUtils.cp_r kube_chart_path, kube_chart_path_for_helm(name) if kube_chart_path.directory? && !options[:force]
 
-              shellout!("helm create #{name}", cwd: kube_tmp_chart_path)
+              shellout!("helm create #{name}", cwd: kube_chart_path_for_helm)
               kube_create_chart_samples
 
               FileUtils.rm_rf kube_chart_path
-              FileUtils.mv kube_tmp_chart_path(name), kube_chart_path
+              FileUtils.mv kube_chart_path_for_helm(name), kube_chart_path
             end
           end
 
           def kube_create_chart_samples
-            kube_tmp_chart_path(name, 'secret-values.yaml').tap { |f| FileUtils.touch(f) unless f.file? }
-            kube_tmp_chart_path(name, kube_chart_secret_dir_name).tap { |dir| FileUtils.mkdir(dir) unless dir.directory? }
-            kube_tmp_chart_path(name, 'templates',  '_envs.tpl').tap do |f|
+            kube_chart_path_for_helm(name, 'secret-values.yaml').tap { |f| FileUtils.touch(f) unless f.file? }
+            kube_chart_path_for_helm(name, kube_chart_secret_dir_name).tap { |dir| FileUtils.mkdir(dir) unless dir.directory? }
+            kube_chart_path_for_helm(name, 'templates',  '_envs.tpl').tap do |f|
               f.write begin
                 <<-EOF
 {{- define "common_envs" }}
@@ -39,7 +39,7 @@ module Dapp
                 EOF
               end unless f.file?
             end
-            kube_tmp_chart_path(name, 'templates', 'backend.yaml').tap do |f|
+            kube_chart_path_for_helm(name, 'templates', 'backend.yaml').tap do |f|
               f.write begin
                 <<-EOF
 apiVersion: extensions/v1beta1

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

@@ -58,12 +58,14 @@ module Dapp
           def with_kube_tmp_chart_dir
             yield if block_given?
           ensure
-            FileUtils.rm_rf(kube_tmp_chart_path)
+            FileUtils.rm_rf(@kube_tmp_helm_chart_dir) if @kube_tmp_helm_chart_dir
           end
 
-          def kube_tmp_chart_path(*path)
-            @kube_tmp_path ||= Dir.mktmpdir('dapp-helm-chart-', tmp_base_dir)
-            make_path(@kube_tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }
+          def kube_chart_path_for_helm(*path)
+            chart_dir = ENV['DAPP_HELM_CHART_DIR'] || begin
+              @kube_tmp_helm_chart_dir ||= Dir.mktmpdir('dapp-helm-chart-', tmp_base_dir)
+            end
+            make_path(chart_dir, *path).expand_path.tap { |p| p.parent.mkpath }
           end
 
           def secret

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

@@ -26,7 +26,7 @@ module Dapp
                 repo: repo,
                 image_version: image_version,
                 namespace: kube_namespace,
-                chart_path: kube_tmp_chart_path,
+                chart_path: kube_chart_path_for_helm,
                 set: self.options[:helm_set_options],
                 values: [*kube_values_paths, *kube_tmp_chart_secret_values_paths],
                 deploy_timeout: self.options[:timeout] || 300
@@ -38,7 +38,7 @@ module Dapp
           end
 
           def kube_copy_chart
-            FileUtils.cp_r("#{kube_chart_path}/.", kube_tmp_chart_path)
+            FileUtils.cp_r("#{kube_chart_path}/.", kube_chart_path_for_helm)
           end
 
           def kube_helm_decode_secrets
@@ -89,10 +89,10 @@ module Dapp
 {{- define "dapp_secret_file" -}}
 {{- $relative_file_path := index . 0 -}}
 {{- $context := index . 1 -}}
-{{- $context.Files.Get (print "#{kube_tmp_chart_secret_path.subpath_of(kube_tmp_chart_path)}/" $relative_file_path) -}}
+{{- $context.Files.Get (print "#{kube_tmp_chart_secret_path.subpath_of(kube_chart_path_for_helm)}/" $relative_file_path) -}}
 {{- end -}}
             EOF
-            kube_tmp_chart_path('templates/_dapp_helpers.tpl').write(cont)
+            kube_chart_path_for_helm('templates/_dapp_helpers.tpl').write(cont)
           end
 
           def kube_flush_hooks_jobs(release)
@@ -144,14 +144,7 @@ module Dapp
               end
 
               watch_hooks_thr = Thread.new do
-                watch_hooks.each {|job|
-                  begin
-                    Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
-                  rescue ::Exception => e
-                    sentry_exception(e, extra: {"job-spec" => job.spec})
-                    raise
-                  end
-                }
+                watch_hooks.each {|job| Kubernetes::Manager::Job.new(self, job.name).watch_till_done!}
               end
 
               deployment_managers = release.deployments.values
@@ -180,7 +173,7 @@ module Dapp
           end
 
           def kube_tmp_chart_secret_path(*path)
-            kube_tmp_chart_path('decoded-secret', *path).tap { |p| p.parent.mkpath }
+            kube_chart_path_for_helm('decoded-secret', *path).tap { |p| p.parent.mkpath }
           end
 
           def kube_values_paths
@@ -190,7 +183,7 @@ module Dapp
           end
 
           def kube_tmp_chart_secret_values_paths
-            @kube_tmp_chart_secret_values_paths ||= kube_secret_values_paths.map { |f| kube_tmp_chart_path("#{SecureRandom.uuid}-#{f.basename}") }
+            @kube_tmp_chart_secret_values_paths ||= kube_secret_values_paths.each_with_index.map { |f, i| kube_chart_path_for_helm( "decoded-secret-values-#{i}.yaml") }
           end
 
           def kube_secret_values_paths

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

@@ -17,7 +17,7 @@ module Dapp
                 end
               end
 
-              tmp_file_path = kube_tmp_chart_path(File.basename(file_path))
+              tmp_file_path = kube_chart_path_for_helm(File.basename(file_path))
               tmp_file_path.binwrite(decoded_data)
 
               loop do

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

@@ -49,8 +49,8 @@ module Dapp
 
       def deploy!
         args = [
-          name, chart_path, additional_values,
-          set_options, extra_options
+          name, chart_path, additional_values_options,
+          set_options, upgrade_extra_options
         ].flatten
 
         dapp.kubernetes.create_namespace!(namespace) unless dapp.kubernetes.namespace?(namespace)
@@ -62,52 +62,31 @@ module Dapp
 
       def evaluation_output
         @evaluation_output ||= begin
-          args = [
-            name, chart_path, additional_values,
-            set_options, extra_options(dry_run: true)
-          ].flatten
-
-          dapp.shellout!("helm upgrade #{args.join(' ')}").stdout
+          cmd = dapp.shellout! [
+            "helm",
+            "template",
+            chart_path,
+            additional_values_options,
+            set_options,
+            ("--namespace #{namespace}" if namespace),
+          ].compact.join(" ")
+
+          cmd.stdout
         end
       end
 
       def resources_specs
         @resources_specs ||= {}.tap do |specs|
-          generator = proc do |text|
-            text.split(/# Source.*|---/).reject {|c| c.strip.empty? }.map {|c| yaml_load(c) }.each do |spec|
-              specs[spec['kind']] ||= {}
-              specs[spec['kind']][(spec['metadata'] || {})['name']] = spec
-            end
-          end
-
-          hook_start_index = nil
-          if ind = evaluation_output.lines.index("HOOKS:\n")
-            hook_start_index =  ind + 1
-          else
-            warn "[WARN][DEBUG INFO] Cannot find HOOKS section in helm dry-run output:"
-          end
-
-          manifest_start_index = nil
-          if ind = evaluation_output.lines.index("MANIFEST:\n")
-            manifest_start_index = ind + 1
-          else
-            warn "[WARN][DEBUG INFO] Cannot find MANIFEST section in helm dry-run output:"
-          end
-
-          happy_helming_start_index = evaluation_output.lines.index("Release \"#{name}\" has been upgraded. Happy Helming!\n")
-
-          generator.call(evaluation_output.lines[hook_start_index..manifest_start_index-2].join) if hook_start_index and manifest_start_index
-          if manifest_start_index
-            if happy_helming_start_index
-              generator.call(evaluation_output.lines[manifest_start_index..happy_helming_start_index-2].join)
-            else
-              generator.call(evaluation_output.lines[manifest_start_index..-1].join)
-            end
+          evaluation_output.split(/^---$/)
+              .reject {|chunk| chunk.lines.all? {|line| line.strip.empty? or line.strip.start_with? "#"}}
+              .map {|chunk| yaml_load(chunk)}.each do |spec|
+            specs[spec['kind']] ||= {}
+            specs[spec['kind']][(spec['metadata'] || {})['name']] = spec
           end
         end
       end
 
-      def additional_values
+      def additional_values_options
         [].tap do |options|
           options.concat(values.map { |p| "--values #{p}" })
         end
@@ -122,11 +101,11 @@ module Dapp
         end
       end
 
-      def extra_options(dry_run: nil)
+      def upgrade_extra_options(dry_run: nil)
         dry_run = dapp.dry_run? if dry_run.nil?
 
         [].tap do |options|
-          options << "--namespace #{namespace}"
+          options << "--namespace #{namespace}" if namespace
           options << '--install'
           options << '--dry-run' if dry_run
           options << '--debug'   if dry_run

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.17.4'.freeze
+  VERSION = '0.18.0'.freeze
   BUILD_CACHE_VERSION = 20
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.18.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2017-11-03 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
@@ -471,7 +443,6 @@ files:
 - lib/dapp/dapp/logging/i18n.rb
 - lib/dapp/dapp/logging/paint.rb
 - lib/dapp/dapp/logging/process.rb
-- lib/dapp/dapp/sentry.rb
 - lib/dapp/dapp/shellout/base.rb
 - lib/dapp/dapp/shellout/streaming.rb
 - lib/dapp/dapp/ssh_agent.rb
@@ -668,7 +639,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
@@ -736,7 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell

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