dapp 0.13.26 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557eecaf7833aafc8165c5a3191b3c4d961044fa
-  data.tar.gz: a7d766a573beb19a0cd1c99bfdb9e484e2c344c2
+  metadata.gz: 895148a805cfe81e9fd0b6b11fe3dfc58f746a6f
+  data.tar.gz: a07d1a3ae7209847e5fa836464a5ab9a6f3d4c90
 SHA512:
-  metadata.gz: 6b396fcf8969353a6a704a09344131d04dfe5c6295c003cc69519086c0f1d25c18ceaf99bab0a5b9f2a09108bb3bd22803b575d5cb9c7962a6ef97df71024196
-  data.tar.gz: dacf00d79fa3004474c3ae45dd231d7e608275075f0624bd789796ad798cfa28912aafe29226b5fce3eacfca0c9a607a25fd6d66d6fbfb6c7b1c14545f61c872
+  metadata.gz: eb6190e22c37d6f3709cfe881485e994c3084e0480a10548cab4072ef5eeaf66baf2cca6d81638aaf42781b57f92cf3a07b01a7e26bbcbc3eed873e87796bf00
+  data.tar.gz: 62e11ceb271eb71ae7a68e459da907c10f1d8a6ecd08608c99d58a186b7788ac0ce39614a84065dcd1c17963f6cd91ab19a0fba78f544768c87b8fcb4e72ac1e

data/bin/dapp

@@ -14,10 +14,6 @@ begin
         $stderr.puts(message)
       end
 
-      if Dapp::CLI.dapp_object
-        Dapp::CLI.dapp_object.sentry_exception(e)
-      end
-
       raise
     end
   rescue ::SystemExit

data/lib/dapp.rb

@@ -23,8 +23,6 @@ require 'yaml'
 require 'openssl'
 require 'etc'
 require 'zlib'
-require 'sentry-raven'
-require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -35,7 +33,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'
@@ -51,7 +48,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

@@ -56,16 +56,12 @@ module Dapp
           super()
         end
 
-        def run_method
-          class_to_lowercase
-        end
-
         def run(_argv = ARGV)
           raise
         end
 
         def cli_options(**kvargs)
-          config.merge(dapp_command: run_method, **kvargs)
+          config.merge(**kvargs)
         end
       end
     end

data/lib/dapp/config/config.rb

@@ -9,6 +9,10 @@ module Dapp
         !!@_dev_mode
       end
 
+      def after_parsing!
+        do_all!('_after_parsing!')
+      end
+
       def validate!
         do_all!('_validate!')
       end

data/lib/dapp/dapp.rb

@@ -12,13 +12,9 @@ module Dapp
     include Logging::Paint
 
     include SshAgent
-    include Sentry
-
     include Helper::Sha256
-    extend  Helper::Trivia
     include Helper::Trivia
     include Helper::Tar
-    include Helper::Url
 
     include Deps::Gitartifact
     include Deps::Base
@@ -32,21 +28,6 @@ module Dapp
       Logging::I18n.initialize
       validate_config_options!
       Logging::Paint.initialize(option_color)
-
-      ::Dapp::CLI.dapp_object = self
-      sentry_message("Manual usage: `#{options[:dapp_command]}` command") unless ENV['CI']
-    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
@@ -89,18 +70,15 @@ module Dapp
       File.expand_path(options[:tmp_dir_prefix] || '/tmp')
     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)
@@ -124,10 +102,6 @@ module Dapp
       self.class.host_docker_bin
     end
 
-    def self.home_dir
-      File.join(Dir.home, ".dapp")
-    end
-
     def self.host_docker_bin
       @host_docker_bin ||= begin
         raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?

data/lib/dapp/dapp/dappfile.rb

@@ -33,6 +33,7 @@ module Dapp
           ::Dapp::Config::Config.new(dapp: self).tap do |config|
             begin
               config.instance_eval File.read(dappfile_path), dappfile_path
+              config.after_parsing!
               config.validate!
             rescue SyntaxError, StandardError => e
               backtrace = e.backtrace.find { |line| line.start_with?(dappfile_path) }

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

