eac_tools 0.55.7 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b4986d5d4f203b2446bf15351a22b29701c9f3f467afee4e2e5fd557a7b15f3
-  data.tar.gz: 3f277827e7f8880fce8c95a1d5bd21529763e786e8c6edf4e070b04762a531f0
+  metadata.gz: b39a13e0d2d3c95ec91b645a95b4194dd25550440a986de200e9e0867ef2ec31
+  data.tar.gz: b7135c790da9d47ce3675cced805478b9b16a4c9d27ee3454612bc5c86e9e2f2
 SHA512:
-  metadata.gz: 5d6de889f5814a26b52abb0c77135d7eb173333fc9c35fc2a1d5a043cefc6624018fc2fe7897cc4eba0fb94e219b02538623c9e8689d32c0e735b8d99e1587c5
-  data.tar.gz: 27a49cabf562f3ca549f171a3c3b29d4587dcf16a94887f95980f135bc63dd7222c6f75e9a8d3b568bcba08e022b067a3f9867919d30a5b3ec54f7737f24246d
+  metadata.gz: f400d1cf29e23f6ffc9a87025d4765a7a601c9e0fd4c53925ccfc636bca411e840e94cb153cdc7cfd11ff32fb79111ba97d3b59389772260fdfc7d1e02861d6d
+  data.tar.gz: f22e7776248bc742fb3005aa4f3fbf3fb468f8efcafb890d14058ac3d4c93a3cd4012da2d99d0accaf7216ef8948cd359dcad8f7e543c6e8b1e372b5337e12de

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.55.7)
-      avm (~> 0.65)
+    eac_tools (0.56.0)
+      avm (~> 0.66)
       avm-eac_asciidoctor_base0 (~> 0.15)
-      avm-eac_generic_base0 (~> 0.11)
+      avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.4, >= 0.4.1)
       avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
@@ -14,7 +14,7 @@ PATH
       avm-eac_redmine_base0 (~> 0.18, >= 0.18.2)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.30)
-      avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
+      avm-eac_webapp_base0 (~> 0.14)
       avm-eac_wordpress_base0 (~> 0.3)
       avm-git (~> 0.13, >= 0.13.1)
       avm-tools (~> 0.145, >= 0.145.1)
@@ -47,8 +47,8 @@ PATH
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.11.0)
-      avm (~> 0.64, >= 0.64.1)
+    avm-eac_generic_base0 (0.12.0)
+      avm (~> 0.66)
       eac_ruby_utils (~> 0.112)
 
 PATH
@@ -137,13 +137,13 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.13.1)
-      avm (~> 0.60)
-      avm-eac_generic_base0 (~> 0.9)
+    avm-eac_webapp_base0 (0.14.0)
+      avm (~> 0.66)
+      avm-eac_generic_base0 (~> 0.12)
       avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
-      avm-eac_ubuntu_base0 (~> 0.4)
+      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
       avm-files (~> 0.6)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -194,7 +194,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.65.0)
+    avm (0.66.0)
       aranha-parsers (~> 0.17)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_config (~> 0.12)
@@ -334,7 +334,7 @@ GEM
     os (1.1.4)
     parallel (1.22.1)
     parseconfig (1.1.2)
