eac_tools 0.61.0 → 0.62.0

data/sub/eac_templates/spec/lib/eac_templates/{patches/module/template_spec.rb → modules/base_spec.rb}

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require 'eac_templates/patches/module/template'
+require 'eac_templates/modules/base'
+require 'eac_templates/abstract/not_found_error'
 require 'eac_templates/sources/set'
 
-RSpec.describe ::Module do
+RSpec.describe ::EacTemplates::Modules::Base do
   def self.on_node_specs(node_name, &block)
     context "when object is \"#{node_name}\"" do # rubocop:disable RSpec/EmptyExampleGroup
       let(:node) { send(node_name) }
@@ -40,13 +41,13 @@ RSpec.describe ::Module do
   def self.file_specs_error(node_name)
     on_node_specs(node_name) do
       it do
-        expect { node }.to raise_error(::RuntimeError)
+        expect { node }.to raise_error(::EacTemplates::Abstract::NotFoundError)
       end
     end
   end
 
   let(:a_module) do
-    described_class.new do
+    ::Module.new do
       def self.name
         'AModule'
       end
@@ -61,43 +62,52 @@ RSpec.describe ::Module do
     r.include a_module
     r
   end
+  let(:prepended_module) do
+    ::Module.new do
+      def self.name
+        'PrependedModule'
+      end
+    end
+  end
   let(:sub_class) do
     r = ::Class.new(super_class) do
       def self.name
         'SuperClass'
       end
     end
+    r.prepend(prepended_module)
     r
   end
-  let(:files_dir) { __dir__.to_pathname.join('template_spec_files') }
+  let(:files_dir) { __dir__.to_pathname.join('base_spec_files') }
   let(:variables_source) { { vx: '_X_', vy: '_Y_' } }
+  let(:source_set) do
+    r = ::EacTemplates::Sources::Set.new
+    %w[path1 path2].each do |sub|
+      r.included_paths << files_dir.join(sub)
+    end
+    r
+  end
 
-  let(:a) { instance.template.child('a') }
+  let(:a) { instance.child('a') }
   let(:a_a) { a.child('a_a') }
   let(:a_b) { a.child('a_b') }
   let(:a_c) { a.child('a_c') }
-  let(:b) { instance.template.child('b') }
-  let(:c) { instance.template.child('c') }
-
-  before do
-    %w[path1 path2].each do |sub|
-      ::EacTemplates::Sources::Set.default.included_paths << files_dir.join(sub)
-    end
-  end
+  let(:b) { instance.child('b') }
+  let(:c) { instance.child('c') }
 
   context 'when module is AModule' do # rubocop:disable RSpec/EmptyExampleGroup
-    let(:instance) { a_module }
+    let(:instance) { described_class.new(a_module, source_set: source_set) }
 
-    dir_specs(:a, %w[a_a])
+    dir_specs(:a, %w[a_a a_b])
     file_specs_ok(:a_a, "A_MODULE_A_A\n", "A_MODULE_A_A\n", [])
-    file_specs_error(:a_b)
+    file_specs_ok(:a_b, "A_MODULE_A_B\n", "A_MODULE_A_B\n", [])
     file_specs_error(:a_c)
     file_specs_ok(:b, "A_MODULE_B%%vy%%\n", "A_MODULE_B_Y_\n", %w[vy])
-    file_specs_error(:c)
+    file_specs_ok(:c, "A_MODULE_C%%vx%%\n", "A_MODULE_C_X_\n", %w[vx])
   end
 
   context 'when module is SuperClass' do # rubocop:disable RSpec/EmptyExampleGroup
-    let(:instance) { super_class }
+    let(:instance) { described_class.new(super_class, source_set: source_set) }
 
     dir_specs(:a, %w[a_b])
     file_specs_error(:a_a)
@@ -108,7 +118,7 @@ RSpec.describe ::Module do
   end
 
   context 'when module is SubClass' do # rubocop:disable RSpec/EmptyExampleGroup
-    let(:instance) { sub_class }
+    let(:instance) { described_class.new(sub_class, source_set: source_set) }
 
     dir_specs(:a, %w[a_b])
     file_specs_error(:a_a)
@@ -117,4 +127,15 @@ RSpec.describe ::Module do
     file_specs_ok(:b, "SUPER_CLASS_B\n", "SUPER_CLASS_B\n", [])
     file_specs_error(:c)
   end
+
+  context 'when module is PrependedModule' do # rubocop:disable RSpec/EmptyExampleGroup
+    let(:instance) { described_class.new(prepended_module, source_set: source_set) }
+
+    file_specs_error(:a)
+    file_specs_error(:a_a)
+    file_specs_error(:a_b)
+    file_specs_error(:a_c)
+    file_specs_error(:b)
+    file_specs_ok(:c, "PREPENDED_MODULE_C%%vy%%%%vx%%\n", "PREPENDED_MODULE_C_Y__X_\n", %w[vy vx])
+  end
 end

