eac_tools 0.7.0 → 0.10.0

data/sub/avm/lib/avm/registry/with_path.rb

@@ -1,22 +1,48 @@
 # frozen_string_literal: true
 
-require 'avm/registry/base'
+require 'avm/registry/from_gems'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Registry
-    class WithPath < ::Avm::Registry::Base
+    class WithPath < ::Avm::Registry::FromGems
+      require_sub __FILE__
+
+      # @return [Object, nil]
+      def class_detect(klass, detect_args)
+        r = klass.new(*detect_args)
+        r.valid? ? r : nil
+      end
+
       def detect_by_path(path)
         detect_by_path_optional(path) || raise_not_found(path)
       end
 
       def detect_by_path_optional(path)
-        current_path = path.to_pathname.expand_path
-        until current_path.root?
-          detect_optional(current_path).if_present { |v| return v }
-          current_path = current_path.parent
+        on_cache do
+          cache.detect_optional(path)
+        end
+      end
+
+      private
+
+      attr_accessor :cache
+
+      def on_cache(&block)
+        cache.present? ? on_cache_with_cache(&block) : on_cache_with_no_cache(&block)
+      end
+
+      def on_cache_with_cache(&block)
+        block.call
+      end
+
+      def on_cache_with_no_cache(&block)
+        self.cache = ::Avm::Registry::WithPath::Cache.new(self)
+        begin
+          block.call
+        ensure
+          self.cache = nil
         end
-        nil
       end
     end
   end

data/sub/avm/lib/avm/registry.rb

@@ -7,14 +7,14 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :instance_stereotypes, :runners, :scms, :sources
+    lists.add_symbol :category, :application_stereotypes, :instances, :runners, :scms, :sources
 
     WITH_PATH = [CATEGORY_SCMS, CATEGORY_SOURCES].freeze
 
     class << self
       enable_simple_cache
 
-      # @return [Array<Avm::Registry::Base>]
+      # @return [Array<Avm::Registry::FromGems>]
       def registries
         lists.category.values.map { |c| send(c) }
       end
@@ -28,11 +28,7 @@ module Avm
       end
 
       def registry_class(category)
-        if WITH_PATH.include?(category)
-          ::Avm::Registry::WithPath
-        else
-          ::Avm::Registry::Base
-        end
+        ::Avm::Registry.const_get(category.to_s.camelize)
       end
     end
   end

data/sub/avm/lib/avm/rspec/shared_examples/not_in_avm_registry.rb

@@ -7,7 +7,7 @@ require 'avm/registry'
     .each do |registry|
     context "when registry is #{registry}" do
       it 'is not in the avm registry' do
-        expect(registry.registered_modules).not_to include(described_class)
+        expect(registry.available).not_to include(described_class)
       end
     end
   end

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

@@ -9,8 +9,19 @@ module Avm
   module Sources
     class Base
       module Configuration
+        PARENT_CONFIGURATION_SUFFIX = %w[subs at].freeze
         CONFIGURATION_FILENAMES = %w[.avm.yml .avm.yaml].freeze
 
+        # @return [EacConfig::NodeEntry]
+        def configuration_entry(*entry_args)
+          parent_configuration.if_present do |v|
+            parent_entry = v.entry(*entry_args)
+            return parent_entry if parent_entry.found?
+          end
+
+          configuration.entry(*entry_args)
+        end
+
         # @return [EacRubyUtils::Envs::Command, nil]
         def configuration_value_to_env_command(value)
           configuration_value_to_shell_words(value).if_present { |v| env.command(v).chdir(path) }
@@ -25,13 +36,13 @@ module Avm
 
         # @return [Array<String>, nil]
         def read_configuration_as_shell_words(key)
-          configuration_value_to_shell_words(configuration.entry(key).value)
+          configuration_value_to_shell_words(configuration_entry(key).value)
         end
 
         # Utility to read a configuration as a [EacRubyUtils::Envs::Command].
         # @return [EacRubyUtils::Envs::Command]
         def read_configuration_as_env_command(key)
-          configuration_value_to_env_command(configuration.entry(key).value)
+          configuration_value_to_env_command(configuration_entry(key).value)
         end
 
         private
@@ -44,6 +55,16 @@ module Avm
           configuration_with_filename(CONFIGURATION_FILENAMES.first, false)
         end
 