@@ -31,7 +31,7 @@ module Dapp
           end
 
           def git_artifacts_dev_patch_hashes
-            dimg.git_artifacts.map(&:dev_patch_hash)
+            dimg.git_artifacts.map {|ga| ga.dev_patch_hash(self)}
           end
         end # GALatestPatch
       end # Stage

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

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

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

@@ -8,6 +8,10 @@ module Dapp
 
         protected
 
+        def dimg_after_parsing!
+          _dimg.each(&:artifacts_after_parsing!)
+        end
+
         def dimg_config_validate!
           raise Error::Config, code: :dimg_name_required if _dimg.any? { |dimg| dimg._name.nil? } && _dimg.size > 1
           _dimg.each(&:validate!)

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

@@ -130,6 +130,10 @@ module Dapp
               end
             end
 
+            def artifacts_after_parsing!
+              _artifacts_auto_excluding!
+            end
+
             protected
 
             def builder(type)
@@ -140,6 +144,42 @@ module Dapp
             def passed_directives
               [:@_chef, :@_shell, :@_docker, :@_git_artifact, :@_mount, :@_artifact_groups, :@_builder]
             end
+
+            def _artifacts_auto_excluding!
+              path_to_relative = proc { |path| path.reverse.chomp('/').reverse }
+
+              all_artifacts.reduce({}) do |hash, artifact|
+                unless artifact._to.nil?
+                  to_common = artifact._to[/^\/[^\/]*/]
+                  hash[to_common] ||= []
+                  hash[to_common] << artifact
+                end
+                hash
+              end.each do |to_common, artifacts|
+                include_paths_common = artifacts.reduce([]) do |arr, artifact|
+                  arr << artifact._to.sub(to_common, '')
+                  arr.concat(artifact._include_paths.map { |path| File.join(artifact._to.sub(to_common, ''), path) } )
+                  arr
+                end.map(&path_to_relative).uniq
+
+                artifacts.each do |artifact|
+                  artifact_include_shift = path_to_relative.call(artifact._to.sub(to_common, ''))
+
+                  include_paths_common.each do |path|
+                    next if artifact_include_shift.start_with? path
+
+                    path = path_to_relative.call(path.sub(artifact_include_shift, ''))
+                    unless artifact._include_paths.any? { |ipath| ipath.start_with? path } || artifact._exclude_paths.any? { |epath| path.start_with? epath }
+                      artifact._exclude_paths << path
+                    end
+                  end
+                end
+              end
+            end
+
+            def all_artifacts
+              _artifact + _git_artifact._local + _git_artifact._remote
+            end
           end # InstanceMethods
           # rubocop:enable Metrics/ModuleLength
         end # Dimg

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

@@ -67,7 +67,7 @@ module Dapp
             end
 
             def validate_artifacts!
-              artifacts = validate_artifact_format(validated_artifacts)
+              artifacts = validate_artifact_format(all_artifacts)
               loop do
                 break if artifacts.empty?
                 verifiable_artifact = artifacts.shift
@@ -133,10 +133,6 @@ module Dapp
                 !(art._before.nil? && art._after.nil?)
               end
             end
-
-            def validated_artifacts
-              _artifact + _git_artifact._local + _git_artifact._remote
-            end
           end # Validation
           # rubocop:enable Metrics/ModuleLength
         end # Dimg

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_artifact.rb

@@ -7,6 +7,8 @@ module Dapp
       attr_reader :repo
       attr_reader :name
 
