avm-tools 0.116.0 → 0.117.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27716dd4266fe2074f32cc46de1d3d4b0a83612a50e4794f9948523d3ed6bad5
-  data.tar.gz: 97d712f91c0adbeacedd67674ae108d9f48fd2db800df50696625a7d81bd95f3
+  metadata.gz: aae509f1d4971fd8a6d39a9f20cc4a3dab9fd28267c333ffe521cba9252f20bb
+  data.tar.gz: f27d6bd59c10b9638f1f42b173d38a53a677b1d8de4b1a01c63e170ed1ed362f
 SHA512:
-  metadata.gz: ba1854580f3fd1cbda82b94422e8feffde990f8f8ec4ec5e789f7e565536502f581a9e6da694a2eb04c76da27916b6bbd8504dc6663e8a540aae7e8517941256
-  data.tar.gz: fc5000e7db1db0c41cda3768665ce4bd08846a81ba7c7f8d5b8c8e014d79fc28bf99a6d0fa5ba75d7b2d8b3be360c2dd13d18321cdb0b1789972f84e89616d60
+  metadata.gz: ea73fcc793b05f0265396c36a592969b9f60c6ccb8a0e7526f7f5e12f5c7b58688489c11cda94b7e17ab8a0430029dccca11d3a0b799a49e6c65d11c5f200b8a
+  data.tar.gz: bf13a36e7cdf500a7538c75531b108b7f09ef76dfd1b5a4ceb102cc32f2c2b76026df875c593de2fa6c240b3b5fccc43b9d7a989941dab6b15e61a8b142ee503

data/lib/avm/launcher/instances/settings.rb

@@ -23,7 +23,7 @@ module Avm
         end
 
         def publishable?
-          !!publishable_value
+          publishable_value ? true : false
         end
 
         def stereotype_publishable?(stereotype)
@@ -39,11 +39,15 @@ module Avm
         end
 
         def parse_publishable_value(value, hash_to_true)
-          return value.with_indifferent_access if !hash_to_true && value.is_a?(::Hash)
+          return value.with_indifferent_access if parse_publishable_value_hash?(value, hash_to_true)
           return true if value.nil? || value == true
           return false if value == false
 
-          !!value
+          value ? true : false
+        end
+
+        def parse_publishable_value_hash?(value, hash_to_true)
+          !hash_to_true && value.is_a?(::Hash)
         end
       end
     end

data/lib/avm/projects/stereotypes.rb

@@ -11,8 +11,8 @@ module Avm
       class << self
         def list
           @list ||= constants.map { |c| const_get(c) }
-                             .select { |c| c.included_modules.include?(Avm::Projects::Stereotype) }
-                             .freeze
+                      .select { |c| c.included_modules.include?(Avm::Projects::Stereotype) }
+                      .freeze
         end
       end
     end

data/lib/avm/ruby/bundler/incompatible_parser/depends_on.rb

@@ -9,7 +9,7 @@ module Avm
       class IncompatibleParser
         class DependsOn < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /(.+) was resolved to (.+), which depends on/
-                        .to_parser { |m| new(m[1], m[2]) }
+                          .to_parser { |m| new(m[1], m[2]) }
 
           common_constructor :gem_name, :version do
             self.version = ::Gem::Version.new(version)

data/lib/avm/ruby/bundler/incompatible_parser/gem_conflict.rb

@@ -9,7 +9,7 @@ module Avm
       class IncompatibleParser
         class GemConflict < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /Bundler could not find compatible versions for gem "(.+)":/
-                        .to_parser { |m| new(m[1]) }
+                          .to_parser { |m| new(m[1]) }
 
           enable_simple_cache
           common_constructor :gem_name

data/lib/avm/ruby/bundler/incompatible_parser/in_gemfile.rb

@@ -9,7 +9,7 @@ module Avm
       class IncompatibleParser
         class InGemfile < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /In Gemfile:/
-                        .to_parser { |_m| new }
+                          .to_parser { |_m| new }
 
           common_constructor
         end

data/lib/avm/ruby/bundler/incompatible_parser/version_requirement.rb

@@ -9,7 +9,7 @@ module Avm
       class IncompatibleParser
         class VersionRequirement < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /\A([a-z][a-z_0-9]*)(?: \((.+)\))?\z/
-                        .to_parser { |m| new(m[1], m[2]) }
+                          .to_parser { |m| new(m[1], m[2]) }
 
           enable_simple_cache
           attr_accessor :stack

data/lib/avm/ruby/bundler/incompatible_parser.rb

@@ -13,7 +13,7 @@ module Avm
 
         def initialize(path)
           @gems_in_conflict = ::Avm::Ruby::Bundler::IncompatibleParser::LineBuffer
-                              .from_file(path).gems_in_conflict.freeze
+                                .from_file(path).gems_in_conflict.freeze
         end
 
         def data

data/lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock/git.rb

@@ -29,7 +29,7 @@ module Avm
                 def git_continue_run(command)
                   infom "\"#{command}\" --continue..."
                   cmd = instance.git_repo.command(command, '--continue')
-                                .envvar('GIT_EDITOR', 'true')
+                          .envvar('GIT_EDITOR', 'true')
                   return unless !cmd.system && !conflict?
 
                   fatal_error "\"#{cmd}\" failed and there is no conflict"

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

@@ -71,8 +71,8 @@ module Avm
 
           def test_builder
             r = ::Avm::Sources::Tests::Builder.new(runner_context.call(:subject))
-                                              .include_main(include_main?)
-                                              .include_subs(include_subs?)
+                  .include_main(include_main?)
+                  .include_subs(include_subs?)
             parsed.source_id.inject(r) { |a, e| a.include_id(e) }
           end
 

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

@@ -8,14 +8,13 @@ module Avm
     class Runner
       class AppSrc
         class VersionBump
-          runner_with :help do
+          runner_with :help, :confirmation do
             desc 'Bump version of a local project.'
             arg_opt '-n', '--new', 'Set new version.'
             arg_opt '-s', '--segment', 'Increment de <segment>-th segment (Left-most is 0)'
             bool_opt '-M', '--major', 'Same as --segment=0.'
             bool_opt '-m', '--minor', 'Same as --segment=1.'
             bool_opt '-p', '--patch', 'Same as --segment=2.'
-            bool_opt '-y', '--yes', 'Bump without confirmation.'
           end
 
           def run
@@ -26,7 +25,7 @@ module Avm
           def run_version_changed
             infom 'Version changed'
             if confirm?
-              runner_context.call(:instance).run_job(:version_bump, target_version)
+              runner_context.call(:subject).version_bump(target_version)
               success 'Bumped'
             else
               fatal_error 'Bump unconfirmed'
@@ -38,17 +37,13 @@ module Avm
           end
 
           def start_banner
-            runner_context.call(:instance_banner)
+            infov 'Instance', runner_context.call(:subject)
             infov 'Current version', current_version.if_present('-')
             infov 'Target version', target_version.if_present('-')
           end
 
-          def confirm?
-            parsed.yes? || input('Confirm version bump?', bool: true)
-          end
-
           def current_version_uncached
-            runner_context.call(:instance).if_respond('version')
+            runner_context.call(:subject).if_respond('version')
           end
 
           def target_version_uncached

data/lib/avm/tools/runner/git/deploy.rb

@@ -78,15 +78,15 @@ module Avm
 
           def deploy
             ::Avm::Git::Commit.new(git, reference_sha1)
-                              .deploy_to_url(target_url)
-                              .append_templatized_directories(appended_directories)
-                              .variables_source_set(variables_source)
-                              .run
+              .deploy_to_url(target_url)
+              .append_templatized_directories(appended_directories)
+              .variables_source_set(variables_source)
+              .run
           end
 
           def target_url
             parsed.target_url.if_present { |v| return v }
