dapp 0.22.17 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 125ccf57682d13035150191173dd8b2f0ad8af3b
-  data.tar.gz: a1c74f6511df262e5a3423549c0909ff21110f23
+  metadata.gz: 501a8c18b049fad1debe8448c6e595e6b6ece898
+  data.tar.gz: c2a3cd337e13baa495acb67d76295608ff7828ab
 SHA512:
-  metadata.gz: 60cb923e5e5cf44001c0dabdc04d56a903f7680219492f336900a2e36622da578c77836f77d3fc3c3a0855f5740a8ba82747d46d2c09296373c529118844a730
-  data.tar.gz: 47a57d0155fd13388240fdae1b42dc475d8f5ce3b30c051f118afb783b1ef805ad7aeb00a25a38848967c4a60b508ad87d6d508ab724503c52a9ba6b4dd2e2ef
+  metadata.gz: d786163dbf0bc002be691579dd0c6b7835e88201ff37bc77bbc323dcf4bd411e1993677d5603546f094ee932f6799ea4204a7af2da0c166b4dae25c620f35c26
+  data.tar.gz: 2c77b2d54789be940ef323cb6529b1143b12fb2bd82ea915936e0343158e4113c619bc4d710ed73264164c2ef9fcad0941e3638c2e8aee5f6c5fd030a98dab1c

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

@@ -81,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

@@ -25,8 +25,6 @@ require 'etc'
 require 'zlib'
 require 'slugify'
 require 'base64'
-require 'sentry-raven'
-require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -37,7 +35,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'
@@ -58,7 +55,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

@@ -38,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
@@ -44,18 +41,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
@@ -101,8 +86,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
@@ -110,10 +95,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/logging/base.rb

@@ -2,18 +2,6 @@ module Dapp
   class Dapp
     module Logging
       module Base
-        class << self
-          def included(base)
-            base.send(:extend, ClassMethods)
-          end
-        end
-
-        module ClassMethods
-          def log_time
-            "#{DateTime.now.strftime('%Y-%m-%dT%T%z')} "
-          end
-        end
-
         def log_quiet?
           option_quiet
         end
@@ -99,6 +87,10 @@ module Dapp
           self.class.log_time
         end
 
+        def self.log_time
+          "#{DateTime.now.strftime('%Y-%m-%dT%T%z')} "
+        end
+
         def log_format_string(str, time: true, indent: true, style: nil)
           str.to_s.lines.map do |line|
             line = paint_string(line, style) if style

data/lib/dapp/dapp/option_tags.rb

@@ -11,12 +11,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/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/build/stage/ga_latest_patch.rb

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

data/lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb

@@ -27,7 +27,7 @@ module Dapp
             def changes_size_since_g_a_pre_setup_patch
               dimg.git_artifacts.map do |git_artifact|
                 if git_artifact.repo.commit_exists? prev_stage.layer_commit(git_artifact)
-                  git_artifact.patch_size(prev_stage.layer_commit(git_artifact), git_artifact.latest_commit)
+                  git_artifact.patch_size(prev_stage.layer_commit(git_artifact))
                 else
                   0
                 end

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

@@ -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/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

@@ -136,7 +136,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!
@@ -73,39 +71,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 ::Dapp::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 ::Dapp::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] }
@@ -133,20 +104,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(::Dapp::Error::Config, code: :artifact_conflict)
+              validate_artifact_path!(verifiable_artifact, artifact[:include_paths]) if verifiable_artifact[:include_paths].empty?
+            end
 
-              raise ::Dapp::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(::Dapp::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
@@ -41,11 +42,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!

data/lib/dapp/dimg/git_artifact.rb

@@ -70,12 +70,12 @@ module Dapp
               stage.image.add_service_change_label(repo.dapp.dimgstage_g_a_type_label(paramshash).to_sym => 'directory')
 
               commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
-              commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commit(stage))} -C \"#{to}\""
+              commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage)} -C \"#{to}\""
             when :file
               stage.image.add_service_change_label(repo.dapp.dimgstage_g_a_type_label(paramshash).to_sym => 'file')
 
               commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{File.dirname(to)}\""
-              commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commit(stage))} -C \"#{File.dirname(to)}\""
+              commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage)} -C \"#{File.dirname(to)}\""
             end
           end
         end
