avm 0.58.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50b6491d183f2df1d7423338b915f2017ec2bf147e6857806c27cdde72ef10d
-  data.tar.gz: 225020d14af638e08b723a00482794790715165b7cbe092e0833e301ba182993
+  metadata.gz: 8ee7bf9c423e00a5bbd0e070ab0f1a191f338e80c794fde0609a3463c7307d78
+  data.tar.gz: cdb1a486aadcb408fee1123c133f54c5d46fa912be903f49ed547166027b62a2
 SHA512:
-  metadata.gz: e006a7a7a9be79a45abed6317db5de8c6097bd1f5269ec444dc43ad49852713e892c10685e1043f3eb93cfb40a0207739f025c16a758c47a3c3546a48014cc2e
-  data.tar.gz: 28d138623589418cb34db4ba74d7f0e1b1ecf87695ab5e49e2c62c0420c5631e2b09525952815d1a0b6c837367b1b4ce9123f1d42833ab08f1822aec5a5e2ba2
+  metadata.gz: d1a37030086636976394fe3392a2681c4065cb8dbabd32fc1f702193b581372372519ef099b254c7c126f3818cff4715dc1597f2ecab1c65a9953044a20362a0
+  data.tar.gz: 2a72c35e69480aabe07bc71a00ec8cfaf30854ced09da08b423f88c9229f59e42275a902d9797f12a23ec5305c4893803770425b439035a96e70d3f45be30060

data/lib/avm/file_formats/base.rb

@@ -8,6 +8,7 @@ module Avm
   module FileFormats
     class Base
       enable_abstract_methods
+      compare_by :class
 
       def apply(files)
         old_content = Hash[files.map { |f| [f, File.read(f)] }]
@@ -15,6 +16,12 @@ module Avm
         files.map { |f| build_file_result(f, old_content[f]) }
       end
 
+      # @param path [Pathname]
+      # @return [Avm::FileFormats::FileWith]
+      def file_resource_name(path)
+        path.to_pathname.to_path
+      end
+
       def name
         self.class.name.demodulize
       end

data/lib/avm/file_formats/search_formatter.rb

@@ -50,19 +50,9 @@ module Avm
         @result = []
       end
 
+      # @return [Avm::FileFormats::Base, nil]
       def find_format(file)
-        formats.each do |c|
-          return c if c.match?(file)
-        end
-        nil
-      end
-
-      def formats_uncached
-        formats_from_registry
-      end
-
-      def formats_from_registry
-        ::Avm::Registry.file_formats.available.reverse.map(&:new)
+        ::Avm::Registry.file_formats.detect_optional(file)
       end
 
       def search_files

data/lib/avm/registry/file_formats.rb

@@ -5,6 +5,10 @@ require 'avm/registry/from_gems'
 module Avm
   module Registry
     class FileFormats < ::Avm::Registry::FromGems
+      # @return [Avm::FileFormats::Base]
+      def class_detect(klass, detect_args)
+        klass.new if klass.new.match?(detect_args.first)
+      end
     end
   end
 end

data/lib/avm/rspec/setup.rb

@@ -7,8 +7,8 @@ module Avm
   module Rspec
     module Setup
       require_sub __FILE__
-      EXAMPLES = %w[avm_file_formats_with_fixtures avm_source_generated entries_values
-                    in_avm_registry not_in_avm_registry].freeze
+      EXAMPLES = %w[avm_file_formats_with_fixtures avm_file_format_file_resource_name
+                    avm_source_generated entries_values in_avm_registry not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'avm_file_format_file_resource_name' do |input_expected|
+  describe '#file_resource_name' do
+    input_expected.each do |path, expected_resource_name|
+      context "when path is \"#{path}\"" do
+        let(:instance) { described_class.new }
+
+        it { expect(instance.file_resource_name(path)).to eq(expected_resource_name) }
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/file_resource_name.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    module AutoCommit
+      class FileResourceName
+        require_sub __FILE__, include_modules: true
+        enable_simple_cache
+        common_constructor :source_root, :path do
+          self.source_root = source_root.to_pathname
+          self.path = path.to_pathname
+        end
+
+        def class_name
+          file_format.file_resource_name(path)
+        end
+
+        def commit_message
+          r = class_name
+          r += ': remove' unless path.file?
+          r + '.'
+        end
+
+        def relative_path
+          path.expand_path.relative_path_from(source_root.expand_path)
+        end
+
+        private
+
+        # @return [Avm::FileFormats::Base]
+        def file_format_uncached
+          ::Avm::Registry.file_formats.detect(path)
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/for_file.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit_info'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    module AutoCommit
+      class ForFile
+        enable_speaker
+        enable_simple_cache
+        enable_listable
+
+        common_constructor :scm, :path, :rules do
+          self.path = path.to_pathname.expand_path(scm.path)
+        end
+
+        COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
+
+        def scm_relative_path
+          path.to_pathname.relative_path_from(scm.path)
+        end
+
+        def run
+          start_banner
+          run_commit || warn("No rule returned commit information for \"#{path}\"")
+        end
+
+        private
+
+        def commit_info_uncached
+          rules.lazy.map { |rule| rule.with_file(self).commit_info }.find(&:present?)
+            .if_present { |v| v.path(path) }
+        end
+
+        def start_banner
+          infov 'Path', path
+          infov '  Commits found', commits.count
+        end
+
+        def run_commit
+          return false if commit_info.blank?
+
+          infov '  Commit info', commit_info
+          scm.run_commit(commit_info)
+          success '  Commited'
+          true
+        end
+
+        def commits_uncached
+          scm.current_milestone_interval.commits
+            .select { |c| c.changed_files.include?(path.relative_path_from(scm.path)) }
+            .reject(&:fixup?).each_with_index
+            .map { |commit, index| CommitDelegator.new(commit, index) }
+        end
+
+        class CommitDelegator < ::SimpleDelegator
+          attr_reader :index
+
+          def initialize(commit, index)
+            super(commit)
+            @index = index
+          end
+
+          def position
+            index + 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/rules/base.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit_info'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    module AutoCommit
+      module Rules
+        class Base
+          class << self
+            def keys
+              [long_key, short_key]
+            end
+
+            def long_key
+              name.demodulize.variableize
+            end
+
+            def short_key
+              long_key[0, 1]
+            end
+          end
+
+          def with_file(file)
+            self.class.const_get('WithFile').new(self, file)
+          end
+
+          class WithFile
+            common_constructor :rule, :file
+
+            def new_commit_info
+              ::Avm::Scms::CommitInfo.new
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/rules/last.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/scms/auto_commit/rules/base'
+
+module Avm
+  module Scms
+    module AutoCommit
+      module Rules
+        class Last < ::Avm::Scms::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Scms::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              file.commits.last.if_present { |v| new_commit_info.fixup(v) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/rules/manual.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'avm/scms/auto_commit/rules/base'
+
+module Avm
+  module Scms
+    module AutoCommit
+      module Rules
+        class Manual < ::Avm::Scms::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Scms::AutoCommit::Rules::Base::WithFile
+            enable_speaker
+
+            SKIP_OPTION = 's'
+
+            def commit_info
+              return nil unless file.commits.any?
+
+              commits_banner
+              input('Which commit?', list: commits_by_position).if_present do |v|
+                new_commit_info.fixup(v)
+              end
+            end
+
+            def commits_banner
+              file.commits.each_with_index do |commit, _index|
+                infov "    #{commit.position}", commit
+              end
+              infov "    #{SKIP_OPTION}", 'skip'
+            end
+
+            def commits_by_position
+              (file.commits.map { |commit| [commit.position.to_s, commit] } + [[SKIP_OPTION, nil]])
+                .to_h
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/rules/new.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/scms/auto_commit/rules/base'
+require 'avm/scms/auto_commit/file_resource_name'
+
+module Avm
+  module Scms
+    module AutoCommit
+      module Rules
+        class New < ::Avm::Scms::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Scms::AutoCommit::Rules::Base::WithFile
+            def auto_commit_path
+              ::Avm::Scms::AutoCommit::FileResourceName.new(file.scm.path, file.path)
+            end
+
+            def commit_info
+              new_commit_info.message(auto_commit_path.commit_message)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/rules/nth.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/scms/auto_commit/rules/base'
+
+module Avm
+  module Scms
+    module AutoCommit
+      module Rules
+        class Nth < ::Avm::Scms::AutoCommit::Rules::Base
+          SHORT_KEY = 't'
+
+          class << self
+            def short_key
+              SHORT_KEY
+            end
+          end
+
+          common_constructor :number do
+            self.number = number.to_i
+          end
+
+          class WithFile < ::Avm::Scms::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              file.commits(number - 1).if_present { |v| new_commit_info.fixup(v) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/rules/unique.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/scms/auto_commit/rules/base'
+
+module Avm
+  module Scms
+    module AutoCommit
+      module Rules
+        class Unique < ::Avm::Scms::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Scms::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              return nil unless file.commits.count == 1
+
+              new_commit_info.fixup(file.commits.first)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit/rules.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::EacRubyUtils.require_sub __FILE__
+
+module Avm
+  module Scms
+    module AutoCommit
+      module Rules
+        RULES_CLASSES = %w[last manual new nth unique]
+                          .map { |key| ::Avm::Scms::AutoCommit::Rules.const_get(key.camelcase) }
+
+        class << self
+          # @return [Array<Avm::Scms::AutoCommit::Rules>]
+          def all
+            RULES_CLASSES
+          end
+
+          def parse(string)
+            parts = string.split(':')
+
+            klass = rule_class_by_key(parts.shift)
+            klass.new(*parts)
+          end
+
+          def rule_class_by_key(key)
+            RULES_CLASSES.find { |klass| klass.keys.include?(key) } ||
+              raise("Rule not find with key \"#{key}\" (Available: " +
+                RULES_CLASSES.flat_map(&:keys).join(', ') + ')')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/auto_commit.rb

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

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Base
+      module Commits
+        # @return [Avm::Scms::Commit,NilClass]
+        def commit_if_change(_message = nil)
+          raise_abstract_method __method__
+        end
+
+        # @return [Avm::Scms::Commit]
+        def head_commit
+          raise_abstract_method __method__
+        end
+
+        # @param commit_info [Avm::Scms::CommitInfo]
+        # @return [Avm::Scms::Commit]
+        def run_commit(_commit_info)
+          raise_abstract_method __method__
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Base
+      module Milestones
+        # @return [Avm::Scms::Interval]
+        def current_milestone_interval
+          interval(current_milestone_base_commit, head_commit)
+        end
+
+        # @return [Avm::Scms::Commit]
+        def current_milestone_base_commit
+          raise_abstract_method __method__
+        end
+      end
+    end
+  end
+end

data/lib/avm/scms/base.rb

@@ -6,6 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Scms
     class Base
+      require_sub __FILE__, include_modules: true
       enable_abstract_methods
       enable_simple_cache
       include ::Avm::With::ApplicationStereotype
@@ -14,8 +15,13 @@ module Avm
         self.path = path.to_pathname
       end
 
-      # @return [Avm::Scms::Commit,NilClass]
-      def commit_if_change(_message = nil)
+      # @return [Avm::Scms::ChangedFile]
+      def changed_files
+        raise_abstract_method __method__
+      end
+
+      # @return [Avm::Scms::Interval]
+      def interval(_from, _to)
         raise_abstract_method __method__
       end
 

data/lib/avm/scms/changed_file.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class ChangedFile
+      enable_abstract_methods
+
+      # @return [Pathname]
+      def absolute_path
+        path.expand_path(scm.path)
+      end
+
+      # @return [Pathname]
+      def path
+        raise_abstract_method __method__
+      end
+
+      # @return [Avm::Scms::Base]
+      def scm
+        raise_abstract_method __method__
+      end
+    end
+  end
+end

data/lib/avm/scms/commit.rb

@@ -16,6 +16,11 @@ module Avm
         raise_abstract_method __method__
       end
 
+      # @return [Boolean]
+      def fixup?
+        raise_abstract_method __method__
+      end
+
       def id
         raise_abstract_method __method__
       end
@@ -46,6 +51,16 @@ module Avm
       def scm_file?(_path)
         raise_abstract_method __method__
       end
+
+      # @return [String]
+      def subject
+        raise_abstract_method __method__
+      end
+
+      # @return [String]
+      def to_s
+        "#{subject} [#{id}]"
+      end
     end
   end
 end

data/lib/avm/scms/commit_info.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class CommitInfo
+      enable_immutable
+
+      immutable_accessor :fixup, :message
+      immutable_accessor :path, type: :array
+
+      def to_s
+        self.class.name.demodulize + '[' +
+          %w[fixup message].map { |m| [m, send(m)] }.reject { |m| m[1].blank? }
+            .map { |m| m.join(': ') }.join(',') + ']'
+      end
+    end
+  end
+end

data/lib/avm/scms/interval.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Scms
+    class Interval
+      enable_abstract_methods
+
+      common_constructor :scm, :from, :to
+
+      # @return [Array<Avm::Scms::Commit>]
+      def commits
+        raise_abstract_method __method__
+      end
+    end
+  end
+end

data/lib/avm/scms.rb

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

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-24 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -106,20 +106,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.109'
+        version: '0.110'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.109.1
+        version: 0.110.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.109'
+        version: '0.110'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.109.1
+        version: 0.110.1
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -369,15 +369,32 @@ files:
 - lib/avm/rspec/setup.rb
 - lib/avm/rspec/setup/launcher.rb
 - lib/avm/rspec/setup/source_generator.rb
+- lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb
 - lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb
 - lib/avm/rspec/shared_examples/avm_source_generated.rb
 - lib/avm/rspec/shared_examples/entries_values.rb
 - lib/avm/rspec/shared_examples/in_avm_registry.rb
 - lib/avm/rspec/shared_examples/not_in_avm_registry.rb
 - lib/avm/runners/base.rb
+- lib/avm/scms.rb
+- lib/avm/scms/auto_commit.rb
+- lib/avm/scms/auto_commit/file_resource_name.rb
+- lib/avm/scms/auto_commit/for_file.rb
+- lib/avm/scms/auto_commit/rules.rb
+- lib/avm/scms/auto_commit/rules/base.rb
+- lib/avm/scms/auto_commit/rules/last.rb
+- lib/avm/scms/auto_commit/rules/manual.rb
+- lib/avm/scms/auto_commit/rules/new.rb
+- lib/avm/scms/auto_commit/rules/nth.rb
+- lib/avm/scms/auto_commit/rules/unique.rb
 - lib/avm/scms/base.rb
+- lib/avm/scms/base/commits.rb
+- lib/avm/scms/base/milestones.rb
+- lib/avm/scms/changed_file.rb
 - lib/avm/scms/commit.rb
+- lib/avm/scms/commit_info.rb
 - lib/avm/scms/inflector.rb
+- lib/avm/scms/interval.rb
 - lib/avm/scms/null.rb
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb