avm-tools 0.45.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e0e6277dfb4d7fb9d026f49aa93d0bc395c1c4b526911a5229f062e95a33a60
-  data.tar.gz: 7c3628d294e04080fa3b9adef605bba3c4c75260bcaf398b1a46a8b1cca8a33d
+  metadata.gz: 1137821182b34e4446f1f175eac9e65759aa94850eaa2be6452e438794c3d7e2
+  data.tar.gz: 646ea6c80d87e421e6959d316c746ef24e778650346dfbc7cd141c556fec77ad
 SHA512:
-  metadata.gz: 690afb20bf63115d36da0090cb070ff112fd187ba6dc428cb25fd6d31b0ab9588f90abcf09faf43d1a33f1aacc0bb5fb549ef63ba14ab7a4f2ff31a6bb32cbff
-  data.tar.gz: 28ae352ef538db3bb01a0dc8fbdc593ca61fd34ef24fdfe97e00db3ce3c27af6d953e3c9459fbb51b7dce2106c5d801b717c9d5e2adf0ee3a6ab4fb984a519e8
+  metadata.gz: 01a3a8f6965075d701380b9e97338b3d50497cf2ccc3e0e5bfe3f219c709db6b0c0bb3a6af6c51ea19557046c2170134fd70ea830b0faaddc03dac1f958a9c99
+  data.tar.gz: ea67bf1ddfdae82da134cb4883958ed9c1efc17d6b25e65d2acc40d5c16fadeacc67b1f93817c113b4165360caf16a21fee1ef38e788e2e76b8e593625a7d7ed

data/lib/avm/git/issue/complete.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/patches/eac_launcher_git_base'
+require 'eac_launcher/git/base'
 require 'eac_ruby_utils/console/speaker'
 require 'eac_ruby_utils/options_consumer'
 require 'eac_ruby_utils/require_sub'

data/lib/avm/git/issue/complete/_test.rb

@@ -2,16 +2,20 @@
 
 require 'avm/instances/configuration'
 require 'avm/result'
+require 'eac_ruby_utils/fs/temp'
 
 module Avm
   module Git
     module Issue
       class Complete
         def test_result
-          test_command = configuration.if_present(&:test_command)
+          test_command = configuration.if_present(&:any_test_command)
           return ::Avm::Result.success('unconfigured') unless test_command.present?
 
-          if test_command.execute[:exit_code].zero?
+          infom "Running test command \"#{test_command}\"..."
+          result = test_command.execute
+          test_result_log(result)
+          if result.fetch(:exit_code).zero?
             ::Avm::Result.success('yes')
           else
             ::Avm::Result.error('no')
@@ -20,6 +24,16 @@ module Avm
 
         private
 
+        def test_result_log(result)
+          stdout_file = ::EacRubyUtils::Fs::Temp.file
+          stderr_file = ::EacRubyUtils::Fs::Temp.file
+          stdout_file.write(result.fetch(:stdout))
+          stderr_file.write(result.fetch(:stderr))
+          infov '  * Exit code', result.fetch(:exit_code)
+          infov '  * STDOUT', stdout_file.to_path
+          infov '  * STDERR', stderr_file.to_path
+        end
+
         def configuration_uncached
           ::Avm::Instances::Configuration.find_by_path(@git)
         end

data/lib/avm/git/issue/complete/_validations.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/git/issue/complete/validation'
 require 'avm/result'
 require 'ostruct'
 
@@ -28,20 +29,6 @@ module Avm
           end
         end
 
-        def validations
-          VALIDATIONS.map do |key, label|
-            ::OpenStruct.new(key: key, label: label, result: validation_result(key))
-          end
-        end
-
-        def validation_result(key)
-          if skip_validations.include?(key)
-            ::Avm::Result.neutral('skipped')
-          else
-            send("#{key}_result")
-          end
-        end
-
         def validate_skip_validations
           skip_validations.each do |validation|
             next if VALIDATIONS.keys.include?(validation)
@@ -49,6 +36,14 @@ module Avm
             raise "\"#{validation}\" is not a registered validation"
           end
         end
+
+        private
+
+        def validations_uncached
+          VALIDATIONS.map do |key, label|
+            ::Avm::Git::Issue::Complete::Validation.new(self, key, label)
+          end
+        end
       end
     end
   end

data/lib/avm/git/issue/complete/validation.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        class Validation
+          enable_simple_cache
+          common_constructor :parent, :key, :label
+
+          def skip?
+            parent.skip_validations.include?(key)
+          end
+
+          private
+
+          def result_uncached
+            if skip?
+              ::Avm::Result.neutral('skipped')
+            else
+              parent.send("#{key}_result")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/revision_test.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'avm/fs_cache'
-require 'avm/ruby'
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/ruby'
 
 module Avm
   module Git
@@ -57,7 +57,7 @@ module Avm
       def run_test
         infom "Running test command \"#{::Shellwords.join(test_command_args)}\"" \
           " on \"#{git_absolute_path}\"..."
-        result = ::Avm::Ruby.on_clean_environment { test_command.execute }
+        result = ::EacRubyUtils::Ruby.on_clean_environment { test_command.execute }
         infom 'Test done'
         write_result_cache(result)
       end

data/lib/avm/instances/configuration/_tests.rb

@@ -1,13 +1,27 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_gems_utils/gem'
+
 module Avm
   module Instances
     class Configuration < ::EacRubyUtils::Configs
+      BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
       TEST_COMMAND_KEY = 'test.command'
 
