eac_tools 0.101.3 → 0.102.1

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class GitSubrepo < ::Avm::Git::Scms::GitSubBase
+        def update
+          git_subrepo.command('clean').execute!
+          git_subrepo.command('pull').execute!
+        end
+
+        # @return [EacGit::Local]
+        def git_repo
+          @git_repo ||= ::EacGit::Local.find(path)
+        end
+
+        # @return [EacGit::Local::Subrepo]
+        def git_subrepo
+          @git_subrepo ||= git_repo.subrepo(subpath)
+        end
+
+        # @return [Pathname]
+        def subpath
+          path.expand_path.relative_path_from(git_repo.root_path.expand_path)
+        end
+
+        def valid?
+          path.join('.gitrepo').file?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class GitSubtree < ::Avm::Git::Scms::GitSubBase
+        # @return [Boolean]
+        def no_other_git_scm?
+          (::Avm::Git::Scms::Provider.new.all - [self.class])
+            .lazy.map { |scm_class| scm_class.new(path) }.none?(&:valid?)
+        end
+
+        # @return [Boolean]
+        def parent_git_scm?
+          ::Avm::Git::Scms::Provider.new.all.any? { |scm_class| parent_scm.is_a?(scm_class) }
+        end
+
+        def update
+          # Do nothing
+        end
+
+        # @return [Boolean]
+        def valid?
+          parent_git_scm? && no_other_git_scm?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Provider
+        SCMS = [::Avm::Git::Scms::Git, ::Avm::Git::Scms::GitSubrepo,
+                ::Avm::Git::Scms::GitSubtree].freeze
+
+        def all
+          SCMS
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    class SubrepoCheck
+      module Parent
+        def fix_parent
+          return if parent_result.success?
+
+          info('  Fixing...')
+          self.parent_hash = expected_parent_hash
+          info_banner
+        end
+
+        private
+
+        def expected_parent_hash_uncached
+          subrepo.local.rev_parse("#{last_file_change_rev}^")
+        end
+
+        def last_file_change_rev
+          subrepo.local.command('log', '-n', '1', '--pretty=format:%H', '--',
+                                subrepo.config_relative_path.to_path).execute!.strip
+        end
+
+        def parent_hash
+          subrepo.parent_commit_id
+        end
+
+        def parent_hash=(new_hash)
+          subrepo.config.parent_commit_id = new_hash
+          subrepo.write_config
+        end
+
+        def parent_hash_ok?
+          return false if expected_parent_hash.blank? || parent_hash.blank?
+
+          expected_parent_hash == parent_hash
+        end
+
+        def parent_result_uncached
+          ::Avm::Result.success_or_error(parent_hash_ok?,
+                                         parent_hash.presence || blank_text)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+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,30 @@
+# frozen_string_literal: true
+
+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,36 @@
+# frozen_string_literal: true
+
+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,57 @@
+# frozen_string_literal: true
+
+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-git/lib/avm/git/vendor/github.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Vendor
+      module Github
+        class << self
+          def to_ssh_url(url)
+            return nil if url.blank?
+
+            url_no_dot_git = url.gsub(/\.git\z/, '')
+
+            m = %r{\Ahttps://github.com/([^/]+)/([^/]+)\z}.match(url_no_dot_git.to_s)
+            m ? "git@github.com:#{m[1]}/#{m[2]}.git" : url
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+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.20.2'
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils'
+EacRubyUtils::RootModuleSetup.perform __FILE__
+
+require 'avm'
+require 'eac_cli'
+require 'eac_config'
+require 'eac_git'
+require 'filesize'
+require 'git'
+
+module Avm
+  module Git
+  end
+end

data/sub/avm-git/locale/en.yml

@@ -0,0 +1,6 @@
+en:
+  avm:
+    git:
+      scms:
+        git_subrepo:
+          update_version_scm_message: '**/.gitrepo: fix/update.'

data/sub/avm-git/locale/pt-BR.yml

@@ -0,0 +1,6 @@
+pt-BR:
+  avm:
+    git:
+      scms:
+        git_subrepo:
+          update_version_scm_message: '**/.gitrepo: conserta/atualiza.'

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-RSpec.describe EacGit::Local::Commit::DiffTreeLine, :git do
+require 'avm/git/commit/diff_tree_line'
+
+RSpec.describe Avm::Git::Commit::DiffTreeLine, :git do
   include_examples 'source_target_fixtures', __FILE__ do
     def source_data(source_file)
       File.read(source_file).each_line.map do |line|

data/sub/{eac_git/spec/lib/eac_git/local → avm-git/spec/lib/avm/git}/commit_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'tmpdir'
+require 'avm/git/commit'
 
-RSpec.describe EacGit::Local::Commit, :git do
+RSpec.describe Avm::Git::Commit, :git do
   let(:git) { stubbed_git_local_repo }
 
   let(:first_commit_sha1) do
@@ -26,9 +26,9 @@ RSpec.describe EacGit::Local::Commit, :git do
   let(:first_commit) { described_class.new(git, first_commit_sha1) }
   let(:second_commit) { described_class.new(git, second_commit_sha1) }
 
-  describe '#changed_files' do
-    it { expect(first_commit.changed_files.count).to eq(2) }
-    it { expect(second_commit.changed_files.count).to eq(3) }
+  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],
@@ -37,16 +37,16 @@ RSpec.describe EacGit::Local::Commit, :git do
       filenames.each do |filename|
         it "find file \"#{filename}\" in commit \"#{commit_name}\"" do
           commit = send(commit_name)
