eac_tools 0.101.1 → 0.101.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 624b7798ee787487ca1d381c2c18c9b662bbb240d2b34ee074436f2ba094caf2
-  data.tar.gz: e9182b15272b9901eddb501105f40af7561605ad6be9326c0a752ceb7fecfbff
+  metadata.gz: 7ad7feb56d29b81651e8aeef18db673028d8f8342f44fed884d9b416d845f588
+  data.tar.gz: 2aa75b19a3bfa474123edb0e7ac7dc9419bac54715346dd79684f24fdce29537
 SHA512:
-  metadata.gz: 8bf9dd0d1223b460cfc68ccb4cc3048c8884ebb6a0d30b943bb8f1c0b1c7c43e56f518dd649fc8181d9861b36e82ee761158d2a73c36cc0e4b36e3a0a277ee23
-  data.tar.gz: 7a7ab1ec0a87a2648a2ee1917ddbcae9afac92acb80a9c2d82d44493efffb420ebac159f8695ff287ad69abbd328d8a92825be884359d5af15702ae74b820430
+  metadata.gz: 4141e51287ea3b764b35e64fb2c9104a4e79cf413bf8fe9a3c344154710f33e01203b48e6bb59c01f6a9fd875fbd1923e90b99bf081405574ea4c21eb3062838
+  data.tar.gz: c4ac068036432f77efd182a2dbe737d7adf893a5bdd1d97c7ad996517b8268a91d736da7333e312fd4e0903ab11f234f411acee2d20f25e043db559c26ec5eda

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.101.1)
+    eac_tools (0.101.2)
       avm (~> 0.96, >= 0.96.1)
       avm-eac_asciidoctor_base0 (~> 0.25)
       avm-eac_generic_base0 (~> 0.15, >= 0.15.1)
@@ -19,50 +19,19 @@ PATH
       avm-eac_ruby_base1 (~> 0.36)
       avm-eac_webapp_base0 (~> 0.21, >= 0.21.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
-      avm-git (~> 0.20)
+      avm-git (~> 0.20, >= 0.20.1)
       avm-tools (~> 0.163, >= 0.163.3)
       eac_ruby_utils (~> 0.128)
 
 PATH
-  remote: sub/avm-eac_generic_base0
+  remote: sub/avm-git
   specs:
-    avm-eac_generic_base0 (0.15.1)
-      avm (~> 0.96, >= 0.96.1)
-      eac_ruby_utils (~> 0.128)
-
-PATH
-  remote: sub/avm-eac_webapp_base0
-  specs:
-    avm-eac_webapp_base0 (0.21.1)
+    avm-git (0.20.1)
       avm (~> 0.96, >= 0.96.1)
-      avm-eac_generic_base0 (~> 0.15, >= 0.15.1)
-      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
-      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
       avm-files (~> 0.9)
+      eac_git (~> 0.18)
       eac_ruby_utils (~> 0.128)
-      htmlbeautifier (~> 1.4, >= 1.4.3)
-
-PATH
-  remote: sub/avm-tools
-  specs:
-    avm-tools (0.163.3)
-      avm (~> 0.96, >= 0.96.1)
-      clipboard (~> 1.4, >= 1.4.1)
-      eac_ruby_base0 (~> 0.19, >= 0.19.1)
-
-PATH
-  remote: sub/avm
-  specs:
-    avm (0.96.1)
-      clipboard (~> 1.4, >= 1.4.1)
-      eac_cli (~> 0.43)
-      eac_config (~> 0.15)
-      eac_docker (~> 0.7)
-      eac_fs (~> 0.18, >= 0.18.1)
-      eac_ruby_utils (~> 0.128)
-      eac_templates (~> 0.8, >= 0.8.1)
-      minitar (~> 0.12, >= 0.12.1)
-      ruby-progressbar (~> 1.13)
+      git (~> 1.19, >= 1.19.1)
 
 GEM
   remote: https://rubygems.org/
@@ -78,6 +47,16 @@ GEM
     asciidoctor (2.0.23)
     ast (2.4.3)
     attr_extras (7.1.0)
+    avm (0.96.1)
+      clipboard (~> 1.4, >= 1.4.1)
+      eac_cli (~> 0.43)
+      eac_config (~> 0.15)
+      eac_docker (~> 0.7)
+      eac_fs (~> 0.18, >= 0.18.1)
+      eac_ruby_utils (~> 0.128)
+      eac_templates (~> 0.8, >= 0.8.1)
+      minitar (~> 0.12, >= 0.12.1)
+      ruby-progressbar (~> 1.13)
     avm-eac_asciidoctor_base0 (0.25.0)
       asciidoctor (~> 2.0, >= 2.0.23)
       avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
@@ -85,6 +64,9 @@ GEM
       eac_ruby_utils (~> 0.123)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
+    avm-eac_generic_base0 (0.15.1)
+      avm (~> 0.96, >= 0.96.1)
+      eac_ruby_utils (~> 0.128)
     avm-eac_github_base0 (0.3.0)
       avm (~> 0.82)
       avm-git (~> 0.14)
@@ -139,18 +121,24 @@ GEM
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
       eac_templates (~> 0.5, >= 0.5.1)
+    avm-eac_webapp_base0 (0.21.1)
+      avm (~> 0.96, >= 0.96.1)
+      avm-eac_generic_base0 (~> 0.15, >= 0.15.1)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
+      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
+      avm-files (~> 0.9)
+      eac_ruby_utils (~> 0.128)
+      htmlbeautifier (~> 1.4, >= 1.4.3)
     avm-eac_wordpress_base0 (0.3.2)
       avm (~> 0.86, >= 0.86.2)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
       eac_ruby_utils (~> 0.121)
     avm-files (0.9.0)
       avm (~> 0.95)
-    avm-git (0.20.0)
-      avm (~> 0.96)
-      avm-files (~> 0.9)
-      eac_git (~> 0.18)
-      eac_ruby_utils (~> 0.128)
-      git (~> 1.19, >= 1.19.1)
+    avm-tools (0.163.3)
+      avm (~> 0.96, >= 0.96.1)
+      clipboard (~> 1.4, >= 1.4.1)
+      eac_ruby_base0 (~> 0.19, >= 0.19.1)
     base64 (0.3.0)
     clipboard (1.4.1)
     colorize (0.8.1)
@@ -265,7 +253,7 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.4)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -274,7 +262,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.4)
-    rubocop (1.76.2)
+    rubocop (1.77.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -326,10 +314,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  avm!
-  avm-eac_generic_base0!
-  avm-eac_webapp_base0!
-  avm-tools!
+  avm-git!
   eac_ruby_gem_support (~> 0.12)
   eac_tools!
 

data/lib/eac_tools/version.rb

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

data/sub/{avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec → avm-git/avm-git.gemspec}

@@ -2,24 +2,24 @@
 
 $LOAD_PATH.push File.expand_path('lib', __dir__)
 
-require 'avm/eac_webapp_base0/version'
+require 'avm/git/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'avm-eac_webapp_base0'
-  s.version     = Avm::EacWebappBase0::VERSION
+  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,template}/**/{*,.*}']
+  s.files = Dir['{lib,locale}/**/*']
   s.required_ruby_version = '>= 2.7'
 
   s.add_dependency 'avm', '~> 0.96', '>= 0.96.1'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.15', '>= 0.15.1'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.3'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5', '>= 0.5.1'
   s.add_dependency 'avm-files', '~> 0.9'
