avm-tools 0.92.0 → 0.94.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b6568f1c571107315662a90e29d111bf1af9a534c326ea57f358fa68c7ec550
-  data.tar.gz: 808a16008057b72ef58b11d91f05e021c814bca2100f3c5e85c0363bcac97216
+  metadata.gz: 266e7f05ba459608c81b684bb675e5efab20d7be043e59424398a3c810cf1db9
+  data.tar.gz: f9b04149ba95fa4cd4b4aba277118918351727999ed1a363b4782f0cd5ffcd96
 SHA512:
-  metadata.gz: dc0628987c36f9c72d642546a7b4ab85e3c630a239e053af92beb86658deac8fba9c7e389947b843097499fce529d2b100d734173aad36dea200d5c874a61ef8
-  data.tar.gz: c3b19cbf0a2d063e5a436d314b5b20ab7167e584bca986c486e6ee2fd9beccfcd156e0d7095559caf0fd4236f279aeea91a81cb45207cd5b01f769e2987c85b4
+  metadata.gz: 1b2028e2aa894113dcbcee37742d302d1e12a363fddd5b569da22d84ea6c9e8f49ce87e9675af1bf8cef0b1a5d9e11dc94c969f61e71ff6ab1164371b145e987
+  data.tar.gz: 356839265fa90cc3d360af76194562840fa88aea67f0743814f22044263903fa5007b6617878610e19e43763bc5e238c6a37b697c379cccdf376ff61596ce1fa

data/lib/avm/eac_asciidoctor_base0/apache_path.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/apache_path'
+
+module Avm
+  module EacAsciidoctorBase0
+    class ApachePath < ::Avm::EacWebappBase0::ApachePath
+    end
+  end
+end

data/lib/avm/eac_rails_base0/apache_path.rb

@@ -1,49 +1,17 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ubuntu_base0/apache'
+require 'avm/eac_webapp_base0/apache_path'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacRailsBase0
-    class ApachePath
-      enable_console_speaker
-      enable_simple_cache
-      common_constructor :instance, :options, default: [{}]
-
-      def run
-        write_available_conf
-        enable_conf
-        reload_apache
-        ::Avm::Result.success('Done')
-      end
-
-      def content
-        template.child('default.conf').apply(instance)
-      end
-
-      private
-
-      def apache_uncached
-        ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
-      end
-
-      def enable_conf
-        infom 'Enabling configuration...'
-        conf.enable
-      end
-
-      def reload_apache
-        infom 'Reloading Apache...'
-        apache.service('reload')
-      end
-
-      def conf_uncached
-        apache.conf(instance.id)
+    class ApachePath < ::Avm::EacWebappBase0::ApachePath
+      def document_root
+        ::File.join(super, 'public')
       end
 
-      def write_available_conf
-        infom 'Writing available configuration...'
-        conf.write(content)
+      def extra_content
+        template.child('extra_content.conf').apply(instance)
       end
     end
   end

data/lib/avm/eac_webapp_base0/apache_host.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'avm/apps/jobs/base'
 require 'avm/patches/object/template'
 require 'avm/eac_ubuntu_base0/apache'
 require 'avm/patches/object/template'
@@ -8,24 +9,14 @@ require 'avm/patches/object/template'
 module Avm
   module EacWebappBase0
     class ApacheHost
-      enable_console_speaker
-      enable_simple_cache
-      common_constructor :instance, :options, default: [{}]
-
-      def run
-        write_available_no_ssl_site
-        enable_no_ssl_site
-        remove_ssl_site
-        reload_apache
-        run_certbot
-        enable_ssl_site
-        reload_apache
-        ::Avm::Result.success('Done')
-      end
+      JOBS = %w[write_available_no_ssl_site enable_no_ssl_site remove_ssl_site reload_apache
+                run_certbot enable_ssl_site reload_apache].freeze
+      include ::Avm::Apps::Jobs::Base
 
       def no_ssl_site_content
-        ::Avm::EacWebappBase0::ApacheHost.template.child('no_ssl.conf')
-                                         .apply(EntriesReader.new(self, instance))
+        ::Avm::EacWebappBase0::ApacheHost
+          .template.child('no_ssl.conf')
+          .apply(variables_source)
       end
 
       def ssl?
@@ -83,21 +74,6 @@ module Avm
         infom 'Writing no SSL site conf...'
         no_ssl_site.write(no_ssl_site_content)
       end
-
-      class EntriesReader
-        common_constructor :job, :instance
-
-        def read_entry(path, options = {})
-          entry_from_job(path) || instance.read_entry(path, options)
-        end
-
-        private
-
-        def entry_from_job(path)
-          method = path.gsub('.', '_').underscore
-          return job.send(method) if job.respond_to?(method, true)
-        end
-      end
     end
   end
 end

data/lib/avm/eac_webapp_base0/apache_path.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'avm/apps/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class ApachePath
+      JOBS = %w[write_available_conf enable_conf reload_apache].freeze
+      include ::Avm::Apps::Jobs::Base
+
+      def content
+        ::Avm::EacWebappBase0::ApachePath.template.child('default.conf').apply(variables_source)
+      end
+
+      def document_root
+        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+      end
+
+      def extra_content
+        ''
+      end
+
+      private
+
+      def apache_uncached
+        ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
+      end
+
+      def enable_conf
+        infom 'Enabling configuration...'
+        conf.enable
+      end
+
+      def reload_apache
+        infom 'Reloading Apache...'
+        apache.service('reload')
+      end
+
+      def conf_uncached
+        apache.conf(instance.id)
+      end
+
+      def write_available_conf
+        infom 'Writing available configuration...'
+        conf.write(content)
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/callbacks'
+require 'avm/apps/jobs/base'
 require 'avm/git'
 require 'avm/patches/object/template'
 require 'eac_ruby_utils/core_ext'
@@ -11,30 +12,23 @@ module Avm
   module EacWebappBase0
     class Deploy
       require_sub __FILE__, include_modules: true
-      include ::ActiveSupport::Callbacks
 
       DEFAULT_REFERENCE = 'HEAD'
 
-      enable_console_speaker
-      enable_simple_cache
-      enable_listable
-      lists.add_symbol :option, :appended_directories, :no_request_test, :reference
-      common_constructor :instance, :options, default: [{}] do
-        self.options = ::Avm::EacWebappBase0::Deploy.lists.option
-                                                    .hash_keys_validate!(options.symbolize_keys)
-      end
-
       REQUEST_TEST_JOB = 'request_test'
       JOBS = (%w[create_build_dir build_content append_instance_content write_on_target
                  setup_files_units assert_instance_branch] + [REQUEST_TEST_JOB]).freeze
-      define_callbacks(*JOBS)
+
+      include ::Avm::Apps::Jobs::Base
+
+      lists.add_symbol :option, :appended_directories, :no_request_test, :reference
+
+      def option_list
+        ::Avm::EacWebappBase0::Deploy.lists.option
+      end
 
       def run
-        start_banner
-        run_jobs
-        ::Avm::Result.success('Deployed')
-      rescue ::Avm::Result::Error => e
-        e.to_result
+        super
       ensure
         remove_build_dir
       end
@@ -67,25 +61,13 @@ module Avm
         fatal_error "Request to #{uri} failed" unless response.code.to_i == 200
       end
 
-      def variables_source
-        instance
-      end
-
-      private
+      protected
 
       def jobs
-        r = JOBS.dup
+        r = super
         r.delete(REQUEST_TEST_JOB) if options[OPTION_NO_REQUEST_TEST]
         r
       end
-
-      def run_jobs
-        jobs.each do |job|
-          run_callbacks job do
-            send(job)
-          end
-        end
-      end
     end
   end
 end

data/lib/avm/eac_webapp_base0/instance.rb

@@ -9,6 +9,7 @@ require 'avm/eac_webapp_base0/deploy/file_unit'
 module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
+      require_sub __FILE__
       include ::Avm::Postgresql::InstanceWith
 
       FILES_UNITS = [].freeze
@@ -26,8 +27,10 @@ module Avm
       end
 
       def run_subcommand(subcommand_class, argv)
-        parent = ::OpenStruct.new(instance: self)
-        subcommand_class.new(argv: argv, parent: parent).run
+        subcommand_class.create(
+          argv: argv,
+          parent: ::Avm::EacWebappBase0::Instance::SubcommandParent.new(self)
+        ).run
       end
 
       def data_package

data/lib/avm/eac_webapp_base0/instance/subcommand_parent.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class Instance < ::Avm::Instances::Base
+      class SubcommandParent
+        enable_simple_cache
+        common_constructor :instance
+
+        private
+
+        def runner_context_uncached
+          ::EacCli::Runner::Context.new(self, argv: runner_argv)
+        end
+
+        def runner_argv
+          [instance.class.name.split('::')[-2].dasherize, instance.id]
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/runner/apache_host.rb

