eac_tools 0.101.2 → 0.101.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad7feb56d29b81651e8aeef18db673028d8f8342f44fed884d9b416d845f588
-  data.tar.gz: 2aa75b19a3bfa474123edb0e7ac7dc9419bac54715346dd79684f24fdce29537
+  metadata.gz: 489153e4e4bd6aefa3230f9f21333483afae0d3eef61306efd9e8118b2cfd94a
+  data.tar.gz: d7f4dbc273b0ca76c4a09a63f325776bf541cad7457e23d0272865210571ead3
 SHA512:
-  metadata.gz: 4141e51287ea3b764b35e64fb2c9104a4e79cf413bf8fe9a3c344154710f33e01203b48e6bb59c01f6a9fd875fbd1923e90b99bf081405574ea4c21eb3062838
-  data.tar.gz: c4ac068036432f77efd182a2dbe737d7adf893a5bdd1d97c7ad996517b8268a91d736da7333e312fd4e0903ab11f234f411acee2d20f25e043db559c26ec5eda
+  metadata.gz: 8025ddc546729e95e9d2a421e78fcabe36c4db09563d31163a47830ed8aca5e2f57f8f278f2bbb5b10a39f2910c8ffd4e823858438ba8df600c5515a08964525
+  data.tar.gz: 966ce86e688c4f5c55027b251110895c23e5437fd08396f2d471050b4b2515b0f5caa1a11d402043330679a7fbda1d20cf46b5ec75838cb781e79e949ae4e0cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.101.2)
+    eac_tools (0.101.3)
       avm (~> 0.96, >= 0.96.1)
       avm-eac_asciidoctor_base0 (~> 0.25)
       avm-eac_generic_base0 (~> 0.15, >= 0.15.1)
@@ -16,22 +16,19 @@ PATH
       avm-eac_redmine_base0 (~> 0.22, >= 0.22.3)
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
       avm-eac_ruby_base0 (~> 0.1)
-      avm-eac_ruby_base1 (~> 0.36)
+      avm-eac_ruby_base1 (~> 0.37, >= 0.37.1)
       avm-eac_webapp_base0 (~> 0.21, >= 0.21.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.20, >= 0.20.1)
       avm-tools (~> 0.163, >= 0.163.3)
-      eac_ruby_utils (~> 0.128)
+      eac_ruby_utils (~> 0.128, >= 0.128.3)
 
 PATH
-  remote: sub/avm-git
+  remote: sub/eac_git
   specs:
-    avm-git (0.20.1)
-      avm (~> 0.96, >= 0.96.1)
-      avm-files (~> 0.9)
-      eac_git (~> 0.18)
-      eac_ruby_utils (~> 0.128)
-      git (~> 1.19, >= 1.19.1)
+    eac_git (0.18.1)
+      eac_ruby_utils (~> 0.128, >= 0.128.3)
+      parseconfig (~> 1.1, >= 1.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -112,11 +109,11 @@ GEM
     avm-eac_ruby_base0 (0.1.0)
       avm-eac_ruby_base1 (~> 0.34)
       eac_ruby_utils (~> 0.122)
-    avm-eac_ruby_base1 (0.36.0)
-      avm (~> 0.95, >= 0.95.2)
-      avm-eac_generic_base0 (~> 0.15)
-      eac_envs-http (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.127)
+    avm-eac_ruby_base1 (0.37.1)
+      avm (~> 0.96, >= 0.96.1)
+      avm-eac_generic_base0 (~> 0.15, >= 0.15.1)
+      eac_envs-http (~> 0.7)
+      eac_ruby_utils (~> 0.128, >= 0.128.3)
     avm-eac_ubuntu_base0 (0.5.1)
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
@@ -135,6 +132,12 @@ GEM
       eac_ruby_utils (~> 0.121)
     avm-files (0.9.0)
       avm (~> 0.95)
+    avm-git (0.20.1)
+      avm (~> 0.96, >= 0.96.1)
+      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)
@@ -147,10 +150,10 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.6.2)
-    eac_cli (0.43.0)
+    eac_cli (0.43.1)
       colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.14, >= 0.14.3)
-      eac_ruby_utils (~> 0.127)
+      eac_config (~> 0.15)
+      eac_ruby_utils (~> 0.128, >= 0.128.3)
       tty-table (~> 0.12)
     eac_config (0.15.0)
       addressable (~> 2.8, >= 2.8.7)
@@ -158,31 +161,28 @@ GEM
     eac_docker (0.7.0)
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
-    eac_envs-http (0.6.1)
-      eac_fs (~> 0.18, >= 0.18.1)
-      eac_ruby_utils (~> 0.123)
+    eac_envs-http (0.7.0)
+      eac_fs (~> 0.19)
+      eac_ruby_utils (~> 0.128, >= 0.128.3)
       faraday (~> 2.8, >= 2.8.1)
       faraday-follow_redirects (~> 0.3)
       faraday-gzip (~> 0.1)
-      faraday-multipart (~> 1.0, >= 1.0.4)
-      faraday-retry (~> 2.2, >= 2.2.1)
+      faraday-multipart (~> 1.1, >= 1.1.1)
+      faraday-retry (~> 2.3, >= 2.3.2)
       random-port (~> 0.7, >= 0.7.1)
-    eac_fs (0.18.1)
+    eac_fs (0.19.1)
       content-type (~> 0.0, >= 0.0.2)
-      eac_ruby_utils (~> 0.123)
+      eac_ruby_utils (~> 0.128, >= 0.128.3)
       ruby-filemagic (~> 0.7, >= 0.7.3)
-    eac_git (0.18.0)
-      eac_ruby_utils (~> 0.128)
-      parseconfig (~> 1.1, >= 1.1.2)
     eac_rest (0.12.0)
       eac_envs-http (~> 0.5)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.120)
-    eac_ruby_base0 (0.19.1)
-      avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
-      eac_cli (~> 0.38, >= 0.38.1)
-      eac_fs (~> 0.18, >= 0.18.1)
-      eac_ruby_utils (~> 0.126)
+    eac_ruby_base0 (0.19.2)
+      avm-eac_ruby_base1 (~> 0.37)
+      eac_cli (~> 0.43)
+      eac_fs (~> 0.19)
+      eac_ruby_utils (~> 0.128, >= 0.128.2)
     eac_ruby_gem_support (0.12.0)
       eac_ruby_utils (~> 0.127)
       rspec (~> 3.13, >= 3.13.1)
@@ -190,7 +190,7 @@ GEM
       rubocop-rails (~> 2.32)
       rubocop-rspec (~> 3.6)
       super_diff (~> 0.9)
-    eac_ruby_utils (0.128.0)
+    eac_ruby_utils (0.128.3)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.7)
       bundler
@@ -314,7 +314,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  avm-git!
+  eac_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.2'
+  VERSION = '0.101.3'
 end

data/sub/eac_git/eac_git.gemspec

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_git/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_git'
+  s.version     = EacGit::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,vendor}/**/*']
+  s.required_ruby_version = '>= 2.7'
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.128', '>= 0.128.3'
+  s.add_dependency 'parseconfig', '~> 1.1', '>= 1.1.2'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.12'
+end

data/sub/eac_git/lib/eac_git/executables.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module EacGit
+  module Executables
+    class << self
+      include ::EacRubyUtils::SimpleCache
+
+      def env
+        ::EacRubyUtils::Envs.local
+      end
+
+      private
+
+      def git_uncached
+        r = env.executable('git', '--version')
+        r.extend(GitCommandExtensions)
+        r
+      end
+
+      def tar_uncached
+        env.executable('tar', '--version')
+      end
+
+      module GitCommandExtensions
+        def command(*args)
+          super.envvar('PATH', path_with_git_subrepo)
+        end
+
+        def gem_root
+          '../..'.to_pathname.expand_path(__dir__)
+        end
+
+        def git_subrepo_root
+          gem_root.join('vendor', 'git-subrepo')
+        end
+
+        def path_with_git_subrepo
+          ([git_subrepo_root.join('lib').to_path] +
+              ENV['PATH'].if_present('').split(::File::PATH_SEPARATOR))
+            .join(::File::PATH_SEPARATOR)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/branch.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Branch
+      REFS_PREFIX = 'refs/heads/'
+
+      common_constructor :local, :name
+
+      # @return [String]
+      # @deprecated Use {#head_commit_id} instead.
+      def current_commit_id
+        head_commit_id
+      end
+
+      # @return [Boolean]
+      def exist?
+        local.command('show-ref', '--quiet', full_ref_name).execute.fetch(:exit_code).zero?
+      end
+
+      def full_ref_name
+        "#{REFS_PREFIX}#{name}"
+      end
+
+      # @return [EacGit::Local::Commit]
+      def head_commit
+        local.commit(head_commit_id, true)
+      end
+
+      # @return [String]
+      def head_commit_id
+        local.rev_parse(full_ref_name, true)
+      end
+
+      # @param remote [EacGit::Local::Remote]
+      # @return [void]
+      def push(remote, options = {})
+        options[:refspec] = name
+        options.inject(remote.push) do |a, e|
+          a.send(*e)
+        end.perform
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/changed_file.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class ChangedFile
+      QUOTED_PATH_PATTERN = /\A"(.+)"\z/.freeze
+      STATUS_LINE_PATTERN = /\A(.)(.)\s(.+)\z/.freeze
+      TO_HASH_ATTRIBUTES = %i[absolute_path index path worktree].freeze
+
+      class << self
+        def by_porcelain_v1_line(local_repo, line)
+          STATUS_LINE_PATTERN.match(line.gsub(/\n\z/, '')).then do |m|
+            new(local_repo, m[1], m[2], parse_status_line_path(m[3]).to_pathname)
+          end
+        end
+
+        # @param path [String]
+        # @return [String]
+        def parse_status_line_path(path)
+          m = QUOTED_PATH_PATTERN.match(path)
+          m ? m[1] : path
+        end
+      end
+
+      common_constructor :local_repo, :index, :worktree, :path
+
+      # @return [Pathname]
+      def absolute_path
+        path.expand_path(local_repo.root_path)
+      end
+
+      # @return [Boolean]
+      def add?
+        (index == '?' && worktree == '?') || (index == 'A' && worktree == ' ')
+      end
+
+      # @return [Boolean]
+      def delete?
+        [index, worktree].include?('D')
+      end
+
+      # @return [Boolean]
+      def modify?
+        [index, worktree].include?('M')
+      end
+
+      # @return [Hash]
+      def to_h
+        compact_to_h(*TO_HASH_ATTRIBUTES)
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/commit/archive.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Commit
+      module Archive
+        # @return [EacRubyUtils::Envs::Command]
+        def archive_to_dir(path)
+          path = path.to_pathname
+          repo.command('archive', '--format=tar', id).pipe(
+            ::EacGit::Executables.tar.command('-xC', path)
+          )
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/commit/changed_file.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Commit
+      class ChangedFile
+        enable_simple_cache
+
+        attr_reader :commit, :diff_tree
+
+        # @param commit [EacGit::Local::Commit]
+        # @param diff_tree_line [String] A line from command "repo diff-tree --no-commit-id -r
+        #   --full-index"'s output.
+        def initialize(commit, diff_tree_line)
+          @commit = commit
+          @diff_tree = ::EacGit::Local::Commit::DiffTreeLine.new(diff_tree_line)
+        end
+
+        delegate(*::EacGit::Local::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(id)
+          return 0 if /\A0+\z/.match(id)
+
+          commit.repo.command('cat-file', '-s', id).execute!.strip.to_i
+        end
+      end
+    end
+  end
+end

data/sub/{avm-git/lib/avm/git → eac_git/lib/eac_git/local}/commit/diff_tree_line.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module Avm
-  module Git
+module EacGit
+  class Local
     class Commit
       class DiffTreeLine
         DIFF_TREE_PATTERN = /\A:(\d{6}) (\d{6}) (\S+) (\S+) (\S+)\t(\S.*)\z/.freeze

data/sub/eac_git/lib/eac_git/local/commit.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Commit
+      require_sub __FILE__, include_modules: true
+      enable_simple_cache
+      include ::Comparable
+
+      FIELDS = {
+        author_name: '%an', author_email: '%ae', author_date: '%ai',
+        subject: '%s',
+        author_all: '%an <%ae>, %ai',
+        commit_hash: '%H', abbreviated_commit_hash: '%h',
+        commiter_name: '%cn', commiter_email: '%ce', commiter_date: '%ci',
+        commiter_all: '%cn <%ce>, %ci',
+        raw_body: '%B'
+      }.freeze
+
+      common_constructor :repo, :id
+
+      def <=>(other)
+        [repo, id] <=> [other.repo, other.id]
+      end
+
+      def format(format)
+        repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", id).execute!.strip
+      end
+
+      FIELDS.each do |field, format|
+        define_method(field) { format(format) }
+      end
+
+      def changed_files_uncached
+        diff_tree_execute.each_line.map do |line|
+          ::EacGit::Local::Commit::ChangedFile.new(self, line)
+        end
+      end
+
+      def changed_files_size_uncached
+        changed_files.inject(0) { |a, e| a + e.dst_size }
+      end
+
+      # @return [EacGit::Local::Commit, nil]
+      def parent
+        ps = parents
+        raise "#{self} has more than one parent" if ps.count > 2
+
+        ps.empty? ? nil : ps.first
+      end
+
+      # @return [Array<EacGit::Local::Commit>]
+      def parents
+        format('%P').each_line.map { |line| repo.commitize(line) } # rubocop:disable Style/RedundantFormat
+      end
+
+      def root_child?
+        parents.empty?
+      end
+
+      private
+
+      def diff_tree_execute
+        args = []
+        args << '--root' if root_child?
+        args << id
+        repo.command(*::EacGit::Local::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/dirty_files.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+
+module EacGit
+  class Local
+    module DirtyFiles
+      def dirty?
+        dirty_files.any?
+      end
+
+      def dirty_file?(path)
+        absolute_path = path.to_pathname.expand_path(root_path)
+        dirty_files.any? do |df|
+          df.absolute_path == absolute_path
+        end
+      end
+
+      def dirty_files
+        command('status', '--porcelain=v1', '--untracked-files', '--no-renames')
+          .execute!.each_line
+          .map { |line| ::EacGit::Local::ChangedFile.by_porcelain_v1_line(self, line) }
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/log.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    module Log
+      def log(until_commit = nil, from_commit = nil)
+        until_commit, from_commit = [until_commit, from_commit].map { |c| commitize(c) }
+        from_commit ||= head
+        command('log', '--format=%H', "#{until_commit.id}..#{from_commit.id}")
+          .execute!.each_line.map { |line| commitize(line.strip) }
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/remote/push.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Remote
+      class Push
+        acts_as_immutable
+        immutable_accessor :force, type: :boolean
+        immutable_accessor :refspec, type: :array
+
+        common_constructor :remote
+        delegate :local, to: :remote
+
+        # @return [Array<Object>]
+        def immutable_constructor_args
+          [remote]
+        end
+
+        # @return [void]
+        def perform
+          local.command(*git_command_args).system!
+        end
+
+        # @return [Enumerable<String>]
+        def git_command_args
+          r = ['push', remote.name]
+          r << '--force' if force?
+          r + refspecs
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/remote.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Remote
+      NO_SUCH_REMOTE_CODE = 512
+
+      enable_simple_cache
+      include ::EacGit::RemoteLike
+
+      common_constructor :local, :name
+
+      def exist?
+        url
+      end
+
+      # @return [EacRubyUtils::Envs::Command
+      def git_command(*args)
+        local.command(*args)
+      end
+
+      # @return [EacGit::Local::Remote::Push]
+      def push
+        ::EacGit::Local::Remote::Push.new(self)
+      end
+
+      # @return [String]
+      def remote_reference
+        name
+      end
+
+      # @return [String, nil]
+      def url
+        local.command('remote', 'get-url', name)
+          .execute!(exit_outputs: { NO_SUCH_REMOTE_CODE => nil })
+          .if_present(nil, &:strip)
+      end
+
+      # @return [String]
+      def url=(new_url)
+        local.command('remote', 'set-url', name, new_url).execute!
+      end
+
+      require_sub __FILE__
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/remotes.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    module Remotes
+      def remote(name)
+        ::EacGit::Local::Remote.new(self, name)
+      end
+
+      def remotes
+        command('remote').execute!.each_line.map(&:strip).compact_blank.map do |name|
+          remote(name)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local/subrepo/config.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Subrepo
+      class Config
+        MAPPING = {
+          command_version: :cmdver, commit_id: :commit, join_method: :method,
+          parent_commit_id: :parent, remote_branch: :branch, remote_uri: :remote
+        }.freeze
+
+        class << self
+          def from_file(file_path)
+            new(
+              ::ParseConfig.new(file_path.to_pathname)['subrepo']
+            )
+          end
+        end
+
+        common_constructor :values do
+          self.values = values.with_indifferent_access
+        end
+
+        MAPPING.each_key do |method_name|
+          define_method(method_name) do
+            values[MAPPING.fetch(method_name)]
+          end
+
+          define_method("#{method_name}=") do |value|
+            values[MAPPING.fetch(method_name)] = value
+          end
+        end
+
+        def to_content
+          "[subrepo]\n" + MAPPING.map { |k, v| "  #{v} = #{send(k)}\n" }.join # rubocop:disable Style/StringConcatenation
+        end
+      end
+    end
+  end
+end