@@ -94,11 +94,11 @@ module Dapp
                 changed_files = diff_patches(*dev_patch_stage_commits(stage)).map {|p| "\"#{File.join(to, cwd, p.delta.new_file[:path])}\""}
                 commands << "#{repo.dapp.rm_bin} -rf #{changed_files.join(' ')}"
                 commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
-                commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage, *dev_patch_stage_commits(stage))} -C \"#{to}\""
+                commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage)} -C \"#{to}\""
               when :file
                 commands << "#{repo.dapp.rm_bin} -rf \"#{to}\""
                 commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{File.dirname(to)}\""
-                commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage, *dev_patch_stage_commits(stage))} -C \"#{File.dirname(to)}\""
+                commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage)} -C \"#{File.dirname(to)}\""
               else
                 raise
               end
@@ -130,44 +130,44 @@ module Dapp
 
         @stage_dependencies_checksums ||= {}
         @stage_dependencies_checksums[stage_dependencies_key] ||= begin
-          if (entries = repo_entries(commit, paths: paths)).empty?
-            repo.dapp.log_warning(desc: { code: :stage_dependencies_not_found,
-                                          data: { repo: repo.respond_to?(:url) ? repo.url : 'local',
-                                                  dependencies: stage_dependencies.join(', ') } })
-          end
+          if dev_mode?
+            dev_patch_hash(paths: paths)
+          else
+            if (entries = repo_entries(commit, paths: paths)).empty?
+              repo.dapp.log_warning(desc: { code: :stage_dependencies_not_found,
+                                            data: { repo: repo.respond_to?(:url) ? repo.url : 'local',
+                                                    dependencies: stage_dependencies.join(', ') } })
+            end
 
-          entries
-            .sort_by {|root, entry| File.join(root, entry[:name])}
-            .reduce(nil) {|prev_hash, (root, entry)|
-              content = nil
-              content = repo.lookup_object(entry[:oid]).content if entry[:type] == :blob
+            entries
+              .sort_by {|root, entry| File.join(root, entry[:name])}
+              .reduce(nil) {|prev_hash, (root, entry)|
+                content = nil
+                content = repo.lookup_object(entry[:oid]).content if entry[:type] == :blob
 
-              hexdigest prev_hash, File.join(root, entry[:name]), entry[:filemode].to_s, content
-            }
+                hexdigest prev_hash, File.join(root, entry[:name]), entry[:filemode].to_s, content
+              }
+          end
         end
       end
 
-      def patch_size(from_commit, to_commit)
+      def patch_size(from_commit)
+        to_commit = dev_mode? ? nil : latest_commit
         diff_patches(from_commit, to_commit).reduce(0) do |bytes, patch|
-          patch.hunks.each do |hunk|
-            hunk.lines.each do |l|
-              bytes +=
-                case l.line_origin
-                when :eof_newline_added, :eof_newline_removed then 1
-                when :addition, :deletion, :binary            then l.content.size
-                else # :context, :file_header, :hunk_header, :eof_no_newline
-                  0
-                end
-            end
-          end
+          bytes += patch.delta.deleted? ? patch.delta.old_file[:size] : patch.delta.new_file[:size]
           bytes
         end
       end
 
-      def dev_patch_hash(stage)
+      def dev_patch_hash(**options)
         return unless dev_mode?
-
-        hexdigest *diff_patches(latest_commit, nil).map {|patch| change_patch_new_file_path(stage, patch)}
+        hexdigest begin
+          diff_patches(nil, nil, **options).map do |patch|
+            file = patch.delta.new_file
+            raise_if_submodule!(file[:path], file[:mode])
+            [file[:path], File.read(File.join(repo.workdir_path, file[:path])), file[:mode]]
+          end
+        end
       end
 
       def latest_commit
@@ -183,7 +183,7 @@ module Dapp
       end
 
       def archive_any_changes?(stage)
-        repo_entries(archive_stage_commit(stage)).any?
+        repo_entries(stage_commit(stage)).any?
       end
 
       def patch_any_changes?(stage)
