eac_tools 0.49.0 → 0.51.0

data/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/lib/avm/version.rb

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

data/sub/avm/spec/lib/avm/file_formats/base_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/file_formats/base'
+
+::RSpec.describe ::Avm::FileFormats::Base do
+  include_examples 'avm_file_format_file_resource_name', {
+    'app/models/mynamespace/the_class.rb' => 'app/models/mynamespace/the_class.rb',
+    'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb' =>
+      'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb'
+  }
+end

data/sub/{avm-git/spec/lib/avm/git/auto_commit_path_spec.rb → avm/spec/lib/avm/scms/auto_commit/file_resource_name_spec.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'avm/git/auto_commit_path'
+require 'avm/scms/auto_commit/file_resource_name'
 
-RSpec.describe ::Avm::Git::AutoCommitPath, git: true do
+RSpec.describe ::Avm::Scms::AutoCommit::FileResourceName, git: true do
   let(:git) { stubbed_git_local_repo }
 
   describe '#class_name' do

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'avm', '~> 0.60'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base/file_resource_name.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_ruby_base1/rubocop'
+
+module Avm
+  module EacRubyBase1
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        class FileResourceName
+          enable_method_class
+          common_constructor :file_format, :path do
+            self.path = path.to_pathname
+          end
+
+          LIBRARY_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z},
+                              %r{app/[^/]+/(.+)\.rb\z}].freeze
+          SPEC_PATTERNS = [%r{spec/[^/]+/(.+)_spec\.rb\z}].freeze
+
+          # @param path [Pathname]
+          # @return [Avm::FileFormats::FileWith]
+          def result
+            result_from_spec || result_from_library || result_from_superclass
+          end
+
+          private
+
+          def result_from_library
+            result_from_patterns(LIBRARY_PATTERNS) { |m| m[1].camelize }
+          end
+
+          def result_from_patterns(patterns)
+            patterns.lazy.map { |pattern| pattern.to_parser.parse(path.to_path) }
+              .find(&:present?).if_present { |v| yield(v) }
+          end
+
+          def result_from_spec
+            result_from_patterns(SPEC_PATTERNS) { |m| "RSpec.describe('#{m[1].camelize}')" }
+          end
+
+          def result_from_superclass
+            file_format.class.superclass.instance_method(:file_resource_name)
+              .bind_call(file_format, path)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb

@@ -7,6 +7,8 @@ module Avm
   module EacRubyBase1
     module FileFormats
       class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        require_sub __FILE__
+
         VALID_BASENAMES = %w[*.gemspec *.rake *.rb Gemfile Rakefile].freeze
         VALID_TYPES = ['x-ruby'].freeze
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.27.3'
+    VERSION = '0.28.0'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/file_formats/base_spec.rb

@@ -4,4 +4,12 @@ require 'avm/eac_ruby_base1/file_formats/base'
 
 ::RSpec.describe ::Avm::EacRubyBase1::FileFormats::Base do
   include_examples 'avm_file_formats_with_fixtures', __FILE__
+  include_examples 'avm_file_format_file_resource_name', {
+    'app/models/mynamespace/the_class.rb' => 'Mynamespace::TheClass',
+    'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb' => 'Cliutils::EacRedmineBase0::Activity',
+    'a_non_library_file.rb' => 'a_non_library_file.rb',
+    'spec/lib/my_lib_spec.rb' => 'RSpec.describe(\'MyLib\')',
+    'spec/lib/sub/my_lib_spec.rb' => 'RSpec.describe(\'Sub::MyLib\')',
+    'spec/spec_helper.rb' => 'spec/spec_helper.rb'
+  }
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'avm', '~> 0.59'
   s.add_dependency 'avm-files', '~> 0.6'
   s.add_dependency 'eac_git', '~> 0.14'
-  s.add_dependency 'eac_ruby_utils', '~> 0.108'
-  s.add_dependency 'git', '~> 1.12'
+  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
+  s.add_dependency 'git', '~> 1.13'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

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