+      def any_test_command
+        bundle_test_command || test_command
+      end
+
       def test_command
         read_command(TEST_COMMAND_KEY)
       end
+
+      def bundle_test_command
+        read_entry(BUNDLE_TEST_COMMAND_KEY).if_present do |v|
+          args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
+          ::EacRubyGemsUtils::Gem.new(::File.dirname(storage_path)).bundle(*args).chdir_root
+        end
+      end
     end
   end
 end

data/lib/avm/rails.rb

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

data/lib/avm/rails/runners.rb

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

data/lib/avm/rails/runners/bundle.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'shellwords'
+
+module Avm
+  module Rails
+    module Runners
+      class Bundle < ::EacRubyUtils::Console::DocoptRunner
+        enable_console_speaker
+
+        DOC = <<~DOCOPT
+          Runs "bundle ...".
+
+          Usage:
+            __PROGRAM__ [<bundle-args>...]
+            __PROGRAM__ -h | --help
+
+          Options:
+            -h --help                 Show this screen.
+        DOCOPT
+
+        def run
+          infov 'Bundle arguments', ::Shellwords.join(bundle_args)
+          context(:instance).bundle(*bundle_args).system!
+        end
+
+        def bundle_args
+          options.fetch('<bundle-args>').reject { |arg| arg == '--' }
+        end
+      end
+    end
+  end
+end

data/lib/avm/rails/runners/runner.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Rails
+    module Runners
+      class Runner < ::EacRubyUtils::Console::DocoptRunner
+        enable_console_speaker
+        enable_simple_cache
+
+        DOC = <<~DOC
+          Runs a Ruby code with "rails runner".
+
+          Usage:
+            __PROGRAM__ [options] <code>
+            __PROGRAM__ --version
+            __PROGRAM__ -h | --help
+
+          Options:
+            -h --help         Show this screen.
+            -e --environment  Specifies the environment for the runner to
+                              operate (test/development/production). Default: "development".
+        DOC
+
+        def run
+          infov 'Runner arguments', runner_args
+          infov 'Environment', context(:instance).host_env
+          runner_command.system!
+        end
+
+        def runner_command_uncached
+          context(:instance).bundle(*bundle_args)
+        end
+
+        def bundle_args
+          %w[exec rails runner] + runner_args
+        end
+
+        def runner_args
+          options.fetch('--environment').if_present([]) { |v| ['--environment', v] } +
+            [options.fetch('<code>')]
+        end
+      end
+    end
+  end
+end

data/lib/avm/ruby.rb

@@ -5,25 +5,5 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Ruby
     require_sub __FILE__
-
-    class << self
-      def on_clean_environment
-        on_clean_envvars('BUNDLE', 'RUBY') { yield }
-      end
-
-      private
-
-      def on_clean_envvars(*start_with_vars)
-        old_values = envvars_starting_with(start_with_vars)
-        old_values.keys.each { |k| ENV.delete(k) } # rubocop:disable Style/HashEachMethods
-        yield
-      ensure
-        old_values&.each { |k, v| ENV[k] = v }
-      end
-
-      def envvars_starting_with(start_with_vars)
-        ENV.select { |k, _v| start_with_vars.any? { |var| k.start_with?(var) } }
-      end
-    end
   end
 end

data/lib/avm/stereotypes/eac_redmine_base0/deploy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/ruby'
 require 'avm/stereotypes/eac_webapp_base0/deploy'
+require 'eac_ruby_utils/ruby'
 
 module Avm
   module Stereotypes
@@ -11,7 +11,7 @@ module Avm
 
         def run_installer
           infom 'Running installer'
-          ::Avm::Ruby.on_clean_environment do
+          ::EacRubyUtils::Ruby.on_clean_environment do
             installer_command.system!
           end
         end

data/lib/avm/stereotypes/eac_webapp_base0/instance.rb

@@ -42,9 +42,9 @@ module Avm
         private
 
         def files_units
-          self.class.const_get('FILES_UNITS').map do |data_key, fs_path_subpath|
-            [data_key, ::Avm::Data::Instance::FilesUnit.new(self, fs_path_subpath)]
-          end.to_h
+          self.class.const_get('FILES_UNITS').transform_values do |fs_path_subpath|
+            ::Avm::Data::Instance::FilesUnit.new(self, fs_path_subpath)
+          end
         end
       end
     end

data/lib/avm/tools/runner/eac_rails_base0/bundle.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/rails/runners/bundle'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class Bundle < ::Avm::Rails::Runners::Bundle
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_rails_base0/runner.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/rails/runners/runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class Runner < ::Avm::Rails::Runners::Runner
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_redmine_base0/bundle.rb

@@ -1,34 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_redmine_base0/deploy'
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/rails/runners/bundle'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Bundle < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
-
-          DOC = <<~DOCOPT
-            Runs "bundle ...".
-
-            Usage:
-              __PROGRAM__ [<bundle-args>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                 Show this screen.
-          DOCOPT
-
-          def run
-            infov 'Bundle arguments', ::Shellwords.join(bundle_args)
-            context(:instance).bundle(*bundle_args).system!
-          end
-
-          def bundle_args
-            options.fetch('<bundle-args>').reject { |arg| arg == '--' }
-          end
+        class Bundle < ::Avm::Rails::Runners::Bundle
         end
       end
     end

data/lib/avm/tools/runner/eac_redmine_base0/runner.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/rails/runners/runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class Runner < ::Avm::Rails::Runners::Runner
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/files/format.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/files/formatter'
-require 'avm/patches/eac_launcher_git_base'
+require 'eac_launcher/git/base'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/core_ext'