avm-tools 0.109.1 → 0.110.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb253fe8f448ec59893d5aedcd818661142dd53efc0043d934da9e57e841dab
-  data.tar.gz: 5c6bcf1c7ba068dc25ce894a43b893facc3a4304632d2b8df84266d99cd5bc36
+  metadata.gz: d43e61c9d3bd87bf7af09c3bd6010342ce2b31d6fd27e7f83aabee279475038d
+  data.tar.gz: 30a050c8a12f111380c6f11c18d1e3afe87218c1872d1ecfebabb5289efc057f
 SHA512:
-  metadata.gz: 8b50d5638c8e3c660da897cb51ff08d79b56be1f0ba3c0543b4da887143777c369175c81d13efef2011187e53ed4f102e96854217458a517ca8e068248c1ffcb
-  data.tar.gz: fa9d2274713b503ffe149eff0c259a27c6ec725d47f48ddb56ea749525a1719e50ca42c61166d37f8637cf7c7202609ed76310bec62a1d86a9f6cd09fbfbf933
+  metadata.gz: b5abf8184f30cff08511d952f28537952ad45d8b61204e3cb0ad88520b58f93b753a87a2b122c05f52c527b772c6a8023390af09130179fdcefa1026adaf8c9f
+  data.tar.gz: 602de22511c237207bb8bd2223badf4bbd26d0be24f0b595bdb2e94e526b5d775e5a8d1a65d6eb0410391b886c33a2c3ec69751d17126e7433964d67f94cec0f

data/lib/avm/tools/runner/files/rotate.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/files/rotate'
+require 'avm/data/rotate'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -19,7 +19,7 @@ module Avm
           end
 
           def rotate
-            @rotate ||= ::Avm::Files::Rotate.new(
+            @rotate ||= ::Avm::Data::Rotate.new(
               parsed.path,
               space_limit: parsed.space_limit
             )

data/lib/avm/tools/runner.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/self'
+require 'avm/registry'
 require 'avm/tools/version'
 require 'eac_ruby_base0/runner'
 
@@ -17,6 +18,10 @@ module Avm
       def application
         ::Avm::Self.application
       end
+
+      def extra_available_subcommands
+        ::Avm::Registry.runners.registered_modules.map { |k| [k.command_argument, k] }.to_h
+      end
     end
   end
 end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.109.1'
+    VERSION = '0.110.0'
   end
 end

data/vendor/avm/avm.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
+  s.add_dependency 'eac_cli', '~> 0.23', '>= 0.23.1'
   s.add_dependency 'eac_docker', '~> 0.3'
   s.add_dependency 'eac_git', '~> 0.6'
   s.add_dependency 'eac_ruby_utils', '~> 0.77'

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
-require 'avm/files/rotate'
+require 'avm/data/rotate'
+require 'eac_ruby_utils/core_ext'
 require 'minitar'
 
 module Avm
@@ -88,7 +88,7 @@ module Avm
           return unless existing == EXISTING_ROTATE
 
           infom "Rotating \"#{data_file_path}\"..."
-          ::Avm::Files::Rotate.new(data_file_path).run
+          ::Avm::Data::Rotate.new(data_file_path).run
         end
 
         def new_build_path

data/vendor/{avm-files/lib/avm/files → avm/lib/avm/data}/rotate.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/object/blank'
 require 'eac_ruby_utils/simple_cache'
 
 module Avm
-  module Files
+  module Data
     class Rotate
       include ::EacRubyUtils::SimpleCache
 

data/vendor/avm/lib/avm/docker/runner.rb

@@ -13,6 +13,7 @@ module Avm
 
       runner_with :help do
         desc 'Manipulate Docker images.'
+        bool_opt '-I', '--image-name', 'Output image name.'
         arg_opt '-n', '--registry-name', 'Docker registry\'s name.'
         bool_opt '-p', '--push', 'Push the image to Docker registry.'
         bool_opt '-r', '--run', 'Run or start a container with builded image.'
@@ -27,6 +28,7 @@ module Avm
         setup
         banner
         build
+        output_image_name
         push
         container_run
       end
@@ -84,6 +86,12 @@ module Avm
         )
       end
 
+      def output_image_name
+        return unless parsed.image_name
+
+        out(docker_image.tag.to_s.strip + "\n")
+      end
+
       def registry_uncached
         registry_from_option || registry_from_instance || registry_from_default ||
           fatal_error('No registry defined')

data/vendor/avm/lib/avm/registry.rb

@@ -7,7 +7,7 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :instance_stereotypes, :scms, :source_stereotypes
+    lists.add_symbol :category, :instance_stereotypes, :runners, :scms, :source_stereotypes
 
     class << self
       enable_simple_cache

data/vendor/avm/lib/avm/runners/base.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Runners
+    class Base
+      enable_abstract_methods
+
+      class << self
+        def command_argument
+          stereotype_name.underscore.dasherize
+        end
+
+        def stereotype_name
+          name.split('::')[-3]
+        end
+      end
+
+      delegate :command_argument, :stereotype_name, to: :class
+
+      runner_with :help, :subcommands do
+        subcommands
+      end
+
+      def to_s
+        stereotype_name
+      end
+    end
+  end
+end

data/vendor/avm/lib/avm/version.rb

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

data/vendor/avm-eac_ubuntu_base0/Gemfile

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

data/vendor/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_ubuntu_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_ubuntu_base0'
+  s.version     = Avm::EacUbuntuBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,template}/**/*']
+
+  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_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+end

data/{lib → vendor/avm-eac_ubuntu_base0/lib}/avm/eac_ubuntu_base0/docker_image.rb

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

data/vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances/base.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/docker_image'
+require 'avm/instances/base'
+
+module Avm
+  module EacUbuntuBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        def docker_image_class
+          ::Avm::EacUbuntuBase0::DockerImage
+        end
+      end
+    end
+  end
+end

data/vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances.rb

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

data/vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/patches/object/template.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/patches/object/template'
+
+::EacTemplates::Searcher.default.included_paths <<
+  __dir__.to_pathname.expand_path.parent_n(5).join('template')

data/vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base/docker.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/docker/runner'
+require 'avm/runners/base'
+require 'eac_ruby_utils/struct'
+
+module Avm
+  module EacUbuntuBase0
+    module Runners
+      class Base < ::Avm::Runners::Base
+        class Docker < ::Avm::Docker::Runner
+          def use_default_registry?
+            true
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/runners/base'
+require 'avm/eac_ubuntu_base0/instances/base'
+require 'eac_ruby_utils/patches/module/require_sub'
+
+module Avm
+  module EacUbuntuBase0
+    module Runners
+      class Base < ::Avm::Runners::Base
+        enable_simple_cache
+        require_sub __FILE__
+
+        INSTANCE_ID = 'eac-ubuntu-base0_self'
+
+        private
+
+        def instance_uncached
+          ::Avm::EacUbuntuBase0::Instances::Base.by_id(INSTANCE_ID)
+        end
+      end
+    end
+  end
+end

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

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

data/{lib → vendor/avm-eac_ubuntu_base0/lib}/avm/eac_ubuntu_base0.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacUbuntuBase0
+    require_sub __FILE__
   end
 end

data/vendor/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/docker_image_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/docker_image'
+require 'eac_docker/images/base'
+require 'eac_docker/registry'
+
+::RSpec.describe ::Avm::EacUbuntuBase0::DockerImage do
+  let(:registry) { ::EacDocker::Registry.new('stub') }
+  let(:instance) { described_class.new(registry) }
+
+  describe '#provide' do
+    it do
+      expect(instance.provide).to be_a(::EacDocker::Images::Base)
+    end
+  end
+end

data/vendor/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/runners/base_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/runners/base'
+
+::RSpec.describe ::Avm::EacUbuntuBase0::Runners::Base do
+  include_examples 'in_avm_registry', 'runners'
+end

data/vendor/avm-eac_ubuntu_base0/spec/rubocop_spec.rb

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

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'Gemfile']
   s.test_files = Dir['{spec}/**/*', '.rspec']
 
