avm 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe83959f89ed9d43c44578111aa230b740036e6d9231b5c80a6a59ba777d7cc
-  data.tar.gz: 48911ce71466c63dbe3e8dd4ab84f0ecfa061a1c7c55103150ce325bcf745462
+  metadata.gz: 563904ca1b51a6a150dea04c0b6ae22e465fdd51ab6528743e33d62a6565b92c
+  data.tar.gz: 0b81dcf8b1b4f1442141d464ed4f4f94cbaa889f61cb386dada4cd31e81093c1
 SHA512:
-  metadata.gz: 210f097d0c4f57a0fa0a1bbf64e83e9d4a116250ba552f477401fbc5064eaa7f781c7ff1a3115b5a42844299728578cc13508c663031c2e287994d0507f7b488
-  data.tar.gz: 7b65907b3c3201914d97d1e3efa2a740b26dcb87cd820e689a81fdcfbb6e0e1d21619807a6a0f02759af964cae5f0278020eea4dce16672e8aad391bc6d8ee8d
+  metadata.gz: a4cb6348291b7ae8c74957a6cfa9448a034077e6ea755ed49079e991be4abce66c33ad55983faa452ced6d28ce294e0f6d787caf2edc634f0d9edf6317e5c9c5
+  data.tar.gz: 07525e34146d9e712aaa8157cbafb8e9c2fdd83aa2b381931399306aa0592d8d839c272b0851eb8fa0d5bc46538f350e2367da48d1821d00413873f2524772fb

data/lib/avm/data/callbacks.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'active_support/callbacks'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    module Callbacks
+      common_concern do
+        include ::ActiveSupport::Callbacks
+
+        %i[dump load].each do |action|
+          define_callbacks action
+
+          %i[before after].each do |callback|
+            method_name = "#{callback}_#{action}"
+            singleton_class.class_eval do
+              define_method method_name do |callback_method = nil, &block|
+                if callback_method
+                  set_callback action, callback, callback_method
+                else
+                  set_callback action, callback, &block
+                end
+                self
+              end
+            end
+
+            define_method method_name do |callback_method = nil, &block|
+              singleton_class.send(method_name, callback_method, &block)
+              self
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/data/package.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'avm/data/package/dump'
-require 'avm/data/package/load'
+require 'avm/data/callbacks'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Data
     class Package
-      attr_reader :units
+      require_sub __FILE__
+      include ::Avm::Data::Callbacks
 
       def initialize(options)
-        @units = {}
         options = options.to_options_consumer
         units = options.consume(:units)
         options.validate
@@ -19,7 +19,7 @@ module Avm
       end
 
       def add_unit(identifier, unit)
-        @units[identifier.to_sym] = unit
+        units[identifier.to_sym] = unit
       end
 
       def dump(data_path, options = {})
@@ -31,11 +31,19 @@ module Avm
       end
 
       def dump_units_to_directory(directory)
-        @units.each { |identifier, unit| unit.dump_to_directory(directory, identifier) }
+        run_callbacks :dump do
+          units.each { |identifier, unit| unit.dump_to_directory(directory, identifier) }
+        end
       end
 
       def load_units_from_directory(directory)
-        @units.each { |identifier, unit| unit.load_from_directory(directory, identifier) }
+        run_callbacks :load do
+          units.each { |identifier, unit| unit.load_from_directory(directory, identifier) }
+        end
+      end
+
+      def units
+        @units ||= {}
       end
     end
   end

data/lib/avm/data/unit.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
+require 'avm/data/callbacks'
 require 'eac_ruby_utils/core_ext'
-require 'active_support/callbacks'
 
 module Avm
   module Data
     class Unit
-      include ::ActiveSupport::Callbacks
+      include ::Avm::Data::Callbacks
 
-      define_callbacks :dump, :load
       enable_speaker
 
       %w[dump load].each do |action|
@@ -20,26 +19,6 @@ module Avm
             fail "\\"#{method_name}\\" is a abstract method. Override in #{singleton_class}."
           end
         CODE
-
-        # Callbacks
-        %w[before after].each do |callback|
-          method = "#{callback}_#{action}"
-          class_eval <<~CODE, __FILE__, __LINE__ + 1
-            def self.#{method}(callback_method = nil, &block)
-              if callback_method
-                set_callback :#{action}, :#{callback}, callback_method
-              else
-                set_callback :#{action}, :#{callback}, &block
-              end
-              self
-            end
-
-            def #{method}(callback_method = nil, &block)
-              singleton_class.#{method}(callback_method, &block)
-              self
-            end
-          CODE
-        end
       end
 
       def extension

data/lib/avm/entries/uri_builder.rb

@@ -46,8 +46,10 @@ module Avm
         field_get(translate_field(avm_field))
       end
 
+      # @return [String, nil]
       def field_get(name)
-        data[name.to_sym].if_present(&:to_s)
+        v = data[name.to_sym]
+        v.nil? ? nil : v.to_s
       end
 
       def field_set(field, value)

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