-            instance.if_present { |v| return v.read_entry('fs.url') }
+            instance.if_present { |v| return v.read_entry(::Avm::Instances::EntryKeys::FS_URL) }
             nil
           end
 

data/lib/avm/tools/runner/git/dirty_files.rb

@@ -10,7 +10,7 @@ module Avm
           DEFAULT_FORMAT = '%p'
           FIELDS = {
             i: :index, w: :worktree, p: :path, a: :absolute_path
-          }.map { |k, v| ["%#{k}", v] }.to_h
+          }.transform_keys { |k| "%#{k}" }
 
           runner_with :help do
             desc 'Lists dirty files in Git repository.'

data/lib/avm/tools/runner/git/revisions_test.rb

@@ -51,7 +51,7 @@ module Avm
 
           def revisions_uncached
             runner_context.call(:git).execute!('log', '--pretty=format:%H', 'origin/master..HEAD')
-                          .each_line.map(&:strip).reverse.map do |sha1|
+              .each_line.map(&:strip).reverse.map do |sha1|
               ::Avm::Git::RevisionTest.new(runner_context.call(:git), sha1, test_revision_options)
             end
           end

data/lib/avm/tools/runner/ruby/rubocop.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/ruby/rubocop'
+require 'avm/eac_ruby_base1/rubocop'
 
 module Avm
   module Tools
@@ -15,7 +15,7 @@ module Avm
           end
 
           def run
-            ::Avm::Ruby::Rubocop.new(path, parsed.rubocop_args).run
+            ::Avm::EacRubyBase1::Rubocop.new(path, parsed.rubocop_args).run
           end
 
           private

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.116.0'
+    VERSION = '0.117.0'
   end
 end

data/sub/avm/avm.gemspec

@@ -15,12 +15,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_cli', '~> 0.23', '>= 0.23.1'
   s.add_dependency 'eac_docker', '~> 0.3'
   s.add_dependency 'eac_git', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.80'
+  s.add_dependency 'eac_ruby_utils', '~> 0.95'
   s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'
   s.add_dependency 'minitar', '~> 0.9'
 
-  s.add_development_dependency 'aranha-parsers', '~> 0.7', '>= 0.7.2'
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
+  s.add_development_dependency 'aranha-parsers', '~> 0.14', '~> 0.14.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm/lib/avm/instances/base/auto_values/mailer.rb

@@ -9,8 +9,8 @@ module Avm
       module AutoValues
         module Mailer
           ::Avm::Instances::EntryKeys.all.select { |c| c.to_s.start_with?('mailer.') }
