eac_tools 0.60.2 → 0.60.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cea9f60c673884523dc9facce73368d7f9de5308a57e31da5a50a343a58fbeaa
-  data.tar.gz: 799fbec7b964b8453d66c77c75181d20f24149b38e2dc9bc6a8e007f62b8e474
+  metadata.gz: 45d93cbf1d3d3ff2f5b76c8fffeae344c0025b822fcfd9fac2a2f4aabffd92cf
+  data.tar.gz: c1a141d90c59c987c7f2f08a1aed69561782042a04ff42cf238b5c78baa996dc
 SHA512:
-  metadata.gz: 46f50888ff1612d6636f6e68d3132c202b40f01334638ef2ea1aa921425c530ae677f365bedad0b09178094e2033c4844ec8489bc83eeaf92622dc69dbe5533b
-  data.tar.gz: db1a4bc114d5870ed7ad1f3034d79d6c069e8c72b44e6915a71198675cd7ee9435fe3851d294130426b3c4c215854809930f6b288bd8e9ed6b059de23b7e05b5
+  metadata.gz: 201e612bf01ed05f4c1e2f7478591cb6aecfbdc526af61931cc05aebaf916e4ed00592ffb7d66e86d90e48074d264f96d18b91d17f4cc49aad5db6450a9ec3a6
+  data.tar.gz: 1372d4f44f77b4ea330e6233509faee81f6ac75e0316f6e18517fbafebe270c475826272edc28b62663667cb13ac0edb4ad5c220290a9f5650974e31224174ea

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.60.2)
-      avm (~> 0.67)
+    eac_tools (0.60.3)
+      avm (~> 0.67, >= 0.67.1)
       avm-eac_asciidoctor_base0 (~> 0.18, >= 0.18.1)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -13,7 +13,7 @@ PATH
       avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
       avm-eac_redmine_base0 (~> 0.19, >= 0.19.2)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.1)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
       avm-eac_webapp_base0 (~> 0.15)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.1)
@@ -117,17 +117,17 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.30.1)
-      aranha-parsers (~> 0.17)
-      avm (~> 0.66, >= 0.66.1)
+    avm-eac_ruby_base1 (0.30.2)
+      aranha-parsers (~> 0.17, >= 0.17.1)
+      avm (~> 0.67, >= 0.67.1)
       avm-eac_generic_base0 (~> 0.12)
       eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_ubuntu_base0
   specs:
-    avm-eac_ubuntu_base0 (0.4.1)
-      avm (~> 0.64)
+    avm-eac_ubuntu_base0 (0.4.2)
+      avm (~> 0.67, >= 0.67.1)
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
 
@@ -153,12 +153,12 @@ PATH
 PATH
   remote: sub/avm-files
   specs:
-    avm-files (0.6.0)
-      avm (~> 0.52)
-      eac_cli (~> 0.28)
-      eac_fs (~> 0.12, >= 0.12.3)
-      eac_ruby_utils (~> 0.106)
-      eac_templates (~> 0.3, >= 0.3.2)
+    avm-files (0.6.1)
+      avm (~> 0.67, >= 0.67.1)
+      eac_cli (~> 0.30, >= 0.30.1)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.112)
+      eac_templates (~> 0.4)
 
 PATH
   remote: sub/avm-git
@@ -191,7 +191,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.67.0)
+    avm (0.67.1)
       aranha-parsers (~> 0.17, >= 0.17.1)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_config (~> 0.12)
@@ -199,7 +199,7 @@ PATH
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
       eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.3, >= 0.3.2)
+      eac_templates (~> 0.4)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
       minitar (~> 0.9)
@@ -260,6 +260,13 @@ PATH
       filesize (~> 0.2)
       net-ssh (~> 4.2)
 
+PATH
+  remote: sub/eac_templates
+  specs:
+    eac_templates (0.4.0)
+      eac_config (~> 0.12)
+      eac_ruby_utils (~> 0.112)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -298,9 +305,6 @@ GEM
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    eac_templates (0.3.2)
-      eac_config (~> 0.11, >= 0.11.1)
-      eac_ruby_utils (~> 0.102, >= 0.102.1)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -320,7 +324,7 @@ GEM
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.2)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     minitar (0.9)
@@ -334,7 +338,7 @@ GEM
     os (1.1.4)
     parallel (1.23.0)
     parseconfig (1.1.2)
-    parser (3.2.2.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
     parslet (2.0.0)
     public_suffix (5.0.1)
@@ -348,9 +352,9 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-mocks (3.12.5)
@@ -376,7 +380,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
     zlib (2.1.1)
 
 PLATFORMS
@@ -410,6 +414,7 @@ DEPENDENCIES
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.5.1)
   eac_ruby_utils!
