avm-tools 0.117.3 → 0.118.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fec1bb05188ea00085f3ca44ed3945e58675f2dddb1593fd857312ce98caa45
-  data.tar.gz: 695a666752439b000d12d60da7ee84c1b34aba488a650409eedeb2708702a8f1
+  metadata.gz: 934d4ed06e787c60b6d3bb79b2962290ab933e7dc4b75a0f2a7b767e346d8ed6
+  data.tar.gz: ed4f80fe5ec3bac6ae64e6efc6c8bf95f47e228ecc6445f79f9ab9807239278e
 SHA512:
-  metadata.gz: fb85f443966aa7612f54b69f367a0b72df3d9ba4016cb6b4b4ea8e1f927d34c6d3716bcbdfd1f2638faba539b50d7042043d202469ffb604e35f41ea6b8e5906
-  data.tar.gz: d3629c61d983caee50edfc740da31ff96d031e9632f170ce25be6f73687295baa5c6fe410ffb32260c212290c0716fb0534a1229884be2849bfa3206bc84dac5
+  metadata.gz: c9fe3ccc4c3b9c5527405cf534c1ac481bacf9be50cadca02511a6a58311fde0132e1905ac466eb0a0d3b9529f36f2174b7100e4581a4842c4870f93952f2065
+  data.tar.gz: 7f6e8a7c43bedeeb8bf8c28d3fbd0d6467c5ec41ab7914b46d978a6adba1babfbbe8c7809d86744165ac2edffa6bc58a2475ab57d84106360a76696793718e70

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

@@ -14,7 +14,6 @@ module Avm
           def run
             show_instance
             show_source
-            show_subs
           end
 
           private