data/sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/a_module/a/a_b

@@ -0,0 +1 @@
+A_MODULE_A_B

data/sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/a_module/c

@@ -0,0 +1 @@
+A_MODULE_C%%vx%%

data/sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/prepended_module/c

@@ -0,0 +1 @@
+PREPENDED_MODULE_C%%vy%%%%vx%%

data/sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/super_class/a/a_b

@@ -0,0 +1 @@
+SUPER_CLASS_A_B_PATH_2

data/sub/eac_templates/spec/lib/eac_templates/variables/{file_spec.rb → content_spec.rb}

@@ -3,10 +3,10 @@
 require 'eac_config/old_configs'
 require 'eac_templates/variables/file'
 
-RSpec.describe ::EacTemplates::Variables::File do
-  let(:files_dir) { ::File.join(__dir__, 'file_spec_files') }
-  let(:source_path) { ::File.join(files_dir, 'source.template') }
-  let(:instance) { described_class.new(source_path) }
+RSpec.describe ::EacTemplates::Variables::Content do
+  let(:files_dir) { ::File.join(__dir__, 'content_spec_files').to_pathname }
+  let(:source_path) { files_dir.join('source.template') }
+  let(:instance) { described_class.from_file(source_path) }
   let(:expected_content) { ::File.read(::File.join(files_dir, 'expected_content')) }
 
   describe '#apply' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.61.0
+  version: 0.62.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.67.1
+        version: '0.68'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.67.1
+        version: '0.68'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -184,20 +178,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +263,7 @@ dependencies:
         version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -285,7 +273,7 @@ dependencies:
         version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
@@ -654,8 +642,16 @@ files:
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/deploy.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/instances/rest_api.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/rest_api/entity_base.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/rest_api/project.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/rest_api/root.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/rest_api/wiki_page.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/docker.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project/wiki_page.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project/wiki_page/read.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project/wiki_page/write.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project_rename.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/base.rb
@@ -1363,9 +1359,12 @@ files:
 - sub/eac_cli/lib/eac_cli/runner/exit.rb
 - sub/eac_cli/lib/eac_cli/runner/instance_methods.rb
 - sub/eac_cli/lib/eac_cli/runner_with.rb
+- sub/eac_cli/lib/eac_cli/runner_with/confirmation.rb
 - sub/eac_cli/lib/eac_cli/runner_with/help.rb
 - sub/eac_cli/lib/eac_cli/runner_with/help/builder.rb
 - sub/eac_cli/lib/eac_cli/runner_with/help/builder/alternative.rb
+- sub/eac_cli/lib/eac_cli/runner_with/input.rb
+- sub/eac_cli/lib/eac_cli/runner_with/output.rb
 - sub/eac_cli/lib/eac_cli/runner_with/subcommands.rb
 - sub/eac_cli/lib/eac_cli/runner_with/subcommands/definition_concern.rb
 - sub/eac_cli/lib/eac_cli/runner_with_set.rb
@@ -1380,7 +1379,9 @@ files:
 - sub/eac_cli/spec/lib/eac_cli/old_configs_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_spec.rb
+- sub/eac_cli/spec/lib/eac_cli/runner_with/confirmation_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb
+- sub/eac_cli/spec/lib/eac_cli/runner_with/output_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/speaker_spec.rb
 - sub/eac_cli/spec/rubocop_spec.rb
@@ -1698,6 +1699,33 @@ files:
 - sub/eac_git/vendor/git-subrepo/test/setup
 - sub/eac_git/vendor/git-subrepo/test/status.t
 - sub/eac_git/vendor/git-subrepo/test/submodule.t
+- sub/eac_rest/Gemfile
+- sub/eac_rest/eac_rest.gemspec
+- sub/eac_rest/lib/eac_rest.rb
+- sub/eac_rest/lib/eac_rest/api.rb
+- sub/eac_rest/lib/eac_rest/entity.rb
+- sub/eac_rest/lib/eac_rest/error.rb
+- sub/eac_rest/lib/eac_rest/request.rb
+- sub/eac_rest/lib/eac_rest/response.rb
+- sub/eac_rest/lib/eac_rest/version.rb
+- sub/eac_rest/spec/lib/eac_rest/api_spec.rb
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/get.source.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/get.target.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/get_with_auth.source.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/get_with_auth.target.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/post_array_body.source.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/post_array_body.target.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/post_string_body.source.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/post_string_body.target.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/put_hash_body.source.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/put_hash_body.target.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/put_with_file.source.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/put_with_file.target.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/root.source.yaml
+- sub/eac_rest/spec/lib/eac_rest/api_spec_files/root.target.yaml
+- sub/eac_rest/spec/rubocop_spec.rb
+- sub/eac_rest/spec/spec_helper.rb
+- sub/eac_rest/spec/spec_helper/request_builder.rb
 - sub/eac_ruby_base0/Gemfile
 - sub/eac_ruby_base0/eac_ruby_base0.gemspec
 - sub/eac_ruby_base0/lib/eac_ruby_base0.rb
