eac_tools 0.2.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a71c505659f946f57541a262d512b04250607f653e15443d45da2450656a2f39
-  data.tar.gz: 80d857d14af3b2e6d5dd46c4429b8f8cf6a3c811a03cce11abe83ffd98f18c94
+  metadata.gz: 6e96780cde14c4b87945f466bcedbb9344b12aa87a9b9832fc520d5ab681fa13
+  data.tar.gz: '028b3f2c1c65d20cf6c0a1b65470806c49d6368e688bb962161674472e7b7b84'
 SHA512:
-  metadata.gz: fa69b309ceef7296b7b95319ee6aab4fd4fdcc69ede0b018485110a24fe6db132041834cb15ccd5b7a472d5824d70fe6e4abcb15504448eac7bfc0d3e1615004
-  data.tar.gz: a4e6c32ffe03e22954a14d3b62cb2a22b6a585bd289cf19464f90d920fe1bd08a920e4f8369c7c6d738c1052433bbdfe77c3f66242dc7a4a93dd58705df37e65
+  metadata.gz: 68acf9dcd522d222060f070a7400834e2baabdfa3a5cd8a268077b6b8863abf5470588d8dd040aea08b9542144b57f983434511b1b44c6d4d10d83b8581eed42
+  data.tar.gz: cdf796ff102923bd500a1c427d6598ae6d1026f4146d80ddff2ffd212ff13c596c9309445c43b1b6e76b9c8015865fadf8927570986afd0fb1ac3945b778a23f

data/Gemfile.lock

@@ -1,34 +1,42 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.2.2)
-      avm-eac_generic_base0 (~> 0.2, >= 0.2.2)
-      avm-eac_rails_base1 (~> 0.3, >= 0.3.1)
-      avm-eac_redmine_base0 (~> 0.7)
+    eac_tools (0.5.0)
+      avm-eac_generic_base0 (~> 0.3)
+      avm-eac_rails_base0 (~> 0.5)
+      avm-eac_rails_base1 (~> 0.4)
+      avm-eac_redmine_base0 (~> 0.8)
       avm-eac_redmine_plugin_base0 (~> 0.1, >= 0.1.1)
-      avm-eac_ruby_base1 (~> 0.8, >= 0.8.2)
+      avm-eac_ruby_base1 (~> 0.9)
       avm-tools (~> 0.121)
-      eac_ruby_utils (~> 0.95, >= 0.95.1)
+      eac_ruby_utils (~> 0.95, >= 0.95.2)
 
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.2.2)
-      avm (~> 0.19)
-      eac_ruby_utils (~> 0.80)
+    avm-eac_generic_base0 (0.3.0)
+      avm (~> 0.24)
+      eac_ruby_utils (~> 0.05, >= 0.95.2)
+
+PATH
+  remote: sub/avm-eac_rails_base0
+  specs:
+    avm-eac_rails_base0 (0.5.0)
+      avm-eac_rails_base1 (~> 0.3)
+      eac_ruby_utils (~> 0.80, >= 0.80.2)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.3.2)
-      avm-eac_ruby_base1 (~> 0.8)
+    avm-eac_rails_base1 (0.4.0)
+      avm-eac_ruby_base1 (~> 0.9)
       avm-eac_webapp_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.95, >= 0.95.1)
+      eac_ruby_utils (~> 0.95, >= 0.95.2)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.7.1)
+    avm-eac_redmine_base0 (0.8.0)
       avm-eac_rails_base1 (~> 0.3)
       avm-eac_ubuntu_base0 (~> 0.2)
       curb (~> 0.9.10)
@@ -46,7 +54,7 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.8.2)
+    avm-eac_ruby_base1 (0.9.0)
       avm (~> 0.23)
       avm-eac_generic_base0 (~> 0.2)
       eac_ruby_utils (~> 0.95, >= 0.95.1)
@@ -54,7 +62,7 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.121.1)
+    avm-tools (0.121.2)
       aranha-parsers (~> 0.4)
       avm (~> 0.22)
       avm-eac_asciidoctor_base0 (~> 0.3, >= 0.3.4)
@@ -73,7 +81,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.23.0)
+    avm (0.24.0)
       eac_cli (~> 0.27, >= 0.27.6)
       eac_docker (~> 0.3)
       eac_git (~> 0.6)
@@ -108,10 +116,20 @@ PATH
       eac_fs (~> 0.10)
       eac_ruby_utils (~> 0.95, >= 0.95.1)
 
+PATH
+  remote: sub/eac_ruby_utils
+  specs:
+    eac_ruby_utils (0.95.2)
+      activesupport (>= 4, < 7)
+      addressable (~> 2.6)
+      bundler
+      filesize
+      net-ssh (~> 4.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -139,9 +157,6 @@ GEM
     avm-eac_postgresql_base0 (0.2.0)
       avm (~> 0.12, >= 0.12.1)
       eac_ruby_utils (~> 0.82)
-    avm-eac_rails_base0 (0.4.1)
-      avm-eac_rails_base1 (~> 0.3)
-      eac_ruby_utils (~> 0.80, >= 0.80.2)
     avm-eac_ubuntu_base0 (0.3.0)
       avm (~> 0.7)
       eac_ruby_utils (~> 0.77, >= 0.77.1)
@@ -164,8 +179,8 @@ GEM
     clipboard (1.3.6)
     colorize (0.8.1)
     concurrent-ruby (1.1.10)
-    content-type (0.0.1)
-      parslet (~> 1.5)
+    content-type (0.0.2)
+      parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
     eac_config (0.8.1)
@@ -185,11 +200,6 @@ GEM
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    eac_ruby_utils (0.95.1)
-      activesupport (>= 4, < 7)
-      addressable (~> 2.6)
-      filesize
-      net-ssh (~> 4.2)
     eac_templates (0.3.1)
       eac_config (~> 0.5)
       eac_ruby_utils (~> 0.64)
@@ -226,14 +236,14 @@ GEM
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.2)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     minitar (0.9)
     minitest (5.16.2)
     multipart-post (2.2.3)
     net-ssh (4.2.0)
-    nokogiri (1.13.6-x86_64-linux)
+    nokogiri (1.13.7-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
@@ -242,7 +252,7 @@ GEM
     parseconfig (1.1.2)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    parslet (1.8.2)
+    parslet (2.0.0)
     public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.4)
@@ -291,6 +301,7 @@ PLATFORMS
 DEPENDENCIES
   avm!
   avm-eac_generic_base0!
+  avm-eac_rails_base0!
   avm-eac_rails_base1!
   avm-eac_redmine_base0!
   avm-eac_redmine_plugin_base0!
@@ -300,6 +311,7 @@ DEPENDENCIES
   eac_fs!
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.5.1)
+  eac_ruby_utils!
   eac_tools!
 
 BUNDLED WITH

data/lib/eac_tools/version.rb

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

data/sub/avm/lib/avm/sources/base/configuration.rb

@@ -11,19 +11,27 @@ module Avm
       module Configuration
         CONFIGURATION_FILENAMES = %w[.avm.yml .avm.yaml].freeze
 
+        # @return [EacRubyUtils::Envs::Command, nil]
+        def configuration_value_to_env_command(value)
+          configuration_value_to_shell_words(value).if_present { |v| env.command(v).chdir(path) }
+        end
+
+        # @return [Array<String>, nil]
+        def configuration_value_to_shell_words(value)
+          return nil if value.blank?
+
+          value.is_a?(::Enumerable) ? value.map(&:to_s) : ::Shellwords.split(value.to_s)
+        end
+
         # @return [Array<String>, nil]
         def read_configuration_as_shell_words(key)
-          configuration.entry(key).value.if_present do |v|
-            v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v.to_s)
-          end
+          configuration_value_to_shell_words(configuration.entry(key).value)
         end
 
         # Utility to read a configuration as a [EacRubyUtils::Envs::Command].
         # @return [EacRubyUtils::Envs::Command]
         def read_configuration_as_env_command(key)
-          read_configuration_as_shell_words(key).if_present do |v|
-            env.command(v).chdir(path)
-          end
+          configuration_value_to_env_command(configuration.entry(key).value)
         end
 
         private

data/sub/avm/lib/avm/sources/base/testing.rb

@@ -1,25 +1,68 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs/command'
 
 module Avm
   module Sources
     class Base
       module Testing
-        TEST_COMMAND_KEY = 'test.command'
+        DEFAULT_TEST_COMMANDS = {}.freeze
+        TEST_KEY = 'test'
+        TEST_COMMAND_KEY = "#{TEST_KEY}.command"
+        TEST_COMMANDS_KEY = "#{TEST_KEY}.commands"
 
         def configured_test_command
           read_configuration_as_env_command(TEST_COMMAND_KEY)
         end
 
-        # @return [Avm::Sources::Tester]
-        def tester
-          tester_class.new(self)
+        # @return [Hash<String, EacRubyUtils::Envs::Command>, nil]
+        def configured_test_commands
+          configured_value_as_test_commands(configuration.entry(TEST_COMMANDS_KEY).value)
         end
 
-        # @return [Class<Avm::Sources::Tester>
-        def tester_class
-          Avm::Sources::Tester
+        # @return [Hash<String, EacRubyUtils::Envs::Command>, nil]
+        def configured_value_as_test_commands(value)
+          return nil if value.blank?
+
+          [::EacRubyUtils::Envs::Command, ::Hash, ::Enumerable].each do |type|
+            next unless value.is_a?(type)
+
+            return send(
+              "configured_#{type.name.demodulize.variableize}_value_as_test_commands",
+              value
+            )
+          end
+
+          raise "Value for test commands should be a Hash or a Enumerable (Actual: #{value})"
+        end
+
+        # @return [Hash<String, EacRubyUtils::Envs::Command>]
+        def default_test_commands
+          DEFAULT_TEST_COMMANDS
+        end
+
+        # @return [Enumerable<EacRubyUtils::Envs::Command>]
+        def test_commands
+          configured_test_commands ||
+            configured_value_as_test_commands(configured_test_command)
+          default_test_commands
+        end
+
+        protected
+
+        def configured_command_value_as_test_commands(value)
+          configured_enumerable_value_as_test_commands([value])
+        end
+
+        def configured_enumerable_value_as_test_commands(value)
+          configured_hash_value_as_test_commands(
+            value.each_with_index.map { |v| ["test_#{v[1]}", v[0]] }.to_h
+          )
+        end
+
+        def configured_hash_value_as_test_commands(value)
+          value.map { |k, v| [k.to_s.strip, configuration_value_to_env_command(v)] }.to_h
         end
       end
     end

data/sub/avm/lib/avm/sources/tests/builder.rb

@@ -44,6 +44,13 @@ module Avm
           create_units(main_source.subs)
         end
 
+        # @return [Array<Avm::Sources::Tests::Single>]
+        def create_source_units(source)
+          source.test_commands.map do |test_name, test_command|
+            ::Avm::Sources::Tests::Single.new(self, source, test_name, test_command)
+          end
+        end
+
         # @return [Avm::Sources::Tests::Single]
         def create_unit(source)
           ::Avm::Sources::Tests::Single.new(self, source)
@@ -51,7 +58,7 @@ module Avm
 
         # @return [Array<Avm::Sources::Tests::Single>]
         def create_units(sources)
-          sources.map { |a_source| create_unit(a_source) }
+          sources.flat_map { |a_source| create_source_units(a_source) }
         end
 
         # @return [Avm::Sources::Tests::Single]

data/sub/avm/lib/avm/sources/tests/single.rb

@@ -14,9 +14,8 @@ module Avm
         enable_simple_cache
         enable_speaker
 
-        common_constructor :builder, :source
+        common_constructor :builder, :source, :test_name, :test_command
 
-        delegate :logs, :result, to: :tester
         delegate :to_s, to: :id
 
         def failed?
@@ -25,11 +24,7 @@ module Avm
 
         # @return [String]
         def id
-          if main?
-            MAIN_SOURCE_ID
-          else
-            relative_path_from_main_source.to_s
-          end
+          "#{main? ? MAIN_SOURCE_ID : relative_path_from_main_source}\##{test_name}"
         end
 
         def main?
@@ -47,8 +42,32 @@ module Avm
 
         private
 
-        def tester_uncached
-          source.tester
+        # @return [EacFs::Logs]
+        def logs_uncached
+          ::EacFs::Logs.new.add(:stdout).add(:stderr)
+        end
+
+        # @return [Avm::Sources::Tests::Result]
+        def result_uncached
+          if test_command.blank?
+            ::Avm::Sources::Tests::Result::NONEXISTENT
+          elsif run_test_command
+            ::Avm::Sources::Tests::Result::SUCESSFUL
+          else
+            ::Avm::Sources::Tests::Result::FAILED
+          end
+        end
+
+        def run_test_command
+          execute_command_and_log(test_command)
+        end
+
+        # @return [true, false]
+        def execute_command_and_log(command)
+          r = command.execute
+          logs[:stdout].write(r[:stdout])
+          logs[:stderr].write(r[:stderr])
+          r[:exit_code].zero?
         end
       end
     end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.23.0'
+  VERSION = '0.24.0'
 end

data/sub/avm-eac_generic_base0/Gemfile

@@ -3,3 +3,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.19'
-  s.add_dependency 'eac_ruby_utils', '~> 0.80'
+  s.add_dependency 'avm', '~> 0.24'
+  s.add_dependency 'eac_ruby_utils', '~> 0.05', '>= 0.95.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-eac_generic_base0/lib/avm/eac_generic_base0/sources/base.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/sources/tester'
 require 'avm/sources/base'
 require 'eac_ruby_utils/core_ext'
 
@@ -11,11 +10,6 @@ module Avm
         require_sub __FILE__, include_modules: true
         enable_abstract_methods
 
-        # @return [Avm::EacGenericBase0::Sources::Tester]
-        def tester_class
-          Avm::EacGenericBase0::Sources::Tester
-        end
-
         def valid?
           ::Avm::Registry.scms.detect_optional(path).present?
         end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/sources/base.rb

@@ -8,18 +8,31 @@ module Avm
     module Sources
       class Base < ::Avm::EacRailsBase1::Sources::Base
         CONFIG_RU_SUBPATH = 'config.ru'
+        EAC_RAILS_BASE0_GEMNAME = 'eac_rails_base0'
+        EAC_RAILS_BASE0_TEST_NAME = 'eac_rails_base0'
+        EAC_RAILS_BASE0_TEST_RAKE_TASK_NAME = 'eac_rails_base0:test'
         SUBS_INCLUDE_PATHS_DEFAULT = ['sub/*/*'].freeze
 
         def config_ru_path
           path.join(CONFIG_RU_SUBPATH)
         end
 
+        def default_test_commands
+          {
+            EAC_RAILS_BASE0_TEST_NAME => eac_rails_base0_test_command
+          }
+        end
+
+        def eac_rails_base0_test_command
+          rake_test_command(EAC_RAILS_BASE0_TEST_RAKE_TASK_NAME)
+        end
+
         def subs_include_paths_default
           SUBS_PATHS_DEFAULT
         end
 
         def valid?
-          super && config_ru_path.exist?
+          super && gemfile_lock_gem_version(EAC_RAILS_BASE0_GEMNAME).present?
         end
       end
     end

data/sub/{avm-tools/sub/avm-eac_rails_base0 → avm-eac_rails_base0}/lib/avm/eac_rails_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
   end
 end

data/sub/avm-eac_rails_base1/Gemfile

@@ -3,3 +3,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.9'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -8,12 +8,28 @@ module Avm
     module Sources
       class Base < ::Avm::EacRubyBase1::Sources::Base
         CONFIG_RU_SUBPATH = 'config.ru'
+        EAC_RAILS_BASE1_TEST_NAME = 'eac_rails_base1'
+        RAKE_TEST_COMMAND_DEFAULT_TASK_NAME = 'test'
         SUBS_PATHS_DEFAULT = ['sub/*/*'].freeze
 
         def config_ru_path
           path.join(CONFIG_RU_SUBPATH)
         end
 
+        def default_test_commands
+          {
+            EAC_RAILS_BASE1_TEST_NAME => eac_rails_base1_test_command
+          }
+        end
+
+        def eac_rails_base1_test_command
+          rake_test_command
+        end
+
+        def rake_test_command(task_name = RAKE_TEST_COMMAND_DEFAULT_TASK_NAME)
+          rake(task_name).chdir_root.envvar('RAILS_ENV', 'test')
+        end
+
         def subs_paths_default
           SUBS_PATHS_DEFAULT
         end

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

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

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.7.1'
+    VERSION = '0.8.0'
   end
 end

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

@@ -12,7 +12,11 @@ else
 fi
 export address_host='%%WEB.AUTHORITY%%'
 export address_path='%%WEB.PATH%%'
+
+# Git
 export git_repositories_hierarchical_organisation=false
+export gitolite_user='%%GIT.USERNAME%%'
+export gitolite_user_home="/var/lib/${gitolite_user}"
 
 # Mail settings
 export smtp_server='%%MAILER.SMTP.ADDRESS%%'

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

@@ -3,7 +3,6 @@
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/rubygems/version_file'
 require 'avm/eac_ruby_base1/sources/update'
-require 'avm/eac_ruby_base1/sources/tester'
 require 'avm/eac_ruby_base1/sources/runners/bundler'
 require 'avm/version_number'
 require 'eac_ruby_utils/core_ext'
@@ -12,12 +11,21 @@ module Avm
   module EacRubyBase1
     module Sources
       class Base < ::Avm::EacGenericBase0::Sources::Base
-        require_sub __FILE__, include_modules: :prepend, require_dependency: true
+        RSPEC_TEST_COMMAND = 'rspec'
+
+        require_sub __FILE__, include_modules: :prepend
 
         # To-do: dismiss this method at Avm::EacRailsBase1::Instance and remove.
         # @return [EacRubyUtils::Envs::BaseEnv]
         attr_reader :env
 
+        # @return [Hash<String, EacRubyUtils::Envs::Command>]
+        def default_test_commands
+          {
+            RSPEC_TEST_COMMAND => rspec_test_command
+          }
+        end
+
         # To-do: dismiss this method at Avm::EacRailsBase1::Instance and remove.
         # @return [Avm::EacRubyBase1::Sources::Base]
         def env_set(env)
@@ -26,13 +34,13 @@ module Avm
           self
         end
 
-        def valid?
-          gemfile_path.exist? || gemspec_path.present?
+        # @return [EacRubyUtils::Envs::Command]
+        def rspec_test_command
+          bundle('exec', 'rspec', '--fail-fast').chdir_root
         end
 
-        # @return [Avm::EacRubyBase1::Sources::Tester]
-        def tester_class
-          Avm::EacRubyBase1::Sources::Tester
+        def valid?
+          gemfile_path.exist? || gemspec_path.present?
         end
 
         def update