avm-tools 0.88.0 → 0.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39cd843842c1fc4981f71fe88945db68e140b1aa6a7bdddeddd8b344c4215501
-  data.tar.gz: 1fbe73dc1d4e2854e637fc6b697880e6ad192ecb62b4cad5d81612b1e8c22e88
+  metadata.gz: ff6d2b367a6cca1ba76094f9847bfc4155a3c9abe9665b582c572cb35567320b
+  data.tar.gz: 3aea3baa7f0e41dc0566d2d4411e1cf4c78e852aae4787f33d002a274dd4f3b2
 SHA512:
-  metadata.gz: eba623387eb4320e93facda684c544565c2a3b1b0abca7902793df59416506068df6a3b6e0359e4ded1c40897cccb80629f23802dbbe9cc101e637726bf55297
-  data.tar.gz: 4d9b78c8924c5879811517ba7089b74aa8aa5b60a35a99d00e57330431da9141a44123c68c62c191210d9df584cbb02bd881d3067302cc09f2ae3fcc893d3f32
+  metadata.gz: 73222b5a84ab23aacbc5088f0c9a297babcae52fa5427ebcae52053c697250ac4aa8a3e91940a4f82dd5d5f5bf39f12fb730c1d9883ae44cccf606419a241117
+  data.tar.gz: f76583694406760f366788cc4535095604adf4eaaf784350d425d3d820764c4a531a317fde4ddab56abd496b85895cf55dc9825046c3c4fa09059d66934d4992

data/lib/avm/eac_asciidoctor_base0.rb

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

data/lib/avm/{eac_writings_base1 → eac_asciidoctor_base0}/apache_host.rb

@@ -3,7 +3,7 @@
 require 'avm/eac_webapp_base0/apache_host'
 
 module Avm
-  module EacWritingsBase1
+  module EacAsciidoctorBase0
     class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
       def document_root
         instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)

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_writings_base1 → eac_asciidoctor_base0}/build.rb

@@ -4,7 +4,7 @@ require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/fs/clearable_directory'
 
 module Avm
-  module EacWritingsBase1
+  module EacAsciidoctorBase0
     class Build
       require_sub __FILE__
       enable_console_speaker
@@ -15,6 +15,8 @@ module Avm
         self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
       end
 
+      SOURCE_EXTNAMES = %w[.adoc .asc].freeze
+
       def run
         infov 'Files to build', source_files.count
         target_directory.clear
@@ -34,9 +36,9 @@ module Avm
       def source_files_uncached
         r = []
         project.root.children.each do |child|
-          next unless child.extname == '.asc'
+          next unless SOURCE_EXTNAMES.include?(child.extname)
 
-          r << ::Avm::EacWritingsBase1::Build::File.new(self, child.basename)
+          r << ::Avm::EacAsciidoctorBase0::Build::File.new(self, child.basename)
         end
         r
       end

data/lib/avm/{eac_writings_base1 → eac_asciidoctor_base0}/build/file.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/executables'
+require 'asciidoctor'
 
 module Avm
-  module EacWritingsBase1
+  module EacAsciidoctorBase0
     class Build
       class File
         enable_console_speaker
@@ -11,8 +11,8 @@ module Avm
 
         def run
           infov 'Building', subpath
-          target_path.parent.mkpath
-          ::Avm::Executables.asciidoc.command('--out-file', target_path, source_path).system!
+          ::Asciidoctor.convert_file source_path.to_path,
+                                     to_file: target_path.to_path, safe: :unsafe, mkdirs: true
         end
 
         def source_path

data/lib/avm/{eac_writings_base1 → eac_asciidoctor_base0}/deploy.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
 require 'avm/eac_webapp_base0/deploy'
-require 'avm/eac_writings_base1/project'
-require 'avm/eac_writings_base1/build'
+require 'avm/eac_asciidoctor_base0/project'
+require 'avm/eac_asciidoctor_base0/build'
 
 module Avm
-  module EacWritingsBase1
+  module EacAsciidoctorBase0
     class Deploy < ::Avm::EacWebappBase0::Deploy
       def build_content
-        ::Avm::EacWritingsBase1::Build.new(
+        ::Avm::EacAsciidoctorBase0::Build.new(
           project,
-          ::Avm::EacWritingsBase1::Build::OPTION_TARGET_DIRECTORY => build_dir
+          ::Avm::EacAsciidoctorBase0::Build::OPTION_TARGET_DIRECTORY => build_dir
         ).run
       end
 
       private
 
       def project_uncached
-        ::Avm::EacWritingsBase1::Project.new(
+        ::Avm::EacAsciidoctorBase0::Project.new(
           instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
         )
       end

data/lib/avm/{eac_writings_base1 → eac_asciidoctor_base0}/instance.rb

@@ -3,7 +3,7 @@
 require 'avm/eac_webapp_base0/instance'
 
 module Avm
-  module EacWritingsBase1
+  module EacAsciidoctorBase0
     class Instance < ::Avm::EacWebappBase0::Instance
       FILES_UNITS = {}.freeze
     end

data/lib/avm/{eac_writings_base1 → eac_asciidoctor_base0}/project.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacWritingsBase1
+  module EacAsciidoctorBase0
     class Project
       common_constructor :root do
         self.root = root.to_pathname

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,24 +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
-      common_constructor :instance, :options, default: [{}]
+      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
 
-      JOBS = %w[create_build_dir build_content append_instance_content write_on_target
-                setup_files_units assert_instance_branch request_test].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
@@ -61,18 +61,12 @@ module Avm
         fatal_error "Request to #{uri} failed" unless response.code.to_i == 200
       end
 
-      def variables_source
-        instance
-      end
-
-      private
+      protected
 
-      def run_jobs
-        JOBS.each do |job|
-          run_callbacks job do
-            send(job)
-          end
-        end
+      def jobs
+        r = super
+        r.delete(REQUEST_TEST_JOB) if options[OPTION_NO_REQUEST_TEST]
+        r
       end
     end
   end

data/lib/avm/eac_webapp_base0/deploy/appended_directories.rb

@@ -17,7 +17,7 @@ module Avm
         end
 
         def appended_directories_from_options
-          options[:appended_directories] || []
+          options[OPTION_APPENDED_DIRECTORIES] || []
         end
       end
     end

data/lib/avm/eac_webapp_base0/deploy/git_info.rb

@@ -18,7 +18,7 @@ module Avm
         end
 
         def git_reference
-          options[:reference] || DEFAULT_REFERENCE
+          options[OPTION_REFERENCE] || DEFAULT_REFERENCE
         end
 
         def git_reference_found_uncached

data/lib/avm/eac_webapp_base0/instance.rb

@@ -11,6 +11,8 @@ module Avm
     class Instance < ::Avm::Instances::Base
       include ::Avm::Postgresql::InstanceWith
 
+      FILES_UNITS = [].freeze
+
       def stereotype_name
         self.class.name.desconstantize.demodulize
       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