@@ -1713,12 +1741,7 @@ files:
 - sub/eac_ruby_base0/lib/eac_ruby_base0/runner.rb
 - sub/eac_ruby_base0/lib/eac_ruby_base0/runner/prepend.rb
 - sub/eac_ruby_base0/lib/eac_ruby_base0/runner_with.rb
-- sub/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb
-- sub/eac_ruby_base0/lib/eac_ruby_base0/runner_with/input.rb
-- sub/eac_ruby_base0/lib/eac_ruby_base0/runner_with/output.rb
 - sub/eac_ruby_base0/lib/eac_ruby_base0/version.rb
-- sub/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb
-- sub/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/output_spec.rb
 - sub/eac_ruby_base0/spec/rubocop_spec.rb
 - sub/eac_ruby_base0/spec/spec_helper.rb
 - sub/eac_ruby_utils/Gemfile
@@ -1969,6 +1992,11 @@ files:
 - sub/eac_templates/Gemfile
 - sub/eac_templates/eac_templates.gemspec
 - sub/eac_templates/lib/eac_templates.rb
+- sub/eac_templates/lib/eac_templates/abstract/directory.rb
+- sub/eac_templates/lib/eac_templates/abstract/file.rb
+- sub/eac_templates/lib/eac_templates/abstract/fs_object.rb
+- sub/eac_templates/lib/eac_templates/abstract/fs_object_by_pathname.rb
+- sub/eac_templates/lib/eac_templates/abstract/not_found_error.rb
 - sub/eac_templates/lib/eac_templates/core_ext.rb
 - sub/eac_templates/lib/eac_templates/interface_methods.rb
 - sub/eac_templates/lib/eac_templates/modules.rb
@@ -1994,6 +2022,7 @@ files:
 - sub/eac_templates/lib/eac_templates/sources/set.rb
 - sub/eac_templates/lib/eac_templates/sources/single.rb
 - sub/eac_templates/lib/eac_templates/variables.rb
+- sub/eac_templates/lib/eac_templates/variables/content.rb
 - sub/eac_templates/lib/eac_templates/variables/directory.rb
 - sub/eac_templates/lib/eac_templates/variables/file.rb
 - sub/eac_templates/lib/eac_templates/variables/fs_object.rb
@@ -2005,26 +2034,27 @@ files:
 - sub/eac_templates/lib/eac_templates/variables/providers/generic.rb
 - sub/eac_templates/lib/eac_templates/variables/providers/hash.rb
 - sub/eac_templates/lib/eac_templates/version.rb
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec.rb
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path1/a_module/a/a_a
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path1/a_module/b
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path1/super_class/a/a_b
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path1/super_class/b
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/a_module/a/a_b
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/a_module/b
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/a_module/c
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/sub_class/b
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/super_class/a/a_b
-- sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/super_class/b
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec.rb
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path1/a_module/a/a_a
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path1/a_module/b
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path1/super_class/a/a_b
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path1/super_class/b
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/a_module/a/a_b
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/a_module/b
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/a_module/c
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/prepended_module/c
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/sub_class/b
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/super_class/a/a_b
+- sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/super_class/b
 - sub/eac_templates/spec/lib/eac_templates/patches/object/template_spec.rb
 - sub/eac_templates/spec/lib/eac_templates/patches/object/template_spec_files/path/my_stub_with_template
 - sub/eac_templates/spec/lib/eac_templates/sources/set_spec.rb
 - sub/eac_templates/spec/lib/eac_templates/sources/set_spec_files/path1/subdir1/file1.template
 - sub/eac_templates/spec/lib/eac_templates/sources/set_spec_files/path1/subdir1/file2
 - sub/eac_templates/spec/lib/eac_templates/sources/set_spec_files/path2/subdir1/file3.template
-- sub/eac_templates/spec/lib/eac_templates/variables/file_spec.rb
-- sub/eac_templates/spec/lib/eac_templates/variables/file_spec_files/expected_content
-- sub/eac_templates/spec/lib/eac_templates/variables/file_spec_files/source.template
+- sub/eac_templates/spec/lib/eac_templates/variables/content_spec.rb
+- sub/eac_templates/spec/lib/eac_templates/variables/content_spec_files/expected_content
+- sub/eac_templates/spec/lib/eac_templates/variables/content_spec_files/source.template
 - sub/eac_templates/spec/rubocop_spec.rb
 - sub/eac_templates/spec/spec_helper.rb
 homepage: 

data/sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/a_module/a/a_b

@@ -1 +0,0 @@
-A_MODULE_A_A

data/sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/a_module/c

@@ -1 +0,0 @@
-A_MODULE_%%vx%%

data/sub/eac_templates/spec/lib/eac_templates/patches/module/template_spec_files/path2/super_class/a/a_b

@@ -1 +0,0 @@
-SUPER_CLASS_A_B