avm 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21e54d17440b61336b3345c8c6f2db32b0d2d31f6f9d56f78894d4f01bbb3c7
-  data.tar.gz: 29604235a823f781751eaf5031b967a1cf01c5d6c14e194c09e7bfaaba8c2043
+  metadata.gz: 47ace344eec41bb800789fa179273a83a4c0e321436c2535aa5e2fe21ed88ef2
+  data.tar.gz: 79a810126ba2b8fcd0596ec87c6094bd6d2f26b0f26d508a1d8dd5c75a0e5a2e
 SHA512:
-  metadata.gz: a3240b4fafbfedcd68581fec71de2099906e599df3adb4f64d4bd66b4ced66582a02ced5db16d47c91ed78eb580daea910c44554d9abfef10ab3b308ff160ab2
-  data.tar.gz: 1104ec38c87bc15499ad0cd3d37ddd9c6ad0075d1c286ecb514a142d62f329e9c83035f23223788a5d5acb41a769e13f394180d84b80591a5035e347107de153
+  metadata.gz: 859a74c8cd03ae21dcdf5bf77d8da05ee00ed41b0562ee4c080c5eab7cd17a234cf96aaeb66848496a1139c0d2a1618c4eeca40b6332440bceacae0a160f4c3e
+  data.tar.gz: f042f3e2be9b952d2d088407431b41514628bb4caa66381330393310bf13d96ad4a19e78682e41cabffd0347b54dd6f7750c5ba4c541932c882efaa33a8491b7

data/lib/avm/registry/base.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/gems_registry'
+
+module Avm
+  module Registry
+    class Base
+      enable_simple_cache
+      common_constructor :module_suffix
+
+      def detect(*registered_initialize_args)
+        detect_optional(*registered_initialize_args) ||
+          raise("No registered module valid for #{registered_initialize_args}" \
+            " (Module suffix: #{module_suffix})")
+      end
+
+      def detect_optional(*registered_initialize_args)
+        registered_modules.lazy.map { |klass| klass.new(*registered_initialize_args) }
+                          .find(&:valid?)
+      end
+
+      def provider_module_suffix
+        "#{module_suffix}::Provider"
+      end
+
+      def single_module_suffix
+        "#{module_suffix}::Base"
+      end
+
+      def to_s
+        "#{self.class}[#{module_suffix}]"
+      end
+
+      def valid_registered_module?(a_module)
+        a_module.is_a?(::Class) && !a_module.abstract?
+      end
+
+      private
+
+      def registered_modules_uncached
+        (single_registered_modules + provider_registered_modules)
+          .select { |v| valid_registered_module?(v) }.uniq.sort_by { |s| [s.name] }
+      end
+
+      def single_registered_modules
+        single_instance_registry.registered.map(&:registered_module)
+      end
+
+      def provider_registered_modules
+        provider_registry.registered.map(&:registered_module).flat_map do |provider_class|
+          provider_class.new.all
+        end
+      end
+
+      def single_instance_registry_uncached
+        ::EacRubyUtils::GemsRegistry.new(single_module_suffix)
+      end
+
+      def provider_registry_uncached
+        ::EacRubyUtils::GemsRegistry.new(provider_module_suffix)
+      end
+    end
+  end
+end

data/lib/avm/registry.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/gems_registry'
+
+module Avm
+  module Registry
+    require_sub __FILE__
+    enable_listable
+    lists.add_symbol :category, :instance_stereotypes, :scms, :source_stereotypes
+
+    class << self
+      enable_simple_cache
+
+      # @return [Array<Avm::Registry::Base>]
+      def registries
+        lists.category.values.map { |c| send(c) }
+      end
+
+      private
+
+      ::Avm::Registry.lists.category.each_value do |category|
+        define_method "#{category}_uncached" do
+          ::Avm::Registry::Base.new(category.to_s.camelize)
+        end
+      end
+    end
+  end
+end

data/lib/avm/rspec/setup.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Rspec
+    module Setup
+      def self.extended(obj)
+        obj.setup_in_avm_registry_example
+        obj.setup_not_in_avm_registry_example
+      end
+
+      def setup_in_avm_registry_example
+        require 'avm/rspec/shared_examples/in_avm_registry'
+      end
+
+      def setup_not_in_avm_registry_example
+        require 'avm/rspec/shared_examples/not_in_avm_registry'
+      end
+    end
+  end
+end

