eac_tools 0.49.0 → 0.50.0

data/sub/avm-git/lib/avm/git/scms/git/changed_file.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/scms/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class ChangedFile < ::Avm::Scms::ChangedFile
+          common_constructor :scm, :path
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/changed_files.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class ChangedFiles
+          enable_method_class
+          common_constructor :scm
+
+          # @return [Avm::Git::Scms::Git::ChangedFile]
+          def result
+            scm.git_repo.dirty_files.map do |dirty_file|
+              ::Avm::Git::Scms::Git::ChangedFile.new(scm, dirty_file.path)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/commit.rb

@@ -15,11 +15,18 @@ module Avm
           delegate :git_repo, to: :git_scm
           delegate :id, to: :git_commit
 
+          FIXUP_SUBJECT_PATTERN = /\Afixup\!/.freeze
+
           # @return [Array<Pathname>]
           def changed_files
             git_commit.changed_files.map { |cf| cf.path.to_pathname }
           end
 
+          # @return [Boolean]
+          def fixup?
+            FIXUP_SUBJECT_PATTERN.match?(git_commit.subject)
+          end
+
           # @param other [Avm::Git::Scms::Git::Commit]
           # @return [Avm::Git::Scms::Git::Commit]
           def merge_with(other)
@@ -43,6 +50,9 @@ module Avm
             %w[.gitrepo .gitmodules].any? { |file| file.include?(path.basename.to_path) }
           end
 
+          # @return [String]
+          delegate :subject, to: :git_commit
+
           private
 
           def validate_clean_and_head

data/sub/avm-git/lib/avm/git/scms/git/commits.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        module Commits
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def commit(source)
+            if source.is_a?(::Avm::Git::Scms::Git::Commit)
+              return source if source.git_repo == git_repo
+
+              raise 'Not same Git repository'
+            end
+            git_repo.commitize(source).if_present do |v|
+              ::Avm::Git::Scms::Git::Commit.new(self, v)
+            end
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def commit_dirty(message = nil)
+            return nil unless git_repo.dirty?
+
+            git_repo.command('add', '.').execute!
+            git_repo.command(
+              'commit', '-m',
+              message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)
+            ).execute!
+            head_commit
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def commit_if_change(message = nil)
+            tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
+            tracker.start
+            yield
+            tracker.stop
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def head_commit
+            commit(git_repo.head)
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def reset_and_commit(commit_to_reset, message)
+            git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
+            commit_dirty(message)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/interval.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/scms/interval'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Interval < ::Avm::Scms::Interval
+          def initialize(scm, from, to)
+            super(scm, from, to)
+            self.from = scm.commit(from)
+            self.to = scm.commit(to)
+          end
+
+          # @return [Array<Avm::Git::Scms::Git::Commit>]
+          def commits
+            scm.git_repo.command('log', '--pretty=format:%H', git_commit_interval).execute!
+               .each_line.map { |sha1| scm.commit(sha1.strip) }
+          end
+
+          # @return [String]
+          def git_commit_interval
+            [from.id, to.id].join('..')
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/milestones.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        module Milestones
+          BASE_COMMIT_REFERENCE = 'origin/master'
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def current_milestone_base_commit
+            commit(BASE_COMMIT_REFERENCE)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/run_commit.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class RunCommit
+          enable_method_class
+
+          common_constructor :scm, :commit_info
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def result
+            reset
+            add_paths
+            commit
+
+            scm.head_commit
+          end
+
+          protected
+
+          def add_path(path)
+            scm.git_repo.command(
+              *(path.exist? ? ['add'] : ['rm', '-f']),
+              path.relative_path_from(scm.path)
+            ).execute!
+          end
+
+          def add_paths
+            commit_info.paths.each { |path| add_path(path) }
+          end
+
+          def commit
+            scm.git_repo.command('commit', *commit_args).execute!
+          end
+
+          # @return [Array<String>]
+          def commit_args
+            r = commit_info.fixup.if_present([]) { |v| ['--fixup', v.id] }
+            r += commit_info.message.if_present([]) { |v| ['--message', v] }
+            return r if r.any?
+
+            raise 'Argument list is empty'
+          end
+
+          def reset
+            scm.git_repo.command('reset', '--soft', 'HEAD').execute!
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git.rb

@@ -8,7 +8,7 @@ module Avm
   module Git
     module Scms
       class Git < ::Avm::Scms::Base
-        require_sub __FILE__
+        require_sub __FILE__, include_modules: true
         include ::Comparable
 
         COMMIT_DIRTY_DEFAULT_MESSAGE = 'Dirty files.'
@@ -17,44 +17,15 @@ module Avm
           git_repo <=> other.git_repo
         end
 