@@ -15,7 +15,7 @@ module Avm
               .if_present do |v|
               ::File.join(
                 v,
-                "#{id}#{::Avm::Data::Instance::Package::Dump::DEFAULT_FILE_EXTENSION}"
+                "#{id}#{::Avm::Instances::Data::Package::Dump::DEFAULT_FILE_EXTENSION}"
               )
             end
           end

data/lib/avm/instances/data/files_unit.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'avm/instances/data/unit'
+
+module Avm
+  module Instances
+    module Data
+      class FilesUnit < ::Avm::Instances::Data::Unit
+        EXTENSION = '.tar.gz'
+
+        enable_listable
+        lists.add_symbol :option, :sudo_user
+
+        common_constructor :instance, :fs_path_subpath, :options, default: [{}],
+                                                                  super_args: -> { [instance] } do
+          self.fs_path_subpath = fs_path_subpath.to_pathname
+          self.options = self.class.lists.option.hash_keys_validate!(options)
+        end
+
+        before_load :clear_files
+
+        # @return [Pathname]
+        def files_path
+          fs_path_subpath
+            .expand_path(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH))
+        end
+
+        def dump_command
+          instance_command('tar', '-czf', '-', '-C', files_path, '.')
+        end
+
+        def load_command
+          instance_command('tar', '-xzf', '-', '-C', files_path)
+        end
+
+        def clear_files
+          infom "Removing all files under #{files_path}..."
+          instance_command('mkdir', '-p', files_path).execute!
+          instance_command('find', files_path, '-mindepth', 1, '-delete').execute!
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def instance_command(*args)
+          args = ['sudo', '-Hu', sudo_user] + args if sudo_user.present?
+          instance.host_env.command(*args)
+        end
+
+        # @return [String, nil]
+        def sudo_user
+          options[OPTION_SUDO_USER]
+        end
+      end
+    end
+  end
+end

data/lib/avm/{data/instance → instances/data}/package.rb

@@ -3,8 +3,8 @@
 require 'avm/data/package'
 
 module Avm
-  module Data
-    module Instance
+  module Instances
+    module Data
       class Package < ::Avm::Data::Package
         attr_reader :instance
 

data/lib/avm/instances/data/unit.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/data/unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    module Data
+      class Unit < ::Avm::Data::Unit
+        common_constructor :instance
+      end
+    end
+  end
+end

data/lib/avm/instances/data.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    module Data
+      require_sub __FILE__
+    end
+  end
+end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -263,10 +263,7 @@ files:
 - lib/avm/applications/base.rb
 - lib/avm/applications/base/publishing.rb
 - lib/avm/applications/base/stereotype.rb
-- lib/avm/data/instance.rb
-- lib/avm/data/instance/files_unit.rb
-- lib/avm/data/instance/package.rb
-- lib/avm/data/instance/unit.rb
+- lib/avm/data/callbacks.rb
 - lib/avm/data/package.rb
 - lib/avm/data/package/dump.rb
 - lib/avm/data/package/load.rb
@@ -316,6 +313,10 @@ files:
 - lib/avm/instances/base/entry_keys.rb
 - lib/avm/instances/base/install.rb
 - lib/avm/instances/base/web.rb
+- lib/avm/instances/data.rb
+- lib/avm/instances/data/files_unit.rb
+- lib/avm/instances/data/package.rb
+- lib/avm/instances/data/unit.rb
 - lib/avm/instances/docker_image.rb
 - lib/avm/instances/entry_keys.rb
 - lib/avm/instances/ids.rb

data/lib/avm/data/instance/files_unit.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/data/instance/unit'
-
-module Avm
-  module Data
-    module Instance
-      class FilesUnit < ::Avm::Data::Instance::Unit
-        EXTENSION = '.tar.gz'
-
-        attr_reader :fs_path_subpath
-
-        def initialize(instance, fs_path_subpath)
-          super(instance)
-          @fs_path_subpath = fs_path_subpath
-        end
-
-        before_load :clear_files
-
-        def files_path
-          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
-                      fs_path_subpath)
-        end
-
-        def dump_command
-          instance.host_env.command('tar', '-czf', '-', '-C', files_path, '.')
-        end
-
-        def load_command
-          instance.host_env.command('tar', '-xzf', '-', '-C', files_path)
-        end
-
-        def clear_files
-          infom "Removing all files under #{files_path}..."
-          instance.host_env.command('mkdir', '-p', files_path).execute!
-          instance.host_env.command('find', files_path, '-mindepth', 1, '-delete').execute!
-        end
-      end
-    end
-  end
-end

data/lib/avm/data/instance/unit.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/data/unit'
-
-module Avm
-  module Data
-    module Instance
-      class Unit < ::Avm::Data::Unit
-        attr_reader :instance
-
-        def initialize(instance)
-          @instance = instance
-        end
-      end
-    end
-  end
-end

data/lib/avm/data/instance.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
-
-module Avm
-  module Data
-    module Instance
-    end
-  end
-end