-                                     .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
-                                     .each do |mailer_key|
+            .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
+            .each do |mailer_key|
             define_method ::Avm::Instances::Entry.auto_value_method_name(mailer_key) do
               mailer_auto_common(mailer_key)
             end

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -43,8 +43,10 @@ module Avm
 
       {
         '' => %w[data_fs_path fs_path host_id name source_instance_id],
+        admin: %w[username password api_key],
         database: %w[id hostname limit name password port system timeout username extra],
         docker: %w[registry],
+        fs: %w[url],
         mailer: {
           '' => %w[id from reply_to],
           smtp: %w[address port domain username password authentication openssl_verify_mode

data/sub/avm/lib/avm/registry/base.rb

@@ -17,7 +17,7 @@ module Avm
 
       def detect_optional(*registered_initialize_args)
         registered_modules.reverse.lazy.map { |klass| klass.new(*registered_initialize_args) }
-                          .find(&:valid?)
+          .find(&:valid?)
       end
 
       def provider_module_suffix
@@ -40,7 +40,7 @@ module Avm
 
       def registered_modules_uncached
         registered_gems.flat_map { |registry| modules_from_registry(registry) }
-                       .select { |v| valid_registered_module?(v) }.uniq
+          .select { |v| valid_registered_module?(v) }.uniq
       end
 
       def modules_from_registry(registry)

data/sub/avm/lib/avm/rspec/shared_examples/not_in_avm_registry.rb

@@ -4,7 +4,7 @@ require 'avm/registry'
 
 ::RSpec.shared_examples 'not_in_avm_registry' do |registry_method = nil|
   registry_method.if_present(::Avm::Registry.registries) { |v| [::Avm::Registry.send(v)] }
-                 .each do |registry|
+    .each do |registry|
     context "when registry is #{registry}" do
       it 'is not in the avm registry' do
         expect(registry.registered_modules).not_to include(described_class)

data/sub/avm/lib/avm/scms/base.rb

@@ -6,6 +6,7 @@ module Avm
   module Scms
     class Base
       enable_abstract_methods
+      enable_simple_cache
       abstract_methods :update, :valid?
       common_constructor :path do
         self.path = path.to_pathname
@@ -28,6 +29,18 @@ module Avm
       def to_s
         name
       end
+
+      private
+
+      # @return [Avm::Scms::Base]
+      def parent_scm
+        parent_path = path.parent
+        until parent_path.root?
+          ::Avm::Registry.scms.detect_optional(parent_path).if_present { |v| return v }
+          parent_path = parent_path.parent
+        end
+        nil
+      end
     end
   end
 end

data/sub/avm/lib/avm/sources/base/configuration.rb

@@ -29,7 +29,8 @@ module Avm
 
         # @return [Avm::Sources::Configuration]
         def old_configuration_uncached
-          ::Avm::Sources::Configuration.find_in_path(path)
+          ::Avm::Sources::Configuration.find_in_path(path) ||
+            ::Avm::Sources::Configuration.temp_instance
         end
       end
     end

data/sub/avm/lib/avm/sources/base/parent.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Parent
+        # @return [Avm::Sources::Base]
+        def parent
+          parent_by_option || parent_by_search
+        end
+
+        # @return [Avm::Sources::Base]
+        def parent_by_option
+          options[OPTION_PARENT]
+        end
+
+        # @return [Avm::Sources::Base]
+        def parent_by_search
+          parent_path = path.parent
+          until parent_path.root?
+            ::Avm::Registry.sources.detect_optional(parent_path).if_present { |v| return v }
+            parent_path = parent_path.parent
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base.rb

@@ -21,12 +21,6 @@ module Avm
       abstract_methods :update, :valid?
 
       delegate :locale, to: :old_configuration
-      delegate :to_s, to: :path
-
-      # @return [Avm::Sources::Base]
-      def parent
-        options[OPTION_PARENT]
-      end
 
       # @return [Pathname]
       def relative_path
@@ -35,6 +29,10 @@ module Avm
         path.relative_path_from(parent.path)
       end
 
+      def to_s
+        "#{self.class}[#{path}]"
+      end
+
       # @return [Enumerable<Avm::Sources::Base>]
       def subs
         scm.subs.map { |subrepo| ::Avm::Registry.sources.detect(subrepo.path, parent: self) }

data/sub/avm/lib/avm/sources/configuration/{_locale.rb → locale.rb}

@@ -6,10 +6,12 @@ require 'i18n'
 module Avm
   module Sources
     class Configuration < ::EacConfig::OldConfigs
-      LOCALE_KEY = :locale
+      module Locale
+        LOCALE_KEY = :locale
 
-      def locale
-        read_entry(LOCALE_KEY) || ::I18n.default_locale
+        def locale
+          read_entry(LOCALE_KEY) || ::I18n.default_locale
+        end
       end
     end
   end

data/sub/avm/lib/avm/sources/configuration/rubocop.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Avm
+  module Sources
+    class Configuration < ::EacConfig::OldConfigs
+      module Rubocop
+        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 if gemfile_path.blank?
+
+          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
+end

data/sub/avm/lib/avm/sources/configuration/tests.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+
+module Avm
+  module Sources
+    class Configuration < ::EacConfig::OldConfigs
+      module Tests
+        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
+end

data/sub/avm/lib/avm/sources/configuration.rb

@@ -7,7 +7,7 @@ require 'yaml'
 module Avm
   module Sources
     class Configuration < ::EacConfig::OldConfigs
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
 
       FILENAMES = %w[.avm.yml .avm.yaml].freeze
 
@@ -28,6 +28,10 @@ module Avm
           nil
         end
 
+        def temp_instance
+          new(::Tempfile.new(['.avm', '.yaml']))
+        end
+
         private
 
         def internal_find_path(absolute_pathname)

data/sub/avm/lib/avm/sources/tests/builder.rb

@@ -33,7 +33,7 @@ module Avm
         # @return [Array<Avm::Sources::Tests::Single>]
         def available_units
           @available_units ||= ([main_source] + main_source.subs)
-                               .map { |a_source| create_unit(a_source) }
+                                 .map { |a_source| create_unit(a_source) }
         end
 
         def available_units_from_main

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.17.0'
+  VERSION = '0.19.0'
 end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb

@@ -17,7 +17,7 @@ module Avm
           end
 
           def source_path
-            build.project.root.join(subpath)
+            build.project.path.join(subpath)
           end
 
           def target_path

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build.rb

@@ -25,7 +25,7 @@ module Avm
         end
 
         def default_target_directory
-          project.root.join('build')
+          project.path.join('build')
         end
 
         def target_directory
@@ -36,7 +36,7 @@ module Avm
 
         def source_files_uncached
           r = []
-          project.root.children.each do |child|
+          project.path.children.each do |child|
             next unless SOURCE_EXTNAMES.include?(child.extname)
 
             r << ::Avm::EacAsciidoctorBase0::Sources::Build::File.new(self, child.basename)

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runner/build.rb

@@ -29,7 +29,7 @@ module Avm
           end
 
           def default_target_directory
-            runner_context.call(:project).root.join('build')
+            runner_context.call(:project).path.join('build')
           end
 
           def open

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runner.rb

@@ -15,8 +15,8 @@ module Avm
         end
 
         def project_banner
-          infov 'Project', project.name
-          infov 'Path', project.root
+          infov 'Project', project.application.name
+          infov 'Path', project.path
         end
 
         private

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.10'
+  s.add_dependency 'avm', '~> 0.19'
   s.add_dependency 'eac_ruby_utils', '~> 0.80'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/base/version_bump.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacGenericBase0
+    module Sources
+      class Base < ::Avm::Sources::Base
+        module VersionBump
+          def after_sub_version_bump_do_changes
+            # Do nothing
+          end
+
+          # @return [Avm::Scms::Commit, nil]
+          def version_bump(target_version)
+            scm.commit_if_change(version_bump_commit_message(target_version)) do
+              version_bump_do_changes(target_version)
+              parent.if_present(&:after_sub_version_bump_do_changes)
+            end
+          end
+
+          # @return [String]
+          def version_bump_commit_message(target_version)
+            i18n_translate(__method__, version: target_version, __locale: locale)
+          end
+
+          def version_bump_do_changes(_target_version)
+            raise_abstract_method(__METHOD__)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/base.rb

@@ -8,13 +8,16 @@ module Avm
   module EacGenericBase0
     module Sources
       class Base < ::Avm::Sources::Base
+        require_sub __FILE__, include_modules: true
+        enable_abstract_methods
+
         # @return [Avm::EacGenericBase0::Sources::Tester]
         def tester_class
           Avm::EacGenericBase0::Sources::Tester
         end
 
         def valid?
-          path.directory?
+          ::Avm::Registry.scms.detect_optional(path).present?
         end
       end
     end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end