+  eac_templates!
   eac_tools!
 
 BUNDLED WITH

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.60.2'
+  VERSION = '0.60.3'
 end

data/sub/avm/avm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'eac_templates', '~> 0.4'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
   s.add_dependency 'minitar', '~> 0.9'

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

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

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

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.17'
-  s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
+  s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
+  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base.rb

@@ -65,11 +65,11 @@ module Avm
         protected
 
         def apply_to_root_directory(template, subpath)
-          if template.is_a?(::EacTemplates::Directory)
+          if template.is_a?(::EacTemplates::Variables::Directory)
             template.children.each do |child|
               apply_to_root_directory(child, subpath.join(child.basename))
             end
-          elsif template.is_a?(::EacTemplates::File)
+          elsif template.is_a?(::EacTemplates::Variables::File)
             template.apply_to_file(template_variables, root_directory.join(subpath))
           else
             raise "Unknown template object: #{template}"

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.30.1'
+    VERSION = '0.30.2'
   end
 end

data/sub/avm-eac_ubuntu_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_ubuntu_base0/avm-eac_ubuntu_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.64'
+  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
 

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/docker_image.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/docker/image'
-require 'eac_templates/from_all_gems'
+require 'eac_templates/sources/from_all_gems'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacUbuntuBase0
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/sub/avm-files/avm-files.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.52'
-  s.add_dependency 'eac_cli', '~> 0.28'
-  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106'
-  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
+  s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
+  s.add_dependency 'eac_fs', '~> 0.16'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_templates', '~> 0.4'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-files/lib/avm/files/appendable/templatized_directory.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/files/appendable/resource_base'
-require 'eac_templates/directory'
+require 'eac_templates/variables/directory'
 
 module Avm
   module Files
@@ -18,7 +18,7 @@ module Avm
         def write_on(target_dir)
           raise 'Variables source not set' if appender.variables_source.blank?
 
