avm-tools 0.103.1 → 0.107.0

data/vendor/avm/lib/avm/app_src/base.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_git'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module AppSrc
+    class Base
+      enable_simple_cache
+      enable_listable
+      lists.add_symbol :option, :parent
+      common_constructor :path, :options, default: [{}] do
+        self.path = path.to_pathname
+        self.options = self.class.lists.option.hash_keys_validate!(options)
+      end
+
+      delegate :to_s, to: :path
+
+      # @return [Avm::AppSrc::Base]
+      def parent
+        options[OPTION_PARENT]
+      end
+
+      # @return [Pathname]
+      def relative_path
+        return path if parent.blank?
+
+        path.relative_path_from(parent.path)
+      end
+
+      # @return [Enumerable<Avm::AppSrc::Base>]
+      def subs
+        git_repo.subrepos
+                .map { |subrepo| self.class.new(subrepo.subpath.expand_path(path), parent: self) }
+      end
+
+      private
+
+      # @return [EacGit::Local]
+      def git_repo_uncached
+        ::EacGit::Local.new(path)
+      end
+    end
+  end
+end

data/vendor/avm/lib/avm/app_src/configuration/_locale.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+require 'i18n'
+
+module Avm
+  module AppSrc
+    class Configuration < ::EacConfig::OldConfigs
+      LOCALE_KEY = :locale
+
+      def locale
+        read_entry(LOCALE_KEY) || ::I18n.default_locale
+      end
+    end
+  end
+end

data/vendor/avm/lib/avm/app_src/configuration/_rubocop.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Avm
+  module AppSrc
+    class Configuration < ::EacConfig::OldConfigs
+      RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
+      RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'
+
+      def rubocop_command
+        read_command(RUBOCOP_COMMAND_KEY)
+      end
+
+      def rubocop_gemfile
+        gemfile_path = read_entry(RUBOCOP_GEMFILE_KEY)
+        return nil if gemfile_path.blank?
+
+        gemfile_path = gemfile_path.to_pathname.expand_path(storage_path.parent)
+        return gemfile_path if gemfile_path.file?
+
+        raise "Gemfile path \"#{gemfile_path}\" does not exist or is not a file"
+      end
+    end
+  end
+end

data/vendor/avm/lib/avm/app_src/configuration/_tests.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+
+module Avm
+  module AppSrc
+    class Configuration < ::EacConfig::OldConfigs
+      BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
+      TEST_COMMAND_KEY = 'test.command'
+
+      def any_test_command
+        bundle_test_command || test_command
+      end
+
+      def test_command
+        read_command(TEST_COMMAND_KEY)
+      end
+
+      def bundle_test_command
+        read_entry(BUNDLE_TEST_COMMAND_KEY).if_present do |v|
+          args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
+          ::EacRubyGemsUtils::Gem.new(::File.dirname(storage_path)).bundle(*args).chdir_root
+        end
+      end
+    end
+  end
+end

data/vendor/avm/lib/avm/app_src/configuration.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'eac_config/old_configs'
+require 'eac_ruby_utils/core_ext'
+require 'yaml'
+
+module Avm
+  module AppSrc
+    class Configuration < ::EacConfig::OldConfigs
+      require_sub __FILE__
+
+      FILENAMES = %w[.avm.yml .avm.yaml].freeze
+
+      class << self
+        def find_by_path(path)
+          path = ::Pathname.new(path.to_s) unless path.is_a?(::Pathname)
+          internal_find_path(path.expand_path)
+        end
+
+        def find_in_path(path)
+          absolute_pathname = path.to_pathname.expand_path
+          if absolute_pathname.directory?
+            FILENAMES.each do |filename|
+              file = absolute_pathname.join(filename)
+              return new(file) if file.exist?
+            end
+          end
+          nil
+        end
+
+        private
+
+        def internal_find_path(absolute_pathname)
+          r = find_in_path(absolute_pathname)
+          return r if r.present?
+
+          internal_find_path(absolute_pathname.dirname) unless absolute_pathname.root?
+        end
+      end
+
+      def initialize(path)
+        super(nil, storage_path: path)
+      end
+
+      # Utility to read a configuration as a [EacRubyUtils::Envs::Command].
+      # @return [EacRubyUtils::Envs::Command]
+      def read_command(key)
+        read_entry(key).if_present do |v|
+          args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
+          ::EacRubyUtils::Envs.local.command(args).chdir(::File.dirname(storage_path))
+        end
+      end
+    end
+  end
+end

