dapp 0.23.9 → 0.23.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e1a4d9df02d7503f13c90e0d0a7c822430d868a
-  data.tar.gz: 6f9009a613d5f3472cdf5f113c8b51966bf89937
+  metadata.gz: 949df785aff321e34eb685421d3c7c0b396bc62b
+  data.tar.gz: 85336f30a665901ee3c716a9d53512112e58426e
 SHA512:
-  metadata.gz: 446853c002ce18de52381df1be3c55539bdb7dc9836269a124aed216cc308b175e5a3fd44ca2e5d5c2cca158ede4fe6a397614aecacb4b092c0089c4219f4a6f
-  data.tar.gz: 187eeb1ce2018264a7b56e6cf48c3143b6e11c7d88f5d5926804f0837ba2995bb4be241e876b61f471bd115efe8cadd640fae7af0e8504da0ccf2856704e0003
+  metadata.gz: bcb935ad210325c03aa642906adbd970beef82a2e30c3e0d3ccf14e7a60e0b219fe98e141fa28204421b26fafe270dd16ba207073d60fdff5f4cf6fe1a30b437
+  data.tar.gz: 7f199a77a71b6096989ad44431c1e1e900f7155d1a3840f0fc39eb781b3a2e8cc3e0300c12878efb2df04a42b284b8150daabfdebb28c739a7e49370928dcedf

data/bin/dapp

@@ -28,6 +28,10 @@ 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/lib/dapp.rb

@@ -26,6 +26,8 @@ require 'zlib'
 require 'slugify'
 require 'base64'
 require 'io/console'
+require 'sentry-raven'
+require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -36,6 +38,7 @@ 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'
@@ -56,6 +59,7 @@ 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,6 +38,10 @@ 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,6 +58,8 @@ 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
@@ -74,6 +76,10 @@ module Dapp
           end
         end
 
+        def run_method
+          class_to_lowercase
+        end
+
         def log_dapp_running_time(dapp, ignore: false)
           return yield if ignore
 
@@ -95,7 +101,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, **kwargs)
+          config.merge(build_dir: dirs.compact.first, dapp_command: run_method, **kwargs)
         end
       end
     end

data/lib/dapp/dapp.rb

@@ -17,10 +17,13 @@ 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
@@ -41,6 +44,18 @@ 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
@@ -86,8 +101,8 @@ module Dapp
       self.class.tmp_base_dir
     end
 
-    def build_path(*path)
-      @build_path ||= begin
+    def build_dir
+      @build_dir ||= begin
         if option_build_dir
           Pathname.new(option_build_dir)
         else
@@ -95,7 +110,10 @@ module Dapp
           Pathname.new(dir)
         end.expand_path.tap(&:mkpath)
       end
-      make_path(@build_path, *path)
+    end
+
+    def build_path(*path)
+      make_path(build_dir, *path)
     end
 
     def local_git_artifact_exclude_paths(&blk)

data/lib/dapp/dapp/option_tags.rb

@@ -11,6 +11,12 @@ 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/dapp/sentry.rb

@@ -0,0 +1,112 @@
+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/dimg/cli/command/base.rb

@@ -9,10 +9,6 @@ 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/git_artifact_remote.rb

@@ -3,14 +3,13 @@ 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
-
-            url_without_scheme = url.split("://", 2).last
-            url_without_creds = url_without_scheme.split(":", 2).last
-            @_name = url_without_creds.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
+            @_name = git_url_to_name(url)
 
             super(**kwargs, &blk)
           end

data/lib/dapp/helper/url.rb

@@ -0,0 +1,23 @@
+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

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

@@ -116,6 +116,7 @@ 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/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.23.9"
+  VERSION = "0.23.10"
   BUILD_CACHE_VERSION = 26.1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.23.9
+  version: 0.23.10
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -186,6 +186,34 @@ 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
@@ -448,6 +476,7 @@ 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
@@ -647,6 +676,7 @@ 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