avm-tools 0.76.1 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd41b3c790de4a2264c78b5daa5afbd469de6ba2e74b616f096619d0a7bc5460
-  data.tar.gz: 0a1890b253e90debb2951fe90193fef541df4c4d0701dcf82712696377b1adbe
+  metadata.gz: 3345f4afdd4f7bb8cb968848675bc6b1d5c91e5833b17e90c43a01eae82a95c3
+  data.tar.gz: 5e032e2b459e3c1fe3bf5c42e054d89491736c8e181b17a988a079068728b526
 SHA512:
-  metadata.gz: 2ebb73966071bb959e16f10f37b784971f65b3f2cfede241fe4b02c127f24d057bbaedec098e900b8b69edf55e5951637f905a07d5a242d0b7bfd7b51907a3be
-  data.tar.gz: 510d2e7625a10c523269684a6e269212a5d8b027d671dc38e337be9c1015d9c69d4ba8f78049ee13090a9e6c733fabfd6b5d40541b6ddbd1e86cd8b4e524ba7c
+  metadata.gz: eccb5df2cf88efda09388fdcbf6a363ad32d49772980b57a58865d5b322c49848cfbaacbd572d4c7c9f9fa2af486ee5efb32b6632b91ead052546e76aa3be51d
+  data.tar.gz: a28d9a27d6c22363d021dad5c1bee61cff8785139c9f69cf131762a6702f988d478ae15880845eb6294941b99e0e391496f4298e99864455543ebad80f8e8866

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.76.1'
+    VERSION = '0.77.0'
   end
 end

data/template/avm/eac_redmine_base0/deploy/config/install.sh.template

@@ -12,3 +12,15 @@ fi
 export address_host='%%WEB.AUTHORITY%%'
 export address_path='%%WEB.PATH%%'
 export git_repositories_hierarchical_organisation=false
+
+# Mail settings
+export smtp_server='%%MAILER.SMTP.ADDRESS%%'
+export smtp_port='%%MAILER.SMTP.PORT%%'
+export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
+export smtp_tls='%%MAILER_SMTP_TLS%%'
+export smtp_enable_starttls_auto='%%MAILER_SMTP_STARTTLS_AUTO%%'
+export smtp_openssl_verify_mode='%%MAILER_SMTP_OPENSSL_VERIFY_MODE%%'
+export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
+export smtp_username='%%MAILER.SMTP.USERNAME%%'
+export smtp_password='%%MAILER.SMTP.PASSWORD%%'
+export mail_from='%%MAILER.FROM%%'

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

@@ -9,36 +9,30 @@ module EacCli
   class Definition
     require_sub __FILE__
 
+    MAIN_ALTERNATIVE_KEY = :main
     SUBCOMMAND_NAME_ARG = 'subcommand'
     SUBCOMMAND_ARGS_ARG = 'subcommand_args'
 
     attr_accessor :description
-    attr_accessor :options_argument
 
     def initialize
       self.description = '-- NO DESCRIPTION SET --'
-      self.options_argument = true
+      alternatives_set[MAIN_ALTERNATIVE_KEY] = main_alternative
     end
 
     def alt(&block)
-      r = ::EacCli::Definition.new
+      r = ::EacCli::Definition::Alternative.new
       r.instance_eval(&block)
-      alternatives << r
+      alternatives_set[new_alternative_key] = r
       r
     end
 
     def alternatives
-      @alternatives ||= []
+      alternatives_set.values
     end
 
-    def arg_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::ArgumentOption.new(
-        short, long, description, option_options
-      )
-    end
-
-    def bool_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::BooleanOption.new(short, long, description, option_options)
+    def alternative(key)
+      alternatives_set.fetch(key)
     end
 
     def desc(description)
@@ -49,42 +43,31 @@ module EacCli
       @help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
     end
 
-    def options_arg(options_argument)
-      self.options_argument = options_argument
-    end
-
-    def options
-      @options ||= []
+    def main_alternative
+      @main_alternative ||= begin
+        r = ::EacCli::Definition::Alternative.new
+        r.options_argument(true)
+        r
+      end
     end
 
-    def pos_arg(name, arg_options = {})
-      new_pos_arg = ::EacCli::Definition::PositionalArgument.new(name, arg_options)
-      raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
-
-      pos_set << new_pos_arg
+    def options_arg(options_argument)
+      self.options_argument = options_argument
     end
 
-    def positional
-      pos_set.to_a
+    def options_argument
+      main_alternative.options_argument?
     end
 
