eac_tools 0.86.1 → 0.86.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a6a5288fbb307184bdf0d062085b962f00685e7120ffa5f7fc1f451cec4c1a
-  data.tar.gz: 8c5feda81f2fad2157c21e13fc7306e57f8309a07e8537ceb19eeb236c99a607
+  metadata.gz: 971a844d5fe39f713dc7a9b084aa58f9f3f906131004e0660f32990fc96a2bc3
+  data.tar.gz: cc342a3c34371fc6a245150be49105580a53f2761f1b9272a16691864b3dfe78
 SHA512:
-  metadata.gz: dc5cb738f1f66cc715631508a2b28433a7553fb7d0050898e17d87e30879a6f275db895d29dfe982ded2dfdc4bab0ef4be72cd834a945bfa3f1d6002063da72b
-  data.tar.gz: fa29c61ba5253e49f31ef833838739a47c02c7a84f5dc8617a8a0497ff193bd8b79567cc944fde80f77d9843a02bf551248499570931461406b420160e63624a
+  metadata.gz: 48a6afe66fec33a33278c334b9471354350bc1f118ec4f7658e082c005a625f7c5587a5ef0063ba0d94477b38cd89ddc97e3509994ae00f329823b35a0065006
+  data.tar.gz: 05011c8c364dfc4947403deb2664fe6b2c3feec9ce3e1495cf1e86bd54091dbbe12bcf6ee439709e1ea3ec191b72aba9f72a18f364a54d388af27b08af3c197e

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.86.1)
-      avm (~> 0.84, >= 0.84.3)
+    eac_tools (0.86.2)
+      avm (~> 0.85)
       avm-eac_asciidoctor_base0 (~> 0.22)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
       avm-eac_github_base0 (~> 0.3)
@@ -18,16 +18,8 @@ PATH
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.3)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
-      avm-git (~> 0.14)
-      avm-tools (~> 0.160)
-      eac_ruby_utils (~> 0.121)
-
-PATH
-  remote: sub/avm-eac_php_base0
-  specs:
-    avm-eac_php_base0 (0.4.3)
-      avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
-      avm-eac_webapp_base0 (~> 0.18, >= 0.18.3)
+      avm-git (~> 0.15)
+      avm-tools (~> 0.160, >= 0.160.1)
       eac_ruby_utils (~> 0.121)
 
 PATH
@@ -60,19 +52,29 @@ PATH
       avm-eac_webapp_base0 (~> 0.15)
       eac_ruby_utils (~> 0.112)
 
+PATH
+  remote: sub/avm-git
+  specs:
+    avm-git (0.15.0)
+      avm (~> 0.85)
+      avm-files (~> 0.7)
+      eac_git (~> 0.16)
+      eac_ruby_utils (~> 0.121)
+      git (~> 1.19, >= 1.19.1)
+
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.160.0)
+    avm-tools (0.160.1)
       aranha-parsers (~> 0.22)
-      avm (~> 0.84, >= 0.84.2)
+      avm (~> 0.85)
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
       avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.7)
-      avm-git (~> 0.14)
+      avm-git (~> 0.15)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.15)
+      eac_git (~> 0.16)
       eac_ruby_base0 (~> 0.19)
       eac_templates (~> 0.5, >= 0.5.1)
       git (~> 1.19, >= 1.19.1)
@@ -81,10 +83,10 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.84.3)
+    avm (0.85.0)
       aranha-parsers (~> 0.22)
-      eac_cli (~> 0.40)
-      eac_config (~> 0.14, >= 0.14.1)
+      eac_cli (~> 0.40, >= 0.40.1)
+      eac_config (~> 0.14, >= 0.14.2)
       eac_docker (~> 0.7)
       eac_fs (~> 0.17)
       eac_ruby_utils (~> 0.121)
@@ -93,6 +95,13 @@ PATH
       htmlbeautifier (~> 1.4, >= 1.4.3)
       minitar (~> 0.9)
 
+PATH
+  remote: sub/eac_git
+  specs:
+    eac_git (0.16.0)
+      eac_ruby_utils (~> 0.121)
+      parseconfig (~> 1.1, >= 1.1.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -134,6 +143,10 @@ GEM
       avm (~> 0.84, >= 0.84.2)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.3)
       eac_ruby_utils (~> 0.121)
+    avm-eac_php_base0 (0.4.3)
+      avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
+      avm-eac_webapp_base0 (~> 0.18, >= 0.18.3)
+      eac_ruby_utils (~> 0.121)
     avm-eac_python_base0 (0.2.2)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
@@ -173,12 +186,6 @@ GEM
       eac_fs (~> 0.17)
       eac_ruby_utils (~> 0.121)
       eac_templates (~> 0.5, >= 0.5.1)
-    avm-git (0.14.0)
-      avm (~> 0.82)
-      avm-files (~> 0.6, >= 0.6.2)
-      eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.119, >= 0.119.2)
-      git (~> 1.18)
     base64 (0.2.0)
     clipboard (1.3.6)
     colorize (0.8.1)
@@ -187,14 +194,14 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.1)
-    eac_cli (0.40.0)
+    eac_cli (0.40.1)
       colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.120)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_ruby_utils (~> 0.121)
       tty-table (~> 0.12)
-    eac_config (0.14.1)
-      addressable (~> 2.8, >= 2.8.5)
-      eac_ruby_utils (~> 0.119, >= 0.119.2)
+    eac_config (0.14.2)
+      addressable (~> 2.8, >= 2.8.6)
+      eac_ruby_utils (~> 0.121)
     eac_docker (0.7.0)
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
@@ -210,9 +217,6 @@ GEM
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.120)
       ruby-filemagic (~> 0.7, >= 0.7.3)
-    eac_git (0.15.0)
-      eac_ruby_utils (~> 0.120)
-      parseconfig (~> 1.1, >= 1.1.2)
     eac_rest (0.12.0)
       eac_envs-http (~> 0.5)
       eac_fs (~> 0.16)
@@ -351,12 +355,13 @@ PLATFORMS
 
 DEPENDENCIES
   avm!
-  avm-eac_php_base0!
   avm-eac_postgresql_base0!
   avm-eac_redmine_plugin_base0!
   avm-eac_ubuntu_base0!
   avm-eac_wordpress_base0!
+  avm-git!
   avm-tools!
+  eac_git!
   eac_ruby_gem_support (~> 0.10)
   eac_tools!
 

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.7'
 
   s.add_dependency 'aranha-parsers', '~> 0.22'
-  s.add_dependency 'eac_cli', '~> 0.40'
-  s.add_dependency 'eac_config', '~> 0.14', '>= 0.14.1'
+  s.add_dependency 'eac_cli', '~> 0.40', '>= 0.40.1'
+  s.add_dependency 'eac_config', '~> 0.14', '>= 0.14.2'
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.17'
   s.add_dependency 'eac_ruby_utils', '~> 0.121'

data/sub/avm/lib/avm/rspec/setup/launcher.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/launcher/context'
 require 'eac_ruby_utils/core_ext'
 require 'tmpdir'
 

data/sub/avm/lib/avm/scms/base/branches.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Base
+      module Branches
+        # @param id [String]
+        # @return [Avm::Scms::Branch, nil]
+        def branch(id) # rubocop:disable Lint/UnusedMethodArgument
+          raise_abstract_method __method__
+        end
+
+        # @return [Avm::Scms::Branch]
+        def head_branch
+          raise_abstract_method __method__
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/scms/base/remotes.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Base
+      module Branches
+        # @return [Avm::Scms::Remote]
+        def default_remote
+          raise_abstract_method __method__
+        end
+
+        # @param id [String]
+        # @return [Avm::Scms::Remote, nil]
+        def remote(id) # rubocop:disable Lint/UnusedMethodArgument
+          raise_abstract_method __method__
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/scms/branch.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Branch
+      acts_as_abstract
+
+      # @return [Avm::Scms::Commit]
+      def head_commit
+        raise_abstract_method __method__
+      end
+
+      # @return [String]
+      def id
+        raise_abstract_method __method__
+      end
+
+      # @param remote [Avm::Scms::Remote]
+      def push(remote) # rubocop:disable Lint/UnusedMethodArgument
+        raise_abstract_method __method__
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/scms/remote.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Remote
+      enable_abstract_methods
+    end
+  end
+end

data/sub/avm/lib/avm/sources/issues/deliver.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'clipboard'
+
+module Avm
+  module Sources
+    module Issues
+      class Deliver
+        enable_simple_cache
+        enable_speaker
+
+        common_constructor :scm
+        delegate :head_branch, to: :scm
+
+        def run
+          push
+          clipboard_copy_tracker_message
+          true
+        end
+
+        def start_banner
+          infov 'Branch ID', branch_id
+          infov 'Commit ID', branch_commit_id
+        end
+
+        private
+
+        def branch_commit_id
+          head_branch.head_commit.id
+        end
+
+        def branch_id
+          head_branch.id
+        end
+
+        def clipboard_copy_tracker_message
+          ::Clipboard.copy(textile_tracker_message)
+          infov 'Copied to clipboard', textile_tracker_message
+        end
+
+        def push
+          head_branch.push(scm.default_remote)
+        end
+
+        def textile_tracker_message
+          "#{branch_id}: commit:#{branch_commit_id}."
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/issues.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    module Issues
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.84.3'
+  VERSION = '0.85.0'
 end

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

@@ -0,0 +1,23 @@
+# 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.85'
+  s.add_dependency 'avm-files', '~> 0.7'
+  s.add_dependency 'eac_git', '~> 0.16'
+  s.add_dependency 'eac_ruby_utils', '~> 0.121'
+  s.add_dependency 'git', '~> 1.19', '>= 1.19.1'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.9'
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'avm/application_scms/base'
+require 'eac_git/local'
+require 'eac_git/remote'
+require 'eac_ruby_utils/core_ext'
+
+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,21 @@
+# frozen_string_literal: true
+
+require 'avm/application_scms/base'
+require 'eac_ruby_utils/core_ext'
+
+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_php_base0/lib/avm/eac_php_base0/sources.rb → avm-git/lib/avm/git/application_scms.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacPhpBase0
-    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,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+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,46 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/delegation'
+require 'eac_ruby_utils/simple_cache'
+require 'avm/git/commit/diff_tree_line'
+
+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,59 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+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?
+      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,42 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+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).count > 1
+          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