avm-tools 0.92.0 → 0.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b6568f1c571107315662a90e29d111bf1af9a534c326ea57f358fa68c7ec550
-  data.tar.gz: 808a16008057b72ef58b11d91f05e021c814bca2100f3c5e85c0363bcac97216
+  metadata.gz: ff6d2b367a6cca1ba76094f9847bfc4155a3c9abe9665b582c572cb35567320b
+  data.tar.gz: 3aea3baa7f0e41dc0566d2d4411e1cf4c78e852aae4787f33d002a274dd4f3b2
 SHA512:
-  metadata.gz: dc0628987c36f9c72d642546a7b4ab85e3c630a239e053af92beb86658deac8fba9c7e389947b843097499fce529d2b100d734173aad36dea200d5c874a61ef8
-  data.tar.gz: c3b19cbf0a2d063e5a436d314b5b20ab7167e584bca986c486e6ee2fd9beccfcd156e0d7095559caf0fd4236f279aeea91a81cb45207cd5b01f769e2987c85b4
+  metadata.gz: 73222b5a84ab23aacbc5088f0c9a297babcae52fa5427ebcae52053c697250ac4aa8a3e91940a4f82dd5d5f5bf39f12fb730c1d9883ae44cccf606419a241117
+  data.tar.gz: f76583694406760f366788cc4535095604adf4eaaf784350d425d3d820764c4a531a317fde4ddab56abd496b85895cf55dc9825046c3c4fa09059d66934d4992

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/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,15 @@
 # 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.'
+        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

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

@@ -7,22 +7,13 @@ require 'eac_ruby_utils/simple_cache'
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Data < ::EacRubyUtils::Console::DocoptRunner
-        class Load < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCUMENT
-            Load utility for EacRailsBase instance.
-
-            Usage:
-              __PROGRAM__ (<dump-path>|--source-instance=<source-instance>)
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                               Show this screen.
-              -S --source-instance=<source-instance>  Informa a instância a ser extraída o dump.
-          DOCUMENT
+      class Data
+        class Load
+          runner_with :ĥelp do
+            desc 'Load utility for EacRailsBase instance.'
+            arg_opt '-S', '--source-instance', 'Informa a instância a ser extraída o dump.'
+            pos_arg :dump_path, optional: true
+          end
 
           def run
             return ::Dev::Result.error("Dump \"#{dump_path}\" does not exist") unless
@@ -33,16 +24,14 @@ module Avm
           end
 
           def dump_path_uncached
-            return options.fetch('<dump-path>').to_s if options.fetch('<dump-path>').present?
-            return source_instance_dump_path if options.fetch('--source-instance').present?
+            return parsed.dump_path.to_s if parsed.dump_path.present?
+            return source_instance_dump_path if parsed.source_instance.present?
 
-            raise "Dump path unknown (Options: #{options})"
+            raise "Dump path unknown (Options: #{parsed})"
           end
 
           def source_instance_dump_path
-            context(:instance).class.by_id(
-              options.fetch('--source-instance')
-            ).data_dump
+            runner_context.call(:instance).class.by_id(parsed.source_instance).data_dump
           end
 
           def load_dump
@@ -57,7 +46,7 @@ module Avm
           private
 
           def package_load_uncached
-            context(:instance).data_package.load(dump_path)
+            runner_context.call(:instance).data_package.load(dump_path)
           end
         end
       end

data/lib/avm/tools/runner/local_project/ruby.rb

@@ -9,7 +9,7 @@ module Avm
   module Tools
     class Runner
       class LocalProject
-        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby
           require_sub __FILE__
           include ::EacCli::DefaultRunner
 

data/lib/avm/tools/runner/local_project/ruby/bundler.rb

@@ -8,7 +8,7 @@ module Avm
   module Tools
     class Runner
       class LocalProject
-        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby
           class Bundler < ::EacRubyUtils::Console::DocoptRunner
             require_sub __FILE__
             include ::EacCli::DefaultRunner

data/lib/avm/tools/runner/local_project/ruby/bundler/gemfile_lock.rb

@@ -7,7 +7,7 @@ module Avm
   module Tools
     class Runner
       class LocalProject
