dapp 0.25.8 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce0f6b6791bf4fba6bd882e3563b1b57272f452
-  data.tar.gz: 344cfd21cf25a679ba1176b785ce2122d4673bcb
+  metadata.gz: f76da5bbcfb8d6dfe619a3070e565706c5fe3687
+  data.tar.gz: a3d24e6ac82d6112decf07c48e9fdf6aafcafab0
 SHA512:
-  metadata.gz: fb9f90a3add54f6f4ec82490de02f9a47355af1ba91af60b50bc8b67fe9e394ae0a33e5a4e0c88ee08809d6fe56928f266756964097f6957ed964f5476f25ac8
-  data.tar.gz: 2901374544207c428ce7dd926cc0760d195784a7a6338c0dbefe5833bd2b758ae1c4904d8c273ca8b14d227054310fdc899c3654a38c0b7f2dc6edf2db0f6874
+  metadata.gz: 361cf09b363732b5adde9a230e8f0ec895508067a34e6f41bb47a8daacacc35245b0328471230fd0c27767258dfa8d07f14f4b09ef03c1df506bac9b47481cdb
+  data.tar.gz: a25004f9b889e24acd5ce052c8565c1510f0eab6faaea03e36406077e763d3e8c676dfeae4002ea0fb396bf39ee11da8988652daeb4867bf581f4c1eb2faff8f

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/config/en/common.yml

@@ -61,7 +61,6 @@ en:
       introspect_image_impossible: "WARNING: You can't introspect stage `%{name}`!"
       stage_dependencies_not_found: "WARNING: Stage dependencies `%{dependencies}` haven't been found in repo `%{repo}`!"
       unsupported_dapp_config_options: "WARNING: .dapp_config includes unsupported options [%{options}]: use only following options [%{supported_options}]"
-      secret_key_dappfile_not_found: "WARNING: Project root directory can't be initialized: Dappfile not found!"
     group:
       install: 'Install group'
       setup: 'Setup group'

data/config/en/net_status.yml

@@ -48,7 +48,7 @@ en:
     dapp:
       no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
       no_such_app: "No such app: `%{apps_patterns}`!"
-      dappfile_not_found: "Dappfile not found!"
+      dappfile_not_found: "dappfile.yml, dappfile.yaml or Dappfile not found!"
       cannot_run_ssh_agent: "Can't run ssh-agent!"
       ssh_key_not_found: "Ssh key `%{path}` doesn't exist!"
       docker_not_found: "Docker not found!"
@@ -60,6 +60,7 @@ en:
       incorrect_dapp_config_option_color: ".dapp_config includes option `color` with incorrect value `%{value}`: expected one of the following values [%{expected}]"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
       git_branch_without_name: "Dimg has specific revision that isn't associated with a branch name!"
+      download_failed_bad_dappfile_yml_checksum: "Cannot download dappfile-yml binary dependency from %{url}: checksum validation failed"
     config:
       dimg_name_required: 'Dimg name required!'
       dimg_name_incorrect: "Dimg has incorrect name `%{value}`: doesn't match regex `%{pattern}`!"

data/lib/dapp.rb

@@ -26,8 +26,8 @@ require 'zlib'
 require 'slugify'
 require 'base64'
 require 'io/console'
-require 'sentry-raven'
-require 'toml-rb'
+require 'net/http'
+require 'progressbar'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -38,7 +38,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 +58,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'
@@ -273,6 +271,7 @@ require 'dapp/dimg/dimg/path'
 require 'dapp/dimg/dimg/stages'
 require 'dapp/dimg/dimg'
 require 'dapp/dimg/artifact'
+require 'dapp/downloader'
 
 module Dapp
   def self.root

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/config/directive/base.rb

@@ -12,6 +12,13 @@ module Dapp
           _clone
         end
 
+        def encode_with(coder)
+          (instance_variables - [:@dapp]).each do |var|
+            var = var.to_s
+            coder[var.gsub('@', '')] = instance_variable_get(var)
+          end
+        end
+
         protected
 
         attr_reader :dapp

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
@@ -98,8 +83,12 @@ module Dapp
       nil
     end
 
+    def work_dir
+      File.expand_path(options[:dir] || Dir.pwd)
+    end
+
     def path(*path)
