avm-tools 0.106.0 → 0.107.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a71fc17b60e581ba891e58d0b47ad9b4dbae79c2085540bb1816e02011e9af9
-  data.tar.gz: 15387681892ce7192edd15b0e68ee801ed0fca233454b802df21f7d5e0a211a4
+  metadata.gz: 982669127ef20f0cf64fa12fbe0d087c0479b0e8575d7bb2c6047abac2ec81d3
+  data.tar.gz: d4d659206696045d925dbba86c5d4fa69e184dbbdc58001e3453344ef68ef9ef
 SHA512:
-  metadata.gz: d61dadda2108d0d2b7a37f9ec55bbcbc73e222c87f463feec8b91d8f486b3869f1652849296a9bcb7c33e58fe65f1a99f5d12fe7e71c2b1fcf58231b2f453124
-  data.tar.gz: 13a712ee6f75e13797fcf5107ad9b0c72f730195d4264e36ea5368635205aa68c55deb88c8055f01381342cefe48bf74d0decba9d6fe5052df6c6571622a1daf
+  metadata.gz: 436eb2a8f5957c9ffcb130851bb2dee4ab070cfd610a25356e8030766b6190a2a096b7a25250ab33801036f01e79e5c50bfc8024c2b6172f721f1868811251ea
+  data.tar.gz: 57711beda558d8e28ba2f98fd9ccbe4be8372e32093e1e45591ad7b5bb89cc9014946720b5430eaf66ef5ce4e583d96e3b3e556be39ce2670df577ee11d681cb

data/lib/avm/instances/entry.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/config'
+require 'eac_config/node'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -31,7 +31,7 @@ module Avm
       end
 
       def read(extra_options = {})
-        ::Avm::Apps::Config.current.entry(full_path, options.merge(extra_options)).value
+        ::EacConfig::Node.context.current.entry(full_path, options.merge(extra_options)).value
       end
 
       def suffix_as_array
@@ -47,7 +47,7 @@ module Avm
       end
 
       def write(value)
-        ::Avm::Apps::Config.current.entry(full_path).value = value
+        ::EacConfig::Node.context.current.entry(full_path).value = value
       end
     end
   end

data/lib/avm/patches/eac_ruby_gems_utils/gem.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/sources/configuration'
+require 'avm/app_src/configuration'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
@@ -13,7 +13,7 @@ module Avm
         private
 
         def configuration_uncached
-          ::Avm::Apps::Sources::Configuration.find_in_path(root)
+          ::Avm::AppSrc::Configuration.find_in_path(root)
         end
 
         def gemfile_path_uncached

data/lib/avm/ruby/rubocop/_configured.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/sources/configuration'
+require 'avm/app_src/configuration'
 
 module Avm
   module Ruby
@@ -22,7 +22,7 @@ module Avm
       private
 
       def configuration_uncached
-        ::Avm::Apps::Sources::Configuration.find_by_path(base_path)
+        ::Avm::AppSrc::Configuration.find_by_path(base_path)
       end
     end
   end

data/lib/avm/tools/app_src.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'avm/app_src/base'
+require 'avm/app_src/configuration'
+require 'avm/launcher/paths/real'
+require 'avm/projects/stereotype/job_comparator'
+require 'eac_ruby_utils/core_ext'
+require 'avm/projects/stereotypes'
+require 'i18n'
+
+module Avm
+  module Tools
+    class AppSrc
+      enable_simple_cache
+      common_constructor :path do
+        self.path = path.to_pathname
+        source_stereotypes_mixins
+      end
+
+      delegate :to_s, to: :path
+
+      def locale
+        configuration.if_present(&:locale) || ::I18n.default_locale
+      end
+
+      # Backward compatibility with [Avm::Launcher::Paths::Logical].
+      # @return [Avm::Launcher::Paths::Real].
+      def real
+        ::Avm::Launcher::Paths::Real.new(path.to_path)
+      end
+
+      def run_job(job, job_args = [])
+        stereotypes_jobs(job, job_args).each(&:run)
+      end
+
+      private
+
+      def avm_instance_uncached
+        ::Avm::AppSrc::Base.new(path)
+      end
+
+      # @return [Avm::Apps::Sources::Configuration]
+      def configuration_uncached
+        ::Avm::AppSrc::Configuration.find_in_path(path)
+      end
+
+      def stereotypes_jobs(job, job_args)
+        job_class_method = "#{job}_class"
+        r = []
+        stereotypes.each do |stereotype|
+          r << stereotype.send(job_class_method).new(self, *job_args) if
+          stereotype.send(job_class_method).present?
+        end
+        r.sort { |a, b| ::Avm::Projects::Stereotype::JobComparator.new(a, b).result }
+      end
+
+      def stereotypes_uncached
+        ::Avm::Projects::Stereotypes.list.select { |s| s.match?(self) }
+      end
+
+      def source_stereotypes_mixins
+        stereotypes.each do |s|
+          s.local_project_mixin_module.if_present { |v| singleton_class.include(v) }
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/app_src/info.rb

@@ -12,8 +12,22 @@ module Avm
           end
 
           def run
-            infov 'Path', runner_context.call(:instance).path
-            infov 'Stereotypes', runner_context.call(:instance).stereotypes.map(&:label).join(', ')
+            infov 'Path', instance.path
+            infov 'Stereotypes', instance.stereotypes.map(&:label).join(', ')
+            show_subs
+          end
+
+          private
+
+          def show_subs
+            infov 'Sub applications', instance.avm_instance.subs.count
+            instance.avm_instance.subs.each do |subapp|
+              infov '  * ', subapp.relative_path
+            end
+          end
+
+          def instance
+            runner_context.call(:instance)
           end
         end
       end

data/lib/avm/tools/runner/app_src/ruby/bundler/incompatible.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/fs_cache'
 require 'avm/ruby/bundler/incompatible_parser'
 require 'eac_ruby_base0/core_ext'
 
@@ -36,9 +35,8 @@ module Avm
                 fs_cache.content_path
               end
 
-              def fs_cache_uncached
-                ::Avm.fs_cache.child(self.class.name.variableize)
-                     .child(instance.path.to_s.variableize)
+              def fs_cache
+                super.child(instance.path.to_s.variableize)
               end
 
               def gem_title(gem_in_conflict)

data/lib/avm/tools/runner/app_src.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/app_src'
+require 'avm/tools/app_src'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -22,7 +22,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::AppSrc.new(instance_path)
+          ::Avm::Tools::AppSrc.new(instance_path)
         end
 
         def instance_path_uncached

data/lib/avm/tools/runner/config/load_path.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'avm/apps/config'
 require 'avm/self'
 require 'avm/tools/core_ext'
+require 'eac_config/node'
 
 module Avm
   module Tools
@@ -23,7 +23,7 @@ module Avm
 
           # @return [[EacCli::Config]]
           def config_node
-            ::Avm::Apps::Config.current
+            ::EacConfig::Node.context.current
           end
 
           def run_add

data/lib/avm/tools/runner/git/deploy.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'avm/apps/config'
 require 'avm/launcher/git/base'
 require 'avm/git/commit'
+require 'eac_config/node'
 
 module Avm
   module Tools
@@ -91,7 +91,7 @@ module Avm
           end
 
           def variables_source
-            instance || ::Avm::Apps::Config.current
+            instance || ::EacConfig::Node.context.current
           end
 
           def instance_uncached

data/lib/avm/tools/runner.rb

@@ -19,7 +19,7 @@ module Avm
       end
 
       def run
-        ::Avm::Apps::Config.context.on(::Avm::Self.build_config) { super }
+        ::EacConfig::Node.context.on(::Avm::Self.build_config) { super }
       end
     end
   end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.106.0'
+    VERSION = '0.107.0'
   end
 end

data/vendor/avm/avm.gemspec

@@ -16,6 +16,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_git', '~> 0.6'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
   s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
+  s.add_dependency 'filesize', '~> 0.2'
+  s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'
+  s.add_dependency 'minitar', '~> 0.9'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.7', '>= 0.7.2'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'

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/vendor/avm/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/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

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

data/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/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/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/vendor/avm/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/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/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/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.3.2'
+  VERSION = '0.4.0'
 end

data/vendor/avm-apps/avm-apps.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name        = 'avm-apps'
   s.version     = Avm::Apps::VERSION
   s.authors     = ['Eduardo H. Bogoni']
-  s.summary     = 'AVM components for applications.'
+  s.summary     = 'DEPRECATED: use gem "avm" instead.'
 
   s.files = Dir['{lib}/**/*']