eac_tools 0.34.0 → 0.35.0

data/sub/avm-git/lib/avm/git/subrepo_check/remote.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoCheck
+      module Remote
+        private
+
+        def fetch_uncached
+          subrepo.command('clean').execute!
+          subrepo.command('fetch').execute!
+        end
+
+        def check_remote_disabled?
+          !check_remote?
+        end
+
+        def check_remote_disabled_result
+          ::Avm::Result.neutral('Check remote disabled')
+        end
+
+        def local_descend_remote?
+          local_id.present? && remote_id.present? && subrepo.local.descendant?(local_id, remote_id)
+        end
+
+        def local_descend_remote_result
+          ::Avm::Result.pending(remote_result_value)
+        end
+
+        def local_id_uncached
+          fetch
+          subrepo.command('branch', '--force').execute!
+          subrepo.local.rev_parse("subrepo/#{subrepo.subpath}")
+        end
+
+        def remote_descend_local?
+          local_id.present? && remote_id.present? && subrepo.local.descendant?(remote_id, local_id)
+        end
+
+        def remote_descend_local_result
+          ::Avm::Result.outdated(remote_result_value)
+        end
+
+        def remote_branches
+          ['', 'refs/heads/', 'refs/tags/'].map { |prefix| "#{prefix}#{subrepo.remote_branch}" }
+        end
+
+        def remote_id_uncached
+          ls_result = subrepo.remote.ls
+          remote_branches.each do |b|
+            return ls_result[b] if ls_result[b].present?
+          end
+          nil
+        end
+
+        def remote_result_uncached
+          %w[check_remote_disabled same_ids local_descend_remote remote_descend_local]
+            .each do |condition|
+            return send("#{condition}_result") if send("#{condition}?")
+          end
+
+          ::Avm::Result.error(remote_result_value)
+        end
+
+        def remote_result_value
+          local_s = local_id.presence || blank_text
+          remote_s = remote_id.presence || blank_text
+
+          if local_s == remote_s
+            "[L/R=#{local_s}]"
+          else
+            "[L=#{local_s}, R=#{remote_s}]"
+          end
+        end
+
+        def same_ids?
+          local_id.present? && remote_id.present? && local_id == remote_id
+        end
+
+        def same_ids_result
+          ::Avm::Result.success(remote_result_value)
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/subrepo_check/show_result.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoCheck
+      module ShowResult
+        def show_result
+          out(subrepo.subpath.to_path.cyan)
+          out_attr('parent', parent_result.label)
+          run_fix_parent
+          out_attr('remote', remote_result.label)
+          out("\n")
+        end
+
+        def run_fix_parent
+          return unless fix_parent?
+          return unless parent_result.error?
+
+          out('|Fixing...'.white)
+          self.parent_hash = expected_parent_hash
+          out_attr('new parent', parent_result.label)
+        end
+
+        def out_attr(key, value)
+          out('|' + "#{key}=".white + value)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoCheck
+      require_sub __FILE__, include_modules: true
+      enable_speaker
+      enable_simple_cache
+
+      BLANK_TEXT = 'BLANK'
+
+      common_constructor :subrepo, :options
+
+      def blank_text
+        BLANK_TEXT
+      end
+
+      def check_remote?
+        options.fetch(:check_remote) ? true : false
+      end
+
+      def fix_parent?
+        options.fetch(:fix_parent) ? true : false
+      end
+
+      private
+
+      def result_uncached
+        return ::Avm::Result.error('Parent failed') if parent_result.error?
+        return ::Avm::Result.error('Remote failed') if remote_result.error?
+
+        ::Avm::Result.success('Parent and remote ok')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'avm/git/subrepo_check'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoChecks
+      enable_speaker
+      enable_simple_cache
+      attr_accessor :check_remote, :fix_parent
+      common_constructor :repository
+
+      def add_all_subrepos
+        add_subrepos(
+          *repository.command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip)
+          .select(&:present?)
+        )
+      end
+
+      def add_subrepos(*subpath_list)
+        subpath_list.each do |subpath|
+          subpaths.add(subpath)
+        end
+        reset_cache
+        self
+      end
+
+      def check_options
+        { fix_parent: fix_parent, check_remote: check_remote }
+      end
+
+      def show_result
+        checks.each(&:show_result)
+        infov 'Result', result.label
+      end
+
+      private
+
+      def checks_uncached
+        subpaths.map do |subpath|
+          ::Avm::Git::SubrepoCheck.new(repository.subrepo(subpath), check_options)
+        end
+      end
+
+      def result_uncached
+        error_count = checks.count { |check| check.result.error? }
+        ::Avm::Result.success_or_error(
+          error_count.zero?,
+          "#{error_count} of #{checks.count} subrepos failed"
+        )
+      end
+
+      def subpaths
+        @subpaths ||= ::Set.new
+      end
+    end
+  end
+end

data/sub/{avm-tools/lib/avm/launcher → avm-git/lib/avm/git}/vendor/github.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Avm
-  module Launcher
+  module Git
     module Vendor
       module Github
         class << self

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

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

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    VERSION = '0.5.0'
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    require_sub __FILE__
+
+    DEFAULT_REMOTE_NAME = 'origin'
+  end
+end

data/sub/avm-git/spec/lib/avm/git/auto_commit_path_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit_path'
+
+RSpec.describe ::Avm::Git::AutoCommitPath, git: true do
+  let(:git) { stubbed_git_local_repo }
+
+  describe '#class_name' do
+    {
+      'app/models/mynamespace/the_class.rb' => 'Mynamespace::TheClass',
+      'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb' => 'Cliutils::EacRedmineBase0::Activity'
+    }.each do |relative_path, expected_class_name|
+      context "when path is \"#{relative_path}\"" do
+        let(:path) { git.root_path.join(relative_path) }
+        let(:instance) { described_class.new(git, path) }
+
+        it { expect(instance.class_name).to eq(expected_class_name) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require 'avm/git/commit'
+require 'avm/git/commit/deploy'
+require 'eac_ruby_utils/fs/temp'
+
+RSpec.describe ::Avm::Git::Commit::Deploy, git: true do
+  class << self
+    FROM_DEPLOY = %w[a.txt b.txt c.txt appended].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
+    NOT_FROM_DEPLOY = %w[to_be_removed].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
+
+    def check_files(from_deploy_exist)
+      if from_deploy_exist
+        check_files_exist(FROM_DEPLOY)
+        check_files_not_exist(NOT_FROM_DEPLOY)
+      else
+        check_files_not_exist(FROM_DEPLOY)
+        check_files_exist(NOT_FROM_DEPLOY)
+      end
+    end
+
+    def check_file_exist(basename)
+      it("expect \"#{basename}\" to exist") { expect(target_dir.join(basename)).to exist }
+    end
+
+    def check_file_not_exist(basename)
+      it("expect \"#{basename}\" to not exist") { expect(target_dir.join(basename)).not_to exist }
+    end
+
+    def check_files_exist(basenames)
+      basenames.each { |basename| check_file_exist(basename) }
+    end
+
+    def check_files_not_exist(basenames)
+      basenames.each { |basename| check_file_not_exist(basename) }
+    end
+  end
+
+  let(:git) { stubbed_git_local_repo }
+
+  let(:commit_sha1) do
+    git.file('a.txt').write('AAA')
+    git.file('b.txt').write('BBB')
+    git.command('add', '.').execute!
+    git.command('commit', '-m', 'First commit.').execute!
+    git.rev_parse('HEAD')
+  end
+
+  let(:appended_dir) do
+    r = ::EacRubyUtils::Fs::Temp.directory
+    r.join('appended.template').write('Needs a %%ABC%% value.')
+    r
+  end
+
+  let(:target_dir) do
+    r = ::EacRubyUtils::Fs::Temp.directory
+    ::FileUtils.touch(r.join('to_be_removed').to_path)
+    r
+  end
+
+  let(:commit) { ::Avm::Git::Commit.new(git, commit_sha1) }
+  let(:variables_source_class) do
+    ::Class.new do
+      attr_reader :abc
+
+      def initialize(abc)
+        @abc = abc
+      end
+    end
+  end
+  let(:variables_source) { variables_source_class.new('Any value') }
+  let(:target_env) { ::EacRubyUtils::Envs.local }
+  let(:instance) do
+    described_class.new(commit, target_env, target_dir).append_templatized_directory(appended_dir)
+                   .append_file_content('c.txt', 'Any content')
+                   .variables_source_set(variables_source)
+  end
+
+  after do
+    appended_dir.remove
+    target_dir.remove
+  end
+
+  context 'without run' do # rubocop:disable RSpec/EmptyExampleGroup
+    check_files(false)
+  end
+
+  context 'with run' do # rubocop:disable RSpec/EmptyExampleGroup
+    before { instance.run }
+
+    check_files(true)
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'avm/git/commit/diff_tree_line'
+
+RSpec.describe ::Avm::Git::Commit::DiffTreeLine, git: true do
+  include_examples 'source_target_fixtures', __FILE__ do
+    def source_data(source_file)
+      ::File.read(source_file).each_line.map do |line|
+        described_class.new(line).fields
+      end
+    end
+  end
+end

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.source.out

@@ -0,0 +1 @@
+:000000 100644 0000000000000000000000000000000000000000 f380aec0bd8dd777edac43b11636e46cad04273a A	nomes.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.target.yaml

@@ -0,0 +1,7 @@
+---
+- src_mode: '000000'
+  dst_mode: '100644'
+  src_sha1: '0000000000000000000000000000000000000000'
+  dst_sha1: f380aec0bd8dd777edac43b11636e46cad04273a
+  status: A
+  path: nomes.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.source.out

@@ -0,0 +1 @@
+:100644 100644 40bcdecb4214cd8a3fcf96cd25a2beb87e7e7cd8 4a30dfae816b984f05cfb594e0d5958bb8c387ae M	nomes.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.target.yaml

@@ -0,0 +1,7 @@
+---
+- src_mode: '100644'
+  dst_mode: '100644'
+  src_sha1: 40bcdecb4214cd8a3fcf96cd25a2beb87e7e7cd8
+  dst_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
+  status: M
+  path: nomes.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.source.out

@@ -0,0 +1 @@
+:100644 000000 10728718a2915256ab162f1e05178ebff9efa6ce 0000000000000000000000000000000000000000 D	nomes3.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.target.yaml

@@ -0,0 +1,7 @@
+---
+- src_mode: '100644'
+  dst_mode: '000000'
+  src_sha1: 10728718a2915256ab162f1e05178ebff9efa6ce
+  dst_sha1: '0000000000000000000000000000000000000000'
+  status: D
+  path: nomes3.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename.source.out

@@ -0,0 +1,2 @@
+:100644 000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae 0000000000000000000000000000000000000000 D	nomes.txt
+:000000 100644 0000000000000000000000000000000000000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae A	nomes2.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename.target.yaml

@@ -0,0 +1,13 @@
+---
+- src_mode: '100644'
+  dst_mode: '000000'
+  src_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
+  dst_sha1: '0000000000000000000000000000000000000000'
+  status: D
+  path: nomes.txt
+- src_mode: '000000'
+  dst_mode: '100644'
+  src_sha1: '0000000000000000000000000000000000000000'
+  dst_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
+  status: A
+  path: nomes2.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename_modify.source.out

@@ -0,0 +1,2 @@
+:100644 000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae 0000000000000000000000000000000000000000 D	nomes2.txt
+:000000 100644 0000000000000000000000000000000000000000 10728718a2915256ab162f1e05178ebff9efa6ce A	nomes3.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename_modify.target.yaml

@@ -0,0 +1,13 @@
+---
+- src_mode: '100644'
+  dst_mode: '000000'
+  src_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
+  dst_sha1: '0000000000000000000000000000000000000000'
+  status: D
+  path: nomes2.txt
+- src_mode: '000000'
+  dst_mode: '100644'
+  src_sha1: '0000000000000000000000000000000000000000'
+  dst_sha1: 10728718a2915256ab162f1e05178ebff9efa6ce
+  status: A
+  path: nomes3.txt

data/sub/avm-git/spec/lib/avm/git/commit_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'avm/git/commit'
+
+RSpec.describe ::Avm::Git::Commit, git: true do
+  let(:git) { stubbed_git_local_repo }
+
+  let(:first_commit_sha1) do
+    git.file('a.txt').write('AAA')
+    git.file('b.txt').write('BBB')
+    git.command('add', '.').execute!
+    git.command('commit', '-m', 'First commit.').execute!
+    git.rev_parse('HEAD')
+  end
+
+  let(:second_commit_sha1) do
+    first_commit_sha1
+    git.file('a.txt').write('AAAAA')
+    git.file('b.txt').delete
+    git.file('ç.txt').write('CCC')
+    git.command('add', '.').execute!
+    git.command('commit', '-m', 'Second commit.').execute!
+    git.rev_parse('HEAD')
+  end
+
+  let(:first_commit) { described_class.new(git, first_commit_sha1) }
+  let(:second_commit) { described_class.new(git, second_commit_sha1) }
+
+  describe '#files' do
+    it { expect(first_commit.files.count).to eq(2) }
+    it { expect(second_commit.files.count).to eq(3) }
+
+    {
+      'first_commit' => %w[a.txt b.txt],
+      'second_commit' => %w[a.txt b.txt ç.txt]
+    }.each do |commit_name, filenames|
+      filenames.each do |filename|
+        it "find file \"#{filename}\" in commit \"#{commit_name}\"" do
+          commit = send(commit_name)
+          file = commit.files.find { |f| f.path == filename }
+          expect(file).to be_a(::Avm::Git::Commit::File)
+        end
+      end
+    end
+  end
+
+  describe '#files_size' do
+    it { expect(first_commit.files_size).to eq(6) }
+    it { expect(second_commit.files_size).to eq(8) }
+  end
+
+  describe '#root_child?' do
+    it { expect(first_commit.root_child?).to eq(true) }
+    it { expect(second_commit.root_child?).to eq(false) }
+  end
+end

data/sub/avm-git/spec/lib/avm/git/scms/git_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/git/scms/git'
+
+::RSpec.describe ::Avm::Git::Scms::Git do
+  include_examples 'in_avm_registry', 'scms'
+end

data/sub/avm-git/spec/lib/avm/git/scms/git_subrepo_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/git/scms/git_subrepo'
+
+::RSpec.describe ::Avm::Git::Scms::GitSubrepo do
+  include_examples 'in_avm_registry', 'scms'
+end

data/sub/{avm-tools/spec/lib/avm/launcher → avm-git/spec/lib/avm/git}/vendor/github_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/vendor/github'
+require 'avm/git/vendor/github'
 
-RSpec.describe ::Avm::Launcher::Vendor::Github do
+RSpec.describe ::Avm::Git::Vendor::Github do
   describe '#to_ssh_url' do
-    SSH_URL = 'git@github.com:esquilo-azul/eac_launcher.git'
-    NO_SSH_URL = 'https://otherhost.com/esquilo-azul/eac_launcher'
+    SSH_URL = 'git@github.com:esquilo-azul/eac_launcher.git' # rubocop:disable RSpec/LeakyConstantDeclaration
+    NO_SSH_URL = 'https://otherhost.com/esquilo-azul/eac_launcher' # rubocop:disable RSpec/LeakyConstantDeclaration
 
     {
       nil => nil,

data/sub/avm-git/spec/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/avm-git/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/sub/avm-tools/avm-tools.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.3'
-  s.add_dependency 'avm', '~> 0.45'
+  s.add_dependency 'avm', '~> 0.46'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.22'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
-  s.add_dependency 'avm-git', '~> 0.4'
+  s.add_dependency 'avm-git', '~> 0.5'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'

data/sub/avm-tools/lib/avm/launcher/git/warp_base.rb

@@ -2,7 +2,7 @@
 
 require 'avm/launcher/git/mirror_update'
 require 'avm/launcher/instances/error'
-require 'avm/launcher/vendor/github'
+require 'avm/git/vendor/github'
 require 'avm/projects/stereotypes/git/publish'
 
 module Avm
@@ -59,7 +59,7 @@ module Avm
         end
 
         def target_remote_url
-          ::Avm::Launcher::Vendor::Github.to_ssh_url(source_git.git.remote(source_remote_name).url)
+          ::Avm::Git::Vendor::Github.to_ssh_url(source_git.git.remote(source_remote_name).url)
         end
       end
     end

data/sub/avm-tools/lib/avm/projects/stereotypes/git_subrepo/warp.rb

@@ -4,7 +4,7 @@ require 'eac_ruby_utils/simple_cache'
 require 'avm/launcher/git/sub_warp_base'
 require 'avm/launcher/errors/base'
 require 'avm/launcher/paths/real'
-require 'avm/launcher/vendor/github'
+require 'avm/git/vendor/github'
 
 module Avm
   module Projects
@@ -77,7 +77,7 @@ module Avm
           end
 
           def target_remote_url
-            ::Avm::Launcher::Vendor::Github.to_ssh_url(
+            ::Avm::Git::Vendor::Github.to_ssh_url(
               parent_git_warped.subrepo_remote_url(to_parent_git_path)
             )
           end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.138.0'
+    VERSION = '0.139.0'
   end
 end

data/sub/eac_docker/eac_docker.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.96'
-  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_docker/lib/eac_docker/images/templatized.rb

@@ -21,7 +21,7 @@ module EacDocker
         ::EacRubyUtils::Fs::Temp.on_directory do |provide_dir|
           begin
             self.provide_dir = provide_dir
-            template.apply(self, provide_dir)
+            write_in_provide_dir
             coded_image(provide_dir).tag(tag).provide
           ensure
             self.provide_dir = nil
@@ -33,6 +33,12 @@ module EacDocker
         ::EacDocker::Images::Coded.new(provide_dir)
       end
 
+      protected
+
+      def write_in_provide_dir
+        template.apply(self, provide_dir)
+      end
+
       private
 
       attr_writer :provide_dir