-        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby
           class Bundler < ::EacRubyUtils::Console::DocoptRunner
             class GemfileLock < ::EacRubyUtils::Console::DocoptRunner
               include ::EacCli::DefaultRunner

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

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class Ruby < ::EacRubyUtils::Console::DocoptRunner
+      class Ruby
         require_sub __FILE__
-
-        DOC = <<~DOCOPT
-          Ruby utilities for AVM.
-
-          Usage:
-            __PROGRAM__ [options] __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+        runner_with :help, :subcommands do
+          desc 'Ruby utilities for AVM.'
+          subcommands
+        end
       end
     end
   end

data/lib/avm/tools/runner/ruby/gems.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class Ruby < ::EacRubyUtils::Console::DocoptRunner
-        class Gems < ::EacRubyUtils::Console::DocoptRunner
+      class Ruby
+        class Gems
           require_sub __FILE__
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'Rubygems utilities for AVM.'
             subcommands
           end

data/lib/avm/tools/runner/ruby/gems/generate.rb

@@ -1,31 +1,20 @@
 # frozen_string_literal: true
 
 require 'avm/ruby/gems/generator'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_cli/default_runner'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class Ruby < ::EacRubyUtils::Console::DocoptRunner
-        class Gems < ::EacRubyUtils::Console::DocoptRunner
-          class Generate < ::EacRubyUtils::Console::DocoptRunner
-            enable_console_speaker
-            enable_simple_cache
-
-            DOC = <<~DOCUMENT
-              Create a gem.
-
-              Usage:
-                __PROGRAM__ [options] <path>
-                __PROGRAM__ -h --help
-
-              Options:
-                -h --help                                   Show this help.
-                --eac-ruby-utils-version=<version>          Version for "eac_ruby_utils" gem.
-                --eac-ruby-gem-support-version=<version>    Version for "eac_ruby_gem_support" gem.
-            DOCUMENT
+      class Ruby
+        class Gems
+          class Generate
+            runner_with :help do
+              desc 'Create a gem.'
+              arg_opt '--eac-ruby-utils-version', 'Version for "eac_ruby_utils" gem.'
+              arg_opt '--eac-ruby-gem-support-version', 'Version for "eac_ruby_gem_support" gem.'
+              pos_arg :path
+            end
 
             def run
               success "Gem \"#{generator.name}\" created in \"#{generator.root_directory}\""
@@ -34,12 +23,12 @@ module Avm
             private
 
             def generator_uncached
-              ::Avm::Ruby::Gems::Generator.new(options.fetch('<path>'), generator_options)
+              ::Avm::Ruby::Gems::Generator.new(parsed.path, generator_options)
             end
 
             def generator_options
               %w[eac_ruby_utils eac_ruby_gem_support].map do |gem_name|
-                ["#{gem_name}_version".to_sym, options.fetch("--#{gem_name.dasherize}-version")]
+                ["#{gem_name}_version".to_sym, parsed.fetch("#{gem_name.variableize}_version")]
               end.to_h
             end
           end

data/lib/avm/tools/runner/ruby/rubocop.rb

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Tools
     class Runner
-      class Ruby < ::EacRubyUtils::Console::DocoptRunner
+      class Ruby
         class Rubocop < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::Console::Speaker
           include ::EacRubyUtils::SimpleCache

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.92.0'
+    VERSION = '0.93.0'
   end
 end

data/template/avm/eac_rails_base0/apache_path/extra_content.conf

@@ -0,0 +1,5 @@
+<Location "%%WEB.PATH%%">
+  PassengerBaseURI "%%WEB.PATH%%"
+  PassengerAppRoot "%%FS_PATH%%"
+  PassengerAppEnv production
+</Location>

data/template/avm/eac_webapp_base0/apache_path/default.conf

@@ -0,0 +1,9 @@
+<IfModule mod_passenger.c>
+    Alias "%%WEB.PATH%%" "%%DOCUMENT_ROOT%%"
+    %%EXTRA_CONTENT%%
+    <Directory "%%DOCUMENT_ROOT%%">
+        Allow from all
+        Options -MultiViews
+        Require all granted
+    </Directory>
+</IfModule>

data/vendor/avm-apps/Gemfile

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

