eac_tools 0.123.0 → 0.123.1

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
+
+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')
+      commit_file(wc, '.avm.yml', '')
+      wc.execute!('remote', 'add', 'origin', repos)
+      wc.execute!('push', 'origin', 'master')
+
+      touch_commit(app1, 'file2')
+      commit_file(app1, '.avm.yml', "subs:\n  include_path: mylib\n")
+      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

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

@@ -0,0 +1,6 @@
+---
+Instances:
+  /app1:
+    git_current_revision: master
+  /app2:
+    git_current_revision: master

data/sub/avm-git/spec/lib/avm/git/runners/base/deploy_spec.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+
+RSpec.describe Avm::Git::Runners::Base::Deploy, :git do
+  let(:git) { stubbed_git_local_repo }
+  let(:reference) { git.current_branch }
+  let(:stub_file1) { 'stub1.txt' }
+  let(:stub_content1) { 'CONTENT 111' }
+  let(:stub_file2) { 'stub2.txt' }
+  let(:stub_content2) { 'CONTENT 222' }
+  let(:commit_sha1) do
+    git.file(stub_file1).write(stub_content1)
+    git.command('add', stub_file1).execute!
+    git.command('commit', '-m', 'First commit.').execute!
+    git.rev_parse('HEAD')
+  end
+  let(:append_dirs) do
+    [1, 2].map { |n| File.join(__dir__, 'deploy_spec_files', "append#{n}") }.join(':')
+  end
+  let(:target_dir) { File.join(Dir.mktmpdir, 'target') }
+
+  let(:commit_sha2) do
+    git.command('checkout', commit_sha1).execute!
+    git.file(stub_file1).delete
+    git.file(stub_file2).write(stub_content2)
+    git.command('add', stub_file1, stub_file2).execute!
+    git.command('commit', '-m', 'Second commit.').execute!
+    git.rev_parse('HEAD')
+  end
+
+  let(:target_stub_file1) { File.join(target_dir, stub_file1) }
+  let(:target_stub_file2) { File.join(target_dir, stub_file2) }
+
+  context 'with local target' do
+    before do
+      commit_sha1
+      avm_tools_runner_run(target_dir)
+    end
+
+    it { expect(File.read(target_stub_file1)).to eq(stub_content1) }
+    it { expect(File.exist?(target_stub_file2)).to be(false) }
+
+    context 'with second commit' do
+      before do
+        commit_sha2
+        avm_tools_runner_run(target_dir)
+      end
+
+      it { expect(File.exist?(target_stub_file1)).to be(false) }
+      it { expect(File.read(target_stub_file2)).to eq(stub_content2) }
+    end
+  end
+
+  context 'with append directories' do
+    let(:target_stub_file3) { File.join(target_dir, 'stub3.txt') }
+    let(:target_stub_file4) { File.join(target_dir, 'stub4.txt') }
+
+    before do
+      EacConfig::Node.context.current.entry('my_value').value = '123'
+      commit_sha1
+      avm_tools_runner_run('--append-dirs', append_dirs, target_dir)
+    end
+
+    it { expect(File.read(target_stub_file1)).to eq(stub_content1) }
+    it { expect(File.exist?(target_stub_file2)).to be(false) }
+    it { expect(File.read(target_stub_file3)).to eq("MyValue: 123\n") }
+    it { expect(File.read(target_stub_file4)).to eq("MyValue: %%MY_VALUE%%\n") }
+  end
+
+  context 'with instance' do
+    let(:target_stub_file3) { File.join(target_dir, 'stub3.txt') }
+    let(:target_stub_file4) { File.join(target_dir, 'stub4.txt') }
+
+    before do
+      EacConfig::Node.context.current.entry('my-instance_dev.my_value').value = '123'
+      commit_sha1
+      avm_tools_runner_run('-i', 'my-instance_dev', '--append-dirs', append_dirs, target_dir)
+    end
+
+    it { expect(File.read(target_stub_file1)).to eq(stub_content1) }
+    it { expect(File.exist?(target_stub_file2)).to be(false) }
+    it { expect(File.read(target_stub_file3)).to eq("MyValue: 123\n") }
+    it { expect(File.read(target_stub_file4)).to eq("MyValue: %%MY_VALUE%%\n") }
+  end
+
+  context 'with ssh target', :docker do
+    let(:ssh_server) { Avm::EacUbuntuBase0::Rspec::SshDockerServer.new }
+    let(:env) { ssh_server.env }
+    let(:tmpdir) { env.command('mktemp', '-d').execute! }
+    let(:target_dir) { File.join(tmpdir, 'target') }
+    let(:target_url) do
+      r = env.uri.dup
+      r.path = target_dir
+      r.to_s
+    end
+
+    around do |example|
+      ssh_server.on_run(&example)
+    end
+
+    before do
+      commit_sha1
+      avm_tools_runner_run(target_url)
+    end
+
+    it { expect(env.file(target_stub_file1).read).to eq(stub_content1) }
+    it { expect(env.file(target_stub_file2).exist?).to be(false) }
+
+    context 'with second commit' do
+      before do
+        commit_sha2
+        avm_tools_runner_run(target_url)
+      end
+
+      it { expect(env.file(target_stub_file1).exist?).to be(false) }
+      it { expect(env.file(target_stub_file2).read).to eq(stub_content2) }
+    end
+  end
+
+  def avm_tools_runner_args_prefix
+    ['git', '-C', git.root_path.to_path, 'deploy']
+  end
+end

