eac_tools 0.108.0 → 0.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9087fcc860beba5d8e5d439c36366033f303c2305aecd41e22cf0dae2a36c310
-  data.tar.gz: 6815be95c3cd35cab62cdb697d98223f09a874c3449c6fb70869952817055087
+  metadata.gz: d784bae4151ced339eec1e3f92bccc62228f4639b06ee6246a16496152269eba
+  data.tar.gz: 5cf57b206e329e991bc2982f847a5d3a33d87d5ac264ac6ffd2146f931d170a3
 SHA512:
-  metadata.gz: f338858aa70bd48e2e8a89aa1b4d75f50b2331f8cfce5e73b796ad41b90ba89c96124e9f2305f5adbc60c0dbe366581185c83fb58a5fc13cd4c2dc519f57febf
-  data.tar.gz: 308ccf1fe94c41c209fadc6917ec966fe410d616de79520c3800685094f978284f49366b983746f689eb63bd133d89842533d16219eb6a2c333e32722342cdf6
+  metadata.gz: c6c96ccb7f241e144e113b8a701f99272a477e79688743095664b47e94fd77de503eff7e1a2ce180510e80cb7fba3236f4b2b573fb69f9c7909d8f121edf3465
+  data.tar.gz: 421c1f3247e610b59de3a359f1eb8ec709fd3be0463d966fa77a58d28085b15a21a32dddfc38a61563c1a14cdc8b714f19be01c471e68fe467b41930e954305b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.108.0)
+    eac_tools (0.109.0)
       avm (~> 0.98, >= 0.98.4)
       avm-eac_asciidoctor_base0 (~> 0.26, >= 0.26.1)
       avm-eac_generic_base0 (~> 0.15, >= 0.15.2)
@@ -19,107 +19,19 @@ PATH
       avm-eac_ruby_base1 (~> 0.39)
       avm-eac_webapp_base0 (~> 0.21, >= 0.21.3)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
-      avm-git (~> 0.21, >= 0.21.1)
+      avm-git (~> 0.21, >= 0.21.2)
       avm-tools (~> 0.163, >= 0.163.6)
-      eac_ruby_utils (~> 0.129)
+      eac_ruby_utils (~> 0.129, >= 0.129.1)
 
 PATH
-  remote: sub/aranha-parsers
+  remote: sub/avm-git
   specs:
-    aranha-parsers (0.26.2)
-      activesupport (>= 4.0.0)
-      addressable (~> 2.8, >= 2.8.8)
-      aranha (~> 0.20)
-      eac_envs-http (~> 0.7, >= 0.7.1)
-      eac_ruby_utils (~> 0.129)
-      nokogiri (~> 1.19)
-      ofx-parser (~> 1.1)
-
-PATH
-  remote: sub/avm-eac_redmine_base0
-  specs:
-    avm-eac_redmine_base0 (0.24.1)
+    avm-git (0.21.2)
       avm (~> 0.98, >= 0.98.4)
-      avm-eac_generic_base0 (~> 0.15, >= 0.15.2)
-      avm-eac_rails_base1 (~> 0.11, >= 0.11.1)
-      avm-eac_ubuntu_base0 (~> 0.7)
-      eac_fs (~> 0.20)
-      eac_rest (~> 0.12)
-      eac_ruby_utils (~> 0.129)
-
-PATH
-  remote: sub/avm-eac_ruby_base1
-  specs:
-    avm-eac_ruby_base1 (0.39.0)
-      aranha-parsers (~> 0.26, >= 0.26.2)
-      avm (~> 0.98, >= 0.98.4)
-      avm-eac_generic_base0 (~> 0.15, >= 0.15.2)
-      eac_envs-http (~> 0.7, >= 0.7.1)
-      eac_ruby_utils (~> 0.129)
-
-PATH
-  remote: sub/avm-tools
-  specs:
-    avm-tools (0.163.6)
-      avm (~> 0.98, >= 0.98.4)
-      eac_ruby_base0 (~> 0.19, >= 0.19.3)
-
-PATH
-  remote: sub/avm
-  specs:
-    avm (0.98.4)
-      eac_cli (~> 0.45)
-      eac_config (~> 0.15)
-      eac_docker (~> 0.8)
-      eac_fs (~> 0.20)
-      eac_ruby_utils (~> 0.129)
-      eac_templates (~> 0.8, >= 0.8.3)
-      minitar (~> 0.12, >= 0.12.1)
-
-PATH
-  remote: sub/eac_envs-http
-  specs:
-    eac_envs-http (0.7.1)
-      eac_fs (~> 0.20)
-      eac_ruby_utils (~> 0.129)
-      faraday (~> 2.14, >= 2.14.1)
-      faraday-follow_redirects (~> 0.5)
-      faraday-gzip (~> 0.1)
-      faraday-multipart (~> 1.2)
-      faraday-retry (~> 2.4)
-      random-port (~> 0.7, >= 0.7.6)
-      webrick
-
-PATH
-  remote: sub/eac_ruby_base0
-  specs:
-    eac_ruby_base0 (0.19.3)
-      avm-eac_ruby_base1 (~> 0.39)
-      eac_cli (~> 0.45)
-      eac_fs (~> 0.20)
-      eac_ruby_utils (~> 0.129)
-
-PATH
-  remote: sub/eac_ruby_gem_support
-  specs:
-    eac_ruby_gem_support (0.12.1)
-      eac_ruby_utils (~> 0.129)
-      rspec (~> 3.13, >= 3.13.2)
-      rubocop (~> 1.84, >= 1.84.1)
-      rubocop-rails (~> 2.34, >= 2.34.3)
-      rubocop-rspec (~> 3.9)
-      super_diff (~> 0.18)
-
-PATH
-  remote: sub/eac_ruby_utils
-  specs:
-    eac_ruby_utils (0.129.0)
-      activesupport (>= 4, < 7)
-      addressable (~> 2.8, >= 2.8.8)
-      bundler
-      filesize (~> 0.2)
-      net-ssh (~> 4.2)
-      zeitwerk (~> 2.7, >= 2.7.4)
+      eac_git (~> 0.18, >= 0.18.1)
+      eac_ruby_utils (~> 0.129, >= 0.129.1)
+      filesize
+      git (~> 1.19, >= 1.19.1)
 
 GEM
   remote: https://rubygems.org/
@@ -134,9 +46,25 @@ GEM
       public_suffix (>= 2.0.2, < 8.0)
     aranha (0.20.0)
       eac_ruby_utils (~> 0.128)
+    aranha-parsers (0.26.2)
+      activesupport (>= 4.0.0)
+      addressable (~> 2.8, >= 2.8.8)
+      aranha (~> 0.20)
+      eac_envs-http (~> 0.7, >= 0.7.1)
+      eac_ruby_utils (~> 0.129)
+      nokogiri (~> 1.19)
+      ofx-parser (~> 1.1)
     asciidoctor (2.0.26)
     ast (2.4.3)
     attr_extras (7.1.0)
+    avm (0.98.4)
+      eac_cli (~> 0.45)
+      eac_config (~> 0.15)
+      eac_docker (~> 0.8)
+      eac_fs (~> 0.20)
+      eac_ruby_utils (~> 0.129)
+      eac_templates (~> 0.8, >= 0.8.3)
+      minitar (~> 0.12, >= 0.12.1)
     avm-eac_asciidoctor_base0 (0.26.1)
       asciidoctor (~> 2.0, >= 2.0.26)
       avm-eac_webapp_base0 (~> 0.21, >= 0.21.3)
@@ -177,12 +105,26 @@ GEM
       avm-eac_ruby_base1 (~> 0.38, >= 0.38.1)
       avm-eac_webapp_base0 (~> 0.21, >= 0.21.3)
       eac_ruby_utils (~> 0.128, >= 0.128.6)
+    avm-eac_redmine_base0 (0.24.1)
+      avm (~> 0.98, >= 0.98.4)
+      avm-eac_generic_base0 (~> 0.15, >= 0.15.2)
+      avm-eac_rails_base1 (~> 0.11, >= 0.11.1)
+      avm-eac_ubuntu_base0 (~> 0.7)
+      eac_fs (~> 0.20)
+      eac_rest (~> 0.12)
+      eac_ruby_utils (~> 0.129)
     avm-eac_redmine_plugin_base0 (0.5.0)
       avm-eac_ruby_base1 (~> 0.38, >= 0.38.1)
       eac_ruby_utils (~> 0.128, >= 0.128.6)
     avm-eac_ruby_base0 (0.1.0)
       avm-eac_ruby_base1 (~> 0.34)
       eac_ruby_utils (~> 0.122)
+    avm-eac_ruby_base1 (0.39.0)
+      aranha-parsers (~> 0.26, >= 0.26.2)
+      avm (~> 0.98, >= 0.98.4)
+      avm-eac_generic_base0 (~> 0.15, >= 0.15.2)
+      eac_envs-http (~> 0.7, >= 0.7.1)
+      eac_ruby_utils (~> 0.129)
     avm-eac_ubuntu_base0 (0.7.0)
       avm (~> 0.98, >= 0.98.2)
       eac_ruby_utils (~> 0.128, >= 0.128.6)
@@ -198,11 +140,9 @@ 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.1)
-      avm (~> 0.98, >= 0.98.1)
-      eac_git (~> 0.18, >= 0.18.1)
-      eac_ruby_utils (~> 0.128, >= 0.128.4)
-      git (~> 1.19, >= 1.19.1)
+    avm-tools (0.163.6)
+      avm (~> 0.98, >= 0.98.4)
+      eac_ruby_base0 (~> 0.19, >= 0.19.3)
     clipboard (2.0.0)
     colorize (0.8.1)
     concurrent-ruby (1.3.6)
@@ -221,6 +161,16 @@ GEM
     eac_docker (0.8.0)
       eac_ruby_utils (~> 0.128, >= 0.128.2)
       eac_templates (~> 0.8, >= 0.8.1)
+    eac_envs-http (0.7.1)
+      eac_fs (~> 0.20)
+      eac_ruby_utils (~> 0.129)
+      faraday (~> 2.14, >= 2.14.1)
+      faraday-follow_redirects (~> 0.5)
+      faraday-gzip (~> 0.1)
+      faraday-multipart (~> 1.2)
+      faraday-retry (~> 2.4)
+      random-port (~> 0.7, >= 0.7.6)
+      webrick
     eac_fs (0.20.0)
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.128, >= 0.128.5)
@@ -232,6 +182,24 @@ GEM
       eac_envs-http (~> 0.5)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.120)
+    eac_ruby_base0 (0.19.3)
+      avm-eac_ruby_base1 (~> 0.39)
+      eac_cli (~> 0.45)
+      eac_fs (~> 0.20)
+      eac_ruby_utils (~> 0.129)
+    eac_ruby_gem_support (0.12.1)
+      eac_ruby_utils (~> 0.129)
+      rspec (~> 3.13, >= 3.13.2)
+      rubocop (~> 1.84, >= 1.84.1)
+      rubocop-rails (~> 2.34, >= 2.34.3)
+      rubocop-rspec (~> 3.9)
+      super_diff (~> 0.18)
+    eac_ruby_utils (0.129.1)
+      activesupport (>= 4, < 7)
+      addressable (~> 2.8, >= 2.8.8)
+      bundler
+      net-ssh (~> 4.2)
+      zeitwerk (~> 2.7, >= 2.7.4)
     eac_templates (0.8.3)
       eac_config (~> 0.15)
       eac_ruby_utils (~> 0.128, >= 0.128.5)
@@ -290,7 +258,7 @@ GEM
     racc (1.8.1)
     rack (3.2.4)
     rainbow (3.1.1)
-    random-port (0.7.6)
+    random-port (0.8.0)
       tago (~> 0.0)
     rchardet (1.10.0)
     regexp_parser (2.11.3)
@@ -308,7 +276,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.84.1)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -362,15 +330,8 @@ PLATFORMS
   x86_64-linux-gnu
 
 DEPENDENCIES
-  aranha-parsers!
-  avm!
-  avm-eac_redmine_base0!
-  avm-eac_ruby_base1!
-  avm-tools!
-  eac_envs-http!
-  eac_ruby_base0!
-  eac_ruby_gem_support (~> 0.12, >= 0.12.1, >= 0)!
-  eac_ruby_utils!
+  avm-git!
+  eac_ruby_gem_support (~> 0.12, >= 0.12.1)
   eac_tools!
 
 BUNDLED WITH

data/exe/eac

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'eac_tools'
+EacTools::Runner.run

data/lib/eac_tools/runner.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module EacTools
+  class Runner < ::Avm::Tools::Runner
+    runner_definition do
+      desc 'Tools for E.A.C..'
+    end
+
+    delegate :application, to: :'EacTools::Self'
+  end
+end

data/lib/eac_tools/self.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module EacTools
+  module Self
+    class << self
+      def application
+        @application ||= ::EacRubyBase0::Application.new(root.to_path)
+      end
+
+      def root
+        ::Pathname.new('../..').expand_path(__dir__)
+      end
+    end
+  end
+end

data/lib/eac_tools/version.rb

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

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'
+
+  s.add_dependency 'avm', '~> 0.98', '>= 0.98.4'
+  s.add_dependency 'eac_git', '~> 0.18', '>= 0.18.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.129', '>= 0.129.1'
+  s.add_dependency 'filesize'
+  s.add_dependency 'git', '~> 1.19', '>= 1.19.1'
+
+  s.add_development_dependency 'avm-eac_ubuntu_base0', '~> 0.7'
+  s.add_development_dependency 'avm-tools', '~> 0.163', '>= 0.163.6'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.12', '>= 0.12.1'
+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/.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