avm-tools 0.46.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22450837df14cf1ed2d98a21cb8721c9c755d573aa9ac12ca8128efd844eff34
-  data.tar.gz: a0d1f7803ffc840b0677efa4d306e12f3656cd1eb112bbbe5ea7d15a95ecfef2
+  metadata.gz: a30c179acc435486e3fe35ad34714133f582332ddcfb98fd00be1f75c1960df2
+  data.tar.gz: 07d4c21e8c6dd98d2f7ce70a02f5caec1ba0660e9a59f5d15af0c8b6f711022a
 SHA512:
-  metadata.gz: a046970714aa1bfc759a83d7bc55bc86307d2b6c3ad206c5effe6bf1159930e336e5b70ce98789e5c1e65cf177b805bdd8ef0c1d49874411a81fd43f644f2287
-  data.tar.gz: 429de9bfecf5348c034542cb0f5b8555f3c757341da8b47ec6062883633c77b5c87b40f08f5df924419de940e39bd5acdb642b3798e204fe221b6a36821dd648
+  metadata.gz: 9d3b21ec49fb39bad56c9d8de4538cf5261f452d57d8c0188e0cb501ae7a9584fa54d2e35a0a88c250956af6edc48eec0e91f2aa4c186fec038f67d148f911dc
+  data.tar.gz: 761bad690d7493109e71c2fdb34efcf5a0f1737d6d5b52d1f23d16c4c597e18593a5bca169900484421ff8071f79a20560a8754409e4b529135b905c099cbade

data/Gemfile

@@ -3,3 +3,11 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gems_subdir = ::File.join(__dir__, 'vendor', 'gems')
+Dir["#{gems_subdir}/*"].each do |dir|
+  next unless ::File.directory?(dir)
+
+  basename = ::File.basename(dir)
+  gem basename, path: "#{gems_subdir}/#{basename}"
+end

data/lib/avm/data/package/dump.rb

@@ -10,7 +10,7 @@ module Avm
         enable_console_speaker
         enable_listable
 
-        DEFAULT_EXPIRE_TIME = 1.days
+        DEFAULT_EXPIRE_TIME = 1.day
         DEFAULT_FILE_EXTENSION = '.tar'
 
         attr_reader :package, :data_file_path, :existing

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)
-          return ::Avm::Result.success('unconfigured') unless test_command.present?
+          test_command = configuration.if_present(&:any_test_command)
+          return ::Avm::Result.success('unconfigured') if test_command.blank?
 
-          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/_rubocop.rb

@@ -12,7 +12,7 @@ module Avm
 
       def rubocop_gemfile
         gemfile_path = read_entry(RUBOCOP_GEMFILE_KEY)
-        return nil unless gemfile_path.present?
+        return nil if gemfile_path.blank?
 
         gemfile_path = gemfile_path.to_pathname.expand_path(storage_path.parent)
         return gemfile_path if gemfile_path.file?

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/ruby/gems.rb

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

data/lib/avm/ruby/gems/generator.rb

@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+
+require 'avm/patches/object/template'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    module Gems
+      class Generator
+        IDENT = '  '
+        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock rspec].freeze
+        TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
+
+        enable_console_speaker
+        enable_simple_cache
+        common_constructor :root_directory, :options, default: [{}] do
+          self.root_directory = root_directory.to_pathname
+          run
+        end
+
+        def eac_ruby_gem_support_version
+          dependency_version('eac_ruby_gem_support')
+        end
+
+        def eac_ruby_utils_version
+          dependency_version('eac_ruby_utils')
+        end
+
+        def name
+          root_directory.basename.to_s
+        end
+
+        def lib_path
+          name.split('-').join('/')
+        end
+
+        def root_module
+          lib_path.camelize
+        end
+
+        def root_module_close
+          root_module_components.count.times.map do |index|
+            (IDENT * index) + 'end'
+          end.reverse.join("\n")
+        end
+
+        def root_module_inner_identation
+          IDENT * root_module_components.count
+        end
+
+        def root_module_open
+          root_module_components.each_with_index.map do |component, index|
+            (IDENT * index) + 'module ' + component
+          end.join("\n")
+        end
+
+        def root_module_components
+          root_module.split('::')
+        end
+
+        protected
+
+        def apply_to_root_directory(template, subpath)
+          if template.is_a?(::EacRubyUtils::Templates::Directory)
+            template.children.each do |child|
+              apply_to_root_directory(child, subpath.join(child.basename))
+            end
+          elsif template.is_a?(::EacRubyUtils::Templates::File)
+            template.apply_to_file(template_variables, root_directory.join(subpath))
+          else
+            raise "Unknown template object: #{template}"
+          end
+        end
+
+        def dependency_version(gem_name)
+          VersionBuilder.new(gem_name, options).to_s
+        end
+
+        def generate_gemspec
+          template_apply('gemspec', "#{name}.gemspec")
+        end
+
+        def generate_gemfile_lock
+          self_gem.bundle('install').chdir_root.execute!
+        end
+
+        def generate_root_directory
+          root_directory.mkpath
+        end
+
+        def generate_root_lib
+          template_apply('root_lib', "lib/#{lib_path}.rb")
+        end
+
+        def generate_rspec
+          self_gem.bundle('exec', 'rspec').chdir_root.execute!
+        end
+
+        def generate_static
+          template.child('static').apply(self, root_directory)
+        end
+
+        def generate_version_lib
+          template_apply('version', "lib/#{lib_path}/version.rb")
+        end
+
+        def run
+          infov 'Root directory', root_directory
+          infov 'Gem name', name
+          JOBS.each do |job|
+            infom "Generating #{job.humanize}..."
+            send("generate_#{job}")
+          end
+        end
+
+        def self_gem_uncached
+          ::EacRubyGemsUtils::Gem.new(root_directory)
+        end
+
+        def template_apply(from, to)
+          target = root_directory.join(to)
+          target.dirname.mkpath
+          template.child("#{from}.template").apply_to_file(self, target.to_path)
+        end
+
+        class VersionBuilder
+          enable_simple_cache
+          common_constructor :gem_name, :options
+
+          def to_s
+            r = "'~> #{two_segments}'"
+            r += ", '>= #{three_segments}'" if segments.count >= 3 && segments[2].positive?
+            r
+          end
+
+          # @return [Gem::Version]
+          def version
+            (options_version || default_version)
+          end
+
+          def two_segments
+            segments.first(2).join('.')
+          end
+
+          def three_segments
+            segments.first(3).join('.')
+          end
+
+          private
+
+          def segments_uncached
+            version.release.to_s.split('.').map(&:to_i)
+          end
+
+          def default_version
+            ::Gem.loaded_specs[gem_name].version
+          end
+
+          def options_version
+            options["#{gem_name}_version".to_sym].if_present do |v|
+              ::Gem::Version.new(v)
+            end
+          end
+        end
+      end
+    end
+  end
+end