-    parser (3.2.1.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     parslet (2.0.0)
     public_suffix (5.0.1)

data/lib/eac_tools/version.rb

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

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/file_formats/utf8_assert'
 require 'eac_fs/file_info'
 require 'ostruct'
 
@@ -10,10 +9,10 @@ module Avm
       enable_abstract_methods
       compare_by :class
 
-      def apply(files)
-        old_content = Hash[files.map { |f| [f, File.read(f)] }]
-        ::Avm::FileFormats::Utf8Assert.assert_files(files) { internal_apply(files) }
-        files.map { |f| build_file_result(f, old_content[f]) }
+      # @params files [Enumerable<Pathname>]
+      # @return [Enumerable<Avm::FileFormats::FileResult>]
+      def apply(_files)
+        raise_abstract_method __method__
       end
 
       # @param path [Pathname]
@@ -26,42 +25,10 @@ module Avm
         self.class.name.demodulize
       end
 
-      def match?(file)
-        match_by_filename?(file) || match_by_type?(file)
-      end
-
-      def valid_basenames
-        constant_or_array('VALID_BASENAMES')
-      end
-
-      def valid_types
-        constant_or_array('VALID_TYPES')
-      end
-
-      private
-
-      def constant_or_array(name)
-        return [] unless self.class.const_defined?(name)
-
-        self.class.const_get(name)
-      end
-
-      def build_file_result(file, old_content)
-        ::OpenStruct.new(file: file, format: self.class,
-                         changed: (old_content != File.read(file)))
-      end
-
-      def match_by_filename?(file)
-        valid_basenames.any? do |valid_basename|
-          file.basename.fnmatch?(valid_basename)
-        end
-      end
-
-      def match_by_type?(file)
-        info = ::EacFs::FileInfo.new(file)
-        return unless info.content_type.type == 'text'
-
-        valid_types.include?(info.content_type.subtype)
+      # @param file [Pathname]
+      # @return [Boolean]
+      def match?(_file)
+        raise_abstract_method __method__
       end
     end
   end

data/sub/avm/lib/avm/file_formats/file_result.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'avm/file_formats/utf8_assert'
+require 'eac_fs/file_info'
+require 'ostruct'
+
+module Avm
+  module FileFormats
+    class FileResult
+      common_constructor :file, :format, :changed
+    end
+  end
+end

data/sub/avm/lib/avm/file_formats/unknown.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avm/file_formats/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module FileFormats
+    class Unknown < ::Avm::FileFormats::Base
+      # @params files [Enumerable<Pathname>]
+      # @return [Enumerable<Avm::FileFormats::FileResult>]
+      def apply(files)
+        files.map do |file|
+          ::Avm::FileFormats::FileResult.new(file, self.class, false)
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/file_formats/unknown'
 require 'avm/registry/from_gems'
 
 module Avm
@@ -9,6 +10,11 @@ module Avm
       def class_detect(klass, detect_args)
         klass.new if klass.new.match?(detect_args.first)
       end
+
+      # @return [Avm::FileFormats::Base, Avm::FileFormats::Unknown]
+      def detect_optional(*registered_initialize_args)
+        super || ::Avm::FileFormats::Unknown.new
+      end
     end
   end
 end

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

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

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

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.64', '>= 0.64.1'
+  s.add_dependency 'avm', '~> 0.66'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/apply.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/file_formats/base'
+require 'avm/file_formats/file_result'
+require 'avm/file_formats/utf8_assert'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacGenericBase0
+    class FileFormats
+      class Base < ::Avm::FileFormats::Base
+        class Apply
+          enable_method_class
+          common_constructor :file_format, :files
+
+          # @return [Enumerable<Avm::FileFormats::FileResult>]
+          def result
+            old_content = Hash[files.map { |f| [f, File.read(f)] }]
+            ::Avm::FileFormats::Utf8Assert.assert_files(files) { file_format.internal_apply(files) }
+            files.map { |f| file_result(f, old_content[f]) }
+          end
+
+          # @param path [Pathname]
+          # @param old_content [String]
+          # @return [Avm::FileFormats::FileResult]
+          def file_result(file, old_content)
+            ::Avm::FileFormats::FileResult.new(file, file_format.class,
+                                               old_content != File.read(file))
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/match.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'avm/file_formats/base'
+require 'eac_fs/file_info'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacGenericBase0
+    class FileFormats
+      class Base < ::Avm::FileFormats::Base
+        class Match
+          DEFAULT_TYPE = 'text'
+
+          common_constructor :file_format, :file
+
+          # @return [Boolean]
+          def result
+            result_by_filename? || result_by_type?
+          end
+
+          # @return [Array<String>]
+          def valid_basenames
+            constant_or_array('VALID_BASENAMES')
+          end
+
+          # @return [Array<String>]
+          def valid_types
+            constant_or_array('VALID_TYPES').map do |mime_type|
+              mime_type_sanitize(mime_type)
+            end
+          end
+
+          protected
+
+          # @return [String]
+          def mime_type_sanitize(mime_type)
+            if mime_type.split('/').count > 1
+              mime_type
+            else
+              "#{DEFAULT_TYPE}/#{mime_type}"
+            end
+          end
+
+          private
+
+          # @return [Array<String>]
+          def constant_or_array(name)
+            return [] unless file_format.class.const_defined?(name)
+
+            file_format.class.const_get(name)
+          end
+
+          # @return [Boolean]
+          def result_by_filename?
+            valid_basenames.any? do |valid_basename|
+              file.basename.fnmatch?(valid_basename)
+            end
+          end
+
+          # @return [Boolean]
+          def result_by_type?
+            info = ::EacFs::FileInfo.new(file)
+            valid_types.include?(info.content_type.mime_type)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb

@@ -7,7 +7,7 @@ module Avm
   module EacGenericBase0
     class FileFormats
       class Base < ::Avm::FileFormats::Base
-        require_sub __FILE__, include_modules: true
+        require_sub __FILE__, include_modules: true, require_dependency: true
 
         VALID_BASENAMES = %w[*.asm *.bat *.coffee *.java *.js *.rb *.s *.sql *.tex *.url *.yml
                              *.yaml].freeze
@@ -21,7 +21,7 @@ module Avm
         # @param file [Pathname]
         # @return [Boolean]
         def match?(file)
-          super(file) || !file.exist?
+          ::Avm::EacGenericBase0::FileFormats::Base::Match.new(self, file).result || !file.exist?
         end
 
         def file_apply(file)

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.60'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.9'
+  s.add_dependency 'avm', '~> 0.66'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.3'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/xml.rb

@@ -7,8 +7,8 @@ module Avm
   module EacWebappBase0
     module FileFormats
       class Xml < ::Avm::EacGenericBase0::FileFormats::Base
-        VALID_BASENAMES = %w[*.xml].freeze
-        VALID_TYPES = ['xml'].freeze
+        VALID_BASENAMES = %w[*.svg *.xml].freeze
+        VALID_TYPES = ['image/svg+xml', 'xml'].freeze
 
         def internal_apply(files)
           format_command(files).system!

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.13.1'
+    VERSION = '0.14.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.55.7
+  version: 0.56.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.65'
+        version: '0.66'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.65'
+        version: '0.66'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ 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-eac_latex_base0
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -419,7 +413,9 @@ files:
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb
+- sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/apply.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/file_resource_name_helper.rb
+- sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/match.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/instances.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/instances/base.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources.rb
@@ -1111,7 +1107,9 @@ files:
 - sub/avm/lib/avm/executables.rb
 - sub/avm/lib/avm/file_formats.rb
 - sub/avm/lib/avm/file_formats/base.rb
+- sub/avm/lib/avm/file_formats/file_result.rb
 - sub/avm/lib/avm/file_formats/search_formatter.rb
+- sub/avm/lib/avm/file_formats/unknown.rb
 - sub/avm/lib/avm/file_formats/utf8_assert.rb
 - sub/avm/lib/avm/instances.rb
 - sub/avm/lib/avm/instances/base.rb