avm-tools 0.106.0 → 0.109.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a71fc17b60e581ba891e58d0b47ad9b4dbae79c2085540bb1816e02011e9af9
-  data.tar.gz: 15387681892ce7192edd15b0e68ee801ed0fca233454b802df21f7d5e0a211a4
+  metadata.gz: 4fb253fe8f448ec59893d5aedcd818661142dd53efc0043d934da9e57e841dab
+  data.tar.gz: 5c6bcf1c7ba068dc25ce894a43b893facc3a4304632d2b8df84266d99cd5bc36
 SHA512:
-  metadata.gz: d61dadda2108d0d2b7a37f9ec55bbcbc73e222c87f463feec8b91d8f486b3869f1652849296a9bcb7c33e58fe65f1a99f5d12fe7e71c2b1fcf58231b2f453124
-  data.tar.gz: 13a712ee6f75e13797fcf5107ad9b0c72f730195d4264e36ea5368635205aa68c55deb88c8055f01381342cefe48bf74d0decba9d6fe5052df6c6571622a1daf
+  metadata.gz: 8b50d5638c8e3c660da897cb51ff08d79b56be1f0ba3c0543b4da887143777c369175c81d13efef2011187e53ed4f102e96854217458a517ca8e068248c1ffcb
+  data.tar.gz: fa9d2274713b503ffe149eff0c259a27c6ec725d47f48ddb56ea749525a1719e50ca42c61166d37f8637cf7c7202609ed76310bec62a1d86a9f6cd09fbfbf933

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/sources/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::Sources::Configuration.find_in_path(root)
         end
 
         def gemfile_path_uncached

data/lib/avm/projects/stereotypes/ruby_gem/version_bump.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/patches/object/i18n'
+require 'avm/patches/i18n'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -47,7 +47,7 @@ module Avm
           end
 
           def git_commit_message
-            translate(__method__, version: target_version, __locale: instance.locale)
+            i18n_translate(__method__, version: target_version, __locale: instance.locale)
           end
 
           def changing_files

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/sources/configuration'
+require 'avm/sources/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::Sources::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/sources/base'
+require 'avm/sources/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::Sources::Base.new(path)
+      end
+
+      # @return [Avm::Sources::Configuration]
+      def configuration_uncached
+        ::Avm::Sources::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,32 @@ module Avm
           end
 
           def run
-            infov 'Path', runner_context.call(:instance).path
-            infov 'Stereotypes', runner_context.call(:instance).stereotypes.map(&:label).join(', ')
+            show_instance
+            show_source
+            show_subs
+          end
+
+          private
+
+          def show_instance
+            infov 'Path', instance.path
+            infov 'Stereotypes', instance.stereotypes.map(&:label).join(', ')
+          end
+
+          def show_source
+            infov 'Stereotype', runner_context.call(:subject).stereotype
+            infov 'SCM', runner_context.call(:subject).scm
+          end
+
+          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_object_id
+                instance.path.to_s.variableize
               end
 
               def gem_title(gem_in_conflict)

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

@@ -12,8 +12,8 @@ module Avm
           end
 
           def run
-            infov 'Path', runner_context.call(:instance).path
-            runner_context.call(:instance).run_job(:update)
+            infov 'Path', runner_context.call(:subject).path
+            runner_context.call(:subject).update
           end
         end
       end

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
@@ -19,10 +19,14 @@ module Avm
           infov 'Stereotypes', instance.stereotypes.map(&:label).join(', ')
         end
 
+        def subject
+          instance.avm_instance
+        end
+
         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,9 @@
 # frozen_string_literal: true
 
-require 'avm/apps/config'
 require 'avm/self'
 require 'avm/tools/core_ext'
+require 'eac_config/node'
+require 'eac_ruby_utils/recursive_builder'
 
 module Avm
   module Tools
@@ -15,15 +16,19 @@ module Avm
           end
 
           def run
-            run_show
+            config_nodes.each { |config_node| run_show(config_node) }
             run_add
           end
 
           private
 
           # @return [[EacCli::Config]]
-          def config_node
-            ::Avm::Apps::Config.current
+          def root_config_node
+            ::EacConfig::Node.context.current
+          end
+
+          def config_nodes
+            ::EacRubyUtils::RecursiveBuilder.new(root_config_node, &:self_loaded_nodes).result
           end
 
           def run_add
@@ -34,7 +39,7 @@ module Avm
             end
           end
 
-          def run_show
+          def run_show(config_node)
             infov 'Configuration path', config_node.url
             infov 'Paths included', config_node.self_loaded_nodes.count
             config_node.self_loaded_nodes.each do |loaded_node|

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/self/registry.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Self
+        class Registry
+          runner_with :help do
+            desc 'Show information from registry'
+          end
+
+          def run
+            ::Avm::Registry.registries.each do |registry|
+              infov registry.module_suffix, registry.registered_modules.count
+              registry.registered_modules.each { |m| infov '  * ', m }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner.rb

@@ -17,10 +17,6 @@ module Avm
       def application
         ::Avm::Self.application
       end
-
-      def run
-        ::Avm::Apps::Config.context.on(::Avm::Self.build_config) { super }
-      end
     end
   end
 end

data/lib/avm/tools/version.rb

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

data/template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb

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

data/template/avm/ruby/gems/generator/static/spec/spec_helper.rb

@@ -1,102 +1,4 @@
 # frozen_string_literal: true
 
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
-  # have no way to turn it off -- the option exists only for backwards
-  # compatibility in RSpec 3). It causes shared context metadata to be
-  # inherited by the metadata hash of host groups and examples, rather than
-  # triggering implicit auto-inclusion in groups with matching metadata.
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
-  # The settings below are suggested to provide a good initial experience
-  # with RSpec, but feel free to customize to your heart's content.
-  #   # This allows you to limit a spec run to individual examples or groups
-  #   # you care about by tagging them with `:focus` metadata. When nothing
-  #   # is tagged with `:focus`, all examples get run. RSpec also provides
-  #   # aliases for `it`, `describe`, and `context` that include `:focus`
-  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  #   config.filter_run_when_matching :focus
-  #
-  #   # Allows RSpec to persist some state between runs in order to support
-  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
-  #   # you configure your source control system to ignore this file.
-  #   config.example_status_persistence_file_path = "spec/examples.txt"
-  #
-  #   # Limits the available syntax to the non-monkey patched syntax that is
-  #   # recommended. For more details, see:
-  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  #   config.disable_monkey_patching!
-  #
-  #   # This setting enables warnings. It's recommended, but in some cases may
-  #   # be too noisy due to issues in dependencies.
-  #   config.warnings = true
-  #
-  #   # Many RSpec users commonly either run the entire suite or an individual
-  #   # file, and it's useful to allow more verbose output when running an
-  #   # individual spec file.
-  #   if config.files_to_run.one?
-  #     # Use the documentation formatter for detailed output,
-  #     # unless a formatter has already been configured
-  #     # (e.g. via a command-line flag).
-  #     config.default_formatter = "doc"
-  #   end
-  #
-  #   # Print the 10 slowest examples and example groups at the
-  #   # end of the spec run, to help surface which specs are running
-  #   # particularly slow.
-  #   config.profile_examples = 10
-  #
-  #   # Run specs in random order to surface order dependencies. If you find an
-  #   # order dependency and want to debug it, you can fix the order by providing
-  #   # the seed, which is printed after each run.
-  #   #     --seed 1234
-  #   config.order = :random
-  #
-  #   # Seed global randomization in this process using the `--seed` CLI option.
-  #   # Setting this allows you to use `--seed` to deterministically reproduce
-  #   # test failures related to randomization by passing the same `--seed` value
-  #   # as the one that triggered the failure.
-  #   Kernel.srand config.seed
-  require 'eac_ruby_gem_support/rspec'
-  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__))
-end
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/vendor/avm/avm.gemspec

@@ -14,8 +14,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eac_docker', '~> 0.3'
   s.add_dependency 'eac_git', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.68'
+  s.add_dependency 'eac_ruby_utils', '~> 0.77'
   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/jobs/base.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'avm/jobs/variables_source'
+require 'avm/result'
+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.rb → avm/lib/avm/jobs.rb}

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

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/gems_registry'
+
+module Avm
+  module Registry
+    class Base
+      enable_simple_cache
+      common_constructor :module_suffix
+
+      def detect(*registered_initialize_args)
+        detect_optional(*registered_initialize_args) ||
+          raise("No registered module valid for #{registered_initialize_args}" \
+            " (Module suffix: #{module_suffix})")
+      end
+
+      def detect_optional(*registered_initialize_args)
+        registered_modules.lazy.map { |klass| klass.new(*registered_initialize_args) }
+                          .find(&:valid?)
+      end
+
+      def provider_module_suffix
+        "#{module_suffix}::Provider"
+      end
+
+      def single_module_suffix
+        "#{module_suffix}::Base"
+      end
+
+      def to_s
+        "#{self.class}[#{module_suffix}]"
+      end
+
+      def valid_registered_module?(a_module)
+        a_module.is_a?(::Class) && !a_module.abstract?
+      end
+
+      private
+
+      def registered_modules_uncached
+        (single_registered_modules + provider_registered_modules)
+          .select { |v| valid_registered_module?(v) }.uniq.sort_by { |s| [s.name] }
+      end
+
+      def single_registered_modules
+        single_instance_registry.registered.map(&:registered_module)
+      end
+
+      def provider_registered_modules
+        provider_registry.registered.map(&:registered_module).flat_map do |provider_class|
+          provider_class.new.all
+        end
+      end
+
+      def single_instance_registry_uncached
+        ::EacRubyUtils::GemsRegistry.new(single_module_suffix)
+      end
+
+      def provider_registry_uncached
+        ::EacRubyUtils::GemsRegistry.new(provider_module_suffix)
+      end
+    end
+  end
+end