avm-tools 0.87.1 → 0.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b5ee493e22bb4e2eb77a9e62067e0de6dd23b3d3d4dd62ba2eeadedf183d22
-  data.tar.gz: 0d528d18932807487721a84c32a6c4d1f2906a015840ac360921fcbca78b493c
+  metadata.gz: 1b6568f1c571107315662a90e29d111bf1af9a534c326ea57f358fa68c7ec550
+  data.tar.gz: 808a16008057b72ef58b11d91f05e021c814bca2100f3c5e85c0363bcac97216
 SHA512:
-  metadata.gz: 4a7a88618b900c728d17a3ef9f492f1b0f42d74313190f8de7d532ebda8f89e27866eb9edbdee7043cfadfd075b71b44390d8c190191b11341120baef2489fea
-  data.tar.gz: e209c17b18ab7d34483054cb5545da9e946212ca857ae52ec18fa87b00704c3a589697ab1e0dfa1ec8b093afe55a8f8ea5a1e61487bda8ca717196d4e0e47679
+  metadata.gz: dc0628987c36f9c72d642546a7b4ab85e3c630a239e053af92beb86658deac8fba9c7e389947b843097499fce529d2b100d734173aad36dea200d5c874a61ef8
+  data.tar.gz: c3b19cbf0a2d063e5a436d314b5b20ab7167e584bca986c486e6ee2fd9beccfcd156e0d7095559caf0fd4236f279aeea91a81cb45207cd5b01f769e2987c85b4

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

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacWritingsBase1
+  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_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_base1/runner/log.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/runner_with/rails_environment'
+require 'avm/eac_webapp_base0/runner'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class Log
+        runner_with :help, ::Avm::EacRailsBase1::RunnerWith::RailsEnvironment do
+          desc 'Read application\'s log.'
+          bool_opt '-f', '--follow', 'Output appended data as the log grows.'
+        end
+
+        def run
+          start_banner
+          tail_command.system
+        end
+
+        private
+
+        def log_path
+          ::File.join(rails_instance.read_entry('fs_path'), 'log', "#{rails_environment}.log")
+        end
+
+        def start_banner
+          infov 'Environment', rails_environment
+          infov 'Log path', log_path
+        end
+
+        def tail_command
+          rails_instance.host_env.command(*tail_command_args)
+        end
+
+        def tail_command_args
+          r = %w[tail]
+          r << '--follow' if parsed.follow?
+          r + [log_path]
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_rails_base1/runner_with/bundle.rb

@@ -1,29 +1,15 @@
 # frozen_string_literal: true
 
 require 'avm/eac_rails_base1/instance'
+require 'avm/eac_rails_base1/runner_with/rails_environment'
 require 'eac_cli/runner'
 
 module Avm
   module EacRailsBase1
     module RunnerWith
       module Bundle
-        DEFAULT_RAILS_ENVIRONMENT_CONSTANT = 'DEFAULT_RAILS_ENVIRONMENT'
-
         common_concern do
-          include ::EacCli::Runner
-
-          runner_definition do
-            arg_opt '-e', '--environment', 'Specifies the environment for the runner to operate' \
-              ' (test/development/production). Default: "development".'
-          end
-        end
-
-        module ClassMethods
-          def default_rails_environment
-            const_get(DEFAULT_RAILS_ENVIRONMENT_CONSTANT)
-          rescue ::NameError
-            ::Avm::EacRailsBase1::Instance::DEFAULT_RAILS_ENVIRONMENT
-          end
+          include ::Avm::EacRailsBase1::RunnerWith::RailsEnvironment
         end
 
         def bundle_command
@@ -35,22 +21,6 @@ module Avm
           infov 'Rails environment', rails_environment
           bundle_command.system!
         end
-
-        def default_rails_environment
-          self.class.default_rails_environment
-        end
-
-        def rails_instance
-          if respond_to?(:runner_context)
-            runner_context.call(:instance)
-          else
-            context(:instance)
-          end
-        end
-
-        def rails_environment
-          parsed.environment.presence || default_rails_environment
-        end
       end
     end
   end