-        # @return [Avm::Git::Scms::Git::Commit,nil]
-        def commit(source)
-          if source.is_a?(::Avm::Git::Scms::Git::Commit)
-            return source if source.git_repo == self
-
-            raise 'Not same Git repository'
-          end
-          git_repo.commitize(source).if_present do |v|
-            ::Avm::Git::Scms::Git::Commit.new(self, v)
-          end
-        end
-
-        # @return [Avm::Git::Scms::Git::Commit,nil]
-        def commit_dirty(message = nil)
-          return nil unless git_repo.dirty?
-
-          git_repo.command('add', '.').execute!
-          git_repo.command('commit', '-m',
-                           message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)).execute!
-          commit(git_repo.head)
-        end
-
-        # @return [Avm::Git::Scms::Git::Commit,nil]
-        def commit_if_change(message = nil)
-          tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
-          tracker.start
-          yield
-          tracker.stop
-        end
-
         def git_repo
           @git_repo ||= ::EacGit::Local.new(path)
         end
 
-        # @return [Avm::Git::Scms::Git::Commit]
-        def reset_and_commit(commit_to_reset, message)
-          git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
-          commit_dirty(message)
+        # @param from [Avm::Git::Scms::Git::Commit]
+        # @param to [Avm::Git::Scms::Git::Commit]
+        # @return [Avm::Git::Scms::Git::Interval]
+        def interval(from, to)
+          ::Avm::Git::Scms::Git::Interval.new(self, from, to)
         end
 
         # @return [Enumerable<Avm::Git::Scms::GitSubrepo>]

data/sub/avm-git/lib/avm/git/scms/git_subrepo.rb

@@ -8,7 +8,8 @@ module Avm
   module Git
     module Scms
       class GitSubrepo < ::Avm::Scms::Base
-        delegate :commit_if_change, to: :parent_scm
+        delegate :changed_files, :commit_if_change, :current_milestone_base_commit, :interval,
+                 :head_commit, :run_commit, to: :parent_scm
 
         def update
           git_subrepo.command('clean').execute!

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.10.1'
+    VERSION = '0.11.0'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'avm', '~> 0.59'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.3'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'avm-git', '~> 0.10', '>= 0.10.1'
+  s.add_dependency 'avm-git', '~> 0.11'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.14'

data/sub/avm-tools/lib/avm/tools/runner/git/subrepo/fix.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/git/auto_commit/rules/unique'
-require 'avm/git/file_auto_fixup'
+require 'avm/git/scms/git'
 require 'avm/git/subrepo_checks'
+require 'avm/scms/auto_commit/rules/unique'
+require 'avm/scms/auto_commit/for_file'
 require 'eac_git/local'
 
 module Avm
@@ -31,8 +32,10 @@ module Avm
               infov 'Dirty files', local_repos.dirty_files.count
               local_repos.dirty_files.each do |file|
                 infov '  * Ammending', file.path
-                ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file.path,
-                                              [::Avm::Git::AutoCommit::Rules::Unique.new]).run
+                ::Avm::Scms::AutoCommit::ForFile.new(
+                  git_scm, file.path,
+                  [::Avm::Scms::AutoCommit::Rules::Unique.new]
+                ).run
               end
             end
 
@@ -43,6 +46,11 @@ module Avm
               !c.result.error?
             end
 
+            # @return [Avm::Git::Scms::Git]
+            def git_scm_uncached
+              ::Avm::Git::Scms::Git.new(runner_context.call(:git).root_path)
+            end
+
             def new_check(fix_parent = false)
               r = ::Avm::Git::SubrepoChecks.new(local_repos).add_all_subrepos
               r.fix_parent = fix_parent

data/sub/avm-tools/lib/avm/tools/runner/{git → source}/auto_commit.rb

@@ -2,13 +2,13 @@
 
 require 'eac_cli/core_ext'
 require 'avm/file_formats/search_formatter'
-require 'avm/git/file_auto_fixup'
-require 'avm/git/auto_commit/rules'
+require 'avm/scms/auto_commit/for_file'
+require 'avm/scms/auto_commit/rules'
 
 module Avm
   module Tools
     class Runner
-      class Git
+      class Source < ::Avm::Sources::Runner
         class AutoCommit
           runner_with :help do
             desc 'Auto fixup files.'
@@ -19,13 +19,18 @@ module Avm
           end
 
           def run
-            runner_context.call(:git).command('reset', 'HEAD').system!
             format_files
             files.each do |file|
-              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run
+              ::Avm::Scms::AutoCommit::ForFile.new(runner_context.call(:source).scm, file, rules)
+                .run
             end
           end
 
+          def help_extra_text
+            "Rules\n" + ::Avm::Scms::AutoCommit::Rules.all
+                          .map { |r| '  ' + r.keys.join(', ') + "\n" }.join
+          end
+
           private
 
           def files_uncached
@@ -48,14 +53,12 @@ module Avm
           def dirty_files
             return [] unless parsed.dirty?
 
-            runner_context.call(:git).dirty_files.map do |file|
-              file.path.to_pathname.expand_path(runner_context.call(:git).root_path)
-            end
+            runner_context.call(:source).scm.changed_files.map(&:absolute_path)
           end
 
           def rules
             parsed.rule.map do |rule_string|
-              ::Avm::Git::AutoCommit::Rules.parse(rule_string)
+              ::Avm::Scms::AutoCommit::Rules.parse(rule_string)
             end
           end
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.142.8'
+    VERSION = '0.143.0'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/listable/{value.rb → item.rb}

@@ -1,25 +1,19 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/patches/class/common_constructor'
 require 'eac_ruby_utils/inflector'
 
 module EacRubyUtils
   module Listable
-    class Value
-      attr_reader :value, :key
-
-      def initialize(list, value, key, translation_required = true)
-        @list = list
-        @value = value
-        @key = key
-        @translation_required = translation_required
-      end
+    class Item
+      common_constructor :list, :value, :key, :translation_required, default: [true]
 
       def to_s
-        "I: #{@list.item}, V: #{@value}, K: #{@key}"
+        "I: #{list.item}, V: #{value}, K: #{key}"
       end
 
       def constant_name
-        ::EacRubyUtils::Inflector.variableize("#{@list.item}_#{@key}").upcase
+        ::EacRubyUtils::Inflector.variableize("#{list.item}_#{key}").upcase
       end
 
       def label
@@ -36,13 +30,13 @@ module EacRubyUtils
       end
 
       def translation_required?
-        @translation_required
+        translation_required
       end
 
       private
 
       def translate(translate_key)
-        full_translate_key = "#{@list.i18n_key}.#{@key}.#{translate_key}"
+        full_translate_key = "#{list.i18n_key}.#{key}.#{translate_key}"
         if !::I18n.exists?(full_translate_key) && !translation_required?
           ''
         else

data/sub/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/listable/value'
+require 'eac_ruby_utils/listable/item'
 
 module EacRubyUtils
   module Listable
@@ -18,13 +18,23 @@ module EacRubyUtils
       end
 
       def blank_value
-        @blank_value ||= ::EacRubyUtils::Listable::Value.new(self, BLANK_VALUE, BLANK_KEY, false)
+        @blank_value ||= ::EacRubyUtils::Listable::Item.new(self, BLANK_VALUE, BLANK_KEY, false)
       end
 
       def each_value(&block)
         values.each(&block)
       end
 
+      # @return [EacRubyUtils::Listable::Item, nil]
+      def item_by_value(value)
+        @values.values.find { |item| item.value == value }
+      end
+
+      # @return [EacRubyUtils::Listable::Item]
+      def item_by_value!(value)
+        item_by_value(value) || raise(::KeyError, "Value not found: #{value}")
+      end
+
       def values
         @values.values.map(&:value)
       end
@@ -59,7 +69,7 @@ module EacRubyUtils
         "eac_ruby_utils.listable.#{class_i18n_key}.#{item}"
       end
 
-      # @return [EacRubyUtils::Listable::Value, nil]
+      # @return [EacRubyUtils::Listable::Item, nil]
       def instance_value(instance)
         v = instance.send(item)
         return blank_value if v.blank?
@@ -109,7 +119,7 @@ module EacRubyUtils
       def build_values(labels)
         vs = {}
         parse_labels(labels).each do |value, key|
-          v = Value.new(self, value, key)
+          v = ::EacRubyUtils::Listable::Item.new(self, value, key)
           vs[v.value] = v
         end
         vs

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/assert_parent.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+class Pathname
+  # Invoke +mkpath+ for parent path and return +self+.
+  # @return [self]
+  def assert_parent
+    parent.mkpath
+    self
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.109.1'
+  VERSION = '0.110.1'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb

@@ -87,52 +87,52 @@ RSpec.describe ::EacRubyUtils::Listable do
     it { expect(stub_class.lists.is_a?(::EacRubyUtils::Listable::Lists)).to eq(true) }
 
     it {
-      expect(stub_class.lists.inteiro.value_a.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.inteiro.value_a.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.inteiro.value_b.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.inteiro.value_b.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.inteiro.value_c.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.inteiro.value_c.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.code.value_a.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.code.value_a.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.code.value_b.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.code.value_b.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.cadeia.value_a.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.cadeia.value_a.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.cadeia.value_b.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.cadeia.value_b.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.cadeia.value_c.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.cadeia.value_c.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.type.value_a.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.type.value_a.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
 
     it {
-      expect(stub_class.lists.type.value_b.is_a?(::EacRubyUtils::Listable::Value))
+      expect(stub_class.lists.type.value_b.is_a?(::EacRubyUtils::Listable::Item))
         .to eq(true)
     }
   end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/assert_parent_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/pathname/parent_n'
+
+RSpec.describe ::Pathname do
+  let(:root) { temp_dir }
+  let(:parent_dir) { root.join('parent_dir') }
+  let(:instance) { parent_dir.join('the_file') }
+  let(:result) { instance.assert_parent }
+
+  it { expect(parent_dir).not_to exist }
+  it { expect(instance).not_to exist }
+
+  context 'when parent is asserted' do
+    before { result }
+
+    it { expect(parent_dir).to exist }
+    it { expect(instance).not_to exist }
+    it { expect(result).to eq(instance) }
+  end
+end