eac_tools 0.49.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ce6a42783daae88feb2f51ad5a030d0deec5bd232b54134e105ba3aa8e9977
-  data.tar.gz: cf6bd266decf81b7c6ff1ae75b28f7943772f83b7ea733ab3d73916be36f6c7b
+  metadata.gz: 2dbc38a08966af86a3d17c50ad0788770045d7dcbd7c336fbbc31c9883b6a0aa
+  data.tar.gz: '0979accd22c7b7651e8ee52d4798efad58550b74e21def1a2df600f4a557386f'
 SHA512:
-  metadata.gz: 48291d409c8e3c785a0c53911d566c7fefddc7b9380a6109f3ef83baf6bb9e37f11c401725fd6282d362b6883da37c026a7d1023d2f90bccc02a65c8155f5cd1
-  data.tar.gz: ed7abbbd834bb86398069f0b270e833d5f4a4d694da88e53602f06af44f6bc07a169d90cc297d0a212b5cad0ee7c47221fe212a72d80fbe43f3b4bd02e42760d
+  metadata.gz: f3c593fb8b4e163a02e42b7540022bc5180abc1883f1ee2a9b8608035243fe99b43cb484894e0fcc7b40a33b3b63d0b00651885ae4685ba59b7acc40259ff25e
+  data.tar.gz: 65b5f4c7a7713ebe7e49892df82e18965fc32d47304b4afc2ca35af8c0a82a0a85df6b238e79645cd7c99002ef09f3a407357ef3089aa77e61e0defa3d24fdec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.49.0)
-      avm (~> 0.58)
+    eac_tools (0.51.0)
+      avm (~> 0.60)
       avm-eac_asciidoctor_base0 (~> 0.13)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
@@ -13,11 +13,11 @@ PATH
       avm-eac_rails_base1 (~> 0.8)
       avm-eac_redmine_base0 (~> 0.18)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
+      avm-eac_ruby_base1 (~> 0.28)
       avm-eac_webapp_base0 (~> 0.13)
       avm-eac_wordpress_base0 (~> 0.3)
-      avm-tools (~> 0.142, >= 0.142.8)
-      eac_ruby_utils (~> 0.109, >= 0.109.1)
+      avm-tools (~> 0.143)
+      eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
   remote: sub/aranha-parsers
@@ -118,10 +118,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.27.3)
-      avm (~> 0.57)
+    avm-eac_ruby_base1 (0.28.0)
+      avm (~> 0.60)
       avm-eac_generic_base0 (~> 0.8)
-      eac_ruby_utils (~> 0.109)
+      eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
   remote: sub/avm-eac_ubuntu_base0
@@ -163,23 +163,23 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.10.1)
-      avm (~> 0.57)
+    avm-git (0.11.0)
+      avm (~> 0.59)
       avm-files (~> 0.6)
       eac_git (~> 0.14)
-      eac_ruby_utils (~> 0.108)
-      git (~> 1.12)
+      eac_ruby_utils (~> 0.110, >= 0.110.1)
+      git (~> 1.13)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.142.8)
+    avm-tools (0.143.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      avm (~> 0.57)
+      avm (~> 0.59)
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
       avm-eac_ubuntu_base0 (~> 0.4)
       avm-files (~> 0.6)
-      avm-git (~> 0.10, >= 0.10.1)
+      avm-git (~> 0.11)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.14)
@@ -191,14 +191,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.58.0)
+    avm (0.60.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
       eac_cli (~> 0.30)
       eac_config (~> 0.12)
       eac_docker (~> 0.5)
       eac_fs (~> 0.16)
       eac_git (~> 0.14)
-      eac_ruby_utils (~> 0.109, >= 0.109.1)
+      eac_ruby_utils (~> 0.110, >= 0.110.1)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -253,7 +253,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.109.1)
+    eac_ruby_utils (0.110.1)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -329,7 +329,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     minitar (0.9)
-    minitest (5.16.3)
+    minitest (5.17.0)
     multipart-post (2.2.3)
     net-ssh (4.2.0)
     nokogiri (1.13.10-x86_64-linux)