-    def positional_arguments_blocked?(new_pos_arg)
-      last = pos_set.last
-      return false unless last
-      return true if last.repeat?
-      return true if last.optional? && new_pos_arg.required?
-
-      false
+    def options_argument=(enable)
+      main_alternative.options_argument(enable)
     end
 
-    def subcommands
-      pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
-      pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
-                                                              optional: true, repeat: true)
-    end
+    delegate :arg_opt, :bool_opt, :options, :pos_arg,
+             :positional, :subcommands, to: :main_alternative
 
     def subcommands?
-      pos_set.any?(&:subcommand?)
+      alternatives.any?(&:subcommands?)
     end
 
     def options_first(enable = true)
@@ -97,6 +80,18 @@ module EacCli
 
     private
 
+    def alternatives_set
+      @alternatives_set ||= ::ActiveSupport::HashWithIndifferentAccess.new
+    end
+
+    def new_alternative_key
+      @last_key ||= 0
+      loop do
+        @last_key += 1
+        break @last_key unless alternatives_set.key?(@last_key)
+      end
+    end
+
     def pos_set
       @pos_set ||= []
     end

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

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'eac_cli/definition/argument_option'
+require 'eac_cli/definition/boolean_option'
+require 'eac_cli/definition/positional_argument'
+
+module EacCli
+  class Definition
+    class Alternative
+      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
+        )
+      end
+
+      def bool_opt(short, long, description, option_options = {})
+        options_set << ::EacCli::Definition::BooleanOption.new(short, long, description,
+                                                               option_options)
+      end
+
+      def options
+        options_set.to_a
+      end
+
+      def options_argument?
+        @options_argument ? true : false
+      end
+
+      def options_argument(enable)
+        @options_argument = enable
+
+        self
+      end
+
+      def pos_arg(name, arg_options = {})
+        new_pos_arg = ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+        check_positional_blocked(new_pos_arg)
+        pos_set << new_pos_arg
+      end
+
+      def positional
+        pos_set.to_a
+      end
+
+      def positional_arguments_blocked?(new_pos_arg)
+        last = pos_set.last
+        return false unless last
+        return true if subcommands?
+        return true if last.repeat?
+        return true if last.optional? && new_pos_arg.if_present(&:required?)
+
+        false
+      end
+
+      def subcommands
+        pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
+        pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
+                                                                optional: true, repeat: true)
+      end
+
+      def subcommands?
+        pos_set.any?(&:subcommand?)
+      end
+
+      private
+
+      def check_positional_blocked(new_pos_arg)
+        raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
+      end
+
+      def pos_set
+        @pos_set ||= []
+      end
+
+      def options_set
+        @options_set ||= []
+      end
+    end
+  end
+end

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

@@ -6,71 +6,49 @@ require 'eac_ruby_utils/console/docopt_runner'
 module EacCli
   module Docopt
     class DocBuilder
+      require_sub __FILE__
       common_constructor :definition
 
       SEP = ' '
       IDENT = SEP * 2
       OPTION_DESC_SEP = IDENT * 2
 
-      def positional_argument(positional)
-        if positional.subcommand?
-          ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
-        else
-          r = "<#{positional.name}>"
-          r += '...' if positional.repeat?
-          r = "[#{r}]" if positional.optional?
-          r
+      class << self
+        def option_long(option)
+          b = option.long
+          b += '=<value>' if option.argument?
+          b
         end
       end
 
-      def option_argument(option)
-        option_long(option)
-      end
-
       def option_definition(option)
-        option.short + SEP + option_long(option) + OPTION_DESC_SEP + option.description
-      end
-
-      def option_long(option)
-        b = option.long
-        b += '=<value>' if option.argument?
-        b
+        option.short + SEP + self.class.option_long(option) + OPTION_DESC_SEP + option.description
       end
 
       def section(header, include_header = true)
         b = include_header ? "#{header.humanize}:\n" : ''
         b += send("self_#{header}") + "\n"
         definition.alternatives.each do |alternative|
-          b += self.class.new(alternative).section(header, false)
+          b += IDENT + ::EacCli::Docopt::DocBuilder::Alternative.new(alternative).to_s + "\n"
         end
         b
       end
 
