eac_tools 0.11.1 → 0.14.0

data/sub/avm-tools/avm-tools.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.4'
-  s.add_dependency 'avm', '~> 0.27'
+  s.add_dependency 'avm', '~> 0.30'
   s.add_dependency 'avm-eac_asciidoctor_base0', '~> 0.3', '>= 0.3.4'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'

data/sub/avm-tools/lib/avm/tools/runner/source_generate.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/runners/base'
+require 'eac_cli/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class SourceGenerate
+        runner_with :help do
+          pos_arg :stereotype_name
+          pos_arg :target_path
+        end
+
+        def run
+          start_banner
+          generate
+        end
+
+        def generate
+          infom 'Generating...'
+          generator.perform
+          success "Source generated in \"#{generator.target_path}\""
+        end
+
+        def start_banner
+          infov 'Stereotype', stereotype_name
+          infov 'Target path', target_path
+          infov 'Generator', generator.class
+        end
+
+        def generator_uncached
+          ::Avm::Registry.source_generators.detect_optional(stereotype_name, target_path) ||
+            fatal_error("No generator found for stereotype \"#{stereotype_name}\"")
+        end
+
+        delegate :stereotype_name, to: :parsed
+
+        def target_path
+          parsed.target_path.to_pathname
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.126.0'
+    VERSION = '0.127.0'
   end
 end

data/sub/eac_config/eac_config.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'addressable'
-  s.add_dependency 'eac_ruby_utils', '~> 0.83'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/entry_path.rb

@@ -28,17 +28,28 @@ module EacConfig
       end
     end
 
-    attr_reader :parts
-
-    def initialize(parts)
-      @parts = parts.to_a.freeze
+    common_constructor :parts, default: [[]] do
+      self.parts = ::Array.new(parts).freeze
     end
 
+    compare_by :parts
+    delegate :any?, :count, :each, :each_value, :each_with_index, :empty?, :fetch, :first, :index,
+             :inject, :last, :map, :size, to: :parts
+
     # @return [EacConfig::EntryPath]
     def +(other)
       self.class.new(parts + self.class.assert(other).parts)
     end
 
+    def [](*args)
+      slice(*args)
+    end
+
+    def slice(*args)
+      r = parts.slice(*args)
+      r.is_a?(::Enumerable) ? self.class.new(r) : r
+    end
+
     def to_s
       "#{self.class}[#{parts.join(PART_SEPARATOR)}]"
     end

data/sub/eac_config/lib/eac_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacConfig
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/regexp_parser.rb

@@ -20,6 +20,11 @@ module EacRubyUtils
       raise ::ArgumentError, "String \"#{string}\" does not match pattern \"#{pattern}\""
     end
 
+    # @return [Boolean]
+    def parse?(string)
+      internal_parse(string).first
+    end
+
     private
 
     def internal_parse(string)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub/base.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/require_sub/sub_file'
+
+module EacRubyUtils
+  module RequireSub
+    class Base
+      INCLUDE_MODULES_MAP = {
+        nil => nil,
+        false => nil,
+        true => :include,
+        include: :include,
+        prepend: :prepend
+      }.freeze
+
+      include ::EacRubyUtils::Listable
+      lists.add_symbol :option, :base, :include_modules, :require_dependency
+
+      attr_reader :file, :options
+
+      def initialize(file, options = {})
+        @file = file
+        @options = self.class.lists.option.hash_keys_validate!(options)
+      end
+
+      # @return [Boolean]
+      def active_support_require?
+        options[OPTION_REQUIRE_DEPENDENCY] ? true : false
+      end
+
+      def apply
+        require_sub_files
+        include_modules
+      end
+
+      def base
+        options[OPTION_BASE] || raise('Option :base not setted')
+      end
+
+      def base?
+        options[OPTION_BASE] ? true : false
+      end
+
+      def include_modules
+        sub_files.each(&:include_module)
+      end
+
+      def include_or_prepend_method
+        return INCLUDE_MODULES_MAP.fetch(options[OPTION_INCLUDE_MODULES]) if
+        INCLUDE_MODULES_MAP.key?(options[OPTION_INCLUDE_MODULES])
+
+        raise ::ArgumentError, "Invalid value for 'options[OPTION_INCLUDE_MODULES]':" \
+          " \"#{options[OPTION_INCLUDE_MODULES]}\""
+      end
+
+      def require_sub_files
+        sub_files.each(&:require_file)
+      end
+
+      def sub_files
+        @sub_files ||= Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort
+                         .map { |path| ::EacRubyUtils::RequireSub::SubFile.new(self, path) }
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub/sub_file.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'active_support/dependencies'
+require 'active_support/inflector'
+
+module EacRubyUtils
+  module RequireSub
+    class SubFile
+      attr_reader :owner, :path
+
+      def initialize(owner, path)
+        @owner = owner
+        @path = path
+      end
+
+      def base_constant
+        return nil unless owner.base?
+
+        owner.base.const_get(constant_name)
+      rescue ::NameError
+        nil
+      end
+
+      def constant_name
+        ::ActiveSupport::Inflector.camelize(::File.basename(path, '.rb'))
+      end
+
+      def include_module
+        return unless module?
+
+        owner.include_or_prepend_method.if_present do |v|
+          owner.base.send(v, base_constant)
+        end
+      end
+
+      def module?
+        base_constant.is_a?(::Module) && !base_constant.is_a?(::Class)
+      end
+
+      def require_file
+        active_support_require || autoload_require || kernel_require
+      end
+
+      private
+
+      def active_support_require
+        return false unless owner.active_support_require?
+
+        ::Kernel.require_dependency(path)
+        true
+      end
+
+      def autoload_require
+        return false unless owner.base?
+
+        basename = ::File.basename(path, '.*')
+        return false if basename.start_with?('_')
+
+        owner.base.autoload ::ActiveSupport::Inflector.camelize(basename), path
+        true
+      end
+
+      def kernel_require
+        ::Kernel.require(path)
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb

@@ -1,134 +1,11 @@
 # frozen_string_literal: true
 
-require 'active_support/inflector'
-require 'active_support/dependencies'
-require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/require_sub/base'
 
 module EacRubyUtils
   class << self
     def require_sub(file, options = {})
-      ::EacRubyUtils::RequireSub.new(file, options).apply
-    end
-  end
-
-  class RequireSub
-    INCLUDE_MODULES_MAP = {
-      nil => nil,
-      false => nil,
-      true => :include,
-      include: :include,
-      prepend: :prepend
-    }.freeze
-
-    include ::EacRubyUtils::Listable
-    lists.add_symbol :option, :base, :include_modules, :require_dependency
-
-    attr_reader :file, :options
-
-    def initialize(file, options = {})
-      @file = file
-      @options = self.class.lists.option.hash_keys_validate!(options)
-    end
-
-    def apply
-      require_sub_files
-      include_modules
-    end
-
-    def base
-      options[OPTION_BASE] || raise('Option :base not setted')
-    end
-
-    def base?
-      options[OPTION_BASE] ? true : false
-    end
-
-    def include_modules
-      sub_files.each(&:include_module)
-    end
-
-    def include_or_prepend_method
-      return INCLUDE_MODULES_MAP.fetch(options[OPTION_INCLUDE_MODULES]) if
-        INCLUDE_MODULES_MAP.key?(options[OPTION_INCLUDE_MODULES])
-
-      raise ::ArgumentError, "Invalid value for 'options[OPTION_INCLUDE_MODULES]':" \
-         " \"#{options[OPTION_INCLUDE_MODULES]}\""
-    end
-
-    def require_sub_files
-      sub_files.each(&:require_file)
-    end
-
-    def sub_files
-      @sub_files ||= Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort
-                       .map { |path| SubFile.new(self, path) }
-    end
-
-    class SubFile
-      attr_reader :owner, :path
-
-      def initialize(owner, path)
-        @owner = owner
-        @path = path
-      end
-
-      def base_constant
-        return nil unless owner.base?
-
-        owner.base.const_get(constant_name)
-      rescue ::NameError
-        nil
-      end
-
-      def constant_name
-        ::ActiveSupport::Inflector.camelize(::File.basename(path, '.rb'))
-      end
-
-      def include_module
-        return unless module?
-
-        owner.include_or_prepend_method.if_present do |v|
-          owner.base.send(v, base_constant)
-        end
-      end
-
-      def include_or_prepend_method
-        return :include if owner.options[OPTION_INCLUDE_MODULES]
-        return :prepend if owner.options[OPTION_PREPEND_MODULES]
-
-        nil
-      end
-
-      def module?
-        base_constant.is_a?(::Module) && !base_constant.is_a?(::Class)
-      end
-
-      def require_file
-        active_support_require || autoload_require || kernel_require
-      end
-
-      private
-
-      def active_support_require
-        return false unless owner.options[OPTION_REQUIRE_DEPENDENCY]
-
-        ::Kernel.require_dependency(path)
-        true
-      end
-
-      def autoload_require
-        return false unless owner.base?
-
-        basename = ::File.basename(path, '.*')
-        return false if basename.start_with?('_')
-
-        owner.base.autoload ::ActiveSupport::Inflector.camelize(basename), path
-        true
-      end
-
-      def kernel_require
-        ::Kernel.require(path)
-      end
+      ::EacRubyUtils::RequireSub::Base.new(file, options).apply
     end
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.96.0'
+  VERSION = '0.97.0'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/{require_sub_spec.rb → require_sub/base_spec.rb}

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/require_sub'
 class RequireSubStubClass
 end
 
-RSpec.describe ::EacRubyUtils::RequireSub do
+RSpec.describe ::EacRubyUtils::RequireSub::Base do
   let(:instance) { described_class.new(__FILE__, base: RequireSubStubClass, include_modules: true) }
 
   before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +53,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +63,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
