avm-tools 0.103.0 → 0.106.0

data/{lib → vendor/avm/lib}/avm/files/appendable/templatized_directory.rb

@@ -2,6 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/files/appendable/resource_base'
+require 'eac_templates/directory'
 
 module Avm
   module Files

data/{lib → vendor/avm/lib}/avm/files/deploy.rb

@@ -2,7 +2,6 @@
 
 require 'addressable'
 require 'avm/files/appendable'
-require 'avm/patches/object/template'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/vendor/avm/lib/avm/files/formatter/formats/javascript.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/files/formatter/formats/generic_plain'
+
+module Avm
+  module Files
+    class Formatter
+      module Formats
+        class Javascript < ::Avm::Files::Formatter::Formats::GenericPlain
+          VALID_BASENAMES = %w[*.js].freeze
+          VALID_TYPES = [].freeze
+
+          def internal_apply(files)
+            ::Avm::Executables.js_beautify.command.append(
+              ['--indent-size=2', '--end-with-newline', '--replace', *files]
+            ).system!
+            super(files)
+          end
+        end
+      end
+    end
+  end
+end

data/{lib → vendor/avm/lib}/avm/files/formatter/utf8_assert.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/files/info'
+
 module Avm
   module Files
     class Formatter

data/{lib → vendor/avm/lib}/avm/files/formatter.rb

@@ -16,7 +16,7 @@ module Avm
         options.assert_valid_keys(self.class.lists.option.values)
       end
 
-      FORMATS = %w[ruby php html python xml json generic_plain].freeze
+      FORMATS = %w[ruby php html python xml javascript json generic_plain].freeze
 
       def run
         clear

data/{lib → vendor/avm/lib}/avm/git/auto_commit_path.rb

@@ -21,7 +21,7 @@ module Avm
       end
 
       def relative_path
-        path.relative_path_from(git.root_path)
+        path.expand_path.relative_path_from(git.root_path.expand_path)
       end
     end
   end

data/{lib → vendor/avm/lib}/avm/git/commit/deploy.rb

@@ -4,7 +4,6 @@ require 'addressable'
 require 'eac_ruby_utils/core_ext'
 require 'avm/files/appendable'
 require 'avm/files/deploy'
-require 'avm/patches/object/template'
 
 module Avm
   module Git

data/{lib → vendor/avm/lib}/avm/git/commit/file.rb

@@ -12,7 +12,7 @@ module Avm
 
         attr_reader :git, :diff_tree
 
-        # git: [Avm::Launcher::Git::Base]
+        # 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
@@ -38,7 +38,7 @@ module Avm
         def size(sha1)
           return 0 if /\A0+\z/.match(sha1)
 
-          git.execute!('cat-file', '-s', sha1).strip.to_i
+          git.command('cat-file', '-s', sha1).execute!.strip.to_i
         end
       end
     end

data/{lib → vendor/avm/lib}/avm/git/commit.rb

@@ -18,13 +18,14 @@ module Avm
 
       attr_reader :git, :sha1
 
+      # @param git [EacGit::Local]
       def initialize(git, sha1)
         @git = git
         @sha1 = sha1
       end
 
       def format(format)
-        git.execute!('--no-pager', 'log', '-1', "--pretty=format:#{format}", sha1).strip
+        git.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", sha1).execute!.strip
       end
 
       FIELDS.each do |field, format|
@@ -51,7 +52,7 @@ module Avm
         args = []
         args << '--root' if root_child?
         args << sha1
-        git.execute!(*::Avm::Git::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args)
+        git.command(*::Avm::Git::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
       end
     end
   end

data/{lib → vendor/avm/lib}/avm/git/issue/complete.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Git

data/{lib → vendor/avm/lib}/avm/git/issue/deliver.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'clipboard'
 
 module Avm

data/{lib → vendor/avm/lib}/avm/git/subrepo_check/show_result.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/{lib → vendor/avm/lib}/avm/git/subrepo_check.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/{lib → vendor/avm/lib}/avm/git/subrepo_checks.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
+require 'avm/git/subrepo_check'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/vendor/avm/lib/avm/version.rb

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

data/vendor/avm/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/vendor/avm/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/vendor/avm/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/vendor/avm/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.source.out

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

data/vendor/avm/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/vendor/avm/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.source.out

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

data/vendor/avm/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/vendor/avm/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.source.out

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

data/vendor/avm/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/vendor/avm/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/vendor/avm/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/vendor/avm/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/vendor/avm/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/vendor/avm/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/vendor/avm/spec/rubocop_spec.rb

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