-      @path ||= expand_path(dappfile_path)
+      @path ||= make_path(work_dir)
       make_path(@path, *path)
     end
 
@@ -107,8 +96,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 +105,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/dappfile.rb

@@ -1,58 +1,150 @@
 module Dapp
   class Dapp
     module Dappfile
+      module Error
+        class DappfileYmlErrorResponse < ::Dapp::Error::Default
+          def initialize(error_code, response)
+            net_status = {}
+            net_status[:code] = error_code
+            net_status[:message] = response["message"] if response["message"]
+            super(net_status)
+          end
+        end
+      end
+
       def local_git_artifact_exclude_paths(&blk)
         super do |exclude_paths|
           exclude_paths << 'Dappfile'
+          exclude_paths << "dappfile.yml"
+          exclude_paths << "dappfile.yaml"
 
           yield exclude_paths if block_given?
         end
       end
 
-      def dappfile_exists?
-        !!search_file_upward('Dappfile')
-      end
-
-      def dappfile_path
-        raise Error::Dapp, code: :dappfile_not_found unless (dappfile_path = search_file_upward('Dappfile'))
-        dappfile_path
-      end
-
-      def work_dir
-        File.expand_path(options[:dir] || Dir.pwd)
-      end
-
       def expand_path(path, number = 1)
         path = File.expand_path(path)
         number.times.each { path = File.dirname(path) }
         path
       end
 
+      def dappfile_exists?
+        File.exist?(path("dappfile.yml")) ||
+          File.exist?(path("dappfile.yaml")) ||
+            File.exist?(path("Dappfile")) ||
+              ENV["DAPP_LOAD_CONFIG_PATH"]
+      end
+
       def config
         @config ||= begin
-          ::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) }
-              message = begin
-                case e
-                when NoMethodError
-                  e.message =~ /`.*'/
-                  "undefined method #{Regexp.last_match}"
-                when NameError then e.message[/.*(?= for)/]
-                else
-                  e.message
-                end
+          config = nil
+
+          dappfile_yml = path("dappfile.yml").to_s
+          dappfile_yaml = path("dappfile.yaml").to_s
+          dappfile_ruby = path("Dappfile").to_s
+
+          if ENV["DAPP_LOAD_CONFIG_PATH"]
+            config = YAML.load_file ENV["DAPP_LOAD_CONFIG_PATH"]
+          elsif File.exist? dappfile_yml
+            config = load_dappfile_yml(dappfile_yml)
+          elsif File.exist? dappfile_yaml
+            config = load_dappfile_yml(dappfile_yaml)
+          elsif File.exist? dappfile_ruby
+            config = load_dappfile_ruby(dappfile_ruby)
+          else
+            raise ::Dapp::Error::Dapp, code: :dappfile_not_found
+          end
+
+          if ENV["DAPP_DUMP_CONFIG"]
+            puts "-- DAPP_DUMP_CONFIG BEGIN"
+            puts YAML.dump(config)
+            puts "-- DAPP_DUMP_CONFIG END"
+          end
+
+          config
+        end # begin
+      end
+
+      def load_dappfile_ruby(dappfile_path)
+        ::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) }
+            message = begin
+              case e
+              when NoMethodError
+                e.message =~ /`.*'/
+                "undefined method #{Regexp.last_match}"
+              when NameError then e.message[/.*(?= for)/]
+              else
+                e.message
               end
-              message = "#{backtrace[/.*(?=:in)/]}: #{message}" if backtrace
-              raise Error::Dappfile, code: :incorrect, data: { error: e.class.name, message: message }
             end
+            message = "#{backtrace[/.*(?=:in)/]}: #{message}" if backtrace
+            raise ::Dapp::Error::Dappfile, code: :incorrect, data: { error: e.class.name, message: message }
+          end # begin-rescue
+        end
+      end
+
+      def load_dappfile_yml(dappfile_path)
+        if dappfile_yml_bin_path = ENV["DAPP_BIN_DAPPFILE_YML"]
+          unless File.exists? dappfile_yml_bin_path
+            raise ::Dapp::Error::Dapp, code: :dappfile_yml_bin_path_not_found, data: {path: dappfile_yml_bin_path}
+          end
+        else
+          dappfile_yml_bin_path = File.join(::Dapp::Dapp.home_dir, "bin", "dappfile-yml", ::Dapp::VERSION, "dappfile-yml")
+          unless File.exists? dappfile_yml_bin_path
+            download_dappfile_yml_bin(dappfile_yml_bin_path)
           end
         end
