avmtrf1-tools 0.33.0 → 0.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28aaea569505102ad3211b02ec77cf0c2b290acc629b3530190acf0603f289d1
-  data.tar.gz: 755924e206af72290f5958622a20a545cf925882b4ebc6a8c1e5fc7821bbe6ef
+  metadata.gz: 13ca822eb7feaa967b8c8e4d3eec857e6be2dbf9fab206c86a6de1e9ce1d8139
+  data.tar.gz: 04b94662a9a4fab3ee300e32c266be782f026b8e3b75a9fa98db369f9823ce3e
 SHA512:
-  metadata.gz: 767c2478bcc066672821f52114c903f4bf6e30f44b6a1a746c045cce80c33b8589f1fc36051b33009fc02318ff6971b15cc039cc9aad7b725ea93a291a5aa563
-  data.tar.gz: 382e3a8930764a843005e9c24a2f8e9f1cb3deb89886433ed34bcfa40996aaf2a57324c8e61a146cb1834810dff2deeb4fc13fddbb53eb8fbc75610fab557f43
+  metadata.gz: 4811f9b817eb6479acc6f4efe29d41883c746a3e46457e0a96413a955579a96d2ce653e983c81a85706eec246bd20c385a988688ef32dfcd85d7745202bba8bd
+  data.tar.gz: f946e8997c09ba14b181afb40cc0d8a0094e813499eff1bd8f0d85097542ecd33b4a03e6a25f2c553c95f61f77beeef0b0a8e941bc2eb3fcb50f3bdccb0b6860

data/lib/avmtrf1/active_directory/user.rb

@@ -6,9 +6,9 @@ module Avmtrf1
       class << self
         def by_configs(path_prefix)
           new(
-            ::Avmtrf1.configs.read_entry("#{path_prefix}.domain"),
-            ::Avmtrf1.configs.read_entry("#{path_prefix}.username"),
-            ::Avmtrf1.configs.read_password("#{path_prefix}.password")
+            ::Avm::Apps::Config.current.read_entry("#{path_prefix}.domain"),
+            ::Avm::Apps::Config.current.read_entry("#{path_prefix}.username"),
+            ::Avm::Apps::Config.current.read_password("#{path_prefix}.password")
           )
         end
       end

data/lib/avmtrf1/core_ext.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'avm/core_ext'
+require 'avmtrf1/patches'

data/lib/avmtrf1/default_jira.rb

@@ -9,8 +9,8 @@ module Avmtrf1
     def default_jira
       @default_jira ||= ::Avmtrf1::Jira::Instance.new(
         'https://jira.engesoftware.com.br',
-        ::Avmtrf1.configs.read_entry("#{DEFAULT_JIRA_PATH_PREFIX}.username"),
-        ::Avmtrf1.configs.read_password("#{DEFAULT_JIRA_PATH_PREFIX}.password")
+        ::Avm::Apps::Config.current.read_entry("#{DEFAULT_JIRA_PATH_PREFIX}.username"),
+        ::Avm::Apps::Config.current.read_password("#{DEFAULT_JIRA_PATH_PREFIX}.password")
       )
     end
   end

data/lib/avmtrf1/git/cached_repository.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 
 module Avmtrf1
   module Git
-    class CachedRepository < ::EacLauncher::Git::Base
+    class CachedRepository < ::Avm::Launcher::Git::Base
       attr_reader :url
 
       def initialize(url)

data/lib/avmtrf1/git/issue_on_repository.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/speaker'
+require 'eac_ruby_utils/patches/module/speaker'
 require 'eac_ruby_utils/simple_cache'
 require 'avmtrf1/result'
 
 module Avmtrf1
   module Git
     class IssueOnRepository
-      include ::EacRubyUtils::Console::Speaker
+      enable_speaker
       include ::EacRubyUtils::SimpleCache
 
       CHECKS = %w[no_branch_nor_tag branch_and_tag issue_not_found issue_closed_git_open

data/lib/avmtrf1/git/push_large.rb

@@ -2,23 +2,23 @@
 
 require 'ostruct'
 
-require 'eac_ruby_utils/console/speaker'
+require 'eac_ruby_utils/patches/module/speaker'
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
-require 'avmtrf1/patches/eac_launcher/git/base'
+require 'avmtrf1/patches/avm/launcher/git/base'
 
 module Avmtrf1
   module Git
     class PushLarge
       include ::EacRubyUtils::SimpleCache
-      include ::EacRubyUtils::Console::Speaker
+      enable_speaker
 
       ::EacRubyUtils.require_sub(__FILE__)
 
       attr_reader :git, :remote_name, :source_ref, :target_ref, :last_pushed_revision
 
       def initialize(git_local_path, remote_name, source_ref, target_ref)
-        @git = ::EacLauncher::Git::Base.new(git_local_path)
+        @git = ::Avm::Launcher::Git::Base.new(git_local_path)
         @remote_name = remote_name
         @source_ref = source_ref
         @target_ref = target_ref

data/lib/avmtrf1/git/push_large/lfs_commit.rb

@@ -1,21 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
+require 'avmtrf1/core_ext'
 
 module Avmtrf1
   module Git
     class PushLarge
       class LfsCommit
-        include ::EacRubyUtils::Console::Speaker
-        include ::EacRubyUtils::SimpleCache
+        require_sub __FILE__, include_modules: true
+        enable_simple_cache
+        enable_speaker
 
-        ::EacRubyUtils.require_sub(__FILE__)
-
-        attr_reader :source_commit, :lfs_file_min_size, :tracked_files
-
-        def initialize(source_commit, lfs_file_min_size)
-          @source_commit = source_commit
-          @lfs_file_min_size = lfs_file_min_size
+        common_constructor :source_commit, :lfs_file_min_size do
           @tracked_files = 0
           @commit = nil
         end

data/lib/avmtrf1/git/push_large/lfs_commit/cache.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Git
+    class PushLarge
+      class LfsCommit
+        module Cache
+          def fs_cache_uncached
+            source_commit.fs_cache.child(lfs_file_min_size.present? ? lfs_file_min_size : 'nil')
+          end
+
+          %w[sha1 files_size push_pack_error].each do |attr|
+            define_method("#{attr}_cache_uncached") { fs_cache.child(attr) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/git/push_large/lfs_commit/checkout_previous_revision.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Git
+    class PushLarge
+      class LfsCommit
+        module CheckoutPreviousRevision
+          private
+
+          def checkout_base_uncached
+            if previous_revision.blank?
+              checkout_orphan
+            else
+              checkout_previous_revision
+            end
+          end
+
+          def checkout_orphan
+            infom message('Checkout orphan')
+            git.execute!('reset', '--hard')
+            git.execute!('clean', '-df')
+            git.execute!('checkout', source_commit.sha1)
+          end
+
+          def checkout_previous_revision
+            infom message("Checkout previous revision #{previous_revision}")
+            git.execute!('reset', '--hard')
+            git.execute!('clean', '-df')
+            git.execute!('checkout', previous_revision)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/git/push_large/lfs_commit/commit_changes.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Git
+    class PushLarge
+      class LfsCommit
+        module CommitChanges
+          # @return [Avm::Git::Commit]
+          def commit
+            commit_changes
+            @commit
+          end
+
+          private
+
+          def commit_changes_uncached
+            if sha1_cache.read.present?
+              @commit = ::Avm::Git::Commit.new(git, sha1_cache.read)
+              return
+            end
+            track_large_files
+            add_files
+            commit_amend
+            store_commit
+          end
+
+          def add_files
+            infom '    * Adding files'
+            git.system!('add', '.')
+          end
+
+          def commit_amend
+            infom message('Commiting')
+            git.command('commit', '--amend', '--allow-empty', '--allow-empty-message')
+               .envvar('GIT_EDITOR', true).execute!
+          end
+
+          def store_commit
+            @commit = ::Avm::Git::Commit.new(git, git.rev_parse('HEAD'))
+            infov message('Commited (SHA1)'), @commit.sha1
+            sha1_cache.write(@commit.sha1)
+            files_size_cache.write(@commit.files_size)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/git/push_large/lfs_commit/helpers.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Git
+    class PushLarge
+      class LfsCommit
+        module Helpers
+          private
+
+          def message(suffix, padding = 0)
+            "#{('  ' * (padding + 2))}* #{suffix}"
+          end
+
+          def git
+            source_commit.git
+          end
+
+          def push_large
+            source_commit.push_large
+          end
+
+          def previous_revision
+            push_large.last_pushed_revision
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/git/push_large/lfs_commit/pick_source_revision.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Git
+    class PushLarge
+      class LfsCommit
+        module PickSourceRevision
+          private
+
+          def add_cacheinfo_fail?(result)
+            !result.fetch(:exit_code).zero? && result.fetch(:stderr).include?('add_cacheinfo')
+          end
+
+          def cherry_pick_source_revision_uncached
+            checkout_base
+            return unless previous_revision.present?
+
+            infom message("Cherry pick #{source_commit.sha1}")
+            result = git.execute('cherry-pick', '--allow-empty', '--allow-empty-message',
+                                 '-Xtheirs', source_commit.sha1)
+            check_cherry_pick_result(result)
+          end
+
+          def check_cherry_pick_result(result)
+            return if result.fetch(:exit_code).zero?
+            return on_cherry_pick_conflict if cherry_pick_conflict?
+            return on_add_cacheinfo_fail if add_cacheinfo_fail?(result)
+
+            raise "Cherry pick failed: #{result}"
+          end
+
+          def cherry_pick_conflict?
+            ::File.exist?(::File.join(git, '.git', 'CHERRY_PICK_HEAD'))
+          end
+
+          def on_add_cacheinfo_fail
+            warn message('"add_cacheinfo" fail')
+          end
+
+          def on_cherry_pick_conflict
+            warn message('Cherry pick failed with conflict')
+            resolve_cherry_pick_conflicts
+
+            check_dirty_files
+            check_cherry_continue
+          end
+
+          def resolve_cherry_pick_conflicts
+            git.status_files.each do |scf|
+              if scf.dirty == 'D'
+                remove_file(scf.path)
+              elsif scf.dirty.present?
+                add_file(scf.path)
+              end
+            end
+          end
+
+          def remove_file(path)
+            infov message('Removing file'), path
+            git.execute!('rm', path)
+          end
+
+          def add_file(path)
+            infov message('Adding file'), path
+            git.execute!('add', path)
+          end
+
+          def check_dirty_files
+            infom message('Checking dirty files...')
+            df = dirty_files
+            infov message('Dirty files?'), df.any?
+            return unless df.any?
+
+            df.each do |f|
+              infov message(f.path, 1), "|#{f.stage}|#{f.dirty}|"
+            end
+            raise 'There are dirty files'
+          end
+
+          def dirty_files
+            git.status_files.select { |scf| scf.dirty.present? }
+          end
+
+          def check_cherry_continue
+            infom message('Continuing cherry pick')
+            git.execute!('-c', "core.editor=#{bash_editor}", 'cherry-pick', '--continue')
+            raise 'Still in cherry-pick conflict' if cherry_pick_conflict?
+
+            infom message('Cherry pick continue successful')
+          end
+
+          def bash_editor
+            if source_commit.subject.present?
+              'true'
+            else
+              'bash -c "printf \\"Mensagem original em branco.\\n\\" > $1"'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/git/push_large/lfs_commit/push.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Git
+    class PushLarge
+      class LfsCommit
+        module Push
+          private
+
+          PACK_ERROR_MESSAGE = 'pack exceeds maximum allowed size'
+          PACK_ERROR_TRUE = 'true'
+          PACK_ERROR_FALSE = 'false'
+
+          def push_ok_uncached
+            commit
+            fresh_push if push_pack_error_cache.read.blank?
+            after_push_banner
+            push_pack_error_cache.read != PACK_ERROR_TRUE
+          end
+
+          def after_push_banner
+            infov message('Commit SHA1'), commit.sha1
+            raise 'Cache of files size not found' if files_size_cache.read.blank?
+
+            infov message('Files size'), PushLarge.bytes_size(files_size_cache.read)
+          end
+
+          def fresh_push
+            fresh_push_banner
+            check_push_result(
+              git.execute(
+                'push', push_large.remote_name, '--force',
+                "#{commit.sha1}:#{push_reference}"
+              )
+            )
+          end
+
+          def fresh_push_banner
+            infom message('Pushing...')
+            fresh_push_commit_banner
+            fresh_push_remote_banner
+          end
+
+          def fresh_push_commit_banner
+            infov message('SHA1', 1), commit.sha1
+            infov message('Files size', 1), PushLarge.bytes_size(commit.files_size)
+          end
+
+          def fresh_push_remote_banner
+            infov message('Remote', 1), push_large.remote_name
+            infov message('Reference', 1), push_reference
+          end
+
+          def push_reference
+            "refs/heads/#{push_large.target_ref}"
+          end
+
+          def check_push_result(result)
+            if result.fetch(:exit_code).zero?
+              on_push_result_ok
+            elsif result.fetch(:stderr).include?(PACK_ERROR_MESSAGE)
+              on_push_result_pack_error
+            else
+              on_push_result_arbitrary_error(result)
+            end
+          end
+
+          def on_push_result_ok
+            push_pack_error_cache.write(PACK_ERROR_FALSE)
+            success(push_message('successful'))
+          end
+
+          def on_push_result_pack_error
+            push_pack_error_cache.write(PACK_ERROR_TRUE)
+            warn(push_message("failed with message \"#{PACK_ERROR_MESSAGE}\""))
+          end
+
+          def on_push_result_arbitrary_error(result)
+            raise result.pretty_inspect.to_s
+          end
+
+          def push_message(suffix)
+            message("Push of #{commit.sha1} (Size: #{commit.files_size}, " \
+                "Files: #{commit.files.count}): #{suffix}.")
+          end
+        end
+      end
+    end
+  end
+end