avm-tools 0.92.0 → 0.94.3

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/struct'
+
+module EacRubyUtils
+  module SettingsProvider
+    class SettingValue
+      include ::EacRubyUtils::Listable
+      include ::EacRubyUtils::SimpleCache
+
+      attr_reader :source, :key, :options
+      lists.add_symbol :option, :default, :order, :required
+
+      def initialize(source, key, options)
+        @source = source
+        @key = key
+        @options = options
+      end
+
+      def constant_name(fullname = false)
+        name = key.to_s.underscore.upcase
+        name = "#{source.class.name}::#{name}" if fullname
+        name
+      end
+
+      def value
+        parsed_options.order.each do |method|
+          value = send("value_by_#{method}")
+          return value if value
+        end
+        return parsed_options.default if parsed_options.respond_to?(OPTION_DEFAULT)
+        return nil unless parsed_options.required
+
+        raise_key_not_found
+      end
+
+      def value_by_constant
+        source.class.const_get(constant_name)
+      rescue NameError
+        nil
+      end
+
+      def value_by_method
+        source.respond_to?(key, true) ? source.send(key) : nil
+      end
+
+      def value_by_settings_object
+        source.settings_object[key.to_s] || source.settings_object[key.to_sym]
+      end
+
+      private
+
+      def parsed_options_uncached
+        r = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
+        r[:required] = true unless r.key?(OPTION_REQUIRED)
+        r[:order] = source.setting_search_order if r[OPTION_ORDER].nil?
+        ::EacRubyUtils::Struct.new(r)
+      end
+
+      def raise_key_not_found
+        raise "Setting \"#{key}\" not found. Supply in #{source.settings_object_name}, implement "\
+          "a \"#{key}\" method or declare a #{constant_name(true)} constant."
+      end
+    end
+  end
+end

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

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

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb

@@ -42,5 +42,13 @@ RSpec.describe ::EacRubyUtils::SettingsProvider do
     it do
       expect(stub.setting_value('key_e', required: false)).to eq(nil)
     end
+
+    it do
+      expect(stub.setting_value('key_e', default: nil)).to eq(nil)
+    end
+
+    it do
+      expect(stub.setting_value('key_e', default: 'default_e')).to eq('default_e')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.92.0
+  version: 0.94.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-04-01 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
@@ -352,8 +354,10 @@ files:
 - lib/avm/eac_webapp_base0/deploy/version.rb
 - lib/avm/eac_webapp_base0/deploy/write_on_target.rb
 - lib/avm/eac_webapp_base0/instance.rb
+- lib/avm/eac_webapp_base0/instance/subcommand_parent.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
@@ -405,6 +409,7 @@ files:
 - 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
@@ -433,7 +438,6 @@ files:
 - lib/avm/git/organize/reference_update.rb
 - lib/avm/git/organize/repository.rb
 - lib/avm/git/revision_test.rb
-- lib/avm/git/spec_helper.rb
 - lib/avm/git/subrepo_check.rb
 - lib/avm/git/subrepo_check/parent.rb
 - lib/avm/git/subrepo_check/remote.rb
@@ -527,7 +531,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
@@ -540,7 +543,6 @@ files:
 - 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
@@ -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
@@ -675,15 +688,14 @@ files:
 - vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb
 - vendor/eac_cli/lib/eac_cli/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/help.rb
-- vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb
+- vendor/eac_cli/lib/eac_cli/runner_with_set.rb
 - vendor/eac_cli/lib/eac_cli/version.rb
 - vendor/eac_cli/spec/lib/eac_cli/definition/alternative_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/docopt/runner_extension_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb
-- vendor/eac_cli/spec/lib/eac_cli/runner_with/output_file_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb
 - vendor/eac_cli/spec/rubocop_spec.rb
 - vendor/eac_cli/spec/spec_helper.rb
@@ -712,14 +724,30 @@ files:
 - vendor/eac_git/lib/eac_git.rb
 - vendor/eac_git/lib/eac_git/executables.rb
 - vendor/eac_git/lib/eac_git/local.rb
