avm-tools 0.110.0 → 0.113.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d43e61c9d3bd87bf7af09c3bd6010342ce2b31d6fd27e7f83aabee279475038d
-  data.tar.gz: 30a050c8a12f111380c6f11c18d1e3afe87218c1872d1ecfebabb5289efc057f
+  metadata.gz: 42060117f8df5b568312272c0c548235a0640e49034715df19427aa6de2e22e7
+  data.tar.gz: e15b3dc05398374d9f751c654aa133c245718b058b3095475123009d1349cb49
 SHA512:
-  metadata.gz: b5abf8184f30cff08511d952f28537952ad45d8b61204e3cb0ad88520b58f93b753a87a2b122c05f52c527b772c6a8023390af09130179fdcefa1026adaf8c9f
-  data.tar.gz: 602de22511c237207bb8bd2223badf4bbd26d0be24f0b595bdb2e94e526b5d775e5a8d1a65d6eb0410391b886c33a2c3ec69751d17126e7433964d67f94cec0f
+  metadata.gz: 9fb0c125f62aa85f5503598800ea0fbd07f416714344565222a3e76ab1c000ee067c534864c565578b5ceae4c983cbed1272036841972c78766daf9da4db2cdb
+  data.tar.gz: 1026962818483d8f1d96a7eff817fd5ca064528f2196df9bc390102f4913fe4411962b8da9a33509df5153891b188633a403b4b939b1e5a8690c144402f81585

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gems_subdir = ::File.join(__dir__, 'vendor')
+gems_subdir = ::File.join(__dir__, 'sub')
 Dir["#{gems_subdir}/*"].each do |dir|
   next unless ::File.file?(::File.join(dir, 'Gemfile'))
 

data/lib/avm/ruby/rubocop/_envvar.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/on_clean_ruby_environment'
 
 module Avm
   module Ruby

data/lib/avm/ruby/rubocop/_gemfile.rb

@@ -2,7 +2,6 @@
 
 require 'avm/patches/eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/on_clean_ruby_environment'
 
 module Avm
   module Ruby

data/lib/avm/ruby/rubocop.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/on_clean_ruby_environment'
+require 'eac_ruby_utils/ruby/on_clean_environment'
 
 module Avm
   module Ruby
@@ -38,13 +38,13 @@ module Avm
       end
 
       def rubocop_version_uncached
-        ::EacRubyUtils.on_clean_ruby_environment do
+        ::EacRubyUtils::Ruby.on_clean_environment do
           rubocop_command.append(['--version']).execute!.strip
         end
       end
 
       def run_rubocop
-        ::EacRubyUtils.on_clean_ruby_environment { rubocop_command_with_args.system }
+        ::EacRubyUtils::Ruby.on_clean_environment { rubocop_command_with_args.system }
       end
 
       def start_banner

data/lib/avm/tools/app_src.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/sources/base'
+require 'avm/registry'
 require 'avm/sources/configuration'
 require 'avm/launcher/paths/real'
 require 'avm/projects/stereotype/job_comparator'
@@ -36,7 +36,7 @@ module Avm
       private
 
       def avm_instance_uncached
-        ::Avm::Sources::Base.new(path)
+        ::Avm::Registry.sources.detect(path)
       end
 
       # @return [Avm::Sources::Configuration]

data/lib/avm/tools/runner/app_src/info.rb

@@ -25,14 +25,14 @@ module Avm
           end
 
           def show_source
-            infov 'Stereotype', runner_context.call(:subject).stereotype
+            infov 'Stereotype', runner_context.call(:subject).class
             infov 'SCM', runner_context.call(:subject).scm
           end
 
           def show_subs
             infov 'Sub applications', instance.avm_instance.subs.count
             instance.avm_instance.subs.each do |subapp|
-              infov '  * ', subapp.relative_path
+              infov '  * ', "#{subapp.relative_path} [#{subapp.class}]"
             end
           end
 

data/lib/avm/tools/runner/{git → app_src}/issue/complete.rb

@@ -6,7 +6,7 @@ require 'avm/git/issue/complete'
 module Avm
   module Tools
     class Runner
-      class Git
+      class AppSrc
         class Issue
           class Complete
             runner_with :confirmation, :help do
@@ -52,7 +52,8 @@ module Avm
             end
 
             def git_complete_issue_options
-              { dir: runner_context.call(:repository_path), skip_validations: skip_validations }
+              { dir: runner_context.call(:subject).path.to_path,
+                skip_validations: skip_validations }
             end
 
             def doc_validations_list

data/lib/avm/tools/runner/{git → app_src}/issue/deliver.rb

@@ -6,7 +6,7 @@ require 'avm/git/issue/deliver'
 module Avm
   module Tools
     class Runner
-      class Git
+      class AppSrc
         class Issue
           class Deliver
             runner_with :confirmation, :help do
@@ -25,7 +25,7 @@ module Avm
             private
 
             def deliver_uncached
-              ::Avm::Git::Issue::Deliver.new(runner_context.call(:git_repo))
+              ::Avm::Git::Issue::Deliver.new(runner_context.call(:subject).scm.git_repo)
             end
           end
         end

data/lib/avm/tools/runner/{git → app_src}/issue.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/git/issue/complete'
 
 module Avm
   module Tools
     class Runner
-      class Git
+      class AppSrc
         class Issue
           require_sub __FILE__
           runner_with :help, :subcommands do

data/lib/avm/tools/runner/app_src/test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
+require 'avm/sources/tests/builder'
 
 module Avm
   module Tools
@@ -9,20 +10,81 @@ module Avm
         class Test
           runner_with :help do
             desc 'Test local project.'
+            bool_opt '-a', '--all', 'Same as "--self --subs".'
+            bool_opt '-f', '--fail-fast', 'Abort after first failure.'
+            bool_opt '-m', '--main', 'Test main source.'
+            bool_opt '-s', '--subs', 'Test subs\' sources.'
+            pos_arg :source_id, repeat: true, optional: true
           end
 
           def run
-            runner_context.call(:instance_banner)
-            infov 'Test command', test_command
-            if test_command.present?
-              test_command.system!
+            reset_tested_units
+            start_banner
+            show_units_results
+            final_result
+          end
+
+          private
+
+          attr_accessor :tested_units
+
+          def failed_units
+            tested_units.select(&:failed?)
+          end
+
+          def final_result
+            if failed_units.any?
+              failed_units.each do |unit|
+                infov '  * Source', unit
+                info unit.logs.truncate_all
+              end
+              fatal_error 'Some test did not pass'
             else
-              fatal_error 'No test command found'
+              success 'None test failed'
             end
           end
 
-          def test_command
-            runner_context.call(:instance).configuration.if_present(&:any_test_command)
+          def include_main?
+            parsed.main? || parsed.all?
+          end
+
+          def include_subs?
+            parsed.subs? || parsed.all?
+          end
+
+          def reset_tested_units
+            self.tested_units = []
+          end
+
+          def show_units_results
+            test_performer.units.each do |unit|
+              infov unit, unit_result(unit)
+              tested_units << unit
+              break if unit.failed? && parsed.fail_fast?
+            end
+          end
+
+          def start_banner
+            runner_context.call(:instance_banner)
+            infov 'Selected units', test_performer.units.count
+          end
+
+          def test_builder
+            r = ::Avm::Sources::Tests::Builder.new(runner_context.call(:subject))
+                                              .include_main(include_main?)
+                                              .include_subs(include_subs?)
+            parsed.source_id.inject(r) { |a, e| a.include_id(e) }
+          end
+
+          def test_performer_uncached
+            test_builder.performer
+          end
+
+          def unit_result(unit)
+            (
+              [unit.result.to_label] +
+              %i[stdout stderr].map { |label| "#{label.to_s.upcase}: #{unit.logs[label]}" }
+            ).join(' | '.blue)
           end
         end
       end

data/lib/avm/tools/runner/config/load_path.rb

@@ -34,7 +34,7 @@ module Avm
           def run_add
             parsed.push.if_present do |v|
               infov 'Path to add', v
-              config_node.load_path.push(v)
+              root_config_node.write_node.load_path.push(v)
               success 'Path included'
             end
           end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.110.0'
+    VERSION = '0.113.1'
   end
 end