@@ -92,42 +98,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.126'
+        version: '0.127'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.126'
+        version: '0.127'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.96'
+        version: '0.97'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.96'
+        version: '0.97'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +181,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/source_generators/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
@@ -186,6 +193,33 @@ files:
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/apache_path/extra_content.conf
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/deploy/config/database.yml.template
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/Gemfile
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/Rakefile
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/assets/config/manifest.js
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/assets/javascripts/application.js
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/assets/stylesheets/application.scss
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/controllers/application_controller.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/controllers/welcome_controller.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/views/welcome/index.html.erb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/bin/bundle
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/bin/rails
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/bin/rake
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/bin/yarn
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config.ru
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/application.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/boot.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/cable.yml
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/credentials.yml.enc
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/environment.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/puma.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/routes.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config/spring.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/db/schema.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/lib/ability.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/lib/ability_mapping.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/public/favicon.ico
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/code/rubocop_spec.rb
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/spec_helper.rb
 - sub/avm-eac_rails_base1/Gemfile
 - sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1.rb
@@ -270,6 +304,9 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/envvar.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/gemfile.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec/add_or_replace_gem_line.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec/dependency.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/version_file.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb
@@ -455,6 +492,7 @@ files:
 - sub/avm-tools/lib/avm/tools/runner/self.rb
 - sub/avm-tools/lib/avm/tools/runner/self/docker.rb
 - sub/avm-tools/lib/avm/tools/runner/self/registry.rb
+- sub/avm-tools/lib/avm/tools/runner/source_generate.rb
 - sub/avm-tools/lib/avm/tools/self.rb
 - sub/avm-tools/lib/avm/tools/version.rb
 - sub/avm-tools/locale/en.yml
@@ -991,11 +1029,11 @@ files:
 - sub/avm/lib/avm/instances.rb
 - sub/avm/lib/avm/instances/base.rb
 - sub/avm/lib/avm/instances/base/auto_values.rb
-- sub/avm/lib/avm/instances/base/auto_values/access.rb
 - sub/avm/lib/avm/instances/base/auto_values/admin.rb
 - sub/avm/lib/avm/instances/base/auto_values/data.rb
 - sub/avm/lib/avm/instances/base/auto_values/database.rb
 - sub/avm/lib/avm/instances/base/auto_values/filesystem.rb
+- sub/avm/lib/avm/instances/base/auto_values/install.rb
 - sub/avm/lib/avm/instances/base/auto_values/mailer.rb
 - sub/avm/lib/avm/instances/base/auto_values/ruby.rb
 - sub/avm/lib/avm/instances/base/auto_values/source.rb
@@ -1024,6 +1062,7 @@ files:
 - sub/avm/lib/avm/registry/instances.rb
 - sub/avm/lib/avm/registry/runners.rb
 - sub/avm/lib/avm/registry/scms.rb
+- sub/avm/lib/avm/registry/source_generators.rb
 - sub/avm/lib/avm/registry/sources.rb
 - sub/avm/lib/avm/registry/with_path.rb
 - sub/avm/lib/avm/registry/with_path/cache.rb
@@ -1040,6 +1079,8 @@ files:
 - sub/avm/lib/avm/self/docker_image.rb
 - sub/avm/lib/avm/self/instance.rb
 - sub/avm/lib/avm/self/instance/entry_keys.rb
+- sub/avm/lib/avm/source_generators.rb
+- sub/avm/lib/avm/source_generators/base.rb
 - sub/avm/lib/avm/sources.rb
 - sub/avm/lib/avm/sources/base.rb
 - sub/avm/lib/avm/sources/base/configuration.rb
@@ -1059,8 +1100,8 @@ files:
 - sub/avm/lib/avm/sync.rb
 - sub/avm/lib/avm/version.rb
 - sub/avm/lib/avm/version_number.rb
-- sub/avm/lib/avm/with_application_stereotype.rb
-- sub/avm/lib/avm/with_dynamic_runners.rb
+- sub/avm/lib/avm/with/application_stereotype.rb
+- sub/avm/lib/avm/with/extra_subcommands.rb
 - sub/avm/spec/lib/avm/applications/base_spec.rb
 - sub/avm/spec/lib/avm/applications/base_spec_fixture.yml
 - sub/avm/spec/lib/avm/instances/base_spec.rb
@@ -1379,6 +1420,8 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/recursive_builder.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/regexp_parser.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub/base.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub/sub_file.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/default_setup.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup.rb
@@ -1441,9 +1484,9 @@ files:
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/parent_n_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/string/delimited_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/recursive_builder_spec.rb
-- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec.rb
-- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec/stubbed_module_a.rb
-- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec/stubbed_not_module.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub/base_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub/base_spec/stubbed_module_a.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub/base_spec/stubbed_not_module.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb