avm-tools 0.113.2 → 0.113.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdbfe65243619913d183eadb8935248cf9da66a5c4808ac38d3de51413cc17cb
-  data.tar.gz: 1d7bf55929f81dbf1a98436530815c29ceb0f808fb78b91f49c7845e88d10525
+  metadata.gz: 9f0c1b42a6d34ae3d070dbbae54375ddd08eab2a177c5c46cc9d42de8165d10a
+  data.tar.gz: ff02a56141cb130c4b0e9c7fc651ebe3de42ba13ec6c56557fbae70f96ff693c
 SHA512:
-  metadata.gz: 8cfaa26b21b5ef1e97a3ae19209ad2876e79c63d2a36bcf57ff2977dd96a2158e5f46763399b33f4a923a69570b8a721111ae31ac87e3465113bdfc774ab8d6f
-  data.tar.gz: aacf553c790da7d6e8a8609d349d25290de3eda05add3c964425f3a10f3faf16268139b3edd04a9b432ef1f399e892d0eece7904b69701574078a6903d18a8c9
+  metadata.gz: c12fcce202f2eb1b40b58485dbf790e29b7f6bb183d450ce3c9f8a479abf9ae35a77865990c481ad1f2a28b18110bcc4e3db82ecc880c355f040eb8646433143
+  data.tar.gz: d85bb09c92c7d6b1f0414f66509da068ff018d8ec1da32b730f00fe99cc723895d4e09d205f5964cd562a61647c849017f2fe3def50f3fdfec45c770a9d2d8a6

data/lib/avm/eac_writings_base0/commons.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/patches/object/template'
+require 'eac_templates/core_ext'
 require 'singleton'
 
 module Avm

data/lib/avm/patches/i18n.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/self/root'
+require 'avm/tools/self'
 require 'i18n'
 
 module Avm
@@ -12,7 +12,7 @@ module Avm
         end
 
         def locale_files_paths
-          ::Avm::Self.root.join('locale').glob('*.yml')
+          ::Avm::Tools::Self.root.join('locale').glob('*.yml')
         end
       end
     end

data/lib/avm/ruby/gems/generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/patches/object/template'
+require 'eac_templates/core_ext'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/lib/avm/tools/runner/config/load_path.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/self'
 require 'avm/tools/core_ext'
 require 'eac_config/node'
 require 'eac_ruby_utils/recursive_builder'

data/lib/avm/tools/runner/self.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/self'
+require 'avm/self/instance'
 
 module Avm
   module Tools
@@ -14,7 +14,7 @@ module Avm
         end
 
         def instance
-          ::Avm::Self.instance
+          ::Avm::Self::Instance.default
         end
       end
     end

data/lib/avm/tools/runner.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/self'
+require 'avm/tools/self'
 require 'avm/registry'
 require 'avm/tools/version'
 require 'eac_ruby_base0/runner'
@@ -16,7 +16,7 @@ module Avm
       end
 
       def application
-        ::Avm::Self.application
+        ::Avm::Tools::Self.application
       end
 
       def extra_available_subcommands

data/lib/avm/tools/self.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/application'
+require 'eac_ruby_utils/require_sub'
+require 'avm/instances/base'
+
+module Avm
+  module Tools
+    module Self
+      ::EacRubyUtils.require_sub(__FILE__)
+
+      class << self
+        def application
+          @application ||= ::EacRubyBase0::Application.new(root.to_path)
+        end
+
+        def root
+          ::Pathname.new('../../..').expand_path(__dir__)
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.113.2'
+    VERSION = '0.113.6'
   end
 end

data/sub/avm/lib/avm/instances/application.rb

@@ -20,6 +20,10 @@ module Avm
       def instance(suffix)
         ::Avm::Instances::Base.new(self, suffix)
       end
+
+      def name
+        entry(::Avm::Instances::EntryKeys::NAME).read
+      end
     end
   end
 end

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

@@ -9,8 +9,8 @@ module Avm
       module AutoValues
         module Data
           def auto_data_default_dump_path
-            ::Avm::Self
-              .instance
+            ::Avm::Self::Instance
+              .default
               .read_entry_optional(::Avm::Self::Instance::EntryKeys::DATA_DEFAULT_PATH)
               .if_present do |v|
               ::File.join(

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

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
+require 'avm/instances/entry_keys'
+
 module Avm
   module Instances
     class Base
       module AutoValues
         module Filesystem
-          FS_PATH_KEY = :fs_path
-
           def auto_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, FS_PATH_KEY) do |v|