@@ -29,13 +28,6 @@ module Avm
             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} [#{subapp.class}]"
-            end
-          end
-
           def instance
             runner_context.call(:instance)
           end

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

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class AppSrc
+        class Subs
+          PADDING = '  '
+
+          runner_with :help, :output do
+            desc 'Output source\'s subs.'
+            bool_opt '-i', '--info'
+            bool_opt '-R', '--recursive'
+            bool_opt '-t', '--tree'
+          end
+
+          def run
+            start_banner
+            run_output
+          end
+
+          def start_banner
+            infov 'Include PATH', runner_context.call(:subject).subs_include_path
+            infov 'Exclude PATH', runner_context.call(:subject).subs_exclude_path
+            infov 'Count', runner_context.call(:subject).subs.count
+          end
+
+          def output_content
+            b = []
+            runner_context.call(:subject).subs.each do |sub|
+              b += sub_output_content_lines(sub, 0)
+            end
+            b.map { |line| "#{line}\n" }.join
+          end
+
+          def sub_info_label(sub)
+            return '' unless parsed.info?
+
+            ' [' + {
+              'CLASS' => sub.class.name
+            }.map { |k, v| "#{k}: #{v}" }.join(', ') + ']'
+          end
+
+          def sub_label(sub, level)
+            sub_self_label(sub, level) + sub_info_label(sub)
+          end
+
+          def sub_self_label(sub, level)
+            if parsed.tree?
+              (PADDING * level) + sub.relative_path.to_s
+            else
+              sub.path.relative_path_from(runner_context.call(:subject).path).to_s
+            end
+          end
+
+          def sub_output_content_lines(sub, level)
+            [sub_label(sub, level)] + sub_subs_output_content_lines(sub, level)
+          end
+
+          def sub_subs_output_content_lines(sub, level)
+            return [] unless parsed.recursive?
+
+            sub.subs.flat_map { |sub_sub| sub_output_content_lines(sub_sub, level + 1) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.117.3'
+    VERSION = '0.118.0'
   end
 end

data/sub/avm/lib/avm/sources/base/configuration.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_config/yaml_file_node'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/yaml'
 require 'shellwords'
@@ -10,21 +11,27 @@ module Avm
       module Configuration
         # @return [Array<String>, nil]
         def read_configuration_as_shell_words(key)
-          configuration[key].if_present do |v|
+          configuration.entry(key).value.if_present do |v|
             v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v.to_s)
           end
         end
 
         private
 
-        # @return [Hash]
+        # @return [EacConfig::YamlFileNode]
         def configuration_uncached
           ::Avm::Sources::Configuration::FILENAMES.each do |filename|
-            file_path = path.join(filename)
-            return ::EacRubyUtils::Yaml.load_file(file_path).with_indifferent_access if
-            file_path.exist?
+            configuration_with_filename(filename, true)
           end
-          {}
+          configuration_with_filename(::Avm::Sources::Configuration::FILENAMES.first, false)
+        end
+
+        # @return [EacConfig::YamlFileNode, nil]
+        def configuration_with_filename(filename, needs_exist)
+          file_path = path.join(filename)
+          return ::EacConfig::YamlFileNode.new(file_path) if !needs_exist || file_path.exist?
+
+          nil
         end
 
         # @return [Avm::Sources::Configuration]

data/sub/avm/lib/avm/sources/base/subs.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base/subs_paths'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Subs
+        CONFIGURATION_SUBS_EXCLUDE_PATHS_KEY = 'subs.exclude_path'
+        CONFIGURATION_SUBS_INCLUDE_PATHS_KEY = 'subs.include_path'
+        SUBS_EXCLUDE_PATHS_DEFAULT = [].freeze
+        SUBS_INCLUDE_PATHS_DEFAULT = ['sub/*'].freeze
+
+        # @return [Enumerable<Avm::Sources::Base>]
+        def subs
+          subs_paths_to_search
+            .map { |sub_path| ::Avm::Registry.sources.detect_optional(sub_path, parent: self) }
+            .reject(&:blank?)
+            .sort_by { |sub| [sub.path] }
+        end
+
+        def subs_paths_to_search
+          subs_include_paths.flat_map do |subs_include_path|
+            ::Pathname.glob(path.join(subs_include_path)).reject do |sub_path|
+              subs_exclude_paths.any? do |subs_exclude_path|
+                sub_path.fnmatch?(path.join(subs_exclude_path).to_path)
+              end
+            end
+          end
+        end
+
+        %i[include exclude].each do |type|
+          %i[path paths configured_paths default_paths].each do |method_suffix|
+            obj_method_name = "subs_#{type}_path_obj"
+
+            define_method "subs_#{type}_#{method_suffix}" do
+              send(obj_method_name).send(method_suffix)
+            end
+
+            define_method "#{obj_method_name}_uncached" do
+              ::Avm::Sources::Base::SubsPaths.new(
+                self,
+                self.class.const_get("CONFIGURATION_SUBS_#{type}_PATHS_KEY".upcase),
+                self.class.const_get("SUBS_#{type}_PATHS_DEFAULT".upcase)
+              )
+            end
+
+            private "#{obj_method_name}_uncached" # rubocop:disable Style/AccessModifierDeclarations
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base/subs_paths.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      class SubsPaths
+        SUBS_PATH_SEPARATOR = ':'
+
+        common_constructor :source, :configuration_key, :default_paths
+
+        # @return [String]
+        def path
+          paths.join(SUBS_PATH_SEPARATOR)
+        end
+
+        # @return [Array<String>]
+        def paths
+          configured_paths || default_paths
+        end
+
+        # @return [Array<String>]
+        def configured_paths
+          source.configuration.entry(configuration_key).value.if_present do |v|
+            v.split(SUBS_PATH_SEPARATOR)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base.rb

@@ -33,11 +33,6 @@ module Avm
         "#{self.class}[#{path}]"
       end
 
-      # @return [Enumerable<Avm::Sources::Base>]
-      def subs
-        scm.subs.map { |subrepo| ::Avm::Registry.sources.detect(subrepo.path, parent: self) }
-      end
-
       private
 
       # @return [Avm::Scms::Base]

data/sub/avm/lib/avm/version.rb

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

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.2'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.80', '>= 0.80.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/sources/base.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase0
+    module Sources
+      class Base < ::Avm::EacRailsBase1::Sources::Base
+        CONFIG_RU_SUBPATH = 'config.ru'
+        SUBS_PATHS_DEFAULT = ['sub/*/*'].freeze
+
+        def config_ru_path
+          path.join(CONFIG_RU_SUBPATH)
+        end
+
+        def subs_paths_default
+          SUBS_PATHS_DEFAULT
+        end
+
+        def valid?
+          super && config_ru_path.exist?
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.6'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.3'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '>= 0.9.9'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/sources/base.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Sources
+      class Base < ::Avm::EacRubyBase1::Sources::Base
+        CONFIG_RU_SUBPATH = 'config.ru'
+        SUBS_PATHS_DEFAULT = ['sub/*/*'].freeze
+
+        def config_ru_path
+          path.join(CONFIG_RU_SUBPATH)
+        end
+
+        def subs_paths_default
+          SUBS_PATHS_DEFAULT
+        end
+
+        def valid?
+          super && config_ru_path.exist?
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.2'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.3'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_fs', '~> 0.4'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/base.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class Base < ::Avm::EacRailsBase1::Sources::Base
+        REDMINE_LIB_SUBPATH = 'lib/redmine.rb'
+        SUBS_PATHS_DEFAULT = ['plugins/*'].freeze
+
+        def redmine_lib_path
+          path.join(REDMINE_LIB_SUBPATH)
+        end
+
+        def subs_paths_default
+          SUBS_PATHS_DEFAULT
+        end
+
+        def valid?
+          super && redmine_lib_path.exist?
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.5.2'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.117.3
+  version: 0.118.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -398,6 +398,7 @@ files:
 - lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock.rb
 - lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock/git.rb
 - lib/avm/tools/runner/app_src/ruby/bundler/incompatible.rb
+- lib/avm/tools/runner/app_src/subs.rb
 - lib/avm/tools/runner/app_src/test.rb
 - lib/avm/tools/runner/app_src/update.rb
 - lib/avm/tools/runner/app_src/version_bump.rb
@@ -490,6 +491,7 @@ files:
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instance.rb
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners.rb
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners/base.rb
+- sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/sources/base.rb
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb
 - sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec.rb
 - sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec_files/apache_host_spec_no_ssl_content.conf
@@ -516,6 +518,7 @@ files:
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/tasks_scheduler/systemd_unit.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner_with/bundle.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner_with/rails_environment.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/sources/base.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/service.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.rb
@@ -534,6 +537,7 @@ files:
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instance.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/rest_api.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/base.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb
 - sub/avm-eac_redmine_base0/spec/rubocop_spec.rb
 - sub/avm-eac_redmine_base0/spec/spec_helper.rb
@@ -773,6 +777,8 @@ files:
 - sub/avm/lib/avm/sources/base/configuration.rb
 - sub/avm/lib/avm/sources/base/instance.rb
 - sub/avm/lib/avm/sources/base/parent.rb
+- sub/avm/lib/avm/sources/base/subs.rb
+- sub/avm/lib/avm/sources/base/subs_paths.rb
 - sub/avm/lib/avm/sources/base/testing.rb
 - sub/avm/lib/avm/sources/configuration.rb
 - sub/avm/lib/avm/sources/configuration/locale.rb