eac_tools 0.123.0 → 0.123.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b61b6a6be0c2527827168504fb8db1c7c0185ecbee3c739009f9c6c0b44e12f
-  data.tar.gz: ca198a3ae98a4addb5fc1e7d8c7097ccdb9825e8fc76e083ec3e4e8684e66eef
+  metadata.gz: 67763d7da0f1210a12ec1ef79ed0c633233eec7bd932844b79d92e2411b047fc
+  data.tar.gz: ef445611dc04ae80a5ab5906992e42543c66cb2c64b0b7f6c8a13c095741c321
 SHA512:
-  metadata.gz: ad92b055ef3bfad2006cfa6f138d54e71e633ee3adf8f85b63e3363fcbcd6e29257672c11614e2b29019d5a8fcbf75b1e1328b25716e44f498eac028e91dbd1f
-  data.tar.gz: e4f5dc28a288ea8bd7f1859e56766e71de25df61fecb4f13430bf8b1e80f94735f0534dc12b92d3a6ec6da54a57d45583ea43510d9ffc1cca23175bb60a767d2
+  metadata.gz: ec107ceb7c3f5817110581800b9699683f25040be4ff61a4dd43b2256be2e8390bf33e4fbb9ebdd75005e639d3c138d571f30d2e481a802d6e14a145987212ef
+  data.tar.gz: bd902b2795f3e0e8a7c38b02df8a084a1aa18bbdc1c6771ade8ed50cbb38dff857fa6d7ff539c4b7f39bd9508bb697b098a3b200600e32d588250a41985b69ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.123.0)
+    eac_tools (0.123.1)
       avm (~> 0.103)
       avm-eac_asciidoctor_base0 (~> 0.27, >= 0.27.1)
       avm-eac_generic_base0 (~> 0.16, >= 0.16.1)
@@ -16,56 +16,39 @@ PATH
       avm-eac_redmine_base0 (~> 0.27, >= 0.27.1)
       avm-eac_redmine_plugin_base0 (~> 0.6, >= 0.6.1)
       avm-eac_ruby_base0 (~> 0.3, >= 0.3.1)
-      avm-eac_ruby_base1 (~> 0.45, >= 0.45.1)
+      avm-eac_ruby_base1 (~> 0.45, >= 0.45.2)
       avm-eac_webapp_base0 (~> 0.22, >= 0.22.3)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
-      avm-git (~> 0.21, >= 0.21.2)
+      avm-git (~> 0.22)
       avm-tools (~> 0.164, >= 0.164.1)
       eac_ruby_base1 (~> 0.1, >= 0.1.1)
 
-PATH
-  remote: sub/avm-eac_generic_base0
-  specs:
-    avm-eac_generic_base0 (0.16.1)
-      avm (~> 0.103)
-      eac_ruby_utils (~> 0.134)
-
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.45.1)
+    avm-eac_ruby_base1 (0.45.2)
       aranha-parsers (~> 0.29)
       avm (~> 0.103)
-      avm-eac_generic_base0 (~> 0.16)
+      avm-eac_generic_base0 (~> 0.16, >= 0.16.1)
       eac_envs-http (~> 0.7, >= 0.7.2)
       eac_ruby_base1 (~> 0.1, >= 0.1.1)
 
 PATH
-  remote: sub/eac_cli
+  remote: sub/avm-git
   specs:
-    eac_cli (0.47.2)
-      clipboard (~> 2.0)
-      colorize (~> 0.8, >= 0.8.1)
-      csv (~> 3.3, >= 3.3.6)
-      eac_config (~> 0.15, >= 0.15.2)
+    avm-git (0.22.0)
+      avm (~> 0.103)
+      eac_git (~> 0.21)
       eac_ruby_utils (~> 0.134)
-      tty-table (~> 0.12)
-
-PATH
-  remote: sub/eac_config
-  specs:
-    eac_config (0.15.2)
-      addressable (~> 2.9)
-      eac_ruby_base1 (~> 0.1, >= 0.1.1)
+      filesize (~> 0.2)
+      git (~> 1.19, >= 1.19.1)
 
 PATH
-  remote: sub/eac_ruby_base0
+  remote: sub/eac_git
   specs:
-    eac_ruby_base0 (0.22.0)
-      avm-eac_ruby_base1 (~> 0.45)
-      eac_cli (~> 0.47, >= 0.47.1)
-      eac_fs (~> 0.20, >= 0.20.3)
-      eac_ruby_base1 (~> 0.1, >= 0.1.1)
+    eac_git (0.21.0)
+      eac_ruby_utils (~> 0.134)
+      parseconfig (~> 1.1, >= 1.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -112,6 +95,9 @@ GEM
       eac_ruby_base1 (~> 0.1, >= 0.1.1)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
+    avm-eac_generic_base0 (0.16.1)
+      avm (~> 0.103)
+      eac_ruby_utils (~> 0.134)
     avm-eac_github_base0 (0.4.1)
       avm (~> 0.98, >= 0.98.5)
       avm-git (~> 0.21, >= 0.21.2)
@@ -171,12 +157,6 @@ GEM
       avm (~> 0.86, >= 0.86.2)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
       eac_ruby_utils (~> 0.121)
-    avm-git (0.21.2)
-      avm (~> 0.98, >= 0.98.4)
-      eac_git (~> 0.18, >= 0.18.1)
-      eac_ruby_utils (~> 0.129, >= 0.129.1)
-      filesize
-      git (~> 1.19, >= 1.19.1)
     avm-tools (0.164.1)
       avm (~> 0.102, >= 0.102.2)
       eac_ruby_base0 (~> 0.19, >= 0.19.3)
@@ -191,6 +171,16 @@ GEM
     csv (3.3.6)
     diff-lcs (1.6.2)
     drb (2.2.3)
+    eac_cli (0.47.2)
+      clipboard (~> 2.0)
+      colorize (~> 0.8, >= 0.8.1)
+      csv (~> 3.3, >= 3.3.6)
+      eac_config (~> 0.15, >= 0.15.2)
+      eac_ruby_utils (~> 0.134)
+      tty-table (~> 0.12)
+    eac_config (0.15.2)
+      addressable (~> 2.9)
+      eac_ruby_base1 (~> 0.1, >= 0.1.1)
     eac_docker (0.9.0)
       eac_ruby_base1 (~> 0.1, >= 0.1.1)
       eac_templates (~> 0.9)
@@ -209,13 +199,15 @@ GEM
       eac_ruby_base1 (~> 0.1, >= 0.1.1)
       filesize (~> 0.2)
       ruby-filemagic (~> 0.7, >= 0.7.3)
-    eac_git (0.20.0)
-      eac_ruby_utils (~> 0.131)
-      parseconfig (~> 1.1, >= 1.1.2)
     eac_rest (0.13.0)
       eac_envs-http (~> 0.7, >= 0.7.1)
       eac_fs (~> 0.20, >= 0.20.1)
       eac_ruby_utils (~> 0.130)
+    eac_ruby_base0 (0.22.0)
+      avm-eac_ruby_base1 (~> 0.45)
+      eac_cli (~> 0.47, >= 0.47.1)
+      eac_fs (~> 0.20, >= 0.20.3)
+      eac_ruby_base1 (~> 0.1, >= 0.1.1)
     eac_ruby_base1 (0.1.1)
       eac_ruby_utils (~> 0.131, >= 0.131.2)
     eac_ruby_gem_support (0.15.0)
@@ -258,7 +250,7 @@ GEM
     htmlbeautifier (1.4.3)
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    json (2.21.2)
+    json (3.0.2)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -276,7 +268,7 @@ GEM
     optimist (3.2.1)
     os (1.1.4)
     ostruct (0.6.3)
-    parallel (2.1.0)
+    parallel (2.2.0)
     parseconfig (1.1.2)
     parser (3.3.12.0)
       ast (~> 2.4.1)
@@ -309,8 +301,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.89.0)
-      json (~> 2.3)
+    rubocop (1.91.0)
+      json (>= 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (>= 1.10)
@@ -365,11 +357,9 @@ PLATFORMS
   x86_64-linux-gnu
 
 DEPENDENCIES
-  avm-eac_generic_base0!
   avm-eac_ruby_base1!
-  eac_cli!
-  eac_config!
-  eac_ruby_base0!
+  avm-git!
+  eac_git!
   eac_ruby_gem_support (~> 0.15)
   eac_tools!
 

data/eac_tools.gemspec

@@ -32,10 +32,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-eac_redmine_base0', '~> 0.27', '>= 0.27.1'
   s.add_dependency 'avm-eac_redmine_plugin_base0', '~> 0.6', '>= 0.6.1'
   s.add_dependency 'avm-eac_ruby_base0', '~> 0.3', '>= 0.3.1'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.45', '>= 0.45.1'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.45', '>= 0.45.2'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.22', '>= 0.22.3'
   s.add_dependency 'avm-eac_wordpress_base0', '~> 0.3', '>= 0.3.2'
-  s.add_dependency 'avm-git', '~> 0.21', '>= 0.21.2'
+  s.add_dependency 'avm-git', '~> 0.22'
   s.add_dependency 'avm-tools', '~> 0.164', '>= 0.164.1'
   s.add_dependency 'eac_ruby_base1', '~> 0.1', '>= 0.1.1'
 

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.123.0'
+  VERSION = '0.123.1'
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'aranha-parsers', '~> 0.29'
   s.add_dependency 'avm', '~> 0.103'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.16'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.16', '>= 0.16.1'
   s.add_dependency 'eac_envs-http', '~> 0.7', '>= 0.7.2'
   s.add_dependency 'eac_ruby_base1', '~> 0.1', '>= 0.1.1'
 

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock.rb

@@ -52,8 +52,9 @@ module Avm
               bundle_run('update')
             end
 
+            # @return [Pathname]
             def gemfile_lock
-              'Gemfile.lock'
+              source.gemfile_lock_path
             end
 
             def bundle_run(*)

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.45.1'
+    VERSION = '0.45.2'
   end
 end

data/sub/avm-git/.gitrepo

@@ -0,0 +1,7 @@
+[subrepo]
+  cmdver = 0.4.9
+  commit = 879fd4f01edf671c5f4250f300d38e458cf91efd
+  method = merge
+  parent = 5c037a300f8f45f21ea929eeea77a44dfba6158a
+  branch = master
+  remote = https://github.com/esquilo-azul/avm-git.git

data/sub/avm-git/.rubocop.yml

@@ -0,0 +1,6 @@
+---
+inherit_gem:
+  eac_ruby_gem_support: ".rubocop.yml"
+RSpec/IndexedLet:
+  Exclude:
+  - spec/lib/avm/git/runners/base/deploy_spec.rb

data/sub/avm-git/avm-git.gemspec

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/git/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-git'
+  s.version     = Avm::Git::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,locale}/**/*']
+  s.required_ruby_version = '>= 2.7' # rubocop:disable Gemspec/RequiredRubyVersion
+
+  s.add_dependency 'avm', '~> 0.103'
+  s.add_dependency 'eac_git', '~> 0.21'
+  s.add_dependency 'eac_ruby_utils', '~> 0.134'
+  s.add_dependency 'filesize', '~> 0.2'
+  s.add_dependency 'git', '~> 1.19', '>= 1.19.1'
+
+  s.add_development_dependency 'avm-eac_ubuntu_base0', '~> 0.7', '>= 0.7.2'
+  s.add_development_dependency 'avm-tools', '~> 0.164', '>= 0.164.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.15'
+end