-              v + '/' + id
-            end
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, :data_fs_path) do |v|
-              v + '/' + id
-            end
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_fs_url

data/sub/avm/lib/avm/instances/entry.rb

@@ -27,11 +27,11 @@ module Avm
       end
 
       def optional_value
-        read(required: false, noinput: true) || auto_value
+        context_entry.found? ? context_entry.value : auto_value
       end
 
-      def read(extra_options = {})
-        ::EacConfig::Node.context.current.entry(full_path, options.merge(extra_options)).value
+      def read
+        context_entry.value
       end
 
       def suffix_as_array
@@ -47,7 +47,13 @@ module Avm
       end
 
       def write(value)
-        ::EacConfig::Node.context.current.entry(full_path).value = value
+        context_entry.value = value
+      end
+
+      private
+
+      def context_entry
+        ::EacConfig::Node.context.current.entry(full_path)
       end
     end
   end

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -42,7 +42,7 @@ module Avm
       end
 
       {
-        '' => %w[fs_path host_id source_instance_id],
+        '' => %w[data_fs_path fs_path host_id name source_instance_id],
         database: %w[id hostname limit name password port system timeout username extra],
         docker: %w[registry],
         mailer: {

data/sub/avm/lib/avm/self/instance.rb

@@ -8,6 +8,14 @@ require 'avm/eac_ubuntu_base0/docker_image'
 module Avm
   module Self
     class Instance < ::Avm::Instances::Base
+      DEFAULT_INSTANCE_ID = 'avm_self'
+
+      class << self
+        def default
+          @default ||= by_id(DEFAULT_INSTANCE_ID)
+        end
+      end
+
       def docker_image_class
         ::Avm::Self::DockerImage
       end

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

@@ -37,7 +37,7 @@ module Avm
 
       # @return [Enumerable<Avm::Sources::Base>]
       def subs
-        scm.subs.map { |subrepo| self.class.new(subrepo.path, parent: self) }
+        scm.subs.map { |subrepo| ::Avm::Registry.sources.detect(subrepo.path, parent: self) }
       end
 
       private

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

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

data/sub/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib,template}/**/*']
 
   s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.12'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.2'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

data/sub/avm-eac_postgresql_base0/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_postgresql_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_postgresql_base0'
+  s.version     = Avm::EacPostgresqlBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'avm', '~> 0.12', '>= 0.12.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.82'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+end

data/{lib/avm/postgresql → sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0}/instance/data_unit.rb

@@ -3,7 +3,7 @@
 require 'avm/data/instance/unit'
 
 module Avm
-  module Postgresql
+  module EacPostgresqlBase0
     class Instance
       class DataUnit < ::Avm::Data::Instance::Unit
         EXTENSION = '.pgdump.gz'

data/{lib/avm/postgresql → sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0}/instance.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/postgresql/instance/data_unit'
+require 'avm/eac_postgresql_base0/instance/data_unit'
 
 module Avm
-  module Postgresql
+  module EacPostgresqlBase0
     class Instance
       def initialize(env, connection_params)
         @env = env
@@ -11,7 +11,7 @@ module Avm
       end
 
       def data_unit
-        ::Avm::Postgresql::Instance::DataUnit.new(self)
+        ::Avm::EacPostgresqlBase0::Instance::DataUnit.new(self)
       end
 
       def dump_command

data/{lib/avm/postgresql → sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0}/instance_with.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/instances/entry_keys'
-require 'avm/postgresql/instance'
+require 'avm/eac_postgresql_base0/instance'
 
 module Avm
-  module Postgresql
+  module EacPostgresqlBase0
     module InstanceWith
       def pg
-        @pg ||= ::Avm::Postgresql::Instance.new(
+        @pg ||= ::Avm::EacPostgresqlBase0::Instance.new(
           host_env, user: read_entry(::Avm::Instances::EntryKeys::DATABASE_USERNAME),
                     password: read_entry(::Avm::Instances::EntryKeys::DATABASE_PASSWORD),
                     name: read_entry(::Avm::Instances::EntryKeys::DATABASE_NAME)

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacPostgresqlBase0
+    VERSION = '0.1.0'
+  end
+end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0.rb

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

data/sub/avm-eac_postgresql_base0/spec/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/avm-eac_postgresql_base0/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.1', '>= 0.1.2'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.1', '>= 0.1.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.80', '>= 0.80.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_path.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base0/patches/object/template'
+require 'eac_templates/core_ext'
 require 'avm/eac_webapp_base0/apache_path'
 require 'eac_ruby_utils/core_ext'
 

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base0/patches/object/template'
+require 'eac_templates/core_ext'
 require 'avm/eac_webapp_base0/deploy'
 require 'avm/instances/entry_keys'
 

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners/base.rb

@@ -2,6 +2,8 @@
 
 require 'avm/eac_rails_base0/instance'
 require 'avm/eac_rails_base0/deploy'
+require 'avm/eac_rails_base0/apache_host'
+require 'avm/eac_rails_base0/apache_path'
 require 'avm/eac_rails_base1/runner'
 require 'eac_ruby_utils/core_ext'
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.1.0'
+    VERSION = '0.1.3'
   end
 end

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe ::Avm::EacRailsBase0::ApachePath do
     let(:expected_content) { expect_file.read }
 
     before do
-      instance.entry(::Avm::Instances::Base::FS_PATH_KEY).write('/path/to/stub-app_0')
+      instance.entry(::Avm::Instances::EntryKeys::FS_PATH).write('/path/to/stub-app_0')
       instance.entry('web.url').write('http://stubapp.net/stub-app_0')
     end
 

data/sub/avm-eac_rails_base0/spec/spec_helper.rb

@@ -2,3 +2,4 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 ::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+::EacRubyUtils::Rspec.default_setup.stub_eac_config_node

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,7 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.1'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.2', '>= 0.2.1'
+  s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '>= 0.9.9'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.1.2'
+    VERSION = '0.1.4'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib,template}/**/*']
 
   s.add_dependency 'avm-eac_rails_base1', '~> 0.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 require 'avm/eac_ubuntu_base0/instances/base'
 require 'avm/instances/docker_image'
-require 'avm/eac_redmine_base0/patches/object/template'
+require 'eac_templates/core_ext'
 
 module Avm
   module EacRedmineBase0

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib,locale}/**/*']
 
   s.add_dependency 'avm', '~> 0.9'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.1'

data/sub/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'avm', '~> 0.7'
   s.add_dependency 'eac_ruby_utils', '~> 0.77', '>= 0.77.1'
-  s.add_dependency 'eac_templates', '~> 0.2'
+  s.add_dependency 'eac_templates', '~> 0.3'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
 end

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/docker_image.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/docker/image'
-require 'avm/eac_ubuntu_base0/patches/object/template'
+require 'eac_templates/from_all_gems'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base.rb

@@ -13,6 +13,10 @@ module Avm
 
         INSTANCE_ID = 'eac-ubuntu-base0_self'
 
+        runner_with :help, :subcommands do
+          subcommands
+        end
+
         private
 
         def instance_uncached

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacUbuntuBase0
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/sub/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/runners/base/docker_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/runners/base'
+require 'avm/eac_ubuntu_base0/runners/base/docker'
+
+::RSpec.describe ::Avm::EacUbuntuBase0::Runners::Base::Docker do
+  it do
+    expect { run_command('--registry-name', 'testing', '--image-name') }.not_to raise_error
+  end
+
+  def run_command(*argv)
+    ::Avm::EacUbuntuBase0::Runners::Base.run(argv: %w[docker] + argv)
+  end
+end

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

@@ -10,10 +10,12 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib,template}/**/*']
 
   s.add_dependency 'avm', '~> 0.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.1'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.1'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'

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

@@ -2,9 +2,8 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/jobs/base'
-require 'avm/patches/object/template'
 require 'avm/eac_ubuntu_base0/apache'
-require 'avm/patches/object/template'
+require 'eac_templates/core_ext'
 
 module Avm
   module EacWebappBase0

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

@@ -3,8 +3,8 @@
 require 'active_support/callbacks'
 require 'avm/jobs/base'
 require 'avm/git'
-require 'avm/patches/object/template'
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/core_ext'
 require 'avm/launcher/git/base'
 require 'net/http'
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/instances/base'
-require 'avm/postgresql/instance_with'
+require 'avm/eac_postgresql_base0/instance_with'
 require 'avm/data/instance/files_unit'
 require 'avm/data/instance/package'
 require 'avm/eac_webapp_base0/deploy/file_unit'
@@ -10,7 +10,7 @@ module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
       require_sub __FILE__
-      include ::Avm::Postgresql::InstanceWith
+      include ::Avm::EacPostgresqlBase0::InstanceWith
 
       FILES_UNITS = [].freeze
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end