avm-tools 0.109.0 → 0.112.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d1323f1184dc14780cfebc69d39fc495d7a1e38b7097fbc33259b076decacf9
-  data.tar.gz: 8ee9accc32035421261372235b215e04962a4cc6ae13fb04b70f52702ba947b9
+  metadata.gz: 9b66b870dd3773fc0d1b9f01af2b1071c16dd477b97f11fdf97f2635bebadf8c
+  data.tar.gz: 1c7d80182eee3d3d144e324c4d189e1252d7b47284f03cc8404d3b01793159c8
 SHA512:
-  metadata.gz: a7a0c52c5243b5b761b283e6a5fcec27e6ae5cd9937cb23c4c57889cf37d7808cac60606809cbe01aa24467a5cc5a6c3b818ca63bc088f9f72bdc350cffa926c
-  data.tar.gz: da9d2f826df7d74debc75592028919fd04ac6307f813b7e0b165643c97a65c6451c14150ff33f3be14360afc16d261e3a842fa9accbc204f0d63045c85db293a
+  metadata.gz: 6fc387867645488cfa6be38135087ff5ff9cd9b8785b6c09d38562faecc0e3c995d0415d36f70c1ff61765c0f3ea094f9007af3a9a4434c70d242a47e1ad852c
+  data.tar.gz: 64cd91c8f706d397354e1900028dc504863c6dedc7182da287d864e19e6ab00caf52e0754867d9c393001dd5486e80db5451e63440fe5db359152302a816cd44

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/patches/i18n.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/self/root'
+require 'i18n'
+
+module Avm
+  module Patches
+    module I18n
+      class << self
+        def setup_i18n
+          ::I18n.load_path += locale_files_paths.map(&:to_path)
+        end
+
+        def locale_files_paths
+          ::Avm::Self.root.join('locale').glob('*.yml')
+        end
+      end
+    end
+  end
+end
+
+::Avm::Patches::I18n.setup_i18n

data/lib/avm/projects/stereotypes/ruby_gem/version_bump.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/patches/object/i18n'
+require 'avm/patches/i18n'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -47,7 +47,7 @@ module Avm
           end
 
           def git_commit_message
-            translate(__method__, version: target_version, __locale: instance.locale)
+            i18n_translate(__method__, version: target_version, __locale: instance.locale)
           end
 
           def changing_files

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/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/files/rotate.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/files/rotate'
+require 'avm/data/rotate'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -19,7 +19,7 @@ module Avm
           end
 
           def rotate
-            @rotate ||= ::Avm::Files::Rotate.new(
+            @rotate ||= ::Avm::Data::Rotate.new(
               parsed.path,
               space_limit: parsed.space_limit
             )

data/lib/avm/tools/runner.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/self'
+require 'avm/registry'
 require 'avm/tools/version'
 require 'eac_ruby_base0/runner'
 
@@ -17,6 +18,10 @@ module Avm
       def application
         ::Avm::Self.application
       end
+
+      def extra_available_subcommands
+        ::Avm::Registry.runners.registered_modules.map { |k| [k.command_argument, k] }.to_h
+      end
     end
   end
 end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.109.0'
+    VERSION = '0.112.0'
   end
 end