data/vendor/avm-apps/avm-apps.gemspec

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/apps/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-apps'
+  s.version     = Avm::Apps::VERSION
+  s.authors     = ['Eduardo H. Bogoni']
+  s.summary     = 'AVM components for applications.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.58', '>= 0.58.1'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+end

data/vendor/avm-apps/lib/avm/apps.rb

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

data/vendor/avm-apps/lib/avm/apps/jobs.rb

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

data/vendor/avm-apps/lib/avm/apps/jobs/base.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'avm/apps/jobs/variables_source'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Apps
+    module Jobs
+      module Base
+        common_concern do
+          include ::ActiveSupport::Callbacks
+
+          enable_console_speaker
+          enable_simple_cache
+          enable_listable
+          common_constructor :instance, :options, default: [{}] do
+            if option_list.present?
+              self.options = option_list.hash_keys_validate!(options.symbolize_keys)
+            end
+          end
+          define_callbacks(*jobs)
+        end
+
+        module ClassMethods
+          def jobs
+            const_get('JOBS').dup
+          end
+        end
+
+        module InstanceMethods
+          def option_list
+            nil
+          end
+
+          def run
+            start_banner if respond_to?(:start_banner)
+            run_jobs
+            ::Avm::Result.success('Done!')
+          rescue ::Avm::Result::Error => e
+            e.to_result
+          end
+
+          def variables_source
+            ::Avm::Apps::Jobs::VariablesSource.new(self, instance)
+          end
+
+          protected
+
+          def run_jobs
+            jobs.each do |job|
+              run_callbacks job do
+                send(job)
+              end
+            end
+          end
+
+          def jobs
+            self.class.jobs
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/avm-apps/lib/avm/apps/jobs/variables_source.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Apps
+    module Jobs
+      class VariablesSource
+        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/vendor/avm-apps/lib/avm/apps/version.rb

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

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_gem_support/spec/examples/rubocop_check'
+
+RSpec.describe ::RuboCop, slow: true do
+  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
+end

data/vendor/avm-apps/spec/spec_helper.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # This allows you to limit a spec run to individual examples or groups
+  #   # you care about by tagging them with `:focus` metadata. When nothing
+  #   # is tagged with `:focus`, all examples get run. RSpec also provides
+  #   # aliases for `it`, `describe`, and `context` that include `:focus`
+  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  #   config.filter_run_when_matching :focus
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  #   config.disable_monkey_patching!
+  #
+  #   # This setting enables warnings. It's recommended, but in some cases may
+  #   # be too noisy due to issues in dependencies.
+  #   config.warnings = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = "doc"
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
+end

data/vendor/eac_cli/lib/eac_cli/definition/alternative.rb

@@ -10,15 +10,12 @@ module EacCli
       SUBCOMMAND_NAME_ARG = :subcommand
       SUBCOMMAND_ARGS_ARG = :subcommand_args
 
-      def arg_opt(short, long, description, option_options = {})
-        options_set << ::EacCli::Definition::ArgumentOption.new(
-          short, long, description, option_options
-        )
+      def arg_opt(*args)
+        options_set << ::EacCli::Definition::ArgumentOption.from_args(args)
       end
 
-      def bool_opt(short, long, description, option_options = {})
-        options_set << ::EacCli::Definition::BooleanOption.new(short, long, description,
-                                                               option_options)
+      def bool_opt(*args)
+        options_set << ::EacCli::Definition::BooleanOption.from_args(args)
       end
 
       def options

data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -5,19 +5,26 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     class BaseOption
+      require_sub __FILE__
+
+      class << self
+        def from_args(args)
+          p = ::EacCli::Definition::BaseOption::InitializeArgsParser.new(args)
+          new(p.short, p.long, p.description, p.options)
+        end
+      end
+
       DEFAULT_REQUIRED = false
 
       enable_listable
       enable_abstract_methods :build_value, :default_value
       lists.add_symbol :option, :optional, :usage, :repeat, :required
