dapp 0.19.11 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3886b35e5f607e9753dfc72ca24008f6cc7c2723
-  data.tar.gz: 11ba036e48859960e826cc769b8df3e4e60b98b6
+SHA256:
+  metadata.gz: 25371f86eea9f7d1896fc258be654241cf1021c05bfdc472da2cd676e2bdda56
+  data.tar.gz: d2c8a9e2f4e116ab34ae80c8dae3cca09d31715cc0d80da2c71d06c323f04818
 SHA512:
-  metadata.gz: 36cb56f06eadb64c74d13d423f50a2b737e2160919951463bf24c3bc3df0444b45779088a28ceb2c07169f056c6152f6c1720ad08e1b372cbf9a54a38d5751c6
-  data.tar.gz: eb23d51a61669705e76103320b21f16e18fc1ead511c3daa1df28866901d1235c631ba548d382e7db0f6cf8ffaeef02328dad9311a8b3f5a1e6acadde5b3f5fa
+  metadata.gz: f89fc98080749f41fdf250897010079dd0aaa38c8ffabd1dbfc1874d5c30a40ff303521b2af0c3bc61781cafd93e97acf28562a0bd0cbccdd6c14da4a085d34e
+  data.tar.gz: e8c81970d2f75f1339aab19900874725f3147be4d82ad6febbaafa2863414065d64d65bdc79839bb62005e422d3f1d1b84ae4325d9f2aa3208e4975a74c83a25

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

@@ -17,9 +17,10 @@ en:
       git_artifact_fetch: "fetching remote git_artifact `%{url}`"
       vendoring_builder_cookbooks: 'vendoring builder cookbooks'
       waiting_resouce_lock: "waiting for locked resource `%{name}`"
-      gitartifact_container_creating: 'creating dappdeps/gitartifact container'
-      base_container_creating: 'creating dappdeps/base container'
-      chefdk_container_creating: 'creating dappdeps/chefdk container'
+      gitartifact_container_creating: 'creating dappdeps/gitartifact container `%{name}`'
+      toolchain_container_creating: 'creating dappdeps/toolchain container `%{name}`'
+      base_container_creating: 'creating dappdeps/base container `%{name}`'
+      chefdk_container_creating: 'creating dappdeps/chefdk container `%{name}`'
       image_pull: "pulling image `%{name}`"
       image_push: "pushing image `%{name}`"
       image_save: "saving image `%{name}`"

data/lib/dapp.rb

@@ -24,8 +24,6 @@ require 'openssl'
 require 'etc'
 require 'zlib'
 require 'slugify'
-require 'sentry-raven'
-require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -36,7 +34,6 @@ require 'dapp/helper/sha256'
 require 'dapp/helper/net_status'
 require 'dapp/helper/tar'
 require 'dapp/helper/yaml'
-require 'dapp/helper/url'
 require 'dapp/prctl'
 require 'dapp/error/base'
 require 'dapp/error/dapp'
@@ -52,7 +49,6 @@ require 'dapp/config/config'
 require 'dapp/config/error/config'
 require 'dapp/dapp/lock'
 require 'dapp/dapp/ssh_agent'
-require 'dapp/dapp/sentry'
 require 'dapp/dapp/git_artifact'
 require 'dapp/dapp/dappfile'
 require 'dapp/dapp/chef'
@@ -61,6 +57,7 @@ require 'dapp/dapp/logging/base'
 require 'dapp/dapp/logging/process'
 require 'dapp/dapp/logging/paint'
 require 'dapp/dapp/logging/i18n'
+require 'dapp/dapp/deps/toolchain'
 require 'dapp/dapp/deps/base'
 require 'dapp/dapp/deps/gitartifact'
 require 'dapp/dapp/shellout/streaming'

data/lib/dapp/cli.rb

@@ -37,10 +37,6 @@ BANNER
            show_options: true,
            exit: 0
 
-    class << self
-      attr_accessor :dapp_object
-    end
-
     def initialize(*args)
       super(*args)
 

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

@@ -11,10 +11,6 @@ module Dapp
                long: '--build-dir PATH',
                description: 'Directory where build cache stored (DIR/.dapp_build by default)'
 