data/lib/avm/rspec/shared_examples/in_avm_registry.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+
+::RSpec.shared_examples 'in_avm_registry' do |registry_method|
+  let(:avm_registry) { ::Avm::Registry.send(registry_method) }
+
+  it 'is in the avm registry' do
+    expect(avm_registry.registered_modules).to include(described_class)
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+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|
+    context "when registry is #{registry}" do
+      it 'is not in the avm registry' do
+        expect(registry.registered_modules).not_to include(described_class)
+      end
+    end
+  end
+end

data/lib/avm/{git/organize.rb → rspec.rb}

@@ -3,9 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Git
-    module Organize
-      require_sub __FILE__
-    end
+  module Rspec
+    require_sub __FILE__
   end
 end

data/lib/avm/scms/base.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Base
+      enable_abstract_methods
+      abstract_methods :update, :valid?
+      common_constructor :path do
+        self.path = path.to_pathname
+      end
+
+      # @return [Avm::Scms::Commit,NilClass]
+      def commit_if_change(_message = nil)
+        raise_abstract_method __method__
+      end
+
+      def name
+        self.class.name.demodulize
+      end
+
+      def to_s
+        name
+      end
+    end
+  end
+end

data/lib/avm/scms/commit.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Commit
+      enable_abstract_methods
+
+      # @return [Array<Pathname>]
+      def changed_files
+        raise_abstract_method __method__
+      end
+
+      # @param other [Avm::Scms::Commit]
+      # @return [Avm::Scms::Commit]
+      def merge_with(_other)
+        raise_abstract_method __method__
+      end
+
+      # @return [Array<Pathname>]
+      def no_scm_changed_files
+        changed_files.reject { |path| scm_file?(path) }
+      end
+
+      # @param new_message [String]
+      def reword(_new_message)
+        raise_abstract_method __method__
+      end
+
+      # @return [Array<Pathname>]
+      def scm_changed_files
+        changed_files.select { |path| scm_file?(path) }
+      end
+
+      # @param path [Pathname]
+      # @return [TrueClass,FalseClass]
+      def scm_file?(_path)
+        raise_abstract_method __method__
+      end
+    end
+  end
+end

data/lib/avm/source_stereotypes/base.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module SourceStereotypes
+    class Base
+      enable_abstract_methods
+      abstract_methods :valid?
+      common_constructor :source
+
+      def name
+        self.class.name
+      end
+
+      def to_s
+        name
+      end
+    end
+  end
+end

data/lib/avm/sources/base.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require 'avm/registry'
 require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Sources
     class Base
+      require_sub __FILE__
       enable_simple_cache
       enable_listable
       lists.add_symbol :option, :parent
@@ -14,6 +16,7 @@ module Avm
         self.options = self.class.lists.option.hash_keys_validate!(options)
       end
 
+      delegate :locale, to: :configuration
       delegate :to_s, to: :path
 
       # @return [Avm::Sources::Base]
@@ -34,12 +37,31 @@ module Avm
                 .map { |subrepo| self.class.new(subrepo.subpath.expand_path(path), parent: self) }
       end
 
+      def update
+        stereotype.update_source(self)
+      end
+
       private
 
+      # @return [Avm::Sources::Configuration]
+      def configuration_uncached
+        ::Avm::Sources::Configuration.find_in_path(path) || ::Avm::Sources::Configuration.new
+      end
+
       # @return [EacGit::Local]
       def git_repo_uncached
         ::EacGit::Local.new(path)
       end
+
+      # @return [Avm::Scms::Base]
+      def scm_uncached
+        ::Avm::Registry.scms.detect(path)
+      end
+
+      # @return [Avm::SourceStereotypes::Base]
+      def stereotype_uncached
+        ::Avm::Registry.source_stereotypes.detect(self)
+      end
     end
   end
 end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-02 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_docker
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.68'
+        version: '0.77'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.68'
+        version: '0.77'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -174,75 +174,21 @@ files:
 - lib/avm/docker/image.rb
 - lib/avm/docker/runner.rb
 - lib/avm/executables.rb