-      attr_reader :short, :long, :description, :options
-
-      def initialize(short, long, description, options = {})
-        @short = short
-        @long = long
-        @description = description
-        @options = options.symbolize_keys
-        @options.assert_valid_keys(::EacCli::Definition::BaseOption.lists.option.values)
+      common_constructor :short, :long, :description, :options, default: [{}] do
+        raise 'Nor short neither long selector was set' if short.blank? && long.blank?
+
+        self.options = ::EacCli::Definition::BaseOption.lists.option.hash_keys_validate!(
+          options.symbolize_keys
+        )
       end
 
       def identifier

data/vendor/eac_cli/lib/eac_cli/definition/base_option/initialize_args_parser.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Definition
+    class BaseOption
+      class InitializeArgsParser
+        PROPERTIES = %i[short long description options].freeze
+        attr_reader(*PROPERTIES)
+
+        def initialize(args)
+          self.options = args.extract_options!.freeze
+          args.each { |arg| absorb_arg(arg) }
+        end
+
+        private
+
+        attr_writer(*PROPERTIES)
+
+        def absorb_arg(arg)
+          arg_ext = ArgumentParser.new(arg)
+          send("#{arg_ext.type}=", arg_ext.value)
+        end
+
+        class ArgumentParser
+          TYPES = %i[short long description].freeze
+          common_constructor :value
+
+          def type
+            TYPES.find { |type| send("#{type}?") } || raise("Unknown type for \"#{value}\"")
+          end
+
+          def short?
+            value.start_with?('-') && !long?
+          end
+
+          def long?
+            value.start_with?('--')
+          end
+
+          def description?
+            !short? || !long?
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb

@@ -19,10 +19,24 @@ module EacCli
           b += '=<value>' if option.argument?
           b
         end
+
+        def option_short(option)
+          b = option.short
+          b += '=<value>' if option.argument?
+          b
+        end
+
+        def option_usage_full(option)
+          if option.long.present?
+            [option.short, option_long(option)].reject(&:blank?).join(SEP)
+          else
+            option_short(option)
+          end
+        end
       end
 
       def option_definition(option)
-        option.short + SEP + self.class.option_long(option) + OPTION_DESC_SEP + option.description
+        self.class.option_usage_full(option) + OPTION_DESC_SEP + option.description
       end
 
       def section(header, include_header = true)

data/vendor/eac_cli/lib/eac_cli/version.rb

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

data/vendor/eac_cli/spec/lib/eac_cli/definition/alternative_spec.rb

@@ -7,6 +7,10 @@ RSpec.describe ::EacCli::Definition::Alternative do
 
   it { expect { instance.arg_opt '-a', '--opt2', 'A argument option' }.not_to raise_error }
   it { expect { instance.bool_opt '-b', '--opt1', 'A boolean option' }.not_to raise_error }
+  it { expect { instance.bool_opt '-b', '--no-description' }.not_to raise_error }
+  it { expect { instance.bool_opt '--opt1', 'A option without short' }.not_to raise_error }
+  it { expect { instance.bool_opt '-b', 'A option without long' }.not_to raise_error }
+  it { expect { instance.bool_opt 'A option without selectors' }.to raise_error(::StandardError) }
   it { expect { instance.options_argument(true) }.not_to raise_error }
   it { expect { instance.pos_arg :pos1 }.not_to raise_error }
   it { expect { instance.pos_arg :pos2, optional: true, repeat: true }.not_to raise_error }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.92.0
+  version: 0.93.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -312,6 +312,7 @@ files:
 - lib/avm/docker/runner.rb
 - lib/avm/eac_asciidoctor_base0.rb
 - lib/avm/eac_asciidoctor_base0/apache_host.rb
+- lib/avm/eac_asciidoctor_base0/apache_path.rb
 - lib/avm/eac_asciidoctor_base0/build.rb
 - lib/avm/eac_asciidoctor_base0/build/file.rb
 - lib/avm/eac_asciidoctor_base0/deploy.rb
@@ -344,6 +345,7 @@ files:
 - lib/avm/eac_ubuntu_base0/docker_image.rb
 - lib/avm/eac_webapp_base0.rb
 - lib/avm/eac_webapp_base0/apache_host.rb
+- lib/avm/eac_webapp_base0/apache_path.rb
 - lib/avm/eac_webapp_base0/deploy.rb
 - lib/avm/eac_webapp_base0/deploy/appended_directories.rb
 - lib/avm/eac_webapp_base0/deploy/build.rb
