dapp 0.35.17 → 0.35.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2bc38466149b370c62382aa68ed569ce115f24ac5faf3301189c45f1ced9dc8
-  data.tar.gz: dec34d0c26d3e5184afb01118667c704c67ea62e6cdf273861a388f03ea151b2
+  metadata.gz: 7e9352f864e0861e11219e81099f33c917de38e6f678360d7a6a85c503c8c99c
+  data.tar.gz: 463867abfb9f02c469ba3ad1b386bf6fdb8d4d14c552d4138b2f1065e2952722
 SHA512:
-  metadata.gz: 1846080699119bd6d9c243829e7d81903782824df93acf1da89bc910ef102e242aa36454b3eddf67598fdbdd847dc17983ee2cc2a26fbf0ba5d0637ddc0a87bf
-  data.tar.gz: c9d5166b1344eb0f5264fbb81752caf8b413db1d6c29b500deff0ccd3533604906c9def71c77da25e8161666d0b8282a5f2c16c219d0c9647c31e3459651e07b
+  metadata.gz: 48bb9636eccebbd3548b7ec1f1aead9da7c1f0a537935c8c6763b1a3f8d698cd46dfa488d4e5ffc8a193680ea3ac282612764c6862466a75e802fbd5b9428758
+  data.tar.gz: e6a1c8c23fa3ecb145eea35198b8df9ad3872964867c429db3ac7d765b9b9c54a13fc150227f616a29b005caa1e975473d3355fc55b4bb58d99f7a4ae14d3076

data/lib/dapp/dapp/ruby2go.rb

@@ -29,6 +29,10 @@ module Dapp
         _ruby2go("cleanup", args_hash)
       end
 