data/sub/avm-git/lib/avm/git/application_scms/base/assert_main_at.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module ApplicationScms
+      class Base < ::Avm::ApplicationScms::Base
+        class AssertMainAt
+          MAIN_REFERENCE = 'HEAD'
+
+          acts_as_instance_method
+          enable_simple_cache
+          common_constructor :base, :path
+
+          # @return [Pathname]
+          def result
+            local_repos.remote(base.git_https_url).fetch
+            local_repos.command('checkout', remote_head_commit_id).execute!
+            path
+          end
+
+          private
+
+          # @return [String]
+          def remote_head_commit_id
+            remote_repos.ls.fetch(MAIN_REFERENCE)
+          end
+
+          # @return [EacGit::Local]
+          def local_repos_uncached
+            path.mkpath
+            r = ::EacGit::Local.new(path)
+            r.command('init').execute! unless r.root_path.join('.git').exist?
+            r
+          end
+
+          # @return [EacGit::Remote]
+          def remote_repos_uncached
+            ::EacGit::Remote.new(base.git_https_url)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/application_scms/base.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module ApplicationScms
+      class Base < ::Avm::ApplicationScms::Base
+        acts_as_abstract
+
+        # @return [Addressable::URI]
+        def git_https_url
+          raise_abstract_method __method__
+        end
+
+        require_sub __FILE__, require_mode: :kernel
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/commit/class_methods.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    class Commit
+      module ClassMethods
+        common_concern
+
+        module ClassMethods
+          def target_url_to_env_path(target_url)
+            uri = ::Addressable::URI.parse(target_url)
+            uri.scheme = 'file' if uri.scheme.blank?
+            [uri_to_env(uri), uri.path]
+          end
+
+          private
+
+          def uri_to_env(uri)
+            case uri.scheme
+            when 'file' then ::EacRubyUtils::Envs.local
+            when 'ssh' then ::EacRubyUtils::Envs.ssh(uri)
+            else "Invalid schema \"#{uri.schema}\" (URI: #{uri})"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/commit/diff_tree_line.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    class Commit
+      class DiffTreeLine
+        DIFF_TREE_PATTERN = /\A:(\d{6}) (\d{6}) (\S+) (\S+) (\S+)\t(\S.*)\z/
+        FIELDS = %w[src_mode dst_mode src_sha1 dst_sha1 status path].freeze
+        GIT_COMMAND_ARGS = %w[-c core.quotepath=off diff-tree --no-commit-id -r --full-index].freeze
+
+        attr_reader(*FIELDS)
+
+        # line: a line of command "git [GIT_COMMAND_ARGS]"'s output.
+        # Reference: https://git-scm.com/docs/git-diff-tree
+        def initialize(line)
+          m = DIFF_TREE_PATTERN.match(line.strip)
+          raise "\"#{line}\" did not match pattern" unless m
+
+          FIELDS.count.times { |i| send("#{FIELDS[i]}=", m[i + 1]) }
+        end
+
+        def fields
+          FIELDS.index_with { |field| send(field) }
+        end
+
+        private
+
+        attr_writer(*FIELDS)
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/commit/file.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    class Commit
+      class File
+        include ::EacRubyUtils::SimpleCache
+
+        attr_reader :git, :diff_tree
+
+        # git: [EacGit::Local]
+        # diff_tree_tree: a line of command "git diff-tree --no-commit-id -r --full-index"'s output
+        def initialize(git, diff_tree_line)
+          @git = git
+          @diff_tree = ::Avm::Git::Commit::DiffTreeLine.new(diff_tree_line)
+        end
+
+        delegate(*::Avm::Git::Commit::DiffTreeLine::FIELDS, to: :diff_tree)
+
+        def to_s
+          "#{path}|#{status}"
+        end
+
+        def src_size_uncached
+          size(src_sha1)
+        end
+
+        def dst_size_uncached
+          size(dst_sha1)
+        end
+
+        private
+
+        def size(sha1)
+          return 0 if /\A0+\z/.match(sha1)
+
+          git.command('cat-file', '-s', sha1).execute!.strip.to_i
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/commit.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    class Commit
+      require_sub __FILE__, include_modules: true
+      enable_simple_cache
+
+      FIELDS = {
+        author_name: '%an', author_email: '%ae', author_date: '%ai',
+        subject: '%s',
+        author_all: '%an <%ae>, %ai',
+        commiter_name: '%cn', commiter_email: '%ce', commiter_date: '%ci',
+        commiter_all: '%cn <%ce>, %ci'
+      }.freeze
+
+      attr_reader :git, :sha1
+
+      # @param git [EacGit::Local]
+      def initialize(git, sha1)
+        @git = git
+        @sha1 = sha1
+      end
+
+      def format(format)
+        git.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", sha1).execute!.strip
+      end
+
+      FIELDS.each do |field, format|
+        define_method field do
+          format(format)
+        end
+      end
+
+      def files_uncached
+        diff_tree_execute.each_line.map { |line| ::Avm::Git::Commit::File.new(git, line) }
+      end
+
+      def files_size_uncached
+        files.inject(0) { |a, e| a + e.dst_size }
+      end
+
+      def root_child?
+        format('%P').blank? # rubocop:disable Style/RedundantFormat
+      end
+
+      private
+
+      def diff_tree_execute
+        args = []
+        args << '--root' if root_child?
+        args << sha1
+        git.command(*::Avm::Git::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/issue/complete/commits.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Commits
+          def commits_result
+            ::Avm::Result.success_or_error(commits.any?, 'yes', 'none')
+          end
+
+          def commits_uncached
+            return [] unless branch_hash && follow_master?
+
+            interval = remote_master_hash ? "#{remote_master_hash}..#{branch_hash}" : branch_hash
+            launcher_git.execute!('rev-list', interval).each_line.map(&:strip)
+          end
+
+          def bifurcations_result
+            commits.each do |commit|
+              if multiple_parents?(commit)
+                return ::Avm::Result.error("#{commit} has multiple parents")
+              end
+            end
+            ::Avm::Result.success('no')
+          end
+
+          def multiple_parents?(commit)
+            commit_parents(commit).many?
+          end
+
+          def commit_parents(commit)
+            launcher_git.execute!('log', '--pretty=%P', '-n', '1', commit).split.map(&:strip)
+              .select(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/issue/complete/git_subrepos.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module GitSubrepos
+          def git_subrepos_result
+            return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
+
+            infom 'Checking Git subrepos...'
+            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(launcher_git)).add_all_subrepos
+            r.check_remote = true
+            r.result
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/issue/complete/local_branch.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalBranch
+          NO_CURRENT_BRANCH_NAME = 'none'
+
+          # Retrieves the current local branch.
+          #
+          # @return [EacGit::Local::Branch, nil]
+          def branch_uncached
+            eac_git.current_branch
+          end
+
+          def branch_hash_uncached
+            branch.if_present(&:current_commit_id)
+          end
+
+          def branch_name
+            branch.if_present(NO_CURRENT_BRANCH_NAME, &:name)
+          end
+
+          def branch_name_result
+            ::Avm::Result.success_or_error(issue_id.present?, branch_name)
+          end
+
+          def branch_hash_result
+            ::Avm::Result.success_or_error(
+              branch_hash.present?,
+              branch_hash
+            )
+          end
+
+          def follow_master_result
+            return ::Avm::Result.neutral('No branch hash') unless branch_hash
+
+            r = follow_master?
+            ::Avm::Result.success_or_error(r, 'yes', 'no')
+          end
+
+          def follow_master?
+            remote_master_hash ? launcher_git.descendant?(branch_hash, remote_master_hash) : true
+          end
+
+          def remove_local_branch
+            return unless branch
+
+            info 'Removendo branch local...'
+            bn = branch_name
+            git_execute(['checkout', branch_hash])
+            git_execute(['branch', '-D', bn])
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/issue/complete/local_tag.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalTag
+          def assert_tag
+            if tag_hash
+              return if tag_hash == branch_hash
+
+              delete_tag
+            end
+            create_tag
+          end
+
+          def delete_tag
+            info 'Removendo tag...'
+            git_execute(['tag', '-d', branch_name])
+          end
+
+          def tag
+            "refs/tags/#{branch_name}"
+          end
+
+          def tag_hash
+            launcher_git.rev_parse(tag)
+          end
+
+          def create_tag
+            git_execute(['tag', branch_name, branch_hash])
+          end
+        end
+      end
+    end
+  end
+end