+
+        cmd_res = shellout "#{dappfile_yml_bin_path} -dappfile #{dappfile_path}"
+
+        raw_json_response = nil
+        if cmd_res.exitstatus == 0
+          raw_json_response = cmd_res.stdout
+        elsif cmd_res.exitstatus == 16
+          raw_json_response = cmd_res.stderr
+        else
+          shellout_cmd_should_succeed! cmd_res
+        end
+
+        response = JSON.parse(raw_json_response)
+
+        raise ::Dapp::Dapp::Error::DappfileYmlErrorResponse.new(response["error"], response) if response["error"]
+
+        YAML.load response["dappConfig"]
+      end
+
+      def download_dappfile_yml_bin(dappfile_yml_bin_path)
+        lock("downloader.bin.dappfile-yml", default_timeout: 1800) do
+          return if File.exists? dappfile_yml_bin_path
+
+          log_process("Downloading dappfile-yml dapp dependency") do
+            # FIXME use flant repo
+            location = URI("https://dl.bintray.com/diafour/dapp/#{::Dapp::VERSION}/dappfile-yml")
+
+            tmp_bin_path = File.join(self.class.tmp_base_dir, "dappfile-yml-#{SecureRandom.uuid}")
+            ::Dapp::Downloader.download(location, tmp_bin_path, show_progress: true, progress_titile: dappfile_yml_bin_path)
+
+            checksum_location = URI("https://dl.bintray.com/diafour/dapp/#{::Dapp::VERSION}/dappfile-yml.sha")
+            tmp_bin_checksum_path = tmp_bin_path + ".checksum"
+            ::Dapp::Downloader.download(checksum_location, tmp_bin_checksum_path)
+
+            if Digest::SHA256.hexdigest(File.read(tmp_bin_path)) != File.read(tmp_bin_checksum_path).strip
+              raise ::Dapp::Error::Dapp, code: :download_failed_bad_dappfile_yml_checksum, data: {url: location.to_s, checksum_url: checksum_location.to_s}
+            end
+
+            File.chmod(0755, tmp_bin_path)
+            FileUtils.mkdir_p File.dirname(dappfile_yml_bin_path)
+            FileUtils.mv tmp_bin_path, dappfile_yml_bin_path
+          end # log_process
+        end # lock
       end
+
     end # Dappfile
   end # Dapp
 end # Dapp

data/lib/dapp/dapp/option_tags.rb

@@ -7,12 +7,6 @@ module Dapp
 
       def tags_by_scheme
         @tags_by_scheme_name ||= begin
-          if slug_tags[:custom].any?
-            if settings.fetch("sentry", {}).fetch("detect-push-tag-usage", false)
-              sentry_message("--tag or --tag-slug usage detected", extra: {"slug_tags" => slug_tags})
-            end
-          end
-
           {}.tap do |tags_by_scheme|
             [slug_tags, branch_tags, ci_tags].each do |_tags_by_scheme|
               _tags_by_scheme.each do |scheme, tags|
@@ -95,4 +89,4 @@ module Dapp
       end
     end # Tags
   end # Dapp
-end # Dapp
+end # Dapp

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