data/lib/avm/eac_rails_base1/runner_with/rails_environment.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instance'
+require 'eac_cli/runner'
+
+module Avm
+  module EacRailsBase1
+    module RunnerWith
+      module RailsEnvironment
+        DEFAULT_RAILS_ENVIRONMENT_CONSTANT = 'DEFAULT_RAILS_ENVIRONMENT'
+
+        common_concern do
+          include ::EacCli::Runner
+
+          runner_definition do
+            arg_opt '-e', '--environment', 'Specifies the environment for the runner to operate' \
+              ' (test/development/production). Default: "development".'
+          end
+        end
+
+        module ClassMethods
+          def default_rails_environment
+            const_get(DEFAULT_RAILS_ENVIRONMENT_CONSTANT)
+          rescue ::NameError
+            ::Avm::EacRailsBase1::Instance::DEFAULT_RAILS_ENVIRONMENT
+          end
+        end
+
+        def default_rails_environment
+          self.class.default_rails_environment
+        end
+
+        def rails_environment
+          parsed.environment.presence || default_rails_environment
+        end
+
+        def rails_instance
+          if respond_to?(:runner_context)
+            runner_context.call(:instance)
+          else
+            context(:instance)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -17,10 +17,16 @@ module Avm
 
       enable_console_speaker
       enable_simple_cache
-      common_constructor :instance, :options, default: [{}]
+      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
 
-      JOBS = %w[create_build_dir build_content append_instance_content write_on_target
-                setup_files_units assert_instance_branch request_test].freeze
+      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)
 
       def run
@@ -67,8 +73,14 @@ module Avm
 
       private
 
+      def jobs
+        r = JOBS.dup
+        r.delete(REQUEST_TEST_JOB) if options[OPTION_NO_REQUEST_TEST]
+        r
+      end
+
       def run_jobs
-        JOBS.each do |job|
+        jobs.each do |job|
           run_callbacks job do
             send(job)
           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/deploy.rb

@@ -2,34 +2,25 @@
 
 require 'avm/instances/runner'
 require 'avm/path_string'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/core_ext'
 
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Deploy < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacRubyUtils::Console::Speaker
-
-        DOC = <<~DOCOPT
-          Deploy for instance.
-
-          Usage:
-            __PROGRAM__ [options]
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help                       Show this screen.
-            -r --reference=<git-reference>  Git reference to deploy.
-            -a --append-dirs=<append-dirs>  Append directories to deploy (List separated by ":").
-        DOCOPT
+      class Deploy
+        runner_with :help do
+          desc 'Deploy for instance.'
+          arg_opt '-r', '--reference', 'Git reference to deploy.'
+          arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
+          bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
+        end
 
         def deploy_class
-          context(:stereotype_module).const_get('Deploy')
+          runner_context.call(:stereotype_module).const_get('Deploy')
         end
 
         def run
-          result = deploy_class.new(context(:instance), deploy_options).run
+          result = deploy_class.new(runner_context.call(:instance), deploy_options).run
           if result.error?
             fatal_error result.to_s
           else
@@ -38,8 +29,9 @@ module Avm
         end
 
         def deploy_options
-          { reference: options.fetch('--reference'),
-            appended_directories: ::Avm::PathString.paths(options.fetch('--append-dirs')) }
+          { reference: parsed.reference,
+            appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
+            no_request_test: parsed.no_request_test? }
         end
       end
     end

data/lib/avm/executables.rb

@@ -14,7 +14,7 @@ module Avm
 
       private
 
-      %w[asciidoc docker file git latex php-cs-fixer tidy yapf xdg-open].each do |program|
+      %w[docker file git latex php-cs-fixer tidy yapf xdg-open].each do |program|
         define_method(program.underscore + '_uncached') do
           env.executable(program, '--version')
         end

data/lib/avm/git/auto_commit/commit_info.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      class CommitInfo
+        enable_immutable
+
+        immutable_accessor :fixup
+
+        def git_commit_args
+          r = fixup.if_present([]) { |v| ['--fixup', v.sha1] }
+          return r if r.any?
+
+          raise 'Argument list is empty'
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        require_sub __FILE__
+
+        RULES_CLASSES = %w[last manual nth unique]
+                        .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
+
+        class << self
+          def parse(string)
+            parts = string.split(':')
+
+            klass = rule_class_by_key(parts.shift)
+            klass.new(*parts)
+          end
+
+          def rule_class_by_key(key)
+            RULES_CLASSES.find { |klass| klass.keys.include?(key) } ||
+              raise("Rule not find with key \"#{key}\" (Available: " +
+                RULES_CLASSES.flat_map(&:keys) + ')')
+          end
+        end
+      end
+    end
+  end
+end