+      def ruby2go_slug(args_hash)
+        _ruby2go("slug", args_hash)
+      end
+
       def ruby2go_init
         @_call_after_before_terminate << proc {
           FileUtils.rmtree(@_ruby2go_tmp_dir) if @_ruby2go_tmp_dir

data/lib/dapp/dapp/slug.rb

@@ -1,77 +1,10 @@
 module Dapp
   class Dapp
     module Slug
-      SLUG_SEPARATOR = '-'.freeze
-      SLUG_V2_LIMIT_LENGTH = 53
-
-      def self.included(base)
-        if ENV['DAPP_SLUG_V3']
-          base.include(V3)
-        else
-          base.include(V1V2)
-        end
-      end
-
-      module V1V2
-        def consistent_uniq_slugify(s)
-          return s unless should_be_slugged?(s)
-          consistent_uniq_slug_reg =~ s.tr('/', '-').slugify.squeeze('--')
-          consistent_uniq_slug = Regexp.last_match(1)
-          murmur_hash = MurmurHash3::V32.str_hexdigest(s)
-          [].tap do |slug|
-            slug << begin
-              unless consistent_uniq_slug.nil?
-                index = ENV['DAPP_SLUG_V2'] ? SLUG_V2_LIMIT_LENGTH - murmur_hash.length - SLUG_SEPARATOR.length - 1 : -1
-                consistent_uniq_slug[0..index]
-              end
-            end
-            slug << murmur_hash
-          end.compact.join(SLUG_SEPARATOR)
-        end
-
-        def should_be_slugged?(s)
-          !(/^#{consistent_uniq_slug_reg}$/ =~ s)
-        end
-
-        def consistent_uniq_slug_reg
-          /(?!-)((-?[a-z0-9]+)+)(?<!-)/
-        end
-      end
-
-      module V3
-        def consistent_uniq_slugify(s)
-          return s unless should_be_slugged?(s)
-          slug = consistent_uniq_slug(s)
-          murmur_hash = MurmurHash3::V32.str_hexdigest(s)
-          [].tap do |res|
-            res << begin
-              unless slug.empty?
-                index = SLUG_V2_LIMIT_LENGTH - murmur_hash.length - SLUG_SEPARATOR.length - 1
-                slug[0..index]
-              end
-            end
-            res << murmur_hash
-          end.compact.join(SLUG_SEPARATOR)
-        end
-
-        def should_be_slugged?(s)
-          consistent_uniq_slug(s) != s || s.length > SLUG_V2_LIMIT_LENGTH
-        end
-
-        def consistent_uniq_slug(s)
-          ''.tap do |res|
-            status = :empty
-            s.to_s.chars.each do |ch|
-              next if (s_ch = ch.slugify).empty?
-
-              if s_ch !~ /[[:punct:]|[:blank:]]/
-                res << s_ch
-                status = :non_empty if status == :empty
-              elsif status == :non_empty && res[-1] != '-'
-                res << '-'
-              end
-            end
-          end.chomp('-')
+      def consistent_uniq_slugify(s)
+        ruby2go_slug({ options: { data: s } }).tap do |res|
+          raise Error::Build, code: :ruby2go_slug_failed_unexpected_error, data: { message: res["error"] } unless res["error"].nil?
+          break res['data']
         end
       end
     end # Slug

data/lib/dapp/dimg/dapp/command/cleanup_repo.rb

@@ -3,167 +3,20 @@ module Dapp
     module Dapp
       module Command
         module CleanupRepo
-          GIT_TAGS_LIMIT_POLICY                 = 10
-          EXPIRY_DATE_PERIOD_POLICY             = 60 * 60 * 24 * 30
-          GIT_COMMITS_LIMIT_POLICY              = 50
-          GIT_COMMITS_EXPIRY_DATE_PERIOD_POLICY = 60 * 60 * 24 * 30
-
           def cleanup_repo
-            lock_repo(repo = option_repo) do
-              log_step_with_indent(repo) do
-                log_step_with_indent('Searching for images being used in kubernetes clusters in one of the kube-config contexts') do
-                  deployed_docker_images.each do |deployed_img|
-                    log(deployed_img)
-                  end
-                end
-
-                registry = dimg_registry(repo)
-
-                if git_own_repo_exist?
-                  cleanup_repo_by_nonexistent_git_primitive(registry, actual_detailed_dimgs_images_by_scheme(registry))
-                  cleanup_repo_by_policies(registry, actual_detailed_dimgs_images_by_scheme(registry))
-                end
-
-                repo_dimgstages_cleanup(registry, repo_dimgs, repo_dimgstages) if with_stages?
-              end
-            end
-          end
-
-          def actual_detailed_dimgs_images_by_scheme(registry)
-            {}.tap do |detailed_dimgs_images_by_scheme|
-              tagging_schemes.each { |scheme| detailed_dimgs_images_by_scheme[scheme] = [] }
-              repo_detailed_dimgs_images(registry).each do |image|
-                image_repository = [option_repo, image[:dimg]].compact.join('/')
-                image_name = [image_repository, image[:tag]].join(':')
-
-                should_be_ignored = deployed_docker_images.include?(image_name)
-
-                if should_be_ignored
-                  log "Keep in repo image that is being used in kubernetes: #{image_name}"
-                  next
-                end
-
-                (detailed_dimgs_images_by_scheme[image[:labels]['dapp-tag-scheme']] ||= []) << image
-              end
-            end
-          end
-
-          def cleanup_repo_by_nonexistent_git_primitive(registry, detailed_dimgs_images_by_scheme)
-            %w(git_tag git_branch git_commit).each do |scheme|
-              cleanup_repo_by_nonexistent_git_base(registry, detailed_dimgs_images_by_scheme, scheme) do |detailed_dimg_image|
-                case scheme
-                  when 'git_tag'    then consistent_git_tags.include?(detailed_dimg_image[:tag])
-                  when 'git_branch' then consistent_git_remote_branches.include?(detailed_dimg_image[:tag])
-                  when 'git_commit' then git_own_repo.commit_exists?(detailed_dimg_image[:tag])
-                  else
-                    raise
-                end
-              end unless detailed_dimgs_images_by_scheme[scheme].empty?
-            end
-          end
-
-          def consistent_git_tags
-            git_tag_by_consistent_tag_name.keys
-          end
-
-          def consistent_git_remote_branches
-            @consistent_git_remote_branches ||= git_own_repo.remote_branches.map(&method(:consistent_uniq_slugify))
-          end
-
-          def cleanup_repo_by_nonexistent_git_base(registry, repo_dimgs_images_by_scheme, dapp_tag_scheme)
-            nonexist_repo_images = repo_dimgs_images_by_scheme[dapp_tag_scheme]
-              .select { |dimg_image| dimg_image[:labels]['dapp-tag-scheme'] == dapp_tag_scheme }
-              .select { |dimg_image| !(yield dimg_image) }
-
-            log_step_with_indent(:"#{dapp_tag_scheme.split('_').join(' ')} nonexistent") do
-              nonexist_repo_images.each { |repo_image| delete_repo_image(registry, repo_image) }
-            end unless nonexist_repo_images.empty?
-          end
-
-          def cleanup_repo_by_policies(registry, detailed_dimgs_images_by_scheme)
-            cleanup_repo_tags_by_policies(registry, detailed_dimgs_images_by_scheme)
-            cleanup_repo_commits_by_policies(registry, detailed_dimgs_images_by_scheme)
-          end
-
-          def cleanup_repo_tags_by_policies(registry, detailed_dimgs_images_by_scheme)
-            cleanup_repo_by_policies_base(
-              registry,
-              detailed_dimgs_images_by_scheme['git_tag'].select { |dimg| consistent_git_tags.include?(dimg[:tag]) },
-              expiry_date_policy: git_tags_expiry_date_policy,
-              limit_policy:       git_tags_limit_policy,
-              log_primitive:      'tag'
-            )
-          end
-
-          def cleanup_repo_commits_by_policies(registry, detailed_dimgs_images_by_scheme)
-            cleanup_repo_by_policies_base(
-              registry,
-              detailed_dimgs_images_by_scheme['git_commit'].select { |dimg| git_own_repo.commit_exists?(dimg[:tag]) },
-              expiry_date_policy: git_commits_expiry_date_policy,
-              limit_policy:       git_commits_limit_policy,
-              log_primitive:      'commit'
-            )
-          end
-
-          def cleanup_repo_by_policies_base(registry, detailed_dimgs_images, expiry_date_policy:, limit_policy:, log_primitive:)
-            sorted_detailed_dimgs_images = detailed_dimgs_images.sort_by { |dimg| dimg[:created_at] }.reverse
-
-            expired_dimgs_images, not_expired_dimgs_images = sorted_detailed_dimgs_images.partition do |dimg_image|
-              dimg_image[:created_at] < expiry_date_policy
+            git_repo_option = git_own_repo_exist? ? JSON.dump(git_own_repo.get_ruby2go_state_hash) : nil
+            ruby2go_cleanup_command(:gc, ruby2go_cleanup_gc_options_dump, local_repo: git_repo_option)
+          end
+
+          def ruby2go_cleanup_gc_options_dump
+            ruby2go_cleanup_common_repo_options.merge(
+              mode: {
+                with_stages: with_stages?
+              },
+              deployed_docker_images: deployed_docker_images
+            ).tap do |data|
+              break JSON.dump(data)
             end
-
-            log_step_with_indent(:"git #{log_primitive} date policy (before #{DateTime.strptime(expiry_date_policy.to_s, '%s')})") do
-              expired_dimgs_images.each { |dimg| delete_repo_image(registry, dimg) }
-            end unless expired_dimgs_images.empty?
-
-            not_expired_dimgs_images
-              .each_with_object({}) { |dimg, images_by_dimg| (images_by_dimg[dimg[:dimg]] ||= []) << dimg }
-              .each do |dimg_name, images|
-              next if images[limit_policy..-1].nil?
-              log_step_with_indent(:"git #{log_primitive} limit policy (> #{limit_policy}) (`#{dimg_name || 'nameless'}` dimg)") do
-                images[limit_policy..-1].each { |dimg| delete_repo_image(registry, dimg) }
-              end
-            end
-          end
-
-          def git_tags_expiry_date_policy
-            @git_tags_expiry_date_policy ||= expiry_date_policy_value('EXPIRY_DATE_PERIOD_POLICY', default: EXPIRY_DATE_PERIOD_POLICY)
-          end
-
-          def git_tags_limit_policy
-            @git_tags_limit_policy ||= policy_value('GIT_TAGS_LIMIT_POLICY', default: GIT_TAGS_LIMIT_POLICY)
-          end
-
-          def git_commits_expiry_date_policy
-            @git_commits_expiry_date_policy ||= expiry_date_policy_value('GIT_COMMITS_EXPIRY_DATE_PERIOD_POLICY', default: GIT_COMMITS_EXPIRY_DATE_PERIOD_POLICY)
-          end
-
-          def git_commits_limit_policy
-            @git_commits_limit_policy ||= policy_value('GIT_COMMITS_LIMIT_POLICY', default: GIT_COMMITS_LIMIT_POLICY)
-          end
-
-          def expiry_date_policy_value(env_key, default:)
-            expiry_date_period_policy = policy_value(env_key, default: default)
-            Time.now.to_i - expiry_date_period_policy
-          end
-
-          def policy_value(env_key, default:)
-            return default if (val = ENV[env_key]).nil?
-
-            if val.to_i.to_s == val
-              val.to_i
-            else
-              log_warning("WARNING: `#{env_key}` value `#{val}` is ignored (using default value `#{default}`)!")
-              default
-            end
-          end
-
-          def git_tag_by_consistent_git_tag(consistent_git_tag)
-            git_tag_by_consistent_tag_name[consistent_git_tag]
-          end
-
-          def git_tag_by_consistent_tag_name
-            @git_consistent_tags ||= git_own_repo.tags.map { |t| [consistent_uniq_slugify(t), t] }.to_h
           end
 
           def deployed_docker_images

data/lib/dapp/dimg/dapp/command/flush_local.rb

@@ -8,14 +8,14 @@ module Dapp
           end
 
           def ruby2go_cleanup_flush_local_options_dump
-            ruby2go_cleanup_common_project_options(force: true).merge(
+            ruby2go_cleanup_common_project_options.merge(
               mode: {
                 with_dimgs: true,
                 with_stages: with_stages?,
                 only_repo: false,
               },
-            ).tap do |json|
-              break JSON.dump(json)
+            ).tap do |data|
+              break JSON.dump(data)
             end
           end
         end

data/lib/dapp/dimg/dapp/command/ruby2go_cleanup.rb

@@ -3,11 +3,11 @@ module Dapp
     module Dapp
       module Command
         module Ruby2GoCleanup
-          def ruby2go_cleanup_command(command, command_options)
+          def ruby2go_cleanup_command(command, command_options, **options)
             options = {
               command: command,
               command_options: command_options,
-              options: { host_docker_config_dir: self.class.host_docker_config_dir }
+              options: { host_docker_config_dir: self.class.host_docker_config_dir }.merge(options)
             }
 
             ruby2go_cleanup(options).tap do |res|
@@ -15,13 +15,12 @@ module Dapp
             end
           end
 
-          def ruby2go_cleanup_common_project_options(force: false)
+          def ruby2go_cleanup_common_project_options
             {
               common_project_options: {
                 project_name: name,
                 common_options: {
                   dry_run: dry_run?,
-                  force: force
                 }
               },
             }

data/lib/dapp/dimg/dapp/command/stages/flush_local.rb

@@ -9,7 +9,7 @@ module Dapp
             end
 
             def ruby2go_cleanup_stages_flush_local_options_dump
-              ruby2go_cleanup_common_project_options(force: true).merge(
+              ruby2go_cleanup_common_project_options.merge(
                 mode: {
                   with_dimgs: false,
                   with_stages: true,

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.17"
+  VERSION = "0.35.18"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.17
+  version: 0.35.18
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout