avm-tools 0.116.1 → 0.117.1

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -12,7 +12,8 @@ module Avm
         enable_simple_cache
 
         BASE_IMAGE = 'ubuntu:20.04'
-        INSTALLER_TARGET_TASK = 'redmine_as_apache_base'
+        INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
+        INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
         DATABASE_INTERNAL_HOSTNAME = 'localhost'
         REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
 
@@ -20,6 +21,12 @@ module Avm
           instance.id
         end
 
+        def apache_setup
+          return '' if web_path_present?
+
+          template.child('Dockerfile_apache_setup').apply(self)
+        end
+
         def base_image
           eac_ubuntu_base0_instance.docker_image.provide.id
         end
@@ -30,7 +37,11 @@ module Avm
         end
 
         def installer_target_task
-          INSTALLER_TARGET_TASK
+          if web_path_present?
+            INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT
+          else
+            INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK
+          end
         end
 
         def redmine_user
@@ -53,6 +64,10 @@ module Avm
           '/start.sh'
         end
 
+        def web_path_present?
+          ::Addressable::URI.parse(instance.web_url).path.present?
+        end
+
         private
 
         def eac_ubuntu_base0_instance

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template

@@ -22,19 +22,13 @@ RUN SKIP_DATABASE='%%skip_database%%' \
   '%%redmine_path%%/plugins/redmine_installer/installer/run.sh' '%%installer_target_task%%'
 
 # Apache / Configuração do virtualhost
-COPY apache_http_virtualhost.conf /etc/apache2/sites-available/redmine.conf
-COPY apache_https_virtualhost.conf /etc/apache2/sites-available/redmine_ssl.conf
-USER root
-RUN a2ensite redmine
-RUN a2ensite redmine_ssl
-RUN a2dissite 000-default
-RUN a2enmod ssl
-RUN service apache2 restart
+%%apache_setup%%
 
 # Portas
 EXPOSE 80/tcp 443/tcp 22/tcp
 
 # Execução
+USER root
 COPY start.sh '%%start_path%%'
 RUN /bin/chmod +x '%%start_path%%'
 RUN /bin/chown '%%redmine_user%%:%%redmine_user%%' '%%start_path%%'

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup

@@ -0,0 +1,8 @@
+COPY apache_http_virtualhost.conf /etc/apache2/sites-available/redmine.conf
+COPY apache_https_virtualhost.conf /etc/apache2/sites-available/redmine_ssl.conf
+USER root
+RUN a2ensite redmine
+RUN a2ensite redmine_ssl
+RUN a2dissite 000-default
+RUN a2enmod ssl
+RUN service apache2 restart

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/start.sh.template