@@ -0,0 +1,117 @@
+module Dapp
+  module Downloader
+    module Error
+      class DownloadFailed < ::Exception
+      end
+    end
+
+    class BytesCount
+      attr_reader :bytes, :total_bytes_count
+
+      def initialize(bytes, total_bytes_count: nil)
+        @bytes = bytes.to_f
+        @total_bytes_count = total_bytes_count
+      end
+
+      def to_s(*a)
+        max_bytes = @total_bytes_count || self
+        width = sprintf("%.2f", max_bytes.bytes/1024/1024).bytesize
+        sprintf("%#{width}.2f", @bytes/1024/1024)
+      end
+
+      [:+, :-, :*, :/].each do |method|
+        define_method(method) do |arg|
+          res = case arg
+          when BytesCount
+            @bytes.send(method, arg.bytes)
+          else
+            @bytes.send(method, arg)
+          end
+          self.class.new(res, total_bytes_count: total_bytes_count)
+        end
+      end
+
+      [:>, :<, :==].each do |method|
+        define_method(method) do |arg|
+          case arg
+          when BytesCount
+            @bytes.send(method, arg.bytes)
+          else
+            @bytes.send(method, arg)
+          end
+        end
+      end
+
+      def method_missing(method, *args, &blk)
+        case method
+        when :to_f, :to_i
+          @bytes.send(method, *args, &blk)
+        else
+          raise
+        end
+      end
+    end # BytesCount
+
+    class << self
+      def download(url, destination, show_progress: false, progress_titile: nil)
+        resp = nil
+        location = URI(url)
+        done = false
+        state = {}
+
+        loop do
+          Net::HTTP.start(location.host, location.port, use_ssl: true) do |http|
+            req = Net::HTTP::Get.new location
+            http.request req do |resp|
+              case resp
+              when Net::HTTPRedirection
+                location = URI(resp["location"])
+                next
+              when Net::HTTPSuccess
+                File.open(destination, "wb") do |file|
+                  file_size_bytes = nil
+                  file_size_bytes = BytesCount.new(resp.to_hash["content-length"].first.to_f) if show_progress
+
+                  if show_progress
+                    old_DEFAULT_BEGINNING_POSITION = ProgressBar::Progress.send(:remove_const, :DEFAULT_BEGINNING_POSITION)
+                    ProgressBar::Progress.send(:const_set, :DEFAULT_BEGINNING_POSITION, BytesCount.new(0, total_bytes_count: file_size_bytes))
+                  end
+
+                  begin
+                    progressbar = nil
+                    progressbar = ProgressBar.create(
+                      format: "   %cMB / %CMB   %B  %t",
+                      starting_at: BytesCount.new(0, total_bytes_count: file_size_bytes),
+                      total: file_size_bytes,
+                      progress_mark: "#",
+                      remainder_mark: ".",
+                      title: progress_titile,
+                      length: 100,
+                      autofinish: true
+                    ) if show_progress
+
+                    resp.read_body do |segment|
+                      progressbar.progress = progressbar.progress + segment.bytesize if show_progress
+                      file.write segment
+                    end
+                  ensure
+                    if show_progress
+                      ProgressBar::Progress.send(:remove_const, :DEFAULT_BEGINNING_POSITION)
+                      ProgressBar::Progress.send(:const_set, :DEFAULT_BEGINNING_POSITION, old_DEFAULT_BEGINNING_POSITION)
+                    end
+                  end
+                end # File.open
+
+                done = true
+              else
+                raise Error::DownloadFailed, "Failed to download #{url}: #{resp.code} #{resp.message}"
+              end # when
+            end # http.request
+          end # Net::HTTP.start
+
+          break if done
+        end # loop
+      end
+    end
+  end # Downloader
+end # Dapp

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

@@ -321,15 +321,11 @@ image: {{ tuple $name $context | include "_dimg2" }}
               unless (secret_key = ENV['DAPP_SECRET_KEY'])
                 secret_key_not_found_in << '`DAPP_SECRET_KEY`'
 
-                if dappfile_exists?
-                  file_path = path('.dapp_secret_key')
-                  if file_path.file?
-                    secret_key = path('.dapp_secret_key').read.chomp
-                  else
-                    secret_key_not_found_in << "`#{file_path}`"
-                  end
+                file_path = path('.dapp_secret_key')
+                if file_path.file?
+                  secret_key = path('.dapp_secret_key').read.chomp
                 else
-                  log_warning(desc: { code: :secret_key_dappfile_not_found })
+                  secret_key_not_found_in << "`#{file_path}`"
                 end
               end
 

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

@@ -162,7 +162,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

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.25.8"
-  BUILD_CACHE_VERSION = 26.2
+  VERSION = "0.26.1"
+  BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.25.8
+  version: 0.26.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -187,33 +187,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.6
 - !ruby/object:Gem::Dependency
-  name: sentry-raven
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: 1.9.0
   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
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -476,7 +462,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
@@ -664,6 +649,7 @@ files:
 - lib/dapp/dimg/image/stage.rb
 - lib/dapp/dimg/lock/base.rb
 - lib/dapp/dimg/lock/file.rb
+- lib/dapp/downloader.rb
 - lib/dapp/error/base.rb
 - lib/dapp/error/command.rb
 - lib/dapp/error/config.rb
@@ -678,7 +664,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