-      def self_options
-        definition.options.map { |option| IDENT + option_definition(option) }.join("\n")
-      end
-
-      def self_usage
-        IDENT + self_usage_arguments.join(SEP)
-      end
-
-      def self_usage_arguments
-        [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
-          definition.options_argument.if_present([]) { |_v| ['[options]'] } +
-          self_usage_arguments_options +
-          self_usage_arguments_positional
-      end
-
-      def self_usage_arguments_options
-        definition.options.select(&:show_on_usage?).map { |option| option_argument(option) }
+      def options_section
+        "Options:\n" +
+          definition.alternatives.flat_map(&:options)
+                    .map { |option| IDENT + option_definition(option) + "\n" }.join
       end
 
-      def self_usage_arguments_positional
-        definition.positional.map { |p| positional_argument(p) }
+      def usage_section
+        "Usage:\n" +
+          definition.alternatives.map do |alternative|
+            IDENT + ::EacCli::Docopt::DocBuilder::Alternative.new(alternative).to_s + "\n"
+          end.join
       end
 
       def to_s
-        "#{definition.description}\n\n#{section('usage')}\n#{section('options')}\n"
+        "#{definition.description}\n\n#{usage_section}\n#{options_section}\n"
       end
     end
   end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module EacCli
+  module Docopt
+    class DocBuilder
+      class Alternative
+        common_constructor :alternative
+
+        def to_s
+          (
+            [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
+              alternative.options_argument?.if_present([]) { |_v| ['[options]'] } +
+              options +
+              positionals
+          ).join(::EacCli::Docopt::DocBuilder::SEP)
+        end
+
+        def options
+          alternative.options.select(&:show_on_usage?).map do |option|
+            ::EacCli::Docopt::DocBuilder.option_long(option)
+          end
+        end
+
+        def option_argument(option)
+          b = option.long
+          b += '=<value>' if option.argument?
+          b
+        end
+
+        def positionals
+          alternative.positional.map { |p| positional(p) }
+        end
+
+        def positional(positional)
+          if positional.subcommand?
+            ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
+          else
+            r = "<#{positional.name}>"
+            r += '...' if positional.repeat?
+            r = "[#{r}]" if positional.optional?
+            r
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/parser.rb

@@ -5,10 +5,28 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Parser
     require_sub __FILE__
-    common_constructor :definition
+    enable_simple_cache
+    common_constructor :definition, :argv
 
-    def parse(argv)
-      ::EacCli::Parser::ParseResult.new(definition, argv).result
+    private
+
+    def parsed_uncached
+      raise 'Definition has no alternatives' if alternatives.empty?
+
+      alternatives.each do |alt_parser|
+        return alt_parser.parsed unless alt_parser.error?
+      end
+
+      raise first_error
+    end
+
+    def alternatives_uncached
+      definition.alternatives
+                .map { |alternative| ::EacCli::Parser::Alternative.new(alternative, argv) }
+    end
+
+    def first_error_uncached
+      alternatives.lazy.select(&:error?).map(&:error).first
     end
   end
 end

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

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'eac_cli/parser/collector'
+require 'eac_cli/parser/error'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Parser
+    class Alternative
+      require_sub __FILE__, include_modules: true
+      enable_listable
+      lists.add_symbol :phase, :any, :option_argument, :positional
+      attr_reader :error
+
+      common_constructor :alternative, :argv do
+        alternative.assert_argument(::EacCli::Definition::Alternative, :alternative)
+        self.phase = PHASE_ANY
+        collect
+      end
+
+      def error?
+        error.present?
+      end
+
+      def parsed
+        @parsed ||= collector.to_data.freeze
+      end
+
+      private
+
+      attr_accessor :phase
+
+      def any_collect_argv_value
+        if argv_current_option?
+          option_collect_argv_value
+        else
+          positional_collect_argv_value
+        end
+      end
+
+      def collector
+        @collector ||= ::EacCli::Parser::Collector.new(alternative)
+      end
+
+      def collect
+        loop do
+          break unless argv_pending?
+
+          collect_argv_value
+        end
+        validate
+      rescue ::EacCli::Parser::Error => e
+        @error = e
+      end
+
+      def collect_argv_value
+        send("#{phase}_collect_argv_value")
+        argv_enum.next
+      end
+
+      def collect_option_argv_value
+        alternative.options.each do |option|
+        end
+
+        raise ::EacCli::Parser::Error.new(
+          alternative, argv, "Invalid option: #{argv_enum.current}"
+        )
+      end
+
+      def raise_error(message)
+        raise ::EacCli::Parser::Error.new(alternative, argv, message)
+      end
+
+      def validate
+        (alternative.options + alternative.positional).each do |option|
+          validate_option(option)
+        end
+      end
+
+      def validate_option(option)
+        return unless option.required?
+        return if collector.supplied?(option)
+
+        raise_error("Required option/positional #{option} not supplied")
+      end
+    end
+  end
+end