avm-tools 0.44.2 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c9d91dc20429e3c9c932f57e47152b19fb1e468f3e564c44f4f395f7d04b5d7
-  data.tar.gz: 18bfbdc67f8f8a9c93bccff6798f4b444fc6c20e3a9a4318e1acae168c6cccd1
+  metadata.gz: c4de0474ea4576b01ebad7cc61770d10f4be52e95820681eed2918d0d9faaab9
+  data.tar.gz: 7f849db68edcbe9d6070a814698c69011a73e33940b086c96476509cbd85bff8
 SHA512:
-  metadata.gz: ab35a0b3b98a2885cc1de50a117b5fa579429160aa1cae64d9edf4edc94fa819afad0bb470bcbd7b7f293ca3ff90bda4d56c37460455093dab45ac4879174532
-  data.tar.gz: 6f7ec8185a22da62ec5b5ada88065ba74ca6a0971235322732aff502c94d5853be532dc188fae5bef70830de18cd20412af536ff82f3c3dd991d08a69f7a4559
+  metadata.gz: b35a21622b980f23e8a578277fac9204465543e431b3cd530f6d18d4d224bf811709ecbf61777a96fb0c84820491d0a72d7d020af7f07792ed579ceb5e84320e
+  data.tar.gz: 5360f604e835e82cb18cd8e97224c33d563df588b78a46a9f82ede674828caae31898d41459051f015dae44fdd43bda06b929adca4405f055053ff983774f13b

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+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(&:any_test_command)
+          return ::Avm::Result.success('unconfigured') unless test_command.present?
+
+          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')
+          end
+        end
+
+        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
+      end
+    end
+  end
+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'
 
@@ -14,7 +15,8 @@ module Avm
           follow_master: 'Follow master?',
           commits: 'Commits?',
           bifurcations: 'Bifurcations?',
-          dry_push: 'Dry push?'
+          dry_push: 'Dry push?',
+          test: 'Test ok?'
         }.with_indifferent_access.freeze
 
         def valid?
@@ -27,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)
@@ -48,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.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/configs'
+require 'eac_ruby_utils/core_ext'
 require 'yaml'
 
 module Avm
   module Instances
     class Configuration < ::EacRubyUtils::Configs
+      require_sub __FILE__
+
       FILENAMES = %w[.avm.yml .avm.yaml].freeze
 
       class << self
@@ -30,6 +33,15 @@ module Avm
       def initialize(path)
         super(nil, storage_path: path)
       end
+
+      # Utility to read a configuration as a [EacRubyUtils::Envs::Command].
+      # @return [EacRubyUtils::Envs::Command]
+      def read_command(key)
+        read_entry(key).if_present do |v|
+          args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
+          ::EacRubyUtils::Envs.local.command(args).chdir(::File.dirname(storage_path))
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Avm
+  module Instances
+    class Configuration < ::EacRubyUtils::Configs
+      RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
+      RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'
+
+      def rubocop_command
+        read_command(RUBOCOP_COMMAND_KEY)
+      end
+
+      def rubocop_gemfile
+        gemfile_path = read_entry(RUBOCOP_GEMFILE_KEY)
+        return nil unless gemfile_path.present?
+
+        gemfile_path = gemfile_path.to_pathname.expand_path(storage_path.parent)
+        return gemfile_path if gemfile_path.file?
+
+        raise "Gemfile path \"#{gemfile_path}\" does not exist or is not a file"
+      end
+    end
+  end
+end

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

@@ -0,0 +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/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/ruby/rubocop/_configured.rb

@@ -10,25 +10,13 @@ module Avm
       end
 
       def configured_rubocop_command_by_command
-        rubocop_command = configuration.if_present { |v| v.read_entry('ruby.rubocop.command') }
-        return nil unless rubocop_command.present?
-
-        args = if rubocop_command.is_a?(::Enumerable)
-                 rubocop_command.map(&:to_s)
-               else
-                 ::Shellwords.split(rubocop_command)
-               end
-        cmd(args).chdir(::File.dirname(configuration.storage_path))
+        configuration.if_present(&:rubocop_command)
       end
 
       def configured_rubocop_command_by_gemfile
-        gemfile_path = configuration.if_present { |v| v.read_entry('ruby.rubocop.gemfile') }
-        return nil unless gemfile_path.present?
-
-        gemfile_path = ::Pathname.new(gemfile_path).expand_path(configuration.storage_path.parent)
-        raise "Gemfile path \"#{gemfile_path}\" does not exist" unless gemfile_path.exist?
-
-        rubocop_command_by_gemfile_path(gemfile_path.parent)
+        configuration.if_present(&:rubocop_gemfile).if_present do |v|
+          rubocop_command_by_gemfile_path(v.parent)
+        end
       end
 
       private

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_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