@@ -1,22 +1,19 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
+require 'avm/instances/runner'
+require 'eac_cli/core_ext'
 
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+      class ApacheHost
+        runner_with :help do
           desc 'Configure Apache virtual host for instance.'
           bool_opt '-c', '--certbot', 'Install certbot.'
         end
 
         def run
-          options
-          result = stereotype_apache_host_class.new(context(:instance),
+          result = stereotype_apache_host_class.new(runner_context.call(:instance),
                                                     stereotype_apache_host_options).run
           if result.error?
             fatal_error result.to_s
@@ -26,11 +23,11 @@ module Avm
         end
 
         def stereotype_apache_host_class
-          "#{context(:instance).class.name.deconstantize}::ApacheHost".constantize
+          "#{runner_context.call(:instance).class.name.deconstantize}::ApacheHost".constantize
         end
 
         def stereotype_apache_host_options
-          { certbot: options.fetch('--certbot') }
+          { certbot: parsed.certbot? }
         end
       end
     end

data/lib/avm/eac_webapp_base0/runner/apache_path.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'avm/instances/runner'
+require 'avm/eac_webapp_base0/runner/apache_host'
+require 'avm/eac_rails_base0/apache_path'
+
+module Avm
+  module EacWebappBase0
+    class Runner < ::Avm::Instances::Runner
+      class ApachePath
+        runner_with :help do
+          desc 'Configure Apache path configuration for instance.'
+        end
+
+        def run
+          if result.error?
+            fatal_error result.to_s
+          else
+            infov 'Result', result.label
+          end
+        end
+
+        private
+
+        def apache_path_uncached
+          stereotype_apache_path_class.new(runner_context.call(:instance))
+        end
+
+        def result_uncached
+          apache_path.run
+        end
+
+        def stereotype_apache_path_class
+          "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/runner/data.rb

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/require_sub'
+require 'eac_cli/core_ext'
 
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Data < ::EacRubyUtils::Console::DocoptRunner
-        ::EacRubyUtils.require_sub(__FILE__)
-
-        DOC = <<~DOCOPT
-          Data utilities for EacRailsBase0 instances.
-
-          Usage:
-            __PROGRAM__ __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+      class Data
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          desc 'Data utilities for EacRailsBase0 instances.'
+          subcommands
+        end
       end
     end
   end

data/lib/avm/eac_webapp_base0/runner/data/dump.rb

@@ -1,37 +1,26 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/numeric/time'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/simple_cache'
 require 'avm/data/package/dump'
+require 'eac_cli/core_ext'
 
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Data < ::EacRubyUtils::Console::DocoptRunner
-        class Dump < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
+      class Data
+        class Dump
           DUMP_EXPIRE_TIME = 1.day
           DEFAULT_DUMP_PATH_ENTRY_SUFFIX = 'data.default_dump_path'
           NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
             'dump was expired.'
 
-          DOC = <<~DOCUMENT
-            Dump utility for EacRailsBase instance.
-
-                Usage:
-                __PROGRAM__ [options]
-
-              Options:
-                -h --help               Show this screen.
-                --rewrite               Forces dump overwrite.
-                --dump-path=<dump_path> Set DUMP_PATH variable.
-          DOCUMENT
+          runner_with :help do
+            desc 'Dump utility for EacRailsBase instance.'
+            bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
+            arg_opt '-p', '--dump-path', 'Set DUMP_PATH variable.'
+          end
 
           def run
-            infov 'Instance to dump', "#{context(:instance)} (#{context(:instance).class})"
+            infov 'Instance to dump', "#{instance} (#{instance.class})"
             if package_dump.runnable?
               package_dump.run
             else
@@ -43,20 +32,25 @@ module Avm
 
           private
 
+          def instance
+            runner_context.call(:instance)
+          end
+
           def package_dump_uncached
-            context(:instance).data_package.dump(dump_path, existing: package_dump_existing)
+            instance
+              .data_package.dump(dump_path, existing: package_dump_existing)
           end
 
           def dump_path
-            options.fetch('--dump-path') || default_dump_path
+            parsed.dump_path || default_dump_path
           end
 
           def default_dump_path
-            context(:instance).read_entry(DEFAULT_DUMP_PATH_ENTRY_SUFFIX)
+            instance.read_entry(DEFAULT_DUMP_PATH_ENTRY_SUFFIX)
           end
 
           def package_dump_existing
-            if options.fetch('--rewrite')
+            if parsed.rewrite?
               ::Avm::Data::Package::Dump::EXISTING_ROTATE
             else
               ::Avm::Data::Package::Dump::EXISTING_ROTATE_EXPIRED