+      # FIXME: переименовать cwd в from
+
       # rubocop:disable Metrics/ParameterLists
       def initialize(repo, to:, name: nil, branch: nil, commit: nil,
                      cwd: nil, include_paths: nil, exclude_paths: nil, owner: nil, group: nil,
@@ -28,28 +30,89 @@ module Dapp
       end
       # rubocop:enable Metrics/ParameterLists
 
-      def apply_archive_command(stage)
-        credentials = [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
+      def cwd_type(stage)
+        if dev_mode?
+          p = repo.workdir_path.join(cwd)
+          if p.exist?
+            if p.directory?
+              :directory
+            else
+              :file
+            end
+          end
+        elsif cwd == ''
+          :directory
+        else
+          commit = repo.lookup_commit(stage.layer_commit(self))
+
+          cwd_entry = begin
+            commit.tree.path(cwd)
+          rescue Rugged::TreeError
+          end
+
+          if cwd_entry
+            if cwd_entry[:type] == :tree
+              :directory
+            else
+              :file
+            end
+          end
+        end
+      end
 
+      def apply_archive_command(stage)
         [].tap do |commands|
-          commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{to}"
           if archive_any_changes?(stage)
-            commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(*archive_stage_commits(stage))} -C #{to}"
+            case cwd_type(stage)
+            when :directory
+              stage.image.add_service_change_label :"dapp-git-#{paramshash}-type" => 'directory'
+
+              commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{to}"
+              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commits(stage))} -C #{to}"
+            when :file
+              stage.image.add_service_change_label :"dapp-git-#{paramshash}-type" => 'file'
+
+              commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{File.dirname(to)}"
+              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commits(stage))} -C #{File.dirname(to)}"
+            end
           end
         end
       end
 
+      def archive_type
+        repo.dimg.stage_by_name(:g_a_archive).image.labels["dapp-git-#{paramshash}-type"].to_s.to_sym
+      end
+
       def apply_patch_command(stage)
         [].tap do |commands|
           if dev_mode?
             if any_changes?(*dev_patch_stage_commits(stage))
-              changed_files = diff_patches(*dev_patch_stage_commits(stage)).map {|p| File.join(to, cwd, p.delta.new_file[:path])}
-              commands << "#{sudo}#{repo.dimg.dapp.rm_bin} -rf #{changed_files.join(' ')}"
-              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(*dev_patch_stage_commits(stage))} -C #{to}"
+              case archive_type
+              when :directory
+                changed_files = diff_patches(*dev_patch_stage_commits(stage)).map {|p| File.join(to, cwd, p.delta.new_file[:path])}
+                commands << "#{repo.dimg.dapp.rm_bin} -rf #{changed_files.join(' ')}"
+                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{to}"
+                commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *dev_patch_stage_commits(stage))} -C #{to}"
+              when :file
+                commands << "#{repo.dimg.dapp.rm_bin} -rf #{to}"
+                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{File.dirname(to)}"
+                commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *dev_patch_stage_commits(stage))} -C #{File.dirname(to)}"
+              else
+                raise
+              end
             end
           else
             if patch_any_changes?(stage)
-              commands << "#{sudo}#{repo.dimg.dapp.git_bin} apply --whitespace=nowarn --directory=#{to} --unsafe-paths #{patch_file(*patch_stage_commits(stage))}"
+              case archive_type
+              when :directory
+                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{to}"
+                commands << "#{sudo}#{repo.dimg.dapp.git_bin} apply --whitespace=nowarn --directory=#{to} --unsafe-paths #{patch_file(stage, *patch_stage_commits(stage))}"
+              when :file
+                commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d #{File.dirname(to)}"
+                commands << "#{sudo}#{repo.dimg.dapp.git_bin} apply --whitespace=nowarn --directory=#{File.dirname(to)} --unsafe-paths #{patch_file(stage, *patch_stage_commits(stage))}"
+              else
+                raise
+              end
             end
           end
         end
@@ -103,12 +166,11 @@ module Dapp
         end
       end
 
-      def dev_patch_hash
+      def dev_patch_hash(stage)
         return unless dev_mode?
 
         Digest::SHA256.hexdigest(diff_patches(latest_commit, nil).map do |patch|
-          next unless (path = repo.path.dirname.join(patch.delta.new_file[:path])).file?
-          File.read(path)
+          change_patch_new_file_path(stage, patch)
         end.join(':::'))
       end
 
@@ -146,7 +208,11 @@ module Dapp
         repo.dimg.dapp.sudo_command(owner: owner, group: group)
       end
 