+        # @return [String]
+        def parent_configuration_prefix
+          PARENT_CONFIGURATION_SUFFIX + [relative_path]
+        end
+
+        # @return [EacConfig::PrefixedPathNode]
+        def parent_configuration_uncached
+          parent.if_present { |v| v.configuration.with_prefix(parent_configuration_prefix) }
+        end
+
         # @return [EacConfig::YamlFileNode, nil]
         def configuration_with_filename(filename, needs_exist)
           file_path = path.join(filename)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/application'
+require 'avm/applications/base'
 require 'avm/instances/base'
 
 module Avm
@@ -16,7 +16,7 @@ module Avm
         private
 
         def application_uncached
-          ::Avm::Instances::Application.new(path.basename)
+          ::Avm::Applications::Base.new(path.basename)
         end
 
         def instance_uncached

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

@@ -14,7 +14,7 @@ module Avm
         end
 
         def configured_locale
-          configuration.entry(LOCALE_KEY).value
+          configuration_entry(LOCALE_KEY).value
         end
 
         def default_locale

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

@@ -6,11 +6,6 @@ module Avm
   module Sources
     class Base
       module Parent
-        # @return [Avm::Sources::Base]
-        def parent
-          parent_by_option || parent_by_search
-        end
-
         # @return [Avm::Sources::Base]
         def parent_by_option
           options[OPTION_PARENT]
@@ -18,12 +13,14 @@ module Avm
 
         # @return [Avm::Sources::Base]
         def parent_by_search
-          parent_path = path.parent
-          until parent_path.root?
-            ::Avm::Registry.sources.detect_optional(parent_path).if_present { |v| return v }
-            parent_path = parent_path.parent
-          end
-          nil
+          ::Avm::Registry.sources.detect_by_path_optional(path.parent)
+        end
+
+        private
+
+        # @return [Avm::Sources::Base]
+        def parent_uncached
+          parent_by_option || parent_by_search
         end
       end
     end

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

@@ -22,7 +22,7 @@ module Avm
 
         # @return [Array<String>]
         def configured_paths
-          source.configuration.entry(configuration_key).value.if_present do |v|
+          source.configuration_entry(configuration_key).value.if_present do |v|
             v.split(SUBS_PATH_SEPARATOR)
           end
         end

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

@@ -18,12 +18,12 @@ module Avm
 
         # @return [Hash<String, EacRubyUtils::Envs::Command>, nil]
         def configured_test_commands
-          configured_value_as_test_commands(configuration.entry(TEST_COMMANDS_KEY).value)
+          configured_value_as_test_commands(configuration_entry(TEST_COMMANDS_KEY).value)
         end
 
         # @return [Hash<String, EacRubyUtils::Envs::Command>, nil]
         def configured_value_as_test_commands(value)
-          return nil if value.blank?
+          return nil if value.nil?
 
           [::EacRubyUtils::Envs::Command, ::Hash, ::Enumerable].each do |type|
             next unless value.is_a?(type)
@@ -45,8 +45,8 @@ module Avm
         # @return [Enumerable<EacRubyUtils::Envs::Command>]
         def test_commands
           configured_test_commands ||
-            configured_value_as_test_commands(configured_test_command)
-          default_test_commands
+            configured_value_as_test_commands(configured_test_command) ||
+            default_test_commands
         end
 
         protected

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

@@ -2,6 +2,8 @@
 
 require 'avm/registry'
 require 'avm/scms/null'
+require 'avm/with_application_stereotype'
+require 'avm/with_dynamic_runners'
 require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
@@ -9,6 +11,8 @@ module Avm
   module Sources
     class Base
       require_sub __FILE__, include_modules: true
+      include ::Avm::WithApplicationStereotype
+      include ::Avm::WithDynamicRunners
       compare_by :path
       enable_abstract_methods
       enable_simple_cache

data/sub/avm/lib/avm/sources/tests/builder.rb

@@ -35,7 +35,7 @@ module Avm
         # @return [Array<Avm::Sources::Tests::Single>]
         def available_units
           @available_units ||= ([main_source] + main_source.subs)
-                                 .map { |a_source| create_unit(a_source) }
+                                 .flat_map { |a_source| create_source_units(a_source) }
         end
 
         def available_units_from_main
@@ -62,20 +62,15 @@ module Avm
           end
         end
 
-        # @return [Avm::Sources::Tests::Single]
-        def create_unit(source)
-          ::Avm::Sources::Tests::Single.new(self, source)
-        end
-
         # @return [Array<Avm::Sources::Tests::Single>]
         def create_units(sources)
           sources.flat_map { |a_source| create_source_units(a_source) }
         end
 
         # @return [Avm::Sources::Tests::Single]
-        def create_unit_by_id(source_id)
-          r = available_units.find { |unit| unit.id == source_id }
-          return r if r
+        def create_units_by_id(source_id)
+          r = available_units.select { |unit| unit.source.relative_path.to_path == source_id.to_s }
+          return r if r.any?
 
           raise ::ArgumentError, "Source not found with ID=#{source_id}" \
             "(Available: #{available_units.map(&:id).join(', ')})"
@@ -83,7 +78,7 @@ module Avm
 
         # @return [Array<Avm::Sources::Tests::Single>]
         def select_units_from_ids
-          include_ids.map { |source_id| create_unit_by_id(source_id) }
+          include_ids.flat_map { |source_id| create_units_by_id(source_id) }
         end
 
         # @return [Array<Avm::Sources::Tests::Single>]

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

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

data/sub/avm/lib/avm/with_application_stereotype.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module WithApplicationStereotype
+    common_concern do
+      include ClassMethods
+    end
+
+    module ClassMethods
+      # @return [Module]
+      def stereotype_namespace_module
+        module_parent.module_parent
+      end
+    end
+
+    def stereotype_namespace_module
+      self.class.stereotype_namespace_module
+    end
+  end
+end

data/sub/avm/lib/avm/with_dynamic_runners.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module WithDynamicRunners
+    # @return [Hash<String, EacCli::Runner>]
+    def extra_available_subcommands
+      extra_available_subcommands_from_runners_module
+    end
+
+    # @return [Hash<String, EacCli::Runner>]
+    def extra_available_subcommands_from_runners_module
+      self.class.ancestors.reverse.inject({}) do |a, e|
+        a.merge(RunnersFromModule.new(e).result)
+      end
+    end
+
+    class RunnersFromModule
+      enable_simple_cache
+      common_constructor :the_module
+
+      # @return [Hash<String, EacCli::Runner>]
+      def result
+        return {} if runners_module.blank?
+
+        ::EacCli::RunnerWith::Subcommands.subcommands_from_module(runners_module)
+      end
+
+      def runners_module_uncached
+        return nil if the_module.module_parent.blank?
+
+        begin
+          the_module.module_parent.const_get('Runners')
+        rescue ::NameError
+          nil
+        end
+      end
+    end
+  end
+end

data/sub/{avm-tools/spec/lib/avm/instances/application_spec.rb → avm/spec/lib/avm/applications/base_spec.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/instances/application'
+require 'avm/applications/base'
 
-RSpec.describe ::Avm::Instances::Application do
+RSpec.describe ::Avm::Applications::Base do
   let(:instance) { described_class.new('avm-tools') }
 
   ::EacRubyUtils::Rspec
     .default_setup
-    .stub_eac_config_node(self, ::File.join(__dir__, 'application_spec_fixture.yml'))
+    .stub_eac_config_node(self, ::File.join(__dir__, 'base_spec_fixture.yml'))
 
   describe '#id' do
     it { expect(instance.id).to eq('avm-tools') }

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.24'
-  s.add_dependency 'eac_ruby_utils', '~> 0.05', '>= 0.95.2'
+  s.add_dependency 'avm', '~> 0.28'
+  s.add_dependency 'eac_ruby_utils', '~> 0.96'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/docker/runner.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacGenericBase0
+    module Sources
+      module Docker
+        class Runner
+          CONTAINER_SOURCE_PATH = '/app'
+
+          enable_abstract_methods
+          abstract_methods :docker_image
+
+          runner_with :help do
+            desc 'Run a Docker container with source mapped.'
+            arg_opt '-c', '--command-arg', 'Arguments for [COMMAND] [ARG...].', optional: true,
+                                                                                repeat: true
+          end
+
+          def run
+            start_banner
+            docker_container.run_command.system!
+          end
+
+          def start_banner
+            infov 'Image', docker_image
+            infov 'Command', ::Shellwords.join(command_args)
+          end
+
+          def bash_command_args
+            %w[/bin/bash]
+          end
+
+          def command_args
+            if parsed.command_arg.any?
+              parsed.command_arg
+            else
+              default_command_args
+            end
+          end
+
+          def default_command_args
+            bash_command_args
+          end
+
+          def docker_container
+            docker_image.container
+              .volume(runner_context.call(:subject).path, CONTAINER_SOURCE_PATH)
+              .interactive(true).tty(true).command_args(command_args)
+          end
+
+          # @return [EacDocker::Images::Base]
+          def docker_image
+            raise_abstract_method __method__
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/docker.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacGenericBase0
+    module Sources
+      module Docker
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

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

data/sub/avm-eac_rails_base0/Gemfile

@@ -3,3 +3,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

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

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

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners/docker.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/docker/runner'
+require 'avm/eac_ubuntu_base0/docker_image'
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      module Runners
+        class Docker < ::Avm::EacGenericBase0::Sources::Docker::Runner
+          # @return [Avm::EacUbuntuBase0::DockerImage]
+          def docker_image
+            ::Avm::EacUbuntuBase0::DockerImage.new
+          end
+        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.9.0'
+    VERSION = '0.10.0'
   end
 end

data/sub/avm-eac_redmine_plugin_base0/avm-eac_redmine_plugin_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.10'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.11'
   s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'

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

@@ -8,6 +8,7 @@ module Avm
     module Sources
       class Base < ::Avm::EacRubyBase1::Sources::Base
         DEFAULT_GEMFILE_PATH = 'SelfGemfile'
+        RUBOCOP_GEM_NAME = 'rubocop'
         RUBOCOP_TEST_NAME = 'rubocop'
         PARENT_RAKE_TASK_TEST_NAME = 'parent_rake_task'
         INIT_SUBPATH = 'init.rb'
@@ -19,10 +20,10 @@ module Avm
 
         # @return [Hash<String, EacRubyUtils::Envs::Command>]
         def default_test_commands
-          {
-            PARENT_RAKE_TASK_TEST_NAME => parent_rake_test_command,
-            RUBOCOP_TEST_NAME => rubocop_test_command
-          }
+          r = {}
+          r[PARENT_RAKE_TASK_TEST_NAME] = parent_rake_test_command if parent_rake_test_command?
+          r[RUBOCOP_TEST_NAME] = rubocop_test_command if rubocop_test_command?
+          r
         end
 
         # @return [String]
@@ -35,6 +36,11 @@ module Avm
           [gem_name, 'test'].map(&:variableize).join(':')
         end
 
+        # @return [Boolean]
+        def parent_rake_test_command?
+          ruby_parent.rake_task?(parent_rake_test_task_name)
+        end
+
         # @return [EacRubyUtils::Envs::Command]
         def parent_rake_test_command
           ruby_parent.rake(parent_rake_test_task_name).chdir_root.envvar('RAILS_ENV', 'test')
@@ -47,6 +53,11 @@ module Avm
             .chdir_root
         end
 
+        # @return [Boolean]
+        def rubocop_test_command?
+          gemfile_path.exist? && gemfile_lock_gem_version(RUBOCOP_GEM_NAME).present?
+        end
+
         # @return [Boolean]
         def valid?
           init_path.exist?

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedminePluginBase0
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

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

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.23'
+  s.add_dependency 'avm', '~> 0.26'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
   s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
 

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/bundler.rb

@@ -20,7 +20,7 @@ module Avm
 
           # @return [String]
           def configured_gemfile_path
-            configuration.entry(CONFIGURED_GEMFILE_PATH_ENTRY_KEY).value
+            configuration_entry(CONFIGURED_GEMFILE_PATH_ENTRY_KEY).value
           end
 
           # @return [String]

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rake.rb

@@ -9,6 +9,9 @@ module Avm
       class Base < ::Avm::EacGenericBase0::Sources::Base
         module Rake
           RAKEFILE_BASENAME = 'Rakefile'
+          RAKE_TASKS_LINE_PARSER = /\Arake\s+(\S+)\s+/.to_parser do |m|
+            m[1]
+          end
 
           # @return [Avm::EacRubyBase1::Sources::Base::BundleCommand]
           def rake(*args)
@@ -21,6 +24,17 @@ module Avm
           def rakefile_path
             path.join(RAKEFILE_BASENAME)
           end
+
+          # @return [Boolean]
+          def rake_task?(task_name)
+            rake_tasks.include?(task_name)
+          end
+
+          # @return [Array<String>]
+          def rake_tasks
+            rake('--all', '--tasks').execute!.each_line
+              .map { |line| RAKE_TASKS_LINE_PARSER.parse!(line) }
+          end
         end
       end
     end