+- vendor/eac_git/lib/eac_git/local/commit.rb
+- vendor/eac_git/lib/eac_git/local/commit/changed_file.rb
+- vendor/eac_git/lib/eac_git/local/commit/diff_tree_line.rb
 - vendor/eac_git/lib/eac_git/local/dirty_files.rb
 - vendor/eac_git/lib/eac_git/local/subrepo.rb
 - vendor/eac_git/lib/eac_git/local/subrepo/config.rb
 - vendor/eac_git/lib/eac_git/remote.rb
 - vendor/eac_git/lib/eac_git/remote/ls_result.rb
 - vendor/eac_git/lib/eac_git/rspec.rb
+- vendor/eac_git/lib/eac_git/rspec/stubbed_git_local_repo.rb
 - vendor/eac_git/lib/eac_git/version.rb
 - vendor/eac_git/spec/lib/eac_git/executables_spec.rb
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec.rb
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/remove.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/remove.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename_modify.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename_modify.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit_spec.rb
 - vendor/eac_git/spec/rubocop_spec.rb
 - vendor/eac_git/spec/spec_helper.rb
 - vendor/eac_git/vendor/git-subrepo/Changes
@@ -911,9 +939,22 @@ files:
 - vendor/eac_ruby_base0/eac_ruby_base0.gemspec
 - vendor/eac_ruby_base0/lib/eac_ruby_base0.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/core_ext.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/class.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/class/jobs_runner.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/object.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/object/runner_with.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner/test_all.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/filesystem_traverser.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/output.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb
+- vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb
+- vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/output_spec.rb
 - vendor/eac_ruby_base0/spec/rubocop_spec.rb
 - vendor/eac_ruby_base0/spec/spec_helper.rb
 - vendor/eac_ruby_gems_utils/Gemfile
@@ -1003,6 +1044,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/clearable_directory.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/extname.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/logs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/temp.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/directory.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/file.rb
@@ -1034,6 +1076,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class/common_constructor.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class/settings_provider.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable/boolean_combinations.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerator.rb
@@ -1057,6 +1100,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/debug.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_nil.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_present.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_respond.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb
@@ -1068,6 +1112,7 @@ 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/required_zone.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
@@ -1080,6 +1125,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates.rb
@@ -1163,7 +1209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Tools for AVM.

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/lib/avm/tools/runner/git/auto_fixup.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'avm/git/file_auto_fixup'
-require 'avm/git/auto_commit/rules'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class AutoFixup
-          runner_with :help do
-            desc 'Auto fixup files.'
-            arg_opt '-r', '--rule', 'Apply a rule in the specified order.', repeat: true
-            pos_arg :files, repeat: true, optional: true
-          end
-
-          def run
-            files.each do |file|
-              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run
-            end
-          end
-
-          private
-
-          def files
-            files_from_option || dirty_files
-          end
-
-          def files_from_option
-            r = parsed.files
-            r.any? ? r.map { |p| p.to_pathname.expand_path } : nil
-          end
-
-          def dirty_files
-            runner_context.call(:git).dirty_files.map(&:path)
-          end
-
-          def rules
-            parsed.rule.map do |rule_string|
-              ::Avm::Git::AutoCommit::Rules.parse(rule_string)
-            end
-          end
-
-          def select
-            parsed.last? ? 1 : parsed.select
-          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>

data/vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/abstract_methods'
-
-module EacCli
-  module RunnerWith
-    module OutputFile
-      common_concern do
-        include ::EacCli::Runner
-        include ::EacRubyUtils::AbstractMethods
-
-        abstract_methods :output_content
-
-        runner_definition do
-          arg_opt '-o', '--output-file', 'Output to file.'
-        end
-      end
-
-      def run_output
-        if parsed.output_file.present?
-          ::File.write(parsed.output_file, output_content)
-        else
-          $stdout.write(output_content)
-        end
-      end
-    end
-  end
-end