@@ -354,6 +356,7 @@ files:
 - lib/avm/eac_webapp_base0/instance.rb
 - lib/avm/eac_webapp_base0/runner.rb
 - lib/avm/eac_webapp_base0/runner/apache_host.rb
+- lib/avm/eac_webapp_base0/runner/apache_path.rb
 - lib/avm/eac_webapp_base0/runner/data.rb
 - lib/avm/eac_webapp_base0/runner/data/dump.rb
 - lib/avm/eac_webapp_base0/runner/data/load.rb
@@ -527,7 +530,6 @@ files:
 - lib/avm/tools/runner.rb
 - lib/avm/tools/runner/eac_asciidoctor_base0.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
-- lib/avm/tools/runner/eac_rails_base0/apache_path.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
 - lib/avm/tools/runner/eac_redmine_base0/core_update.rb
 - lib/avm/tools/runner/eac_redmine_base0/docker.rb
@@ -613,13 +615,14 @@ files:
 - lib/eac_launcher/vendor.rb
 - lib/eac_launcher/vendor/github.rb
 - lib/eac_launcher/version.rb
-- template/avm/eac_rails_base0/apache_path/default.conf
+- 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_redmine_base0/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/deploy/config/secrets.yml
 - 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
 - template/avm/eac_writings_base0/commons/all.tex
 - template/avm/eac_writings_base0/commons/ebook.tex
@@ -638,6 +641,15 @@ files:
 - template/avm/ruby/gems/generator/version.template
 - template/avm/self/docker_image/Dockerfile
 - template/avm/self/docker_image/entrypoint.sh
+- vendor/avm-apps/Gemfile
+- vendor/avm-apps/avm-apps.gemspec
+- vendor/avm-apps/lib/avm/apps.rb
+- vendor/avm-apps/lib/avm/apps/jobs.rb
+- vendor/avm-apps/lib/avm/apps/jobs/base.rb
+- vendor/avm-apps/lib/avm/apps/jobs/variables_source.rb
+- vendor/avm-apps/lib/avm/apps/version.rb
+- vendor/avm-apps/spec/rubocop_spec.rb
+- vendor/avm-apps/spec/spec_helper.rb
 - vendor/eac_cli/Gemfile
 - vendor/eac_cli/eac_cli.gemspec
 - vendor/eac_cli/lib/eac_cli.rb
@@ -647,6 +659,7 @@ files:
 - vendor/eac_cli/lib/eac_cli/definition/alternative.rb
 - vendor/eac_cli/lib/eac_cli/definition/argument_option.rb
 - vendor/eac_cli/lib/eac_cli/definition/base_option.rb
+- vendor/eac_cli/lib/eac_cli/definition/base_option/initialize_args_parser.rb
 - vendor/eac_cli/lib/eac_cli/definition/boolean_option.rb
 - vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb
 - vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb

data/lib/avm/tools/runner/eac_rails_base0/apache_path.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-require 'avm/eac_webapp_base0/runner/apache_host'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'avm/eac_rails_base0/apache_path'
-
-module Avm
-  module Tools
-    class Runner
-      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
-        class ApachePath < ::EacRubyUtils::Console::DocoptRunner
-          runner_with
-
-          runner_definition 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
-
-          def apache_path_uncached
-            ::Avm::EacRailsBase0::ApachePath.new(context(:instance))
-          end
-
-          def result_uncached
-            apache_path.run
-          end
-        end
-      end
-    end
-  end
-end

data/template/avm/eac_rails_base0/apache_path/default.conf

@@ -1,13 +0,0 @@
-<IfModule mod_passenger.c>
-    Alias "%%WEB.PATH%%" "%%FS_PATH%%/public"
-    <Location "%%WEB.PATH%%">
-        PassengerBaseURI "%%WEB.PATH%%"
-        PassengerAppRoot "%%FS_PATH%%"
-        PassengerAppEnv production
-    </Location>
-    <Directory "%%FS_PATH%%/public">
-        Allow from all
-        Options -MultiViews
-        Require all granted
-    </Directory>
-</IfModule>