avm 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664fd8172f0c55acb9025054087777483a8442028c94cf287fa4c868e9dcb19b
-  data.tar.gz: 4d7bd04f6ee20c46b1abbbebe2cab10a3cf786cb4b34a557cf157d72d565b2a7
+  metadata.gz: 0a5a8832847c76afcae4e76ef3e8f7d1391d7cfb0b13788c3dc7273f9ef879f1
+  data.tar.gz: 0b89bd147edb92e0e3e4d158d16f0995ef41f0544a680beb053f9fa55b96a282
 SHA512:
-  metadata.gz: '08719226470ae5fd2c38ae2c9afd83e259a1f9517f17c8e2c18ffd56b7ae8cee593097d2e1afbf82dfeb05125c208c02ff4b71cae5eed858c7ad213a66c22d0d'
-  data.tar.gz: 4b7cc1247fb8bcb7f289a28f6b1be1dcb7249e28286b02450ad17d830599347b52a26e00e800c3d714e6bb05a1dab614b57c9e675c04299fa4307be322f6a61c
+  metadata.gz: a70af189af9aee66a693706ba031e5eb7c6d4c8533144099f325dfe2b88b9ef08daae16de8d2f09857f194816d653d3669527d6bc9c07d173566c9ab9121c3f6
+  data.tar.gz: d66a1741ec6295f54166a2007a4d168eddd4e7de30f538f87329067b580faf2572514d99302bb467e0b408dfe1a44dd54a9e4e2abaaed0292b3a7ba69bb02b95

data/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/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/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/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/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/app_src.rb

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

data/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/lib/avm/files/formatter/formats/javascript.rb

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

data/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/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/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/avm/files/formatter/utf8_assert.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/files/info'
+require 'eac_fs/file_info'
 
 module Avm
   module Files
@@ -39,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/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/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/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/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/lib/avm/jobs.rb

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

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_docker
@@ -72,6 +72,54 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: htmlbeautifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +161,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm.rb
+- lib/avm/app_src.rb
+- lib/avm/app_src/base.rb
+- lib/avm/app_src/configuration.rb
+- lib/avm/app_src/configuration/_locale.rb
+- lib/avm/app_src/configuration/_rubocop.rb
+- lib/avm/app_src/configuration/_tests.rb
 - lib/avm/docker.rb
 - lib/avm/docker/container.rb
 - lib/avm/docker/image.rb
@@ -139,7 +193,6 @@ files:
 - lib/avm/files/formatter/formats/ruby.rb
 - lib/avm/files/formatter/formats/xml.rb
 - lib/avm/files/formatter/utf8_assert.rb
-- lib/avm/files/info.rb
 - lib/avm/files/rotate.rb
 - lib/avm/git.rb
 - lib/avm/git/auto_commit/commit_info.rb
@@ -183,6 +236,9 @@ files:
 - lib/avm/git/subrepo_check/show_result.rb
 - lib/avm/git/subrepo_checks.rb
 - lib/avm/instances/docker_image.rb
+- lib/avm/jobs.rb
+- lib/avm/jobs/base.rb
+- lib/avm/jobs/variables_source.rb
 - lib/avm/result.rb
 - lib/avm/version.rb
 - lib/avm/version_number.rb

data/lib/avm/files/info.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/executables'
-require 'eac_ruby_utils/core_ext'
-require 'content-type'
-
-module Avm
-  module Files
-    class Info
-      enable_simple_cache
-      common_constructor :path
-
-      private
-
-      def content_type_uncached
-        ::ContentType.parse(
-          ::Avm::Executables.file.command.append(['-ib', path]).execute!.strip
-        )
-      rescue Parslet::ParseFailed
-        ::ContentType.parse('application/unknown')
-      end
-    end
-  end
-end