@@ -34,7 +34,7 @@ function postgresql_start() {
 
 function request_http_interface() {
   title 'Requesting web interface...'
-  wget 'http://localhost' &> /dev/null
+  wget 'http://localhost%%web.path%%' &> /dev/null
 }
 
 function redmine_log() {

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,locale}/**/*']
 
   s.add_dependency 'avm', '~> 0.9'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '>= 0.9.8'
   s.add_dependency 'eac_ruby_utils', '~> 0.80'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile/add_or_replace_gem_line.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class Gemfile
+        class AddOrReplaceGemLine
+          enable_method_class
+          common_constructor :sender, :gem_name, :gem_specs
+          delegate :lines, to: :sender
+
+          def existing_gem_line_index
+            lines.index { |line| line.start_with?(gem_line_prefix) }
+          end
+
+          def result
+            if existing_gem_line_index.present?
+              replace_line
+            else
+              add_line
+            end
+          end
+
+          def add_line
+            lines.insert(add_line_index, new_gem_line)
+          end
+
+          def add_line_index
+            (gems_lines_start_index..(lines.count - 1)).each do |e|
+              return e if new_gem_line < lines[e]
+            end
+            lines.count
+          end
+
+          def gems_lines_start_index
+            lines.index { |line| line.start_with?('gem ') } || lines.count
+          end
+
+          def new_gem_line
+            ([gem_line_prefix] + gem_specs).join(', ')
+          end
+
+          def gem_line_prefix
+            "gem '#{gem_name}'"
+          end
+
+          def replace_line
+            lines[existing_gem_line_index] = new_gem_line
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile/dependency.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class Gemfile
+        class Dependency
+          common_constructor :gemfile, :gem_name
+
+          def version_specs=(version_specs)
+            gemfile.add_or_replace_gem_line(gem_name, version_specs)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class Gemfile
+        require_sub __FILE__, require_dependency: true
+
+        class << self
+          def from_file(path)
+            new(path.read.each_line.map(&:rstrip))
+          end
+        end
+
+        common_constructor :lines
+
+        # @return [Avm::EacRubyBase1::Bundler::Gemfile::Dependency]
+        def dependency(gem_name)
+          ::Avm::EacRubyBase1::Bundler::Gemfile::Dependency.new(self, gem_name)
+        end
+
+        def write(path)
+          path.to_pathname.write(to_text)
+        end
+
+        def to_text
+          lines.map { |line| "#{line}\n" }.join
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/configured.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/sources/configuration'
+
+module Avm
+  module EacRubyBase1
+    class Rubocop
+      module Configured
+        def configured_rubocop_command_uncached
+          configured_rubocop_command_by_command || configured_rubocop_command_by_gemfile
+        end
+
+        def configured_rubocop_command_by_command
+          configuration.if_present(&:rubocop_command)
+        end
+
+        def configured_rubocop_command_by_gemfile
+          configuration.if_present(&:rubocop_gemfile).if_present do |v|
+            rubocop_command_by_gemfile_path(v.parent)
+          end
+        end
+
+        private
+
+        def configuration_uncached
+          ::Avm::Sources::Configuration.find_by_path(base_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/envvar.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    class Rubocop
+      module Envvar
+        RUBOCOP_COMMAND_ENVVAR_NAME = 'RUBOCOP_COMMAND'
+
+        def env_rubocop_command
+          ENV[RUBOCOP_COMMAND_ENVVAR_NAME].present? ? cmd(ENV[RUBOCOP_COMMAND_ENVVAR_NAME]) : nil
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/gemfile.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    class Rubocop
+      module Gemfile
+        def gemfile_rubocop_command
+          return nil unless rubocop_gemfile?
+
+          rubocop_command_by_gemfile_path(mygem.root)
+        end
+
+        def rubocop_command_by_gemfile_path(path)
+          ::EacRubyGemsUtils::Gem.new(path).bundle('exec', 'rubocop').chdir_root
+        end
+
+        def rubocop_gemfile?
+          return false if mygem.blank?
+
+          mygem.bundle('install').execute!
+          mygem.gemfile_lock_gem_version('rubocop').present?
+        end
+
+        private
+
+        def mygem_uncached
+          find_gem(::Pathname.new(base_path).expand_path)
+        end
+
+        def find_gem(path)
+          r = ::EacRubyGemsUtils::Gem.new(path)
+          return r if r.gemfile_path.exist?
+          return find_gem(path.dirname) unless path.root?
+        end
+      end
+    end
+  end
+end

data/{lib/avm/ruby → sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1}/rubocop.rb

@@ -4,9 +4,9 @@ require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/ruby/on_clean_environment'
 
 module Avm
-  module Ruby
+  module EacRubyBase1
     class Rubocop
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
       enable_speaker
       enable_simple_cache
       common_constructor :base_path, :rubocop_args

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/version_bump.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        module VersionBump
+          def after_sub_version_bump_do_changes
+            the_gem.bundle('install').chdir_root.execute!
+          end
+
+          def version_bump_do_changes(target_version)
+            self.version = target_version
+            the_gem.bundle('install').chdir_root.execute!
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb

@@ -3,6 +3,7 @@
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/sources/update'
 require 'avm/eac_ruby_base1/sources/tester'
+require 'avm/version_number'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
@@ -10,6 +11,7 @@ module Avm
   module EacRubyBase1
     module Sources
       class Base < ::Avm::EacGenericBase0::Sources::Base
+        require_sub __FILE__, include_modules: :prepend, require_dependency: true
         delegate :gemspec_path, to: :the_gem
 
         def gemfile_path
@@ -33,6 +35,15 @@ module Avm
         def update
           ::Avm::EacRubyBase1::Sources::Update.new(self)
         end
+
+        # @return [Avm::VersionNumber]
+        def version
+          the_gem.version.if_present { |v| ::Avm::VersionNumber.new(v) }
+        end
+
+        def version=(value)
+          the_gem.version_file.value = value
+        end
       end
     end
   end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tester.rb

@@ -19,7 +19,7 @@ module Avm
         # @return [EacRubyGemsUtils::Gem::Command, nil]
         def bundle_test_command
           source.read_configuration_as_shell_words(BUNDLE_TEST_COMMAND_CONFIGURATION_KEY)
-                .if_present { |args| the_gem.bundle(*args).chdir_root }
+            .if_present { |args| the_gem.bundle(*args).chdir_root }
         end
 
         # @return [EacRubyGemsUtils::Gem::Command, nil]

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update/sub_update.rb

@@ -18,7 +18,7 @@ module Avm
             if commit.no_scm_changed_files.any?
               commit = commit.reword(no_scm_update_commit_message)
               source.scm.commit_if_change { source_update.bundle_update }
-                    .if_present { |v| v.merge_with(commit) }
+                .if_present { |v| v.merge_with(commit) }
             else
               commit.reword(scm_update_commit_message)
             end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/patches/i18n'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.3.1'
+    VERSION = '0.6.0'
   end
 end

data/sub/avm-files/avm-files.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_ruby_utils', '~> 0.76'
   s.add_dependency 'eac_templates', '~> 0.2'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-files/lib/avm/files/appendable.rb

@@ -35,7 +35,7 @@ module Avm
 
       def append_file_content(target_path, content)
         appended << ::Avm::Files::Appendable::FileContent
-                    .new(self, target_path, content)
+                      .new(self, target_path, content)
         self
       end
 

data/sub/avm-files/lib/avm/files/formatter/formats/ruby.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/files/formatter/formats/generic_plain'
-require 'avm/ruby/rubocop'
+require 'avm/eac_ruby_base1/rubocop'
 
 module Avm
   module Files
@@ -12,7 +12,7 @@ module Avm
           VALID_TYPES = ['x-ruby'].freeze
 
           def internal_apply(files)
-            ::Avm::Ruby::Rubocop.new('.', ['-a', '--ignore-parent-exclusion'] + files).run
+            ::Avm::EacRubyBase1::Rubocop.new('.', ['-a', '--ignore-parent-exclusion'] + files).run
             super(files)
           end
         end

data/sub/avm-files/lib/avm/files/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

data/sub/avm-git/lib/avm/git/scms/git_subrepo.rb

@@ -8,9 +8,7 @@ module Avm
   module Git
     module Scms
       class GitSubrepo < ::Avm::Scms::Base
-        def commit_if_change(_message)
-          nyi
-        end
+        delegate :commit_if_change, to: :parent_scm
 
         def update
           git_subrepo.command('clean').execute!

data/sub/avm-git/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.8.1'
   s.add_dependency 'eac_config', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.83'
+  s.add_dependency 'eac_ruby_utils', '~> 0.95'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_cli/lib/eac_cli/old_configs/entry_reader.rb

@@ -17,7 +17,7 @@ module EacCli
                    ::EacConfig::PathsHash.parse_entry_key(entry_key)
                  end
           path.join('_').gsub(/[^a-z0-9_]/i, '').gsub(/\A_+/, '').gsub(/_+\z/, '')
-              .gsub(/_{2,}/, '_').upcase
+            .gsub(/_{2,}/, '_').upcase
         end
       end
 

data/sub/eac_cli/lib/eac_cli/old_configs/read_entry_options.rb

@@ -8,7 +8,7 @@ module EacCli
       enable_simple_cache
       common_constructor :options do
         self.options = options.to_h.symbolize_keys
-                              .assert_valid_keys(DEFAULT_VALUES.keys).freeze
+                         .assert_valid_keys(DEFAULT_VALUES.keys).freeze
       end
 
       DEFAULT_VALUES = {

data/sub/eac_cli/lib/eac_cli/parser/alternative/short_options.rb

@@ -33,7 +33,7 @@ module EacCli
         # @return [EacCli::Definition::BaseOption] The option collected.
         def short_option_collect_char(char)
           option = find_short_option(char)
-          raise_error "Invalid short option \"#{char}\"" unless option
+          raise_argv_current_invalid_option unless option
 
           option_collect_option(option)
         end

data/sub/eac_cli/lib/eac_cli/parser.rb

@@ -19,12 +19,12 @@ module EacCli
 
     def alternatives_parsed(error)
       alternatives.select { |a| error == a.error? }.map(&:parsed).reverse
-                  .inject(::EacRubyUtils::Struct.new) { |a, e| a.merge(e) }
+        .inject(::EacRubyUtils::Struct.new) { |a, e| a.merge(e) }
     end
 
     def alternatives_uncached
       definition.alternatives
-                .map { |alternative| ::EacCli::Parser::Alternative.new(alternative, argv) }
+        .map { |alternative| ::EacCli::Parser::Alternative.new(alternative, argv) }
     end
 
     def first_error_uncached

data/sub/eac_cli/lib/eac_cli/runner/after_class_methods.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/speaker'
+require 'eac_cli/definition'
+require 'eac_cli/runner/class_runner'
 
 module EacCli
   module Runner
     module AfterClassMethods
+      # @return [EacCli::Runner::ClassRunner]
+      def class_runner(runner_context_args)
+        ::EacCli::Runner::ClassRunner.new(self, runner_context_args)
+      end
+
       def create(*runner_context_args)
-        r = new
-        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
-        r
+        class_runner(runner_context_args).create
       end
 
       def run(*runner_context_args)
-        on_asserted_speaker do
-          r = create(*runner_context_args)
-          r.run_run
-          r
-        end
+        class_runner(runner_context_args).run
       end
 
       def runner_definition(&block)
@@ -29,18 +28,6 @@ module EacCli
       def super_runner_definition
         superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
       end
-
-      private
-
-      def on_asserted_speaker
-        if ::EacRubyUtils::Speaker.context.optional_current
-          yield
-        else
-          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
-            yield
-          end
-        end
-      end
     end
   end
 end

data/sub/eac_cli/lib/eac_cli/runner/class_runner.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/speaker'
+
+module EacCli
+  module Runner
+    class ClassRunner
+      PARSER_ERROR_EXIT_CODE = 1
+
+      common_constructor :klass, :context_args
+
+      def create
+        r = klass.new
+        r.runner_context = ::EacCli::Runner::Context.new(r, *context_args)
+        r
+      end
+
+      def run
+        on_asserted_speaker do
+          r = create
+          begin
+            r.run_run
+          rescue ::EacCli::Parser::Error => e
+            run_parser_error(r, e)
+          end
+          r
+        end
+      end
+
+      def run_parser_error(runner_instance, error)
+        $stderr.write("#{runner_instance.program_name}: #{error}\n")
+        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
+      end
+
+      private
+
+      def on_asserted_speaker
+        if ::EacRubyUtils::Speaker.context.optional_current
+          yield
+        else
+          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
+            yield
+          end
+        end
+      end
+    end
+  end
+end