avm-tools 0.117.2 → 0.119.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35fb18a5736eb65f686b0915a77da3f4e548a64b0ce7e0bd5bc754483c675757
-  data.tar.gz: 053eeec2795b4cf08660991b06d13127e1a66b112a084642f8213fbe89a82e59
+  metadata.gz: e6c5ab539a33cf698f0aa4eaa382e2e23fd408df17185a111ae78983ab1794f1
+  data.tar.gz: 6a9762c549ee37c533af5c35dca078ab7ee19158e6398d81f7451fce54de076a
 SHA512:
-  metadata.gz: 356218e0b80f21fbd6612ef6f88b49112ee7d97bff1c7b3ef21039964f024dffbcf0944d4ab01b82c6f919384b0bba401319572911599154a418f8a1e3d50c99
-  data.tar.gz: f290a18803f13ae99202ec10ee6106f267913a27b8537dd2fc3f6156151b6d0f01a34354c980de17885b85dc7614019adb7747c03e91ebe1038aca22c6d898a5
+  metadata.gz: 6972527557010d58fefc671e1679f011bb68961fb9ecb3a33378681411f39c7fff9fd68ef54a12f6fecf692bd1539e087ee306e05b437c29e542365a54a1231c
+  data.tar.gz: d9f89dbe97cc6ee002566f9b5c1ec806b9f6e9eb33adca54e3473842bf7abb88923fc27e434d428b595d5b1a51281db1f921cd836af0bdc85d6ce2840c49a3db

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

@@ -23,6 +23,8 @@ module Avm
           instance.avm_instance
         end
 
+        delegate :extra_available_subcommands, to: :subject
+
         private
 
         def instance_uncached

data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb

@@ -32,7 +32,7 @@ module Avm
           end
 
           def url
-            options.fetch('--url') || url_by_version
+            parsed.url || url_by_version
           end
 
           def url_by_version

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.117.2'
+    VERSION = '0.119.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

@@ -22,6 +22,16 @@ module Avm
 
       delegate :locale, to: :old_configuration
 
+      # @return [EacRubyUtils::Envs::LocalEnv]
+      def env
+        ::EacRubyUtils::Envs::LocalEnv.new
+      end
+
+      # @return [Hash<String, Class>]
+      def extra_available_subcommands
+        {}
+      end
+
       # @return [Pathname]
       def relative_path
         return path if parent.blank?
@@ -33,11 +43,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.21.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/core_update.rb

@@ -36,6 +36,10 @@ module Avm
         infov 'Package size', source_package.path.size
       end
 
+      def fs_object_id
+        [instance.id, version].join('_').variableize
+      end
+
       private
 
       attr_reader :tempdir

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.1'
+    VERSION = '0.6.0'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,10 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.9'
+  s.add_dependency 'avm', '~> 0.21'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '>= 0.9.8'
   s.add_dependency 'eac_ruby_utils', '~> 0.80'
 
+  s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/bundler/incompatible_parser/depends_on.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     module Bundler
       class IncompatibleParser
-        class DependsOn < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+        class DependsOn < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /(.+) was resolved to (.+), which depends on/
                           .to_parser { |m| new(m[1], m[2]) }
 

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/bundler/incompatible_parser/gem_conflict.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     module Bundler
       class IncompatibleParser
-        class GemConflict < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+        class GemConflict < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /Bundler could not find compatible versions for gem "(.+)":/
                           .to_parser { |m| new(m[1]) }
 
@@ -15,12 +15,11 @@ module Avm
           common_constructor :gem_name
 
           def add_depends_on(depends_on)
-            @depends_on_stack ||= []
-            @depends_on_stack << depends_on
+            depends_on_stack << depends_on
           end
 
           def add_version_requirement(version_requirement)
-            version_requirement.stack = @depends_on_stack
+            version_requirement.stack = depends_on_stack
             versions_requirements << version_requirement
             @depends_on_stack = nil
           end
@@ -32,6 +31,12 @@ module Avm
           def versions_requirements
             @versions_requirements ||= []
           end
+
+          private
+
+          def depends_on_stack
+            @depends_on_stack ||= []
+          end
         end
       end
     end

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/bundler/incompatible_parser/in_gemfile.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     module Bundler
       class IncompatibleParser
-        class InGemfile < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
+        class InGemfile < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /In Gemfile:/
                           .to_parser { |_m| new }
         end

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/bundler/incompatible_parser/line_buffer.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
-require 'avm/ruby/bundler/incompatible_parser/line_factory'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_factory'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     module Bundler
       class IncompatibleParser
         class LineBuffer

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/bundler/incompatible_parser/line_factory.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/ruby/bundler/incompatible_parser/depends_on'
-require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
-require 'avm/ruby/bundler/incompatible_parser/in_gemfile'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/depends_on'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/in_gemfile'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     module Bundler
       class IncompatibleParser
         class LineFactory

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/bundler/incompatible_parser/line_parser_base.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     module Bundler
       class IncompatibleParser
         class LineParserBase

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/bundler/incompatible_parser/version_requirement.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     module Bundler
       class IncompatibleParser
-        class VersionRequirement < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
-          LINE_PARSER = /\A([a-z][a-z_0-9]*)(?: \((.+)\))?\z/
+        class VersionRequirement < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /\A([a-z][a-z\-_0-9]*)(?: \((.+)\))?\z/
                           .to_parser { |m| new(m[1], m[2]) }
 
           enable_simple_cache

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/bundler/incompatible_parser.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     module Bundler
       class IncompatibleParser
         require_sub __FILE__
@@ -12,7 +12,7 @@ module Avm
         attr_reader :gems_in_conflict
 
         def initialize(path)
-          @gems_in_conflict = ::Avm::Ruby::Bundler::IncompatibleParser::LineBuffer
+          @gems_in_conflict = ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineBuffer
                                 .from_file(path).gems_in_conflict.freeze
         end