data/sub/avm-git/spec/lib/avm/git/runners/base/deploy_spec_files/append1/stub3.txt.template

@@ -0,0 +1 @@
+MyValue: %%MY_VALUE%%

data/sub/avm-git/spec/lib/avm/git/runners/base/deploy_spec_files/append2/stub4.txt

@@ -0,0 +1 @@
+MyValue: %%MY_VALUE%%

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+RSpec.describe Avm::Git::Scms::Git::Commit::Deploy, :git 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::Scms::Git.new(git.root_path).commit(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/scms/git_spec.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+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,5 @@
+# frozen_string_literal: true
+
+RSpec.describe Avm::Git::Scms::GitSubrepo do
+  include_examples 'in_avm_registry', 'scms'
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec.describe Avm::Git::Vendor::Github do
+  describe '#to_ssh_url' do
+    SSH_URL = 'git@github.com:esquilo-azul/eac_launcher.git' # rubocop:disable RSpec/LeakyConstantDeclaration, Lint/ConstantDefinitionInBlock
+    NO_SSH_URL = 'https://otherhost.com/esquilo-azul/eac_launcher' # rubocop:disable RSpec/LeakyConstantDeclaration, Lint/ConstantDefinitionInBlock
+
+    {
+      nil => nil,
+      '   ' => nil,
+      'https://github.com/esquilo-azul/eac_launcher' => SSH_URL,
+      'https://github.com/esquilo-azul/eac_launcher.git' => SSH_URL,
+      SSH_URL => SSH_URL,
+      NO_SSH_URL => NO_SSH_URL
+    }.each do |input, expected|
+      it "converts \"#{input}\" to \"#{expected}\"" do
+        expect(described_class.to_ssh_url(input)).to eq(expected)
+      end
+    end
+  end
+end

data/sub/{avm-eac_generic_base0 → avm-git}/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0'
+require 'avm/git'
 require 'eac_ruby_gem_support'
-EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))
+EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__)).stub_avm_contexts

data/sub/eac_git/.gitrepo

@@ -0,0 +1,7 @@
+[subrepo]
+  cmdver = 0.4.9
+  commit = 4a4ceebc4bd5e5250dfab1e81037c8718b5d1c1a
+  method = merge
+  parent = 1ad9c05107e7326694a66ae5566556ea644d1025
+  branch = master
+  remote = https://github.com/esquilo-azul/eac_git.git

data/sub/{avm-eac_generic_base0/avm-eac_generic_base0.gemspec → eac_git/eac_git.gemspec}

@@ -2,20 +2,20 @@
 
 $LOAD_PATH.push File.expand_path('lib', __dir__)
 
-require 'avm/eac_generic_base0/version'
+require 'eac_git/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'avm-eac_generic_base0'
-  s.version     = Avm::EacGenericBase0::VERSION
+  s.name        = 'eac_git'
+  s.version     = EacGit::VERSION
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib,locale}/**/*']
-
+  s.files = Dir.glob('{lib,vendor}/**/*', File::FNM_DOTMATCH)
+              .reject { |f| ['.', '..'].include?(File.basename(f)) }
   s.required_ruby_version = '>= 3.2' # rubocop:disable Gemspec/RequiredRubyVersion
 
-  s.add_dependency 'avm', '~> 0.103'
   s.add_dependency 'eac_ruby_utils', '~> 0.134'
+  s.add_dependency 'parseconfig', '~> 1.1', '>= 1.1.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.15'
 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/
+      STATUS_LINE_PATTERN = /\A(.)(.)\s(.+)\z/
+      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/eac_git/lib/eac_git/local/commit/diff_tree_line.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Commit
+      class DiffTreeLine
+        DIFF_TREE_PATTERN = /\A:(\d{6}) (\d{6}) (\S+) (\S+) (\S+)\t(\S.*)\z/
+        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/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