-      def archive_file(from_commit, to_commit)
+      def credentials
+        [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
+      end
+
+      def archive_file(stage, from_commit, to_commit)
         tar_write(repo.dimg.tmp_path('archives', archive_file_name(from_commit, to_commit))) do |tar|
           diff_patches(from_commit, to_commit).each do |patch|
             entry = patch.delta.new_file
@@ -161,9 +227,9 @@ module Dapp
             end
 
             if entry[:mode] == 40960 # symlink
-              tar.add_symlink slice_cwd(entry[:path]), content, entry[:mode]
+              tar.add_symlink slice_cwd(stage, entry[:path]), content, entry[:mode]
             else
-              tar.add_file slice_cwd(entry[:path]), entry[:mode] do |tf|
+              tar.add_file slice_cwd(stage, entry[:path]), entry[:mode] do |tf|
                 tf.write content
               end
             end
@@ -174,35 +240,54 @@ module Dapp
         raise Error::TarWriter, message: e.message
       end
 
-      def slice_cwd(path)
+      def slice_cwd(stage, path)
         return path if cwd.empty?
-        path
-          .reverse
-          .chomp(cwd.reverse)
-          .reverse
+
+        case cwd_type(stage)
+        when :directory
+          path
+            .reverse
+            .chomp(cwd.reverse)
+            .reverse
+        when :file
+          File.basename(to)
+        else
+          raise
+        end
       end
 
       def archive_file_name(from_commit, to_commit)
         file_name(from_commit, to_commit, 'tar')
       end
 
-      def patch_file(from_commit, to_commit)
+      def patch_file(stage, from_commit, to_commit)
         File.open(repo.dimg.tmp_path('patches', patch_file_name(from_commit, to_commit)), File::RDWR | File::CREAT) do |f|
-          diff_patches(from_commit, to_commit).each { |patch| f.write change_patch_new_file_path(patch) }
+          diff_patches(from_commit, to_commit).each { |patch| f.write change_patch_new_file_path(stage, patch) }
         end
         repo.dimg.container_tmp_path('patches', patch_file_name(from_commit, to_commit))
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      def change_patch_new_file_path(patch)
+      def change_patch_new_file_path(stage, patch)
         patch.to_s.lines.tap do |lines|
           modify_patch_line = proc do |line_number, path_char|
             action_part, path_part = lines[line_number].split
             if (path_with_cwd = path_part.partition("#{path_char}/").last).start_with?(cwd)
-              path_with_cwd.sub(cwd, '').tap do |native_path|
+              native_path = case archive_type
+              when :directory
+                path_with_cwd.sub(cwd, '')
+              when :file
+                File.basename(to)
+              else
+                raise
+              end
+
+              if native_path
                 expected_path = File.join(path_char, native_path)
                 lines[line_number] = [action_part, expected_path].join(' ') + "\n"
               end
+
+              native_path
             end
           end
 

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

@@ -10,6 +10,10 @@ module Dapp
           dimg.dapp.local_git_artifact_exclude_paths
         end
 
+        def workdir_path
+          Pathname(git.workdir)
+        end
+
         def path
           @path ||= Pathname(Rugged::Repository.discover(dimg.home_path.to_s).path)
         rescue Rugged::RepositoryError => _e

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

@@ -143,14 +143,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

data/lib/dapp/kube/kubernetes/client.rb

@@ -4,8 +4,6 @@ module Dapp
       class Client
         include Helper::YAML
 
-        ::Dapp::Dapp::Shellout::Base.default_env_keys << 'KUBECONFIG'
-
         def initialize(namespace: nil)
           @namespace = namespace
           @query_parameters = {}
@@ -255,10 +253,7 @@ module Dapp
 
         def kube_config
           @kube_config ||= begin
-            kube_config_path = ENV['KUBECONFIG']
-            kube_config_path = File.join(ENV['HOME'], '.kube/config') unless kube_config_path
-
-            if File.exist?(kube_config_path)
+            if File.exist?((kube_config_path = File.join(ENV['HOME'], '.kube/config')))
               yaml_load_file(kube_config_path)
             else
               raise Error::Base, code: :kube_config_not_found, data: { path: kube_config_path }

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.26'.freeze
-  BUILD_CACHE_VERSION = 18
+  VERSION = '0.14.0'.freeze
+  BUILD_CACHE_VERSION = 16
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.26
+  version: 0.14.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -166,34 +166,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.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
@@ -451,7 +423,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
@@ -648,7 +619,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
@@ -716,7 +686,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 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