+  s.add_dependency 'eac_git', '~> 0.18'
   s.add_dependency 'eac_ruby_utils', '~> 0.128'
-  s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.3'
+  s.add_dependency 'git', '~> 1.19', '>= 1.19.1'
 
+  s.add_development_dependency 'avm-eac_ubuntu_base0', '~> 0.5', '>= 0.5.1'
+  s.add_development_dependency 'avm-tools', '~> 0.163', '>= 0.163.3'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.12'
 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-eac_generic_base0/lib/avm/eac_generic_base0/sources.rb → avm-git/lib/avm/git/application_scms.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Avm
-  module EacGenericBase0
-    module Sources
+  module Git
+    module ApplicationScms
       require_sub __FILE__
     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/.freeze
+        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

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Push
+          def dry_push_args
+            %w[push --dry-run] + [remote_name] + pushs
+          end
+
+          def dry_push_result
+            return ::Avm::Result.error('Nothing to push') if pushs.empty?
+
+            dry_push_execution_result
+          end
+
+          def push
+            if pushs.empty?
+              info 'PUSH: Nada a enviar'
+            else
+              info "PUSH: enviando \"#{pushs}\"..."
+              git_execute(%w[push origin] + pushs)
+            end
+          end
+
+          def pushs_uncached
+            [master_push, remove_branch_push, tag_push].compact
+          end
+
+          def master_push
+            remote_master_hash == branch_hash ? nil : "#{branch_hash}:refs/heads/master"
+          end
+
+          def remove_branch_push
+            remote_branch_hash ? ":refs/heads/#{branch.name}" : nil
+          end
+
+          def tag_push
+            return nil unless !remote_tag_hash || remote_tag_hash != branch_hash
+
+            "#{branch_hash}:#{tag}"
+          end
+
+          private
+
+          def dry_push_execution_result
+            r = launcher_git.execute(dry_push_args)
+            message = if r.fetch(:exit_code).zero?
+                        'ok'
+                      else
+                        r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
+                      end
+            ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
+          end
+        end
+      end
+    end
+  end
+end