@@ -212,7 +212,8 @@ module Dapp
         [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
       end
 
-      def archive_file(stage, commit)
+      def archive_file(stage)
+        commit = stage_commit(stage)
         if repo.dapp.options[:use_system_tar]
           archive_file_with_system_tar(stage, commit)
         else
@@ -279,17 +280,17 @@ module Dapp
       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 do |patch|
-            raise_if_submodule_entry!(patch.delta.new_file)
+            file = patch.delta.new_file
+            raise_if_submodule!(file[:path], file[:mode])
             f.write change_patch_new_file_path(stage, patch)
           end
         end
         repo.dimg.container_tmp_path('patches', patch_file_name(from_commit, to_commit))
       end
 
-      def raise_if_submodule_entry!(entry) # FIXME
-        if entry[:mode] == 57344 # submodule
-          raise Error::Rugged, code: :submodule_not_supported, data: { path: repo.path.dirname.join(entry[:path]) }
-        end
+      def raise_if_submodule!(relative_file_path, mode) # FIXME
+        return unless mode == 57344
+        raise Error::Rugged, code: :submodule_not_supported, data: { path: repo.path.dirname.join(relative_file_path) }
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -359,14 +360,28 @@ module Dapp
         end
       end
 
-      def each_archive_entry(stage, commit, &blk)
-        repo_entries(commit).each do |root, entry|
-          raise_if_submodule_entry!(entry)
+      def each_archive_entry(stage, commit)
+        if dev_mode? && stage.name != :g_a_archive
+          diff_patches(commit, nil).each do |patch|
+            file = patch.delta.new_file
+            host_file_path = File.join(repo.workdir_path, file[:path])
 
-          if entry[:type] == :blob
-            content = repo.lookup_object(entry[:oid]).content
+            next unless File.exist?(host_file_path)
+            raise_if_submodule!(file[:path], file[:mode])
 
-            yield slice_cwd(stage, File.join(root, entry[:name])), content, entry[:filemode]
+            content = File.read(host_file_path)
+            yield slice_cwd(stage, file[:path]), content, file[:mode]
+          end
+        else
+          repo_entries(commit).each do |root, entry|
+            next unless entry[:type] == :blob
+
+            entry_file_path = File.join(root, entry[:name])
+
+            raise_if_submodule!(entry_file_path, entry[:filemode])
+
+            content = repo.lookup_object(entry[:oid]).content
+            yield slice_cwd(stage, entry_file_path), content, entry[:filemode]
           end
         end
       end
@@ -414,7 +429,7 @@ module Dapp
         end
       end
 
-      def archive_stage_commit(stage)
+      def stage_commit(stage)
         stage.layer_commit(self)
       end
 

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

@@ -3,8 +3,6 @@ module Dapp
     module GitRepo
       # Base class for any Git repo (remote, gitkeeper, etc)
       class Base
-        include Helper::Trivia
-
         attr_reader :name
 
         def initialize(manager, name)
@@ -134,6 +132,32 @@ module Dapp
         def git(**kwargs)
           @git ||= Rugged::Repository.new(path.to_s, **kwargs)
         end
+
+        private
+
+        def ignore_path?(path, paths: [], exclude_paths: [])
+          is_exclude_path = exclude_paths.any? { |p| check_path?(path, p) }
+          is_include_path = begin
+            paths.empty? ||
+              paths.any? do |p|
+                File.fnmatch?(p, path, File::FNM_PATHNAME) ||
+                  File.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME)
+              end
+          end
+
+          is_exclude_path || !is_include_path
+        end
+
+        def check_path?(path, format)
+          path_parts = path.split('/')
+          checking_path = nil
+
+          until path_parts.empty?
+            checking_path = [checking_path, path_parts.shift].compact.join('/')
+            return true if File.fnmatch?(format, checking_path, File::FNM_PATHNAME)
+          end
+          false
+        end
       end
     end
   end

data/lib/dapp/helper/trivia.rb

@@ -28,41 +28,6 @@ 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) }
-      end
-
-      def check_subpath?(path, format)
-        path_checker(format) { |checking_path| File.fnmatch(checking_path, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
-      end
-
-      def path_checker(path)
-        path_parts = path.split('/')
-        checking_path = nil
-
-        until path_parts.empty?
-          checking_path = [checking_path, path_parts.shift].compact.join('/')
-          return true if yield checking_path
-        end
-        false
-      end
-
       def self.class_to_lowercase(class_name = self)
         class_name.to_s.split('::').last.split(/(?=[[:upper:]]|[0-9])/).join('_').downcase.to_s
       end

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

@@ -71,14 +71,7 @@ module Dapp
               watch_hooks_thr = nil
               unless dry_run?
                 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
               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/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.22.17'.freeze
-  BUILD_CACHE_VERSION = 26.1
+  VERSION = '0.23.0'.freeze
+  BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.22.17
+  version: 0.23.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2017-12-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
@@ -676,7 +647,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