avm-tools 0.89.0 → 0.94.0

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/definition/boolean_option.rb

@@ -8,6 +8,14 @@ module EacCli
       def argument?
         false
       end
+
+      def build_value(_new_value, previous_value)
+        repeat? ? previous_value + 1 : true
+      end
+
+      def default_value
+        repeat? ? 0 : false
+      end
     end
   end
 end

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

@@ -13,6 +13,18 @@ module EacCli
         options.assert_valid_keys(self.class.lists.option.values)
       end
 
+      def build_value(new_value, previous_value)
+        if previous_value.is_a?(::Array)
+          previous_value + [new_value]
+        else
+          new_value
+        end
+      end
+
+      def default_value
+        repeat? ? [] : nil
+      end
+
       def identifier
         name.to_s.variableize.to_sym
       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/parser/collector.rb

@@ -24,11 +24,7 @@ module EacCli
       end
 
       def collect(option, value)
-        if data[option].is_a?(::Array)
-          data[option] << value
-        else
-          data[option] = value
-        end
+        data[option] = option.build_value(value, data[option])
       end
 
       def supplied?(option)
@@ -42,18 +38,8 @@ module EacCli
       end
 
       def default_values
-        definition.options.each { |option| data[option] = option_default_value(option) }
-        definition.positional.each do |positional|
-          data[positional] = positional_default_value(positional)
-        end
-      end
-
-      def option_default_value(option)
-        option.argument? ? nil : false
-      end
-
-      def positional_default_value(positional)
-        positional.repeat? ? [] : nil
+        definition.options.each { |option| data[option] = option.default_value }
+        definition.positional.each { |positional| data[positional] = positional.default_value }
       end
     end
   end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.12.6'
+  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 }

data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb

@@ -12,6 +12,8 @@ RSpec.describe ::EacCli::Runner do
       runner_definition do
         arg_opt '-o', '--opt1', 'A arg option.'
         bool_opt '-p', '--opt2', 'A boolean option'
+        arg_opt '-q', '--opt4', 'A repeatable argument option.', repeat: true
+        bool_opt '-r', '--opt5', 'A repeatable boolean option', repeat: true
         pos_arg :pos1
         pos_arg :pos2, repeat: true, optional: true
         alt do
@@ -29,7 +31,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when all args are supplied' do
     let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd] }
     let(:parsed_expected) do
-      { opt1: 'aaa', opt2: true, opt3: false, pos1: 'bbb',
+      { opt1: 'aaa', opt2: true, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
         pos2: %w[ccc ddd] }
     end
 
@@ -63,7 +65,10 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
-    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: false, pos1: 'bbb', pos2: [] } }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
+        pos2: [] }
+    end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to be_nil }
@@ -82,12 +87,25 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when alternative args are supplied' do
     let(:argv) { %w[--opt3] }
-    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: true, pos1: nil, pos2: [] } }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: true, opt4: [], opt5: 0, pos1: nil,
+        pos2: [] }
+    end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt3?).to eq(true) }
   end
 
+  context 'when repeated options are supplied' do
+    let(:argv) { %w[--opt5 -rrr --opt4=A -q B --opt4 C AAA] }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: false, opt4: %w[A B C], opt5: 4, pos1: 'AAA',
+        pos2: [] }
+    end
+
+    it { expect(parsed_actual).to eq(parsed_expected) }
+  end
+
   context 'when extra args are not supplied' do
     let(:runner_class) do
       the_module = described_class

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/local_time_zone.rb

@@ -14,6 +14,10 @@ module EacRubyUtils
         %w[tz_env debian_config offset].lazy.map { |s| send("by_#{s}") }.find(&:present?)
       end
 
+      def auto_set
+        ::Time.zone = auto
+      end
+
       def by_debian_config
         path = ::Pathname.new(DEBIAN_CONFIG_PATH)
         path.exist? ? path.read.strip.presence : nil

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.58.0'
+  VERSION = '0.58.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.89.0
+  version: 0.94.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -24,6 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: asciidoctor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.12
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +310,14 @@ files:
 - lib/avm/docker/image.rb
 - lib/avm/docker/registry.rb
 - 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
+- lib/avm/eac_asciidoctor_base0/instance.rb
+- lib/avm/eac_asciidoctor_base0/project.rb
 - lib/avm/eac_rails_base0.rb
 - lib/avm/eac_rails_base0/apache_host.rb
 - lib/avm/eac_rails_base0/apache_path.rb
@@ -317,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
@@ -327,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
@@ -348,13 +378,6 @@ files:
 - lib/avm/eac_writings_base0/project_build.rb
 - lib/avm/eac_writings_base0/project_build/chapters_content.rb
 - lib/avm/eac_writings_base0/project_build/copy_files.rb
-- lib/avm/eac_writings_base1.rb
-- lib/avm/eac_writings_base1/apache_host.rb
-- lib/avm/eac_writings_base1/build.rb
-- lib/avm/eac_writings_base1/build/file.rb
-- lib/avm/eac_writings_base1/deploy.rb
-- lib/avm/eac_writings_base1/instance.rb
-- lib/avm/eac_writings_base1/project.rb
 - lib/avm/executables.rb
 - lib/avm/files.rb
 - lib/avm/files/appendable.rb
@@ -380,6 +403,14 @@ files:
 - lib/avm/files/rotate.rb
 - lib/avm/fs_cache.rb
 - lib/avm/git.rb
+- lib/avm/git/auto_commit/commit_info.rb
+- lib/avm/git/auto_commit/rules.rb
+- lib/avm/git/auto_commit/rules/base.rb
+- lib/avm/git/auto_commit/rules/last.rb
+- lib/avm/git/auto_commit/rules/manual.rb
+- lib/avm/git/auto_commit/rules/new.rb
+- lib/avm/git/auto_commit/rules/nth.rb
+- lib/avm/git/auto_commit/rules/unique.rb
 - lib/avm/git/auto_commit_path.rb
 - lib/avm/git/auto_commit_path/ruby.rb
 - lib/avm/git/commit.rb
@@ -498,8 +529,8 @@ files:
 - lib/avm/sync.rb
 - lib/avm/tools.rb
 - 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
@@ -507,13 +538,11 @@ files:
 - lib/avm/tools/runner/eac_webapp_base0.rb
 - lib/avm/tools/runner/eac_wordpress_base0.rb
 - lib/avm/tools/runner/eac_writings_base0.rb
-- lib/avm/tools/runner/eac_writings_base1.rb
 - lib/avm/tools/runner/files.rb
 - lib/avm/tools/runner/files/format.rb
 - lib/avm/tools/runner/files/rotate.rb
 - lib/avm/tools/runner/git.rb
 - lib/avm/tools/runner/git/auto_commit.rb
-- lib/avm/tools/runner/git/auto_fixup.rb
 - lib/avm/tools/runner/git/commit.rb
 - lib/avm/tools/runner/git/deploy.rb
 - lib/avm/tools/runner/git/dirty_files.rb
@@ -531,12 +560,12 @@ files:
 - lib/avm/tools/runner/launcher/projects.rb
 - lib/avm/tools/runner/launcher/publish.rb
 - lib/avm/tools/runner/local_project.rb
+- lib/avm/tools/runner/local_project/eac_asciidoctor_base0.rb
+- lib/avm/tools/runner/local_project/eac_asciidoctor_base0/build.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0/build_chapters.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0/build_single.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0/info.rb
-- lib/avm/tools/runner/local_project/eac_writings_base1.rb
-- lib/avm/tools/runner/local_project/eac_writings_base1/build.rb
 - lib/avm/tools/runner/local_project/info.rb
 - lib/avm/tools/runner/local_project/ruby.rb
 - lib/avm/tools/runner/local_project/ruby/bundler.rb
@@ -586,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
@@ -611,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
@@ -620,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
@@ -1041,7 +1081,6 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time.rb
-- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/entry_key_error.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/node.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