-- lib/avm/files.rb
-- lib/avm/files/appendable.rb
-- lib/avm/files/appendable/file_content.rb
-- lib/avm/files/appendable/plain_directory.rb
-- lib/avm/files/appendable/resource_base.rb
-- lib/avm/files/appendable/tar_output_command.rb
-- lib/avm/files/appendable/templatized_directory.rb
-- lib/avm/files/appender.rb
-- lib/avm/files/deploy.rb
-- lib/avm/files/formatter.rb
-- lib/avm/files/formatter/formats.rb
-- lib/avm/files/formatter/formats/base.rb
-- lib/avm/files/formatter/formats/generic_plain.rb
-- lib/avm/files/formatter/formats/html.rb
-- lib/avm/files/formatter/formats/javascript.rb
-- lib/avm/files/formatter/formats/json.rb
-- lib/avm/files/formatter/formats/php.rb
-- lib/avm/files/formatter/formats/python.rb
-- lib/avm/files/formatter/formats/ruby.rb
-- lib/avm/files/formatter/formats/xml.rb
-- lib/avm/files/formatter/utf8_assert.rb
-- lib/avm/files/rotate.rb
-- lib/avm/git.rb
-- lib/avm/git/auto_commit/commit_info.rb
-- lib/avm/git/auto_commit/rules.rb
-- lib/avm/git/auto_commit/rules/base.rb
-- lib/avm/git/auto_commit/rules/last.rb
-- lib/avm/git/auto_commit/rules/manual.rb
-- lib/avm/git/auto_commit/rules/new.rb
-- lib/avm/git/auto_commit/rules/nth.rb
-- lib/avm/git/auto_commit/rules/unique.rb
-- lib/avm/git/auto_commit_path.rb
-- lib/avm/git/auto_commit_path/ruby.rb
-- lib/avm/git/commit.rb
-- lib/avm/git/commit/class_methods.rb
-- lib/avm/git/commit/deploy.rb
-- lib/avm/git/commit/deploy_methods.rb
-- lib/avm/git/commit/diff_tree_line.rb
-- lib/avm/git/commit/file.rb
-- lib/avm/git/file_auto_fixup.rb
-- lib/avm/git/issue.rb
-- lib/avm/git/issue/complete.rb
-- lib/avm/git/issue/complete/commits.rb
-- lib/avm/git/issue/complete/git_subrepos.rb
-- lib/avm/git/issue/complete/local_branch.rb
-- lib/avm/git/issue/complete/local_tag.rb
-- lib/avm/git/issue/complete/push.rb
-- lib/avm/git/issue/complete/remote.rb
-- lib/avm/git/issue/complete/test.rb
-- lib/avm/git/issue/complete/tracker.rb
-- lib/avm/git/issue/complete/validation.rb
-- lib/avm/git/issue/complete/validations.rb
-- lib/avm/git/issue/complete/working_tree.rb
-- lib/avm/git/issue/deliver.rb
-- lib/avm/git/organize.rb
-- lib/avm/git/organize/reference_update.rb
-- lib/avm/git/organize/repository.rb
-- lib/avm/git/revision_test.rb
-- lib/avm/git/subrepo_check.rb
-- lib/avm/git/subrepo_check/parent.rb
-- lib/avm/git/subrepo_check/remote.rb
-- lib/avm/git/subrepo_check/show_result.rb
-- lib/avm/git/subrepo_checks.rb
 - lib/avm/instances/docker_image.rb
 - lib/avm/jobs.rb
 - lib/avm/jobs/base.rb
 - lib/avm/jobs/variables_source.rb
 - lib/avm/path_string.rb
+- lib/avm/registry.rb
+- lib/avm/registry/base.rb
 - lib/avm/result.rb
+- lib/avm/rspec.rb
+- lib/avm/rspec/setup.rb
+- lib/avm/rspec/shared_examples/in_avm_registry.rb
+- lib/avm/rspec/shared_examples/not_in_avm_registry.rb
+- lib/avm/scms/base.rb
+- lib/avm/scms/commit.rb
+- lib/avm/source_stereotypes/base.rb
 - lib/avm/sources.rb
 - lib/avm/sources/base.rb
 - lib/avm/sources/configuration.rb

