eac_tools 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52be2b949c88f70cad235bb01bab0f0155f1093364f0328a83ec022bcd5446e9
-  data.tar.gz: b9b1dcf2119964ebe0052931f853579bbce9dc274412a780075dfc1df24cf550
+  metadata.gz: ccf0291272ccc68e5bc61d5245c96b17081d42319907a8dd2b242fe0dc0940ba
+  data.tar.gz: ced016860d0c5583ce85f9ffbe96ad52bbb5fb922dc8297adaa05f809a3c902f
 SHA512:
-  metadata.gz: 9bfcb9a6e13b090f254550a6c3b0f563f0d5c61fdef6227e29c660bec2f2d419803dbed1655ae29945f1c82d0f26e0f9c76408a74718f92d2817e749fb339ec2
-  data.tar.gz: 34bf06360e871a1e7a88275da9222fb6ea92a75b0e177cb0ce6ff87c2bce3ee8412d7564dcfa045a9acc8cc90f2783d11241f4b3921b205433e937b29b605320
+  metadata.gz: 19a09c17f37b1383f86694deb0c9a465bb952fd6496ab1533fe5888f91f4c009b3c8cabde44d40b7edabdff1b1dfb6540d961e0cd08c9383cb1b75b83bc309dd
+  data.tar.gz: 1572dd79fde46ab7a10482bae41888bcfae0260a71db83e42ab0b00b14f6d4f290842d32b17de4ddbe53a96ae7bef7b210ece980ba870a53abf05c66ce27e623

data/Gemfile.lock

@@ -1,40 +1,48 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.3.0)
-      avm-eac_generic_base0 (~> 0.2, >= 0.2.2)
-      avm-eac_rails_base1 (~> 0.3, >= 0.3.1)
-      avm-eac_redmine_base0 (~> 0.8)
+    eac_tools (0.6.0)
+      avm-eac_generic_base0 (~> 0.3)
+      avm-eac_rails_base0 (~> 0.5)
+      avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
+      avm-eac_redmine_base0 (~> 0.9)
       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.1)
+      avm-eac_ruby_base1 (~> 0.9, >= 0.9.1)
       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.8.0)
-      avm-eac_rails_base1 (~> 0.3)
-      avm-eac_ubuntu_base0 (~> 0.2)
-      curb (~> 0.9.10)
-      eac_fs (~> 0.4)
-      eac_rest (~> 0.4)
-      eac_ruby_utils (~> 0.68)
+    avm-eac_redmine_base0 (0.9.0)
+      avm-eac_rails_base1 (~> 0.4, >= 0.4.1)
+      avm-eac_ubuntu_base0 (~> 0.3)
+      curb (~> 0.9.11)
+      eac_fs (~> 0.12, >= 0.12.2)
+      eac_rest (~> 0.6, >= 0.6.1)
+      eac_ruby_utils (~> 0.95, >= 0.95.2)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -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.1)
       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.25.0)
       eac_cli (~> 0.27, >= 0.27.6)
       eac_docker (~> 0.3)
       eac_git (~> 0.6)
@@ -108,6 +116,16 @@ 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:
@@ -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)
@@ -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)
@@ -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.3.0'
+  VERSION = '0.6.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

@@ -8,6 +8,8 @@ module Avm
   module Sources
     module Tests
       class Builder
+        NO_TEST_TEST_NAME = 'no_test'
+
         require_sub __FILE__
         enable_immutable
 
@@ -44,6 +46,22 @@ module Avm
           create_units(main_source.subs)
         end
 
+        # @return [Avm::Sources::Tests::Single]
+        def create_source_no_test_unit(source)
+          ::Avm::Sources::Tests::Single.new(self, source, NO_TEST_TEST_NAME,
+                                            source.env.command('true'))
+        end
+
+        # @return [Array<Avm::Sources::Tests::Single>]
+        def create_source_units(source)
+          tests = source.test_commands
+          return create_source_no_test_unit(source) unless tests.any?
+
+          tests.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 +69,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.25.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', '>= 0.9.1'
   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.1'
   end
 end

data/sub/avm-eac_redmine_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_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.3'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'
-  s.add_dependency 'curb', '~> 0.9.10'
-  s.add_dependency 'eac_fs', '~> 0.4'
-  s.add_dependency 'eac_rest', '~> 0.4'
-  s.add_dependency 'eac_ruby_utils', '~> 0.68'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.4', '>= 0.4.1'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
+  s.add_dependency 'curb', '~> 0.9.11'
+  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.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_redmine_base0/lib/avm/eac_redmine_base0/sources/base.rb

@@ -8,9 +8,17 @@ module Avm
   module EacRedmineBase0
     module Sources
       class Base < ::Avm::EacRailsBase1::Sources::Base
+        DEFAULT_TEST_COMMANDS = {}.freeze
         REDMINE_LIB_SUBPATH = 'lib/redmine.rb'
         SUBS_INCLUDE_PATHS_DEFAULT = ['plugins/*'].freeze
 
+        # Return a empty hash (No tests).
+        #
+        # @return [Hash<String, EacRubyUtils::Envs::Command].
+        def default_test_commands
+          DEFAULT_TEST_COMMANDS
+        end
+
         def redmine_lib_path
           path.join(REDMINE_LIB_SUBPATH)
         end

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

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