data/{lib/avm/eac_asciidoctor_base0.rb → vendor/avm/lib/avm/app_src.rb}

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacAsciidoctorBase0
+  module AppSrc
     require_sub __FILE__
   end
 end

data/{lib → vendor/avm/lib}/avm/executables.rb

@@ -14,7 +14,7 @@ module Avm
 
       private
 
-      %w[docker file git latex php-cs-fixer tidy yapf xdg-open].each do |program|
+      %w[file git js-beautify latex php-cs-fixer tidy yapf xdg-open].each do |program|
         define_method(program.underscore + '_uncached') do
           env.executable(program, '--version')
         end

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/{lib → vendor/avm/lib}/avm/files/formatter/formats/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/files/info'
+require 'eac_fs/file_info'
 require 'ostruct'
 
 module Avm
@@ -50,7 +50,7 @@ module Avm
           end
 
           def match_by_type?(file)
-            info = ::Avm::Files::Info.new(file)
+            info = ::EacFs::FileInfo.new(file)
             return unless info.content_type.type == 'text'
 
             valid_types.include?(info.content_type.subtype)

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+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/formats/php.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/executables'
 require 'avm/files/formatter/formats/generic_plain'
 
 module Avm

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/executables'
 require 'avm/files/formatter/formats/generic_plain'
 
 module Avm

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/executables'
 require 'avm/files/formatter/formats/generic_plain'
 
 module Avm

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'eac_fs/file_info'
+
 module Avm
   module Files
     class Formatter
@@ -37,7 +39,7 @@ module Avm
         private
 
         def original_info_uncached
-          ::Avm::Files::Info.new(path)
+          ::EacFs::FileInfo.new(path)
         end
 
         def original_charset_uncached

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/test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/sources/configuration'
+require 'avm/app_src/configuration'
 require 'avm/result'
 require 'eac_ruby_utils/fs/temp'
 
@@ -36,7 +36,7 @@ module Avm
           end
 
           def configuration_uncached
-            ::Avm::Apps::Sources::Configuration.find_by_path(@git)
+            ::Avm::AppSrc::Configuration.find_by_path(@git)
           end
         end
       end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/fs_cache'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/ruby'
 
@@ -53,8 +52,8 @@ module Avm
       end
 
       def root_cache
-        ::Avm.fs_cache.child('git', 'revision_test', git_absolute_path.parameterize, sha1,
-                             options.fetch(:test_command).to_s.parameterize)
+        fs_cache.child(git_absolute_path.parameterize, sha1,
+                       options.fetch(:test_command).to_s.parameterize)
       end
 
       def run_test

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/jobs/base.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'avm/jobs/variables_source'
+require 'eac_cli/core_ext'
+
+module Avm
+  module Jobs
+    module Base
+      common_concern do
+        include ::ActiveSupport::Callbacks
+
+        enable_speaker
+        enable_simple_cache
+        enable_listable
+        common_constructor :instance, :options, default: [{}] do
+          if option_list.present?
+            self.options = option_list.hash_keys_validate!(options.symbolize_keys)
+          end
+        end
+        define_callbacks(*jobs)
+      end
+
+      module ClassMethods
+        def jobs
+          const_get('JOBS').dup
+        end
+      end
+
+      module InstanceMethods
+        def option_list
+          nil
+        end
+
+        def run
+          start_banner if respond_to?(:start_banner)
+          run_jobs
+          ::Avm::Result.success('Done!')
+        rescue ::Avm::Result::Error => e
+          e.to_result
+        end
+
+        def variables_source
+          ::Avm::Jobs::VariablesSource.new(self, instance)
+        end
+
+        protected
+
+        def run_jobs
+          jobs.each do |job|
+            run_callbacks job do
+              send(job)
+            end
+          end
+        end
+
+        def jobs
+          self.class.jobs
+        end
+      end
+    end
+  end
+end

data/vendor/avm/lib/avm/jobs/variables_source.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Jobs
+    class VariablesSource
+      common_constructor :job, :instance
+
+      def read_entry(path, options = {})
+        entry_from_job(path) || instance.read_entry(path, options)
+      end
+
+      private
+
+      def entry_from_job(path)
+        method = path.gsub('.', '_').underscore
+        return job.send(method) if job.respond_to?(method, true)
+      end
+    end
+  end
+end

data/vendor/{avm-apps/lib/avm/apps → avm/lib/avm}/jobs.rb

@@ -3,9 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Apps
-    module Jobs
-      require_sub __FILE__
-    end
+  module Jobs
+    require_sub __FILE__
   end
 end

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

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