avm 0.66.0 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b052d242bf8dccbe7db34f395acd096c3700c7553ee5c16f590970653ad6274f
-  data.tar.gz: 35f3f1cbb0840d82b8450921f2725b1adf10df833f82f9ec82138bb777b52e74
+  metadata.gz: 03e18c1b8d8e141cb67d37f8eee123d44aa444003a48c4489176199861dcd326
+  data.tar.gz: 04b402c83045cb9749d82f67e5ca4be1cbbca3ff18eaa0560c1dc70fba24df72
 SHA512:
-  metadata.gz: 1d3e9166ff3862d74e3d5087509c2fb0efbf5d96072eb6acde907ceb88eb14c4be73b7b4b6e0a36081feeefd893050c5bb18abc99b06e3bf983485c20a9af7ea
-  data.tar.gz: 0c1245bdf1e60ccee7bd6f270d7962f2e7eac458c802a728d395f0fb72e8e62e79535a9a0a3e5921bd8f7254bfa907ab7fafbc9a54e765d842aefa6973c3baa6
+  metadata.gz: 86ba3db9f576a68044b0cdba24b58fca43c6251cbfea221cd6528af798e7e069e3eb8d0b5eac9c1af8d5e58a0cd274cea6e486d0a9326122a8f993417b46accc
+  data.tar.gz: f5358b5238bd19bf35d14d2c0252fe0e7b005041ec2fed97cb0ba5a99c56538f2c31e93eed851ee86392fbba70eec62de6c536956901f7056f19fa5c9e225643

data/lib/avm/data/package/build_directory.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/fs/temp'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Package
+      module BuildDirectory
+        private
+
+        attr_writer :build_directory
+
+        # @return [EacRubyUtils::Fs::Temp::Directory]
+        def build_directory
+          @build_directory || raise('@build_directory is blank')
+        end
+
+        def on_build_directory
+          ::EacRubyUtils::Fs::Temp.on_directory do |directory|
+            self.build_directory = directory
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/data/package/dump.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/data/package/build_directory'
 require 'avm/data/rotate'
 require 'eac_ruby_utils/core_ext'
 require 'minitar'
@@ -10,6 +11,7 @@ module Avm
       class Dump
         enable_speaker
         enable_listable
+        include ::Avm::Data::Package::BuildDirectory
 
         DEFAULT_EXPIRE_TIME = 1.day
         DEFAULT_FILE_EXTENSION = '.tar'
@@ -45,8 +47,10 @@ module Avm
         def run
           raise "Cannot run: #{cannot_run_reason}" unless runnable?
 
-          build_dir = dump_units_to_build_directory
-          package_file = create_package_file(build_dir)
+          package_file = on_build_directory do
+            dump_units_to_build_directory
+            create_package_file
+          end
           rotate
           move_download_to_final_dest(package_file)
         end
@@ -100,15 +104,13 @@ module Avm
         end
 
         def dump_units_to_build_directory
-          dir = ::Dir.mktmpdir
-          package.dump_units_to_directory(dir)
-          dir
+          package.dump_units_to_directory(build_directory)
         end
 
-        def create_package_file(build_dir)
+        def create_package_file
           package_path = new_build_path
-          infom "Creating package \"#{package_path}\" from \"#{build_dir}\"..."
-          Dir.chdir(build_dir) do
+          infom "Creating package \"#{package_path}\" from \"#{build_directory}\"..."
+          ::Dir.chdir(build_directory.to_path) do
             ::Minitar.pack('.', File.open(::File.expand_path(package_path), 'wb'))
           end
           package_path

data/lib/avm/data/package/load.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/data/package/build_directory'
 require 'eac_ruby_utils/core_ext'
 require 'minitar'
 
@@ -8,13 +9,9 @@ module Avm
     class Package
       class Load
         enable_speaker
+        include ::Avm::Data::Package::BuildDirectory
 
-        attr_reader :package, :data_file_path
-
-        def initialize(package, data_file_path)
-          @package = package
-          @data_file_path = data_file_path
-        end
+        common_constructor :package, :data_file_path
 
         def runnable?
           cannot_run_reason.blank?
@@ -29,8 +26,10 @@ module Avm
         def run
           raise "Cannot run: #{cannot_run_reason}" unless runnable?
 
-          build_dir = extract_packages_to_build_directory
-          package.load_units_from_directory(build_dir)
+          on_build_directory do
+            extract_packages_to_build_directory
+            package.load_units_from_directory(build_directory)
+          end
         end
 
         def data_file_exist?
@@ -38,9 +37,7 @@ module Avm
         end
 
         def extract_packages_to_build_directory
-          dir = ::Dir.mktmpdir
-          ::Minitar.unpack(data_file_path, dir)
-          dir
+          ::Minitar.unpack(data_file_path, build_directory.to_path)
         end
       end
     end

data/lib/avm/data/package.rb

@@ -18,8 +18,11 @@ module Avm
         end
       end
 
+      # @return [Avm::Data::Package] Return +self+.
       def add_unit(identifier, unit)
         units[identifier.to_sym] = unit
+
+        self
       end
 
       def dump(data_path, options = {})

data/lib/avm/data/unit.rb

@@ -46,6 +46,11 @@ module Avm
         end
       end
 
+      # @return [Struct(:key, :subpath), nil]
+      def installation_files_data
+        nil
+      end
+
       def load(data_path)
         run_callbacks :load do
           infom "Loading unit \"#{name}\" from \"#{data_path}\"..."

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

@@ -39,10 +39,17 @@ module Avm
           instance_command('find', files_path, '-mindepth', 1, '-delete').execute!
         end
 
+        # @return [Struct(:key, :subpath), nil]
+        def installation_files_data
+          return nil unless fs_path_subpath.relative?
+
+          ::Struct.new(:key, :subpath).new(fs_path_subpath.basename.to_path, fs_path_subpath)
+        end
+
         # @return [EacRubyUtils::Envs::Command]
         def instance_command(*args)
           args = ['sudo', '-Hu', sudo_user] + args if sudo_user.present?
-          instance.host_env.command(*args)
+          instance.host_env.command(*args).chdir('/')
         end
 
         # @return [String, nil]

data/lib/avm/launcher/publish/base.rb

@@ -34,7 +34,12 @@ module Avm
         def check_with_rescue
           internal_check
         rescue ::Avm::Launcher::Errors::Base => e
-          ::Avm::Launcher::Publish::CheckResult.blocked("Error: #{e}")
+          ::Avm::Launcher::Publish::CheckResult.blocked("Error: #{error_message(e)}")
+        end
+
+        # @return [String]
+        def error_message(error)
+          error.to_s + error.cause.if_present('') { |v| " / Caused by: #{error_message(v)}" }
         end
       end
     end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.67.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +251,7 @@ files:
 - lib/avm/applications/base/stereotype.rb
 - lib/avm/data/callbacks.rb
 - lib/avm/data/package.rb
+- lib/avm/data/package/build_directory.rb
 - lib/avm/data/package/dump.rb
 - lib/avm/data/package/load.rb
 - lib/avm/data/rotate.rb