-          ::EacTemplates::Directory.new(source_path).apply(
+          ::EacTemplates::Variables::Directory.new(source_path).apply(
             appender.variables_source,
             target_dir
           )

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

data/sub/eac_templates/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+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/eac_templates/eac_templates.gemspec

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_templates/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_templates'
+  s.version     = EacTemplates::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'eac_config', '~> 0.12'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
+end

data/sub/eac_templates/lib/eac_templates/core_ext.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_templates/patches'
+require 'eac_templates/sources/from_all_gems'

data/sub/eac_templates/lib/eac_templates/interface_methods.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module EacTemplates
+  module InterfaceMethods
+    COMMON = %w[apply path].freeze
+    ONLY_DIRECTORY = %w[child children].freeze
+    DIRECTORY = COMMON + ONLY_DIRECTORY
+    ONLY_FILE = %w[apply_to_file content variables].freeze
+    FILE = COMMON + ONLY_FILE
+    ALL = COMMON + ONLY_DIRECTORY + ONLY_FILE
+  end
+end

data/sub/eac_templates/lib/eac_templates/modules/ancestor/directory.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/interface_methods'
+require 'eac_templates/modules/ancestor/fs_object'
+
+module EacTemplates
+  module Modules
+    class Ancestor
+      class Directory < ::EacTemplates::Modules::Ancestor::FsObject
+        delegate(*::EacTemplates::InterfaceMethods::ONLY_DIRECTORY, to: :source_object)
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/modules/ancestor/file.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/interface_methods'
+require 'eac_templates/modules/ancestor/fs_object'
+
+module EacTemplates
+  module Modules
+    class Ancestor
+      class File < ::EacTemplates::Modules::Ancestor::FsObject
+        delegate(*::EacTemplates::InterfaceMethods::ONLY_FILE, to: :source_object)
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/modules/ancestor/fs_object.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/interface_methods'
+
+module EacTemplates
+  module Modules
+    class Ancestor
+      class FsObject
+        enable_simple_cache
+        common_constructor :base
+        delegate(*::EacTemplates::InterfaceMethods::COMMON, :found?, to: :source_object)
+
+        # @return [Symbol]
+        def object_type
+          self.class.name.demodulize.underscore.to_sym
+        end
+
+        # @return [Pathname, nil]
+        def path
+          source_object.found? ? source_object.send(:real_paths).first : nil
+        end
+
+        private
+
+        def source_object_uncached
+          base.source_set.send(object_type, base.path_for_search)
+        end
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/modules/ancestor.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/interface_methods'
+
+module EacTemplates
+  module Modules
+    class Ancestor
+      class << self
+        # @param a_module [Module]
+        # @return [Pathname]
+        def path_for_search(a_module)
+          a_module.name.underscore.to_pathname
+        end
+      end
+
+      common_constructor :base, :ancestor
+      delegate :subpath, :source_set, to: :base
+      delegate(*::EacTemplates::InterfaceMethods::ALL, to: :source_object)
+
+      # @return [EacTemplates::Modules::Directory]
+      def directory
+        ::EacTemplates::Modules::Ancestor::Directory.new(self)
+      end
+
+      # @return [EacTemplates::Modules::File]
+      def file
+        @file ||= ::EacTemplates::Modules::Ancestor::File.new(self)
+      end
+
+      # @return [Pathname]
+      def path_for_search
+        r = self.class.path_for_search(ancestor)
+        subpath.if_present(r) { |v| r.join(v) }
+      end
+
+      # @return [EacTemplates::Modules::Ancestor::FsObject]
+      def source_object
+        return file if file.found?
+        return directory if directory.found?
+
+        raise "No template found: #{path_for_search}"
+      end
+
+      require_sub __FILE__
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/modules/base.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/interface_methods'
+require 'eac_templates/modules/ancestor'
+require 'eac_templates/sources/set'
+
+module EacTemplates
+  module Modules
+    class Base
+      enable_listable
+      lists.add_symbol :option, :source_set, :subpath
+      common_constructor :the_module, :options, default: [{}] do
+        self.options = self.class.lists.option.hash_keys_validate!(options)
+      end
+      delegate(*::EacTemplates::InterfaceMethods::ALL, :path_for_search, :source_object,
+               to: :self_ancestor)
+
+      # @return [EacTemplates::Modules::Ancestor]
+      def self_ancestor
+        @self_ancestor ||= ::EacTemplates::Modules::Ancestor.new(self, the_module)
+      end
+
+      # @return [EacTemplates::SourceSet]
+      def source_set
+        options[OPTION_SOURCE_SET] || ::EacTemplates::Sources::Set.default
+      end
+
+      # @return [Pathname, nil]
+      def subpath
+        options[OPTION_SUBPATH].if_present(&:to_pathname)
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/modules.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacTemplates
+  module Modules
+    require_sub __FILE__
+  end
+end

data/sub/eac_templates/lib/eac_templates/patches/module/erb_template.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'erb'
+
+class Module
+  def erb_template(subpath, binding_obj)
+    ::ERB.new(template.child(subpath).path.read).result(binding_obj)
+  end
+end

data/sub/eac_templates/lib/eac_templates/patches/module/template.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_templates/modules/base'
+
+class Module
+  def template
+    @template ||= ::EacTemplates::Modules::Base.new(self)
+  end
+end

data/sub/eac_templates/lib/eac_templates/patches/module.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub __FILE__

data/sub/eac_templates/lib/eac_templates/patches/object/erb_template.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_templates/patches/module/erb_template'
+
+class Object
+  def erb_template(subpath, binding_obj = nil)
+    self.class.erb_template(subpath, binding_obj || binding)
+  end
+end

data/sub/eac_templates/lib/eac_templates/patches/object/template.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_templates/patches/module/template'
+
+class Object
+  def template
+    self.class.template
+  end
+end

data/sub/eac_templates/lib/eac_templates/patches/object.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub __FILE__

data/sub/eac_templates/lib/eac_templates/patches.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub __FILE__

data/sub/eac_templates/lib/eac_templates/sources/directory.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/sources/fs_object'
+require 'eac_templates/variables/directory'
+
+module EacTemplates
+  module Sources
+    class Directory < ::EacTemplates::Sources::FsObject
+      delegate :apply, :child, :children, :path, to: :applier
+
+      # @return [Class]
+      def applier_class
+        ::EacTemplates::Variables::Directory
+      end
+
+      # @param path [Pathname]
+      # @return [Boolean]
+      def select_path?(path)
+        super && path.directory?
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/sources/file.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/sources/fs_object'
+require 'eac_templates/variables/file'
+
+module EacTemplates
+  module Sources
+    class File < ::EacTemplates::Sources::FsObject
+      delegate :apply, :apply_to_file, :content, :path, :variables, to: :applier
+
+      # @return [Class]
+      def applier_class
+        ::EacTemplates::Variables::File
+      end
+
+      # @param path [Pathname]
+      # @return [Boolean]
+      def select_path?(path)
+        super && path.file?
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/sources/from_all_gems.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_templates/sources/from_gem'
+::EacTemplates::Sources::FromGem.include_all