data/lib/avm/files/appendable/file_content.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/files/appendable/resource_base'
-
-module Avm
-  module Files
-    module Appendable
-      class FileContent < ::Avm::Files::Appendable::ResourceBase
-        attr_reader :target_path, :content
-
-        def initialize(deploy, target_path, content)
-          super(deploy)
-          @target_path = target_path
-          @content = content
-        end
-
-        def write_on(target_dir)
-          target_dir.join(target_path).write(content)
-        end
-      end
-    end
-  end
-end

data/lib/avm/files/appendable/plain_directory.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/files/appendable/resource_base'
-
-module Avm
-  module Files
-    module Appendable
-      class PlainDirectory < ::Avm::Files::Appendable::ResourceBase
-        attr_reader :source_path
-
-        def initialize(appender, source_path)
-          super(appender)
-          @source_path = source_path.to_pathname
-        end
-
-        def write_on(target_dir)
-          raise "\"#{source_path}\" is not a directory" unless source_path.directory?
-
-          ::FileUtils.cp_r("#{source_path}/.", target_dir.to_path)
-        end
-      end
-    end
-  end
-end

data/lib/avm/files/appendable/resource_base.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Files
-    module Appendable
-      class ResourceBase
-        common_constructor :appender
-      end
-    end
-  end
-end

data/lib/avm/files/appendable/tar_output_command.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/envs'
-require 'avm/files/appendable/resource_base'
-
-module Avm
-  module Files
-    module Appendable
-      class TarOutputCommand < ::Avm::Files::Appendable::ResourceBase
-        attr_reader :command
-
-        def initialize(appender, command)
-          super(appender)
-          @command = command
-        end
-
-        def write_on(target_dir)
-          command.pipe(
-            ::EacRubyUtils::Envs.local.command('tar', '-xf', '-', '-C', target_dir)
-          ).execute!
-        end
-      end
-    end
-  end
-end

data/lib/avm/files/appendable/templatized_directory.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/files/appendable/resource_base'
-require 'eac_templates/directory'
-
-module Avm
-  module Files
-    module Appendable
-      class TemplatizedDirectory < ::Avm::Files::Appendable::ResourceBase
-        attr_reader :source_path
-
-        def initialize(appender, source_path)
-          super(appender)
-          @source_path = source_path
-        end
-
-        def write_on(target_dir)
-          raise 'Variables source not set' if appender.variables_source.blank?
-
-          ::EacTemplates::Directory.new(source_path).apply(
-            appender.variables_source,
-            target_dir
-          )
-        end
-      end
-    end
-  end
-end

data/lib/avm/files/appendable.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Files
-    module Appendable
-      require_sub __FILE__
-
-      attr_reader :variables_source
-
-      def appended
-        @appended ||= []
-      end
-
-      def append_templatized_directories(directories)
-        directories.each { |directory| append_templatized_directory(directory) }
-        self
-      end
-
-      def append_plain_directory(directory)
-        appended << ::Avm::Files::Appendable::PlainDirectory.new(self, directory)
-        self
-      end
-
-      def append_tar_output_command(tar_command)
-        appended << ::Avm::Files::Appendable::TarOutputCommand.new(self, tar_command)
-        self
-      end
-
-      def append_templatized_directory(directory)
-        appended << ::Avm::Files::Appendable::TemplatizedDirectory.new(self, directory)
-        self
-      end
-
-      def append_file_content(target_path, content)
-        appended << ::Avm::Files::Appendable::FileContent
-                    .new(self, target_path, content)
-        self
-      end
-
-      def variables_source_set(source)
-        @variables_source = source
-        self
-      end
-
-      def write_appended_on(target_dir)
-        target_dir = target_dir.to_pathname
-        raise "\"#{target_dir}\" is not a directory" unless target_dir.directory?
-
-        appended.each { |append| append.write_on(target_dir) }
-      end
-    end
-  end
-end

data/lib/avm/files/appender.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/files/appendable'
-
-module Avm
-  module Files
-    class Appender
-      include ::Avm::Files::Appendable
-    end
-  end
-end