-          file = commit.changed_files.find { |f| f.path == filename }
-          expect(file).to be_a(EacGit::Local::Commit::ChangedFile)
+          file = commit.files.find { |f| f.path == filename }
+          expect(file).to be_a(Avm::Git::Commit::File)
         end
       end
     end
   end
 
-  describe '#changed_files_size' do
-    it { expect(first_commit.changed_files_size).to eq(6) }
-    it { expect(second_commit.changed_files_size).to eq(8) }
+  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

data/sub/avm-git/spec/lib/avm/git/launcher/base_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/base'
+
+RSpec.describe Avm::Git::Launcher::Base do
+  context 'new non-bare repository' do # rubocop:disable RSpec/ContextWording
+    let(:repo) do
+      r = described_class.new(Dir.mktmpdir)
+      r.git
+      r
+    end
+
+    describe '#remote_exist?' do
+      it { expect(repo.remote_exist?('origin')).to be(false) }
+
+      context 'after remote added' do # rubocop:disable RSpec/ContextWording
+        before { repo.execute!('remote', 'add', 'origin', 'file:///path/to/remote') }
+
+        it { expect(repo.remote_exist?('origin')).to be(true) }
+
+        context 'after remote removed' do # rubocop:disable RSpec/ContextWording
+          before { repo.execute!('remote', 'remove', 'origin') }
+
+          it { expect(repo.remote_exist?('origin')).to be(false) }
+        end
+      end
+    end
+
+    describe '#assert_remote_url' do
+      it { expect(repo.remote_exist?('origin')).to be(false) }
+
+      context 'after asserted remote URL "/remote1"' do # rubocop:disable RSpec/ContextWording
+        before { repo.assert_remote_url('origin', '/remote1') }
+
+        it { expect(repo.git.remote('origin').url).to eq('/remote1') }
+
+        context 'after asserted remote URL "/remote2"' do # rubocop:disable RSpec/ContextWording
+          before { repo.assert_remote_url('origin', '/remote2') }
+
+          it { expect(repo.git.remote('origin').url).to eq('/remote2') }
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/publish_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher_stereotypes/git_subrepo/publish'
+require 'avm/launcher/publish/check_result'
+
+RSpec.describe Avm::Git::LauncherStereotypes::GitSubrepo::Publish do
+  include_context 'with_launcher'
+  include_examples 'with_config', __FILE__
+
+  describe '#check' do
+    context 'with clean context' do
+      let(:settings_path) { File.join(__dir__, 'publish_spec_settings.yml') }
+
+      before do
+        temp_context(settings_path)
+      end
+
+      context 'with app with subrepo' do
+        let(:remote_repos) { init_remote('mylib') }
+
+        before do
+          wc = init_git('mylib')
+          touch_commit(wc, 'file1')
+          wc.execute!('remote', 'add', 'publish', remote_repos)
+          wc.execute!('push', 'publish', 'master')
+        end
+
+        let!(:app) do # rubocop:disable RSpec/ScatteredLet
+          r = init_git('app')
+          touch_commit(r, 'file2')
+          r.execute!('subrepo', 'clone', remote_repos, 'mylib')
+          launcher_controller.application_source_path('app', r.root_path)
+          r
+        end
+
+        it { check_publish_status(:updated) } # rubocop:disable RSpec/NoExpectationExample
+
+        context 'after subrepo updated and before publishing' do # rubocop:disable RSpec/ContextWording
+          before do
+            Avm::Launcher::Context.current.publish_options[:confirm] = true
+            touch_commit(app, 'mylib/file3')
+          end
+
+          it { expect(Avm::Launcher::Context.current.publish_options[:confirm]).to be(true) }
+          it { check_publish_status(:pending) } # rubocop:disable RSpec/NoExpectationExample
+
+          context 'after publishing' do # rubocop:disable RSpec/ContextWording
+            before { described_class.new(app_mylib_instance).run }
+
+            it { check_publish_status(:updated) } # rubocop:disable RSpec/NoExpectationExample
+
+            context 'after reset context' do # rubocop:disable RSpec/ContextWording
+              before do
+                sleep 2
+                launcher_controller.temp_context(settings_path)
+              end
+
+              it { check_publish_status(:updated) } # rubocop:disable RSpec/NoExpectationExample
+            end
+          end
+        end
+
+        def check_publish_status(status_key) # rubocop:disable Metrics/AbcSize
+          instance = app_mylib_instance
+          expect(instance).to be_a(Avm::Launcher::Instances::Base)
+          expect(instance.stereotypes).to include(Avm::Git::LauncherStereotypes::GitSubrepo)
+
+          status = Avm::Launcher::Publish::CheckResult.const_get("STATUS_#{status_key}".upcase)
+          publish = described_class.new(instance)
+          expect(publish.check.status).to(
+            eq(status),
+            "Expected: #{status}, Actual: " \
+            "#{publish.check.status}, Message: #{publish.check.message}"
+          )
+        end
+
+        def app_mylib_instance
+          Avm::Launcher::Context.current.instance('/app/mylib')
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/publish_spec_files/config.yml

@@ -0,0 +1,5 @@
+---
+app:
+  avm_type: Application
+mylib:
+  avm_type: Application

data/sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/publish_spec_settings.yml

@@ -0,0 +1,6 @@
+---
+Instances:
+  /app:
+    git_current_revision: master
+  /mylib:
+    git_current_revision: master

data/sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/warp_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher_stereotypes/git_subrepo/warp'
+
+RSpec.describe Avm::Git::LauncherStereotypes::GitSubrepo::Warp do
+  include_context 'with_config', __FILE__
+  include_context 'with_launcher'
+
+  let(:repos) { init_remote('mylib_repos') }
+  let(:app1) { init_git('app1') } # rubocop:disable RSpec/IndexedLet
+  let(:app2) { init_git('app2') } # rubocop:disable RSpec/IndexedLet
+
+  describe '#unknown' do
+    before do
+      temp_context(File.join(__dir__, 'warp_spec_settings.yml'))
+
+      wc = init_git('mylib_wc')
+      touch_commit(wc, 'file1')
+      wc.execute!('remote', 'add', 'origin', repos)
+      wc.execute!('push', 'origin', 'master')
+
+      touch_commit(app1, 'file2')
+      app1.execute!('subrepo', 'clone', repos, 'mylib')
+      launcher_controller.application_source_path('app1', app1.root_path)
+
+      touch_commit(app2, 'file3')
+      app2.execute!('subrepo', 'clone', repos, 'mylib')
+      touch_commit(app2, 'mylib/file4')
+      app2.execute!('subrepo', 'push', 'mylib')
+    end
+
+    it 'revisions should match' do # rubocop:disable RSpec/ExampleLength, RSpec/MultipleExpectations
+      master_ref = repos.rev_parse('master')
+      expect(master_ref.present?).to be true
+
+      master_ref_previous = repos.rev_parse('master^')
+      expect(master_ref_previous.present?).to be true
+
+      app2.execute!('subrepo', 'branch', 'mylib', '--fetch', '--force')
+      expect(app2.rev_parse('subrepo/mylib')).to eq master_ref
+
+      app1.execute!('subrepo', 'branch', 'mylib', '--fetch', '--force')
+      expect(app1.rev_parse('subrepo/mylib')).to eq master_ref_previous
+
+      instance = Avm::Launcher::Context.current.instance('/app1/mylib')
+      expect(instance).to be_a Avm::Launcher::Instances::Base
+      warp = instance.warped
+      expect(warp).to be_a described_class
+      wgit = Avm::Git::Launcher::Base.new(warp)
+      expect(wgit.rev_parse('HEAD')).to eq master_ref_previous
+    end
+  end
+end

data/sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/warp_spec_files/config.yml

@@ -0,0 +1,3 @@
+---
+app1:
+  avm_type: Application