dapp 0.26.14 → 0.27.0

data/lib/dapp/dimg/git_artifact.rb

@@ -192,10 +192,17 @@ module Dapp
             if any_changes?(*dev_patch_stage_commits(stage))
               case archive_type(stage)
               when :directory
-                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(' ')}"
+                files_to_remove_file_name = file_name('dev_files_to_remove')
+                File.open(dimg.tmp_path('archives', files_to_remove_file_name), File::RDWR | File::CREAT) do |f|
+                  diff_patches(*dev_patch_stage_commits(stage))
+                    .map {|p| File.join(to, cwd, p.delta.new_file[:path])}
+                    .each(&f.method(:puts))
+                end
+
+                commands << "#{repo.dapp.rm_bin} -rf $(#{repo.dapp.cat_bin} #{dimg.container_tmp_path('archives', files_to_remove_file_name)})"
                 commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
                 commands << "#{sudo}#{repo.dapp.tar_bin} -xf #{archive_file(stage)} -C \"#{to}\""
+                commands << "#{repo.dapp.find_bin} \"#{to}\" -empty -type d -delete"
               when :file
                 commands << "#{repo.dapp.rm_bin} -rf \"#{to}\""
                 commands << "#{repo.dapp.install_bin} #{credentials.join(' ')} -d \"#{File.dirname(to)}\""

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: [])

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/kube/dapp/command/deploy.rb

@@ -165,7 +165,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/lint.rb

@@ -4,11 +4,10 @@ module Dapp
       module Command
         module Lint
           def kube_chart_name
-            chart_yaml_path = kube_chart_path.join("Chart.yaml")
-            chart_spec = yaml_load_file(chart_yaml_path)
+            chart_spec = yaml_load_file(kube_chart_yaml_path)
 
             if chart_spec["name"].nil? || chart_spec["name"].empty?
-              raise ::Dapp::Error::Command, code: :no_helm_chart_spec_name, data: { name: chart_spec["name"], path: chart_yaml_path, raw_spec: chart_yaml_path.read.strip }
+              raise ::Dapp::Error::Command, code: :no_helm_chart_spec_name, data: { name: chart_spec["name"], path: kube_chart_yaml_path, raw_spec: kube_chart_yaml_path.read.strip }
             end
 
             chart_spec["name"]
@@ -29,6 +28,7 @@ module Dapp
 
           def kube_lint
             kube_check_helm_chart!
+            kube_check_helm_chart_yaml!
 
             repo = option_repo
 
@@ -41,7 +41,7 @@ module Dapp
 
               all_values = {}
               [kube_chart_path('values.yaml').expand_path, *kube_values_paths, *kube_tmp_chart_secret_values_paths].each do |values_path|
-                all_values = all_values.in_depth_merge(yaml_load_file(values_path))
+                all_values = all_values.in_depth_merge(yaml_load_file(values_path)) if File.file?(values_path)
               end
 
               options[:helm_set_options].each do |opt_spec|
@@ -68,6 +68,13 @@ module Dapp
             end
           end
 
+          def kube_check_helm_chart_yaml!
+            raise ::Dapp::Error::Command, code: :chart_yaml_not_found, data: { path: kube_chart_yaml_path } unless kube_chart_yaml_path.exist?
+          end
+
+          def kube_chart_yaml_path
+            kube_chart_path.join("Chart.yaml")
+          end
         end
       end
     end

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

@@ -65,15 +65,15 @@ module Dapp
           dimgs = dapp.build_configs.map do |config|
             dapp.dimg(config: config, ignore_git_fetch: true)
           end.uniq do |dimg|
-            dimg.config._name
+            dimg.name
           end
 
           dimgs.each do |dimg|
             dimg_data = {}
-            if dimg.config._name
+            if dimg.name
               res["global"]["dapp"]["is_nameless_dimg"] = false
               res["global"]["dapp"]["dimg"] ||= {}
-              res["global"]["dapp"]["dimg"][dimg.config._name] = dimg_data
+              res["global"]["dapp"]["dimg"][dimg.name] = dimg_data
             else
               res["global"]["dapp"]["is_nameless_dimg"] = true
               res["global"]["dapp"]["dimg"] = dimg_data
@@ -83,16 +83,16 @@ module Dapp
             docker_image_id = TEMPLATE_EMPTY_VALUE
             unless fake || without_registry
               begin
-                dimg_labels = dapp.dimg_registry(repo).image_labels(docker_tag, dimg.config._name)
-                docker_image_id = dapp.dimg_registry(repo).image_id(docker_tag, dimg.config._name)
+                dimg_labels = dapp.dimg_registry(repo).image_labels(docker_tag, dimg.name)
+                docker_image_id = dapp.dimg_registry(repo).image_id(docker_tag, dimg.name)
               rescue ::Dapp::Dimg::Error::Registry => err
                 unless disable_warnings
-                  dapp.log_warning "Registry `#{err.net_status[:data][:registry]}` is not availabble: cannot determine <dimg>.docker_image_id and <dimg>.git.<ga>.commit_id helm values of dimg#{dimg.config._name ? " `#{dimg.config._name}`" : nil}"
+                  dapp.log_warning "Registry `#{err.net_status[:data][:registry]}` is not availabble: cannot determine <dimg>.docker_image_id and <dimg>.git.<ga>.commit_id helm values of dimg#{dimg.name ? " `#{dimg.name}`" : nil}"
                 end
               end
             end
 
-            dimg_data["docker_image"] = [[repo, dimg.config._name].compact.join("/"), docker_tag].join(":")
+            dimg_data["docker_image"] = [[repo, dimg.name].compact.join("/"), docker_tag].join(":")
             dimg_data["docker_image_id"] = docker_image_id
 
             [*dimg.local_git_artifacts, *dimg.remote_git_artifacts].each do |ga|

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.26.14"
-  BUILD_CACHE_VERSION = 27.1
+  VERSION = "0.27.0"
+  BUILD_CACHE_VERSION = 27
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.26.14
+  version: 0.27.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -200,48 +200,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
-- !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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -490,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
@@ -564,6 +535,7 @@ files:
 - lib/dapp/dimg/build/stage/setup/setup.rb
 - lib/dapp/dimg/builder.rb
 - lib/dapp/dimg/builder/ansible.rb
+- lib/dapp/dimg/builder/ansible/assets.rb
 - lib/dapp/dimg/builder/base.rb
 - lib/dapp/dimg/builder/chef.rb
 - lib/dapp/dimg/builder/chef/berksfile.rb
@@ -695,7 +667,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,106 +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,
-          "build-dir" => self.build_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|
-          if git_own_repo_exist?
-            extra["git"] = {
-              "remote_origin_url" => git_own_repo.remote_origin_url, # may contain https token
-              "name" => self.git_url_to_name(git_own_repo.remote_origin_url),
-              "path" => git_own_repo.path,
-              "workdir_path" => git_own_repo.workdir_path,
-              "latest_commit" => git_own_repo.latest_commit,
-            }
-          end
-
-          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
-        @_sentry_tags_context ||= {
-          "dapp-name" => self.name,
-          "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|
-          if git_own_repo_exist?
-            tags["git-host"] = self.get_host_from_git_url(git_own_repo.remote_origin_url)
-
-            git_name = self.git_url_to_name(git_own_repo.remote_origin_url)
-
-            tags["git-group"] = git_name.partition("/")[0]
-            tags["git-name"] = git_name
-          end
-
-          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