-  s.add_dependency 'bundler', '~> 2.2', '>= 2.2.17'
+  s.add_dependency 'bundler', '~> 2.2', '>= 2.2.25'
   s.add_dependency 'eac_ruby_utils', '~> 0.70'
 
   # Tests

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

data/vendor/eac_ruby_gems_utils/spec/support/mygem/Gemfile.lock

@@ -16,4 +16,4 @@ DEPENDENCIES
   mygem!
 
 BUNDLED WITH
-   1.17.3
+   2.2.25

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.109.1
+  version: 0.110.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: avm-eac_ubuntu_base0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -252,10 +266,6 @@ files:
 - lib/avm/eac_rails_base0/apache_path.rb
 - lib/avm/eac_rails_base0/deploy.rb
 - lib/avm/eac_rails_base0/instance.rb
-- lib/avm/eac_ubuntu_base0.rb
-- lib/avm/eac_ubuntu_base0/apache.rb
-- lib/avm/eac_ubuntu_base0/apache/resource.rb
-- lib/avm/eac_ubuntu_base0/docker_image.rb
 - lib/avm/eac_wordpress_base0.rb
 - lib/avm/eac_wordpress_base0/apache_host.rb
 - lib/avm/eac_wordpress_base0/deploy.rb
@@ -273,26 +283,6 @@ files:
 - lib/avm/eac_writings_base0/project_build.rb
 - lib/avm/eac_writings_base0/project_build/chapters_content.rb
 - lib/avm/eac_writings_base0/project_build/copy_files.rb
-- lib/avm/instances.rb
-- lib/avm/instances/application.rb
-- lib/avm/instances/base.rb
-- lib/avm/instances/base/auto_values.rb
-- lib/avm/instances/base/auto_values/access.rb
-- lib/avm/instances/base/auto_values/admin.rb
-- lib/avm/instances/base/auto_values/data.rb
-- lib/avm/instances/base/auto_values/database.rb
-- lib/avm/instances/base/auto_values/filesystem.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/auto_values/system.rb
-- lib/avm/instances/base/auto_values/web.rb
-- lib/avm/instances/base/dockerizable.rb
-- lib/avm/instances/base/entry_keys.rb
-- lib/avm/instances/entries.rb
-- lib/avm/instances/entry.rb
-- lib/avm/instances/entry_keys.rb
-- lib/avm/instances/runner.rb
 - lib/avm/launcher/context.rb
 - lib/avm/launcher/context/instance_collector.rb
 - lib/avm/launcher/context/instance_discovery.rb
@@ -384,9 +374,6 @@ files:
 - lib/avm/ruby/rubocop/_envvar.rb
 - lib/avm/ruby/rubocop/_gemfile.rb
 - lib/avm/self.rb
-- lib/avm/self/docker_image.rb
-- lib/avm/self/instance.rb
-- lib/avm/self/instance/entry_keys.rb
 - lib/avm/self/root.rb
 - lib/avm/stereotypes.rb
 - lib/avm/tools.rb
@@ -455,7 +442,6 @@ files:
 - template/avm/eac_rails_base0/apache_path/extra_content.conf
 - template/avm/eac_rails_base0/deploy/config/database.yml.template
 - template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template
-- template/avm/eac_ubuntu_base0/docker_image/Dockerfile
 - template/avm/eac_webapp_base0/apache_host/no_ssl.conf
 - template/avm/eac_webapp_base0/apache_path/default.conf
 - template/avm/eac_wordpress_base0/deploy/wp-config.php.template
@@ -544,6 +530,23 @@ files:
 - vendor/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_stereotypes/base_spec.rb
 - vendor/avm-eac_ruby_base1/spec/rubocop_spec.rb
 - vendor/avm-eac_ruby_base1/spec/spec_helper.rb
+- vendor/avm-eac_ubuntu_base0/Gemfile
+- vendor/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/apache.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/apache/resource.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/docker_image.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances/base.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/patches/object/template.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base/docker.rb
+- vendor/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/version.rb
+- vendor/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/docker_image_spec.rb
+- vendor/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/runners/base_spec.rb
+- vendor/avm-eac_ubuntu_base0/spec/rubocop_spec.rb
+- vendor/avm-eac_ubuntu_base0/spec/spec_helper.rb
+- vendor/avm-eac_ubuntu_base0/template/avm/eac_ubuntu_base0/docker_image/Dockerfile
 - vendor/avm-eac_webapp_base0/Gemfile
 - vendor/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec
 - vendor/avm-eac_webapp_base0/lib/avm/eac_webapp_base0.rb
@@ -591,7 +594,6 @@ files:
 - vendor/avm-files/lib/avm/files/formatter/formats/ruby.rb
 - vendor/avm-files/lib/avm/files/formatter/formats/xml.rb
 - vendor/avm-files/lib/avm/files/formatter/utf8_assert.rb
-- vendor/avm-files/lib/avm/files/rotate.rb
 - vendor/avm-files/lib/avm/files/version.rb
 - vendor/avm-files/spec/rubocop_spec.rb
 - vendor/avm-files/spec/spec_helper.rb
@@ -673,13 +675,34 @@ files:
 - vendor/avm/lib/avm/data/package.rb
 - vendor/avm/lib/avm/data/package/dump.rb
 - vendor/avm/lib/avm/data/package/load.rb
+- vendor/avm/lib/avm/data/rotate.rb
 - vendor/avm/lib/avm/data/unit.rb
 - vendor/avm/lib/avm/docker.rb
 - vendor/avm/lib/avm/docker/container.rb
 - vendor/avm/lib/avm/docker/image.rb
 - vendor/avm/lib/avm/docker/runner.rb
 - vendor/avm/lib/avm/executables.rb
+- vendor/avm/lib/avm/instances.rb
+- vendor/avm/lib/avm/instances/application.rb
+- vendor/avm/lib/avm/instances/base.rb
+- vendor/avm/lib/avm/instances/base/auto_values.rb
+- vendor/avm/lib/avm/instances/base/auto_values/access.rb
+- vendor/avm/lib/avm/instances/base/auto_values/admin.rb
+- vendor/avm/lib/avm/instances/base/auto_values/data.rb
+- vendor/avm/lib/avm/instances/base/auto_values/database.rb
+- vendor/avm/lib/avm/instances/base/auto_values/filesystem.rb
+- vendor/avm/lib/avm/instances/base/auto_values/mailer.rb
+- vendor/avm/lib/avm/instances/base/auto_values/ruby.rb
+- vendor/avm/lib/avm/instances/base/auto_values/source.rb
+- vendor/avm/lib/avm/instances/base/auto_values/system.rb
+- vendor/avm/lib/avm/instances/base/auto_values/web.rb
+- vendor/avm/lib/avm/instances/base/dockerizable.rb
+- vendor/avm/lib/avm/instances/base/entry_keys.rb
 - vendor/avm/lib/avm/instances/docker_image.rb
+- vendor/avm/lib/avm/instances/entries.rb
+- vendor/avm/lib/avm/instances/entry.rb
+- vendor/avm/lib/avm/instances/entry_keys.rb
+- vendor/avm/lib/avm/instances/runner.rb
 - vendor/avm/lib/avm/jobs.rb
 - vendor/avm/lib/avm/jobs/base.rb
 - vendor/avm/lib/avm/jobs/variables_source.rb
@@ -691,8 +714,12 @@ files:
 - vendor/avm/lib/avm/rspec/setup.rb
 - vendor/avm/lib/avm/rspec/shared_examples/in_avm_registry.rb
 - vendor/avm/lib/avm/rspec/shared_examples/not_in_avm_registry.rb
+- vendor/avm/lib/avm/runners/base.rb
 - vendor/avm/lib/avm/scms/base.rb
 - vendor/avm/lib/avm/scms/commit.rb
+- vendor/avm/lib/avm/self/docker_image.rb
+- vendor/avm/lib/avm/self/instance.rb
+- vendor/avm/lib/avm/self/instance/entry_keys.rb
 - vendor/avm/lib/avm/source_stereotypes/base.rb
 - vendor/avm/lib/avm/sources.rb
 - vendor/avm/lib/avm/sources/base.rb