avm-tools 0.91.0 → 0.94.2

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.3.3'
+  VERSION = '0.5.0'
 end

data/vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/runner_with/confirmation'
+
+::RSpec.describe ::EacRubyBase0::RunnerWith::Confirmation do
+  let(:runner) do
+    the_module = described_class
+    Class.new do
+      include the_module
+
+      runner_definition do
+        desc 'A stub runner.'
+      end
+
+      def run
+        if confirm?
+          ::Kernel.puts 'Accepted'
+        else
+          ::Kernel.puts 'Denied'
+        end
+      end
+    end
+  end
+
+  let(:instance) { runner.create(argv: runner_argv) }
+
+  context 'without --no option' do
+    let(:runner_argv) { %w[--no] }
+
+    it do
+      expect { instance.run }.to output("Denied\n").to_stdout_from_any_process
+    end
+  end
+
+  context 'without --yes option' do
+    let(:runner_argv) { %w[--yes] }
+
+    it do
+      expect { instance.run }.to output("Accepted\n").to_stdout_from_any_process
+    end
+  end
+end

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

@@ -10,6 +10,7 @@ module EacRubyUtils
     class << self
       TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
 
+      # @return [ActiveSupport::TimeZone]
       def auto
         %w[tz_env debian_config offset].lazy.map { |s| send("by_#{s}") }.find(&:present?)
       end
@@ -18,22 +19,27 @@ module EacRubyUtils
         ::Time.zone = auto
       end
 
+      # @return [ActiveSupport::TimeZone]
       def by_debian_config
         path = ::Pathname.new(DEBIAN_CONFIG_PATH)
-        path.exist? ? path.read.strip.presence : nil
+        path.exist? ? path.read.strip.if_present { |v| ::ActiveSupport::TimeZone[v] } : nil
       end
 
+      # @return [ActiveSupport::TimeZone]
       def by_offset
-        ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
+        ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset]
       end
 
+      # @return [ActiveSupport::TimeZone]
       def by_timedatectl
         executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
         return nil unless executable.exist?
 
         TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
+                                         .if_present { |v| ::ActiveSupport::TimeZone[v] }
       end
 
+      # @return [ActiveSupport::TimeZone]
       def by_tz_env
         ENV['TZ'].presence
       end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class/settings_provider.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patch'
+require 'eac_ruby_utils/settings_provider'
+
+class Class
+  def enable_settings_provider
+    ::EacRubyUtils.patch(self, ::EacRubyUtils::SettingsProvider)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_nil.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Object
+  # @return +block.call(self)+ if +self+ is not nil, +default_value+ otherwise.
+  def if_not_nil(default_value = nil)
+    return default_value if nil?
+
+    block_given? ? yield(self) : self
+  end
+
+  # @return +yield+ if +self+ is nil, +self+ otherwise.
+  def if_nil
+    return yield if nil? && block_given?
+
+    self
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/required_zone.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/local_time_zone'
+
+class Time
+  class << self
+    def required_zone
+      zone || ::EacRubyUtils::LocalTimeZone.auto || raise('No zone set or discovered')
+    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.59.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.91.0
+  version: 0.94.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-25 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
@@ -400,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
@@ -520,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
@@ -533,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
@@ -606,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
@@ -631,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
@@ -640,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
@@ -670,6 +690,7 @@ files:
 - 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
@@ -904,9 +925,20 @@ 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/version.rb
+- vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb
 - vendor/eac_ruby_base0/spec/rubocop_spec.rb
 - vendor/eac_ruby_base0/spec/spec_helper.rb
 - vendor/eac_ruby_gems_utils/Gemfile
@@ -1027,6 +1059,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
@@ -1050,6 +1083,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
@@ -1061,6 +1095,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

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'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class AutoFixup
-          runner_with :help do
-            desc 'Auto fixup files.'
-            bool_opt '-l', '--last', 'Equivalent to "--select=1".'
-            arg_opt '-s', '--select', 'Automatically select de <value>-th commit.'
-            bool_opt '-u', '--unique', 'Automatically select the first commit if it is unique.'
-            pos_arg :files, repeat: true, optional: true
-          end
-
-          def run
-            files.each do |file|
-              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, file_options).run
-            end
-          end
-
-          private
-
-          def file_options
-            { Avm::Git::FileAutoFixup::OPTION_SELECT => select,
-              Avm::Git::FileAutoFixup::OPTION_UNIQUE => parsed.unique? }
-          end
-
-          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 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>