eac_tools 0.72.0 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f6313738261dc5ddc1c3c7a92ccaed70d82b98d0b2b776a46b667781ebed872
-  data.tar.gz: a059376b3323ba30386875cd12129c1c590007c3123f3c7332eab317f3ee49a1
+  metadata.gz: 3741d3890696e7b076cffae0313ed3ad82d5fc68fe41ba2ae64d75cd3a1a474e
+  data.tar.gz: 6685e1624bb09bbebfdc04b5d05046cd24106c25c336af3117936ec57aa48947
 SHA512:
-  metadata.gz: 628e59eb835b0778eeaba3c040c982cbc86ecaffc8d43a37c0431b087474e2d5ef27be9c73f4edd7d740765f3c68cf7ff07150911b9c0c4559a82dc830b4e1f6
-  data.tar.gz: 9dc783ce0fd9b07daff7889fce3a71dafc31518e0244af14b1667a2049db0e4352d2cf9c13ffed815effd141462950493510ba91af593425878f405e3696258b
+  metadata.gz: 69304f63883050fd2811ef4762a96e8a8fee1091ba1cd7cc768f93c70075a27e89fc49c800b89dfa40683e26e02a006a123b8ad72e42ea7813ab816e1d0702ec
+  data.tar.gz: a03de22b8a063b57beaab4d7862e2cdbf84842b429afa6f7fdbfb6d60414f006b0cc8b55c260c41d4309f0c428c4a6ecc868526560ddc299ba53ea885c2ef8c6

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.72.0)
-      avm (~> 0.78)
+    eac_tools (0.73.0)
+      avm (~> 0.79)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -17,7 +17,7 @@ PATH
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.3)
-      avm-tools (~> 0.152)
+      avm-tools (~> 0.153)
       eac_ruby_utils (~> 0.119)
 
 PATH
@@ -163,9 +163,9 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.152.0)
+    avm-tools (0.153.0)
       aranha-parsers (~> 0.21)
-      avm (~> 0.78)
+      avm (~> 0.79)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
       avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.6, >= 0.6.2)
@@ -181,14 +181,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.78.0)
-      aranha-parsers (~> 0.20)
+    avm (0.79.0)
+      aranha-parsers (~> 0.21)
       eac_cli (~> 0.35, >= 0.35.1)
-      eac_config (~> 0.12)
+      eac_config (~> 0.14)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.117, >= 0.117.1)
+      eac_ruby_utils (~> 0.119)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -205,7 +205,7 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.13.0)
+    eac_config (0.14.0)
       addressable (~> 2.8, >= 2.8.4)
       eac_ruby_utils (~> 0.119)
 

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.20'
+  s.add_dependency 'aranha-parsers', '~> 0.21'
   s.add_dependency 'eac_cli', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'eac_config', '~> 0.12'
+  s.add_dependency 'eac_config', '~> 0.14'
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.117', '>= 0.117.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119'
   s.add_dependency 'eac_templates', '~> 0.5'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

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

@@ -12,7 +12,7 @@ module Avm
       require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
 
-      AVM_TYPE = 'application'
+      AVM_TYPE = 'Application'
       LOCAL_INSTANCE_SUFFIX = 'dev'
 
       common_constructor :id do

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

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

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.21'
-  s.add_dependency 'avm', '~> 0.78'
+  s.add_dependency 'avm', '~> 0.79'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.152.0'
+    VERSION = '0.153.0'
   end
 end

data/sub/eac_config/lib/eac_config/node.rb

@@ -56,7 +56,7 @@ module EacConfig
 
     # @return [Array<EacConfig::Node>]
     def self_loaded_nodes
-      load_path.paths.map { |node_path| load_node(node_path) }
+      load_path.paths.flat_map { |node_path| load_nodes(node_path) }
     end
 
     # @return [Array<EacConfig::Node>]
@@ -72,7 +72,9 @@ module EacConfig
 
     private
 
-    def load_node(node_path)
+    # @param node_path [String]
+    # @return [Array<EacConfig::Node>]
+    def load_nodes(node_path)
       ::EacConfig::NodeUri.new(node_path, url).instanciate
     end
   end

data/sub/eac_config/lib/eac_config/node_uri/instanciate_single.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EacConfig
+  class NodeUri
+    class InstanciateSingle
+      acts_as_instance_method
+      enable_simple_cache
+      common_constructor :node_uri, :instance_uri
+
+      # @return [Array<Class>]
+      def available_node_classes
+        require 'eac_config/envvars_node'
+        require 'eac_config/yaml_file_node'
+        [::EacConfig::EnvvarsNode, ::EacConfig::YamlFileNode]
+      end
+
+      # @return [EacConfig::Node]
+      def result
+        available_node_classes.lazy.map { |k| k.from_uri(self) }.find(&:present?) ||
+          raise("No class mapped for \"#{to_addressable}\"")
+      end
+
+      # @return [Addressable::URI]
+      def to_addressable
+        instance_uri.to_uri
+      end
+    end
+  end
+end

data/sub/eac_config/lib/eac_config/node_uri.rb

@@ -5,21 +5,26 @@ module EacConfig
     enable_simple_cache
     common_constructor :source, :loader_uri, default: [nil]
 
-    def available_node_classes
-      require 'eac_config/envvars_node'
-      require 'eac_config/yaml_file_node'
-      [::EacConfig::EnvvarsNode, ::EacConfig::YamlFileNode]
-    end
-
+    # @return [Array<EacConfig::Node>]
     def instanciate
-      available_node_classes.lazy.map { |k| k.from_uri(self) }.find(&:present?) ||
-        raise("No class mapped for \"#{to_addressable}\"")
+      instance_uris.map { |uri| instanciate_single(uri) }
     end
 
     delegate :to_s, to: :to_addressable
 
     private
 
+    # @return [Array<Addressable::URI>]
+    def instance_uris
+      if to_addressable.scheme == 'file'
+        ::Pathname.glob(to_addressable.path).map do |found_path|
+          ::Addressable::URI.new(scheme: 'file', path: found_path.to_path)
+        end
+      else
+        [to_addressable]
+      end
+    end
+
     def to_addressable_uncached
       r = ::Addressable::URI.parse(source)
       path = r.path.to_pathname
@@ -34,5 +39,7 @@ module EacConfig
 
       r.to_pathname.parent
     end
+
+    require_sub __FILE__, require_mode: :kernel
   end
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.72.0
+  version: 0.73.0
 platform: ruby
 authors:
 - Put here the authors
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '0.79'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '0.79'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -292,14 +292,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.152'
+        version: '0.153'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.152'
+        version: '0.153'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1400,6 +1400,7 @@ files:
 - sub/eac_config/lib/eac_config/node.rb
 - sub/eac_config/lib/eac_config/node_entry.rb
 - sub/eac_config/lib/eac_config/node_uri.rb
+- sub/eac_config/lib/eac_config/node_uri/instanciate_single.rb
 - sub/eac_config/lib/eac_config/old_configs.rb
 - sub/eac_config/lib/eac_config/old_configs/base.rb
 - sub/eac_config/lib/eac_config/old_configs/file.rb