-        option :name,
-               long: "--name NAME",
-               description: "Use custom dapp name. Chaging default name will cause full cache rebuild. By default dapp name is the last element of remote.origin.url from project git, or it is the name of the directory where Dappfile resides."
-
         option :quiet,
                short: '-q',
                long: '--quiet',
@@ -62,8 +58,6 @@ module Dapp
 
         def run_dapp_command(run_method, options: {}, log_running_time: true)
           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
             if block_given?
@@ -74,10 +68,6 @@ module Dapp
           end
         end
 
-        def run_method
-          class_to_lowercase
-        end
-
         def log_dapp_running_time(dapp, ignore: false)
           return yield if ignore
 
@@ -94,7 +84,7 @@ module Dapp
         end
 
         def cli_options(**kwargs)
-          config.merge(dapp_command: run_method, **kwargs)
+          config.merge(**kwargs)
         end
       end
     end

data/lib/dapp/dapp.rb

@@ -12,14 +12,12 @@ 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
     include Deps::Base
 
@@ -38,23 +36,9 @@ 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
-        if name = options[:name]
-          name
-        elsif git_url
+        if git_url
           repo_name = git_url.split('/').last
           repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
           repo_name
@@ -92,18 +76,15 @@ 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
           path('.dapp_build')
         end.expand_path.tap(&:mkpath)
       end
-    end
-
-    def build_path(*path)
-      make_path(build_dir, *path)
+      make_path(@build_path, *path)
     end
 
     def local_git_artifact_exclude_paths(&blk)
@@ -149,10 +130,6 @@ module Dapp
     end
 
     class << self
-      def home_dir
-        File.join(Dir.home, ".dapp")
-      end
-
       def options
         @options ||= {}
       end

data/lib/dapp/dapp/deps/base.rb

@@ -2,7 +2,7 @@ module Dapp
   class Dapp
     module Deps
       module Base
-        BASE_VERSION = '0.1.15'.freeze
+        BASE_VERSION = "0.2.1"
 
         def base_container_name # FIXME: hashsum(image) or dockersafe()
           "dappdeps_base_#{BASE_VERSION}"
@@ -10,13 +10,18 @@ module Dapp
 
         def base_container
           @base_container ||= begin
-            if shellout("#{host_docker} inspect #{base_container_name}").exitstatus.nonzero?
-              log_secondary_process(t(code: 'process.base_container_creating'), short: true) do
-                shellout!(
-                  ["#{host_docker} create",
-                   "--name #{base_container_name}",
-                   "--volume /.dapp/deps/base/#{BASE_VERSION} dappdeps/base:#{BASE_VERSION}"].join(' ')
-                )
+            is_container_exist = proc{shellout("#{host_docker} inspect #{base_container_name}").exitstatus.zero?}
+            if !is_container_exist.call
+              lock("dappdeps.container.#{base_container_name}", default_timeout: 120, type: :global) do
+                if !is_container_exist.call
+                  log_secondary_process(t(code: 'process.base_container_creating', data: {name: base_container_name}), short: true) do
+                    shellout!(
+                      ["#{host_docker} create",
+                      "--name #{base_container_name}",
+                      "--volume /.dapp/deps/base/#{BASE_VERSION} dappdeps/base:#{BASE_VERSION}"].join(' ')
+                    )
+                  end
+                end
               end
             end
             base_container_name
@@ -26,7 +31,7 @@ module Dapp
         %w(rm rsync diff date cat
            stat readlink test sleep mkdir
            install sed cp true find
-           bash tar sudo).each do |cmd|
+           bash tar sudo base64).each do |cmd|
           define_method("#{cmd}_bin") { "/.dapp/deps/base/#{BASE_VERSION}/bin/#{cmd}" }
         end
 

data/lib/dapp/dapp/deps/gitartifact.rb

@@ -2,7 +2,7 @@ module Dapp
   class Dapp
     module Deps
       module Gitartifact
-        GITARTIFACT_VERSION = '0.1.7'.freeze
+        GITARTIFACT_VERSION = "0.2.1"
 
         def gitartifact_container_name # FIXME: hashsum(image) or dockersafe()
           "dappdeps_gitartifact_#{GITARTIFACT_VERSION}"
@@ -10,14 +10,19 @@ module Dapp
 
         def gitartifact_container
           @gitartifact_container ||= begin
-            if shellout("#{host_docker} inspect #{gitartifact_container_name}").exitstatus.nonzero?
-              log_secondary_process(t(code: 'process.gitartifact_container_creating'), short: true) do
-                shellout!(
-                  ["#{host_docker} create",
-                   "--name #{gitartifact_container_name}",
-                   "--volume /.dapp/deps/gitartifact/#{GITARTIFACT_VERSION}",
-                   "dappdeps/gitartifact:#{GITARTIFACT_VERSION}"].join(' ')
-                )
+            is_container_exist = proc{shellout("#{host_docker} inspect #{gitartifact_container_name}").exitstatus.zero?}
+            if !is_container_exist.call
+              lock("dappdeps.container.#{gitartifact_container_name}", default_timeout: 120, type: :global) do
+                if !is_container_exist.call
+                  log_secondary_process(t(code: 'process.gitartifact_container_creating', data: {name: gitartifact_container_name}), short: true) do
+                    shellout!(
+                      ["#{host_docker} create",
+                      "--name #{gitartifact_container_name}",
+                      "--volume /.dapp/deps/gitartifact/#{GITARTIFACT_VERSION}",
+                      "dappdeps/gitartifact:#{GITARTIFACT_VERSION}"].join(' ')
+                    )
+                  end
+                end
               end
             end
             gitartifact_container_name

data/lib/dapp/dapp/deps/toolchain.rb

@@ -0,0 +1,33 @@
+module Dapp
+  class Dapp
+    module Deps
+      module Toolchain
+        TOOLCHAIN_VERSION = "0.1.1"
+
+        def toolchain_container_name # FIXME: hashsum(image) or dockersafe()
+          "dappdeps_toolchain_#{TOOLCHAIN_VERSION}"
+        end
+
+        def toolchain_container
+          @toolchain_container ||= begin
+            is_container_exist = proc {shellout("#{host_docker} inspect #{toolchain_container_name}").exitstatus.zero?}
+            if !is_container_exist.call
+              lock("dappdeps.container.#{toolchain_container_name}", default_timeout: 300, type: :global) do
+                if !is_container_exist.call
+                  log_secondary_process(t(code: 'process.toolchain_container_creating', data: {name: toolchain_container_name}), short: true) do
+                    shellout!(
+                      ["#{host_docker} create",
+                      "--name #{toolchain_container_name}",
+                      "--volume /.dapp/deps/toolchain/#{TOOLCHAIN_VERSION} dappdeps/toolchain:#{TOOLCHAIN_VERSION}"].join(' ')
+                    )
+                  end
+                end
+              end
+            end
+            toolchain_container_name
+          end
+        end
+      end # Toolchain
+    end # Deps
+  end # Dapp
+end # Dapp

data/lib/dapp/dapp/lock.rb

@@ -1,21 +1,31 @@
 module Dapp
   class Dapp
     module Lock
-      def lock_path
-        build_path.join('locks')
+      def lock_path(type)
+        case type
+        when :dapp
+          build_path.join('locks')
+        when :global
+          Pathname.new("/tmp/dapp.global.locks").tap do |p|
+            FileUtils.mkdir_p p.to_s
+          end
+        else
+          raise
+        end
       end
 
-      def _lock(name)
+      def _lock(name, type)
         @_locks ||= {}
-        @_locks[name] ||= ::Dapp::Dimg::Lock::File.new(lock_path, name)
+        @_locks[type] ||= {}
+        @_locks[type][name] ||= ::Dapp::Dimg::Lock::File.new(lock_path(type), name)
       end
 
-      def lock(name, *_args, default_timeout: 300, **kwargs, &blk)
+      def lock(name, *_args, default_timeout: 300, type: :dapp, **kwargs, &blk)
         if dry_run?
           yield if block_given?
         else
           timeout = options[:lock_timeout] || default_timeout
-          _lock(name).synchronize(
+          _lock(name, type).synchronize(
             timeout: timeout,
             on_wait: proc do |&do_wait|
               log_secondary_process(

data/lib/dapp/dapp/shellout/base.rb

@@ -37,7 +37,7 @@ module Dapp
         end
 
         def shellout_pack(command)
-          "eval $(echo #{Base64.strict_encode64(command)} | base64 --decode)"
+          "eval $(echo #{Base64.strict_encode64(command)} | #{base64_bin} --decode)"
         end
 
         class << self

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

@@ -58,6 +58,7 @@ module Dapp
           def run_artifact_dimg(artifact_dimg, artifact_name, commands)
             docker_options = ['--rm',
                               "--volume #{dimg.tmp_path('artifact', artifact_name)}:#{artifact_dimg.container_tmp_path(artifact_name)}",
+                              "--volumes-from #{dimg.dapp.toolchain_container}",
                               "--volumes-from #{dimg.dapp.base_container}",
                               "--entrypoint #{dimg.dapp.bash_bin}"]
             dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do

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

@@ -80,6 +80,8 @@ module Dapp
 
           def prepare_image
             return if dimg.dapp.dry_run?
+
+            image.add_volumes_from dimg.dapp.toolchain_container
             image.add_volumes_from dimg.dapp.base_container
 
             image_add_mounts
@@ -188,7 +190,7 @@ module Dapp
 
           def layer_commit(git_artifact)
             commits[git_artifact] ||= begin
-              if image.built?
+              if image.tagged?
                 image.labels["dapp-git-#{git_artifact.paramshash}-commit"]
               else
                 git_artifact.latest_commit

data/lib/dapp/dimg/builder/chef.rb

@@ -1,7 +1,15 @@
 module Dapp
   module Dimg
     class Builder::Chef < Builder::Base
-      DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:1.2.22-1'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
+      CHEFDK_VERSION = "2.3.17-2"
+
+      def chef_solo_bin
+        "/.dapp/deps/chefdk/#{CHEFDK_VERSION}/bin/chef-solo"
+      end
+
+      def berks_bin
+        "/.dapp/deps/chefdk/#{CHEFDK_VERSION}/bin/berks"
+      end
 
       %i(before_install install before_setup setup build_artifact).each do |stage|
         define_method("#{stage}?") {!stage_empty?(stage)}
@@ -16,7 +24,7 @@ module Dapp
           unless stage_empty?(stage)
             image.add_volumes_from(chefdk_container)
             image.add_volume "#{stage_build_path(stage)}:#{container_stage_build_path(stage)}:ro"
-            image.add_command ['/.dapp/deps/chefdk/bin/chef-solo',
+            image.add_command [chef_solo_bin,
                                '--legacy-mode',
                                "--config #{container_stage_config_path(stage)}",
                                "--json-attributes #{container_stage_json_attributes_path(stage)}",
@@ -45,25 +53,29 @@ module Dapp
       end
 
       def chefdk_image
-        DEFAULT_CHEFDK_IMAGE # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
+        "dappdeps/chefdk:#{CHEFDK_VERSION}" # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
       end
 
       def chefdk_container_name # FIXME: hashsum(image) or dockersafe()
-        chefdk_image.tr('/', '_').tr(':', '_')
+        "dappdeps_chefdk_#{CHEFDK_VERSION}"
       end
 
       def chefdk_container
         @chefdk_container ||= begin
-          if dimg.dapp.shellout("#{dimg.dapp.host_docker} inspect #{chefdk_container_name}").exitstatus.nonzero?
-            dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.chefdk_container_creating'), short: true) do
-              dimg.dapp.shellout!(
-                ["#{dimg.dapp.host_docker} create",
-                 "--name #{chefdk_container_name}",
-                 "--volume /.dapp/deps/chefdk #{chefdk_image}"].join(' ')
-              )
+          is_container_exist = proc{dimg.dapp.shellout("#{dimg.dapp.host_docker} inspect #{chefdk_container_name}").exitstatus.zero?}
+          if !is_container_exist.call
+            dimg.dapp.lock("dappdeps.container.#{chefdk_container_name}", default_timeout: 120, type: :global) do
+              if !is_container_exist.call
+                dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.chefdk_container_creating', data: {name: chefdk_container_name}), short: true) do
+                  dimg.dapp.shellout!(
+                    ["#{dimg.dapp.host_docker} create",
+                    "--name #{chefdk_container_name}",
+                    "--volume /.dapp/deps/chefdk/#{CHEFDK_VERSION} #{chefdk_image}"].join(' ')
+                  )
+                end
+              end
             end
           end
-
           chefdk_container_name
         end
       end

data/lib/dapp/dimg/builder/chef/cookbook.rb

@@ -74,11 +74,9 @@ module Dapp
 
       # rubocop:disable Metrics/AbcSize
       def vendor!
-        volumes_from = [builder.dimg.dapp.base_container, builder.chefdk_container]
+        volumes_from = [builder.dimg.dapp.toolchain_container, builder.dimg.dapp.base_container, builder.chefdk_container]
 
         builder.dimg.dapp.log_secondary_process(builder.dimg.dapp.t(code: _vendor_process_name)) do
-          volumes_from = [builder.dimg.dapp.base_container, builder.chefdk_container]
-
           tmp_berksfile_path = builder.dimg.tmp_path.join("Berksfile.#{SecureRandom.uuid}")
           File.open(tmp_berksfile_path, 'w') {|file| file.write berksfile.dump}
 
@@ -93,7 +91,7 @@ module Dapp
             "cd /tmp/local_cookbooks/#{path}",
             "cp #{tmp_berksfile_path} Berksfile",
             "cp #{tmp_metadata_path} metadata.rb",
-            '/.dapp/deps/chefdk/bin/berks vendor /tmp/cookbooks',
+            "#{builder.berks_bin} vendor /tmp/cookbooks",
             ["#{builder.dimg.dapp.find_bin} /tmp/cookbooks -type d -exec #{builder.dimg.dapp.bash_bin} -ec '",
              "#{builder.dimg.dapp.install_bin} -o #{Process.uid} -g #{Process.gid} ",
              "--mode $(#{builder.dimg.dapp.stat_bin} -c %a {}) -d ",

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

@@ -20,6 +20,10 @@ module Dapp::Dimg::CLI
           end
         end
       end
+
+      def run_method
+        class_to_lowercase
+      end
     end
   end
 end

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

@@ -3,13 +3,11 @@ module Dapp
     module Config
       module Directive
         class GitArtifactRemote < GitArtifactLocal
-          include ::Dapp::Helper::Url
-
           attr_reader :_url, :_name, :_branch, :_commit
 
           def initialize(url, **kwargs, &blk)
             @_url  = url
-            @_name = git_url_to_name(url)
+            @_name = url.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
 
             super(**kwargs, &blk)
           end

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

@@ -59,14 +59,7 @@ module Dapp
               end
 
               watch_hooks_thr = Thread.new do
-                watch_hooks.each {|job|
-                  begin
-                    Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
-                  rescue ::Exception => e
-                    sentry_exception(e, extra: {"job-spec" => job.spec})
-                    raise
-                  end
-                }
+                watch_hooks.each {|job| Kubernetes::Manager::Job.new(self, job.name).watch_till_done!}
               end
 
               deployment_managers = release.deployments.values

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.19.11'.freeze
-  BUILD_CACHE_VERSION = 22.1
+  VERSION = '0.20.0'.freeze
+  BUILD_CACHE_VERSION = 23
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.19.11
+  version: 0.20.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2017-11-24 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
@@ -465,13 +437,13 @@ files:
 - lib/dapp/dapp/dappfile.rb
 - lib/dapp/dapp/deps/base.rb
 - lib/dapp/dapp/deps/gitartifact.rb
+- lib/dapp/dapp/deps/toolchain.rb
 - lib/dapp/dapp/git_artifact.rb
 - lib/dapp/dapp/lock.rb
 - lib/dapp/dapp/logging/base.rb
 - lib/dapp/dapp/logging/i18n.rb
 - lib/dapp/dapp/logging/paint.rb
 - lib/dapp/dapp/logging/process.rb
-- lib/dapp/dapp/sentry.rb
 - lib/dapp/dapp/shellout/base.rb
 - lib/dapp/dapp/shellout/streaming.rb
 - lib/dapp/dapp/ssh_agent.rb
@@ -663,7 +635,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
@@ -735,7 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell

data/lib/dapp/dapp/sentry.rb

@@ -1,112 +0,0 @@
-module Dapp
-  class Dapp
-    module Sentry
-      def sentry_message(msg, **kwargs)
-        return if not ensure_sentry_configured
-        kwargs[:level] ||= "info"
-        Raven.capture_message(msg, _make_sentry_params(**kwargs))
-      end
-
-      def sentry_exception(exception, **kwargs)
-        return if not ensure_sentry_configured
-        (kwargs[:tags] ||= {})['error-code'] = begin
-          net_status = exception.net_status
-          [net_status[:context], net_status[:code]].compact.join('_')
-        end
-        Raven.capture_exception(exception, _make_sentry_params(**kwargs))
-      end
-
-      def ensure_sentry_configured
-        return false unless sentry_settings = settings["sentry"]
-
-        unless @sentry_settings_configured
-          Raven.configure do |config|
-            logger = ::Logger.new(STDOUT)
-            logger.level = ::Logger::WARN
-
-            config.logger = logger
-            config.dsn = sentry_settings["dsn"]
-          end
-
-          @sentry_settings_configured = true
-        end
-
-        return true
-      end
-
-      def _make_sentry_params(level: nil, tags: {}, extra: {}, user: {})
-        {
-          level: level,
-          tags:  _sentry_tags_context.merge(tags),
-          extra: _sentry_extra_context.merge(extra),
-          user:  _sentry_user_context.merge(user),
-        }
-      end
-
-      def _sentry_extra_context
-        @_sentry_extra_context ||= {
-          "pwd" => Dir.pwd,
-          "dapp-dir" => self.work_dir,
-          "options" => self.options,
-          "env-options" => {
-            "DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
-            "DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
-            "ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
-            "DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],
-          },
-        }.tap {|extra|
-          extra["ci-env"] = {"CI" => ENV["CI"]}
-          ENV.select {|k, v| k.start_with?("CI_")}.each do |k, v|
-            extra["ci-env"][k] = v
-          end
-        }
-      end
-
-      def _sentry_tags_context
-        name = options[:name] || 
-        @_sentry_tags_context ||= {
-          "dapp-short-version" => ::Dapp::VERSION.split(".")[0..1].join("."),
-          "dapp-version" => ::Dapp::VERSION,
-          "dapp-build-cache-version" => ::Dapp::BUILD_CACHE_VERSION,
-          "dapp-command" => self.options[:dapp_command],
-        }.tap {|tags|
-          git_config_path = File.join(Dir.pwd, ".git/config")
-
-          tags["dapp-name"] = options[:name]
-
-          if File.exists? git_config_path
-            cfg = IniFile.load(File.join(Dir.pwd, ".git/config"))
-            remote_origin_cfg = cfg['remote "origin"']
-            remote_origin_url = remote_origin_cfg["url"]
-            if remote_origin_url
-              tags["dapp-name"] ||= begin
-                repo_name = remote_origin_url.split('/').last
-                repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
-                repo_name
-              end
-
-              tags["git-host"] = self.get_host_from_git_url(remote_origin_url)
-
-              git_name = self.git_url_to_name(remote_origin_url)
-
-              tags["git-group"] = git_name.partition("/")[0]
-              tags["git-name"] = git_name
-            end
-          end
-
-          tags["dapp-name"] ||= File.basename(Dir.pwd)
-
-          begin
-            ver = self.class.host_docker_minor_version
-            tags["docker-minor-version"] = ver.to_s
-          rescue ::Exception
-          end
-        }
-      end
-
-      def _sentry_user_context
-        @_sentry_user_context ||= {}
-      end
-    end # Sentry
-  end # Dapp
-end # Dapp

data/lib/dapp/helper/url.rb

@@ -1,23 +0,0 @@
-module Dapp
-  module Helper
-    module Url
-      def git_url_to_name(url)
-        url_without_scheme = url.split("://", 2).last
-        # This may be broken, because "@" should delimit creds, not a ":"
-        url_without_creds = url_without_scheme.split(":", 2).last
-        url_without_creds.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
-      end
-
-      def get_host_from_git_url(url)
-        url_without_scheme = url.split("://", 2).last
-        url_without_creds = url_without_scheme.split("@", 2).last
-
-        # Split out part after ":" in this kind of url: github.com:flant/dapp.git
-        url_part = url_without_creds.split(":", 2).first
-
-        # Split out part after first "/": github.com/flant/dapp.git
-        url_part.split("/", 2).first
-      end
-    end # Url
-  end # Helper
-end # Dapp