@@ -339,12 +339,12 @@ GEM
     os (1.1.4)
     parallel (1.22.1)
     parseconfig (1.1.2)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     parslet (2.0.0)
     public_suffix (5.0.1)
     racc (1.6.2)
-    rack (3.0.2)
+    rack (3.0.3)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
@@ -355,10 +355,10 @@ GEM
       rspec-mocks (~> 3.12.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.49.0'
+  VERSION = '0.51.0'
 end

data/sub/avm/avm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_docker', '~> 0.5'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109', '>= 0.109.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/{avm-git/lib/avm/git → avm/lib/avm/scms}/auto_commit/rules/base.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
+require 'avm/scms/commit_info'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Git
+  module Scms
     module AutoCommit
       module Rules
         class Base
@@ -29,7 +30,7 @@ module Avm
             common_constructor :rule, :file
 
             def new_commit_info
-              ::Avm::Git::AutoCommit::CommitInfo.new
+              ::Avm::Scms::CommitInfo.new
             end
           end
         end

data/sub/{avm-git/lib/avm/git → avm/lib/avm/scms}/auto_commit/rules/last.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/git/auto_commit/rules/base'
+require 'avm/scms/auto_commit/rules/base'
 
 module Avm
-  module Git
+  module Scms
     module AutoCommit
       module Rules
-        class Last < ::Avm::Git::AutoCommit::Rules::Base
-          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+        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

data/sub/{avm-git/lib/avm/git → avm/lib/avm/scms}/auto_commit/rules/manual.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
-require 'avm/git/auto_commit/rules/base'
+require 'avm/scms/auto_commit/rules/base'
 
 module Avm
-  module Git
+  module Scms
     module AutoCommit
       module Rules
-        class Manual < ::Avm::Git::AutoCommit::Rules::Base
-          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+        class Manual < ::Avm::Scms::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Scms::AutoCommit::Rules::Base::WithFile
             enable_speaker
 
-            COMMIT_FORMAT = '%h - %s (%cr)'
             SKIP_OPTION = 's'
 
             def commit_info
@@ -24,7 +23,7 @@ module Avm
 
             def commits_banner
               file.commits.each_with_index do |commit, _index|
-                infov "    #{commit.position}", format_commit(commit)
+                infov "    #{commit.position}", commit
               end
               infov "    #{SKIP_OPTION}", 'skip'
             end
@@ -33,10 +32,6 @@ module Avm
               (file.commits.map { |commit| [commit.position.to_s, commit] } + [[SKIP_OPTION, nil]])
                 .to_h
             end
-
-            def format_commit(commit)
-              commit.format(COMMIT_FORMAT)
-            end
           end
         end
       end

data/sub/avm/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/sub/{avm-git/lib/avm/git → avm/lib/avm/scms}/auto_commit/rules/nth.rb

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

data/sub/{avm-git/lib/avm/git → avm/lib/avm/scms}/auto_commit/rules/unique.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/git/auto_commit/rules/base'
+require 'avm/scms/auto_commit/rules/base'
 
 module Avm
-  module Git
+  module Scms
     module AutoCommit
       module Rules
-        class Unique < ::Avm::Git::AutoCommit::Rules::Base
-          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+        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
 

data/sub/{avm-git/lib/avm/git → avm/lib/avm/scms}/auto_commit/rules.rb

@@ -5,13 +5,18 @@ require 'eac_ruby_utils/core_ext'
 ::EacRubyUtils.require_sub __FILE__
 
 module Avm
-  module Git
+  module Scms
     module AutoCommit
       module Rules
         RULES_CLASSES = %w[last manual new nth unique]
-                        .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
+                          .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(':')
 

data/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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