avm 0.64.2 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfbe828fa402574c8d87792d855971448ab931e26ecfb1ed15ea50acc81169e6
-  data.tar.gz: 3a1c0bc8719b29f23cb8e8b195430ca875592b8f01902e1cddcd80ac64943774
+  metadata.gz: b052d242bf8dccbe7db34f395acd096c3700c7553ee5c16f590970653ad6274f
+  data.tar.gz: 35f3f1cbb0840d82b8450921f2725b1adf10df833f82f9ec82138bb777b52e74
 SHA512:
-  metadata.gz: 7fb5104275aa21de8f5b647cd035df7ddf7cf5a5525138d1485643d931257974de2bcf3adbc735212b7c2e4e3958a4079ebd14d6a9bee1c319f0f9fa4984a90e
-  data.tar.gz: 71880eff3e7920658456b8e5e7fe7998b53ea27c5fed3c612008147ad55e65c12268b6f6a67608fa6c89e684d57711114d803bcbfefe5cd16de1370914f5ffbc
+  metadata.gz: 1d3e9166ff3862d74e3d5087509c2fb0efbf5d96072eb6acde907ceb88eb14c4be73b7b4b6e0a36081feeefd893050c5bb18abc99b06e3bf983485c20a9af7ea
+  data.tar.gz: 0c1245bdf1e60ccee7bd6f270d7962f2e7eac458c802a728d395f0fb72e8e62e79535a9a0a3e5921bd8f7254bfa907ab7fafbc9a54e765d842aefa6973c3baa6

data/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/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/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/lib/avm/instances/base/auto_values/database.rb

@@ -7,8 +7,9 @@ module Avm
     class Base
       module AutoValues
         module Database
+          LOCAL_ADDRESS = '127.0.0.1'
           DEFAULT_EXTRA = ''
-          DEFAULT_HOSTNAME = '127.0.0.1'
+          DEFAULT_HOSTNAME = LOCAL_ADDRESS
           DEFAULT_LIMIT = 5
           DEFAULT_PORTS = {
             'postgresql' => 5432,
@@ -19,8 +20,16 @@ module Avm
           DEFAULT_SYSTEM = 'postgresql'
           DEFAULT_TIMEOUT = 5000
 
-          def auto_database_extra
-            database_auto_common('hostname') || DEFAULT_EXTRA
+          %w[extra hostname limit system timeout].each do |attr|
+            define_method "auto_database_#{attr}" do
+              database_auto_common(attr) || self.class.const_get("default_#{attr}".upcase)
+            end
+          end
+
+          %w[username password].each do |attr|
+            define_method "auto_database_#{attr}" do
+              database_auto_common(attr) || id
+            end
           end
 
           def auto_database_name
@@ -28,34 +37,10 @@ module Avm
                                   ::Avm::Instances::EntryKeys::DATABASE_NAME) || id
           end
 
-          def auto_database_hostname
-            database_auto_common('hostname') || DEFAULT_HOSTNAME
-          end
-
-          def auto_database_limit
-            database_auto_common('limit') || DEFAULT_LIMIT
-          end
-
-          def auto_database_password
-            database_auto_common('password') || id
-          end
-
           def auto_database_port
             database_auto_common('port') || database_port_by_system
           end
 
-          def auto_database_username
-            database_auto_common('username') || id
-          end
-
-          def auto_database_system
-            database_auto_common('system') || DEFAULT_SYSTEM
-          end
-
-          def auto_database_timeout
-            database_auto_common('timeout') || DEFAULT_TIMEOUT
-          end
-
           private
 
           def database_auto_common(suffix)

data/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/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.64.2
+  version: 0.66.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 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: aranha-parsers
@@ -279,7 +279,9 @@ files:
 - lib/avm/executables.rb
 - lib/avm/file_formats.rb
 - lib/avm/file_formats/base.rb
+- lib/avm/file_formats/file_result.rb
 - lib/avm/file_formats/search_formatter.rb
+- lib/avm/file_formats/unknown.rb
 - lib/avm/file_formats/utf8_assert.rb
 - lib/avm/instances.rb
 - lib/avm/instances/base.rb
@@ -287,7 +289,6 @@ files:
 - lib/avm/instances/base/auto_values/data.rb
 - lib/avm/instances/base/auto_values/database.rb
 - lib/avm/instances/base/auto_values/mailer.rb
-- lib/avm/instances/base/auto_values/ruby.rb
 - lib/avm/instances/base/auto_values/source.rb
 - lib/avm/instances/base/dockerizable.rb
 - lib/avm/instances/base/entry_keys.rb

data/lib/avm/instances/base/auto_values/ruby.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Ruby
-          def auto_ruby_version
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'ruby.version')
-          end
-        end
-      end
-    end
-  end
-end