avm-tools 0.142.8 → 0.143.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c84f2e749cae1648862dc1b82d29c163827343bbd6b66f19bf5c7d0de245f102
-  data.tar.gz: 8af6511fafa0eebc9485aaec675f4c626553d181ebad740c1686e96a1782c660
+  metadata.gz: fab6890dc62b07870be164bb09ea3403cb66ca9b05416dfddc3dd6d7197fe881
+  data.tar.gz: 1b8b944dfc31c738a4b4efbca860f2e3ab64c00843d08b03b2f2ef2a7b7369c3
 SHA512:
-  metadata.gz: 4a3a5b531513a11fc1947d9c0c704c77f7f7723a581ce6b93f09f8852c353cfc4f875e151e6759a67a7ba628e8ebd7cfd6ee43e92b6680255c0fe475a1dfc823
-  data.tar.gz: bdd574bd6ec63655e4b46439fa8116c9f05dbba9af06dbd86fc038a06895683ad870a253339c3a59b374d581699a329cbd378f745ad0725ce3c3a8c7ae17e929
+  metadata.gz: 87bdbe91033d37ef8950c88d4bb76a7d5e0b1e592a49f328abdc8ac0ef334e05504f7396b4e80c345b3ccb29f2f9bbfa2c0f774f51c47fe3b6829666129aecf7
+  data.tar.gz: c0096ed9eb6408d818f9676fd5bf77bde58d92d11daa8267cb0c4ea66c21c6605fc03652962628dc334614ae809f9061fc44d15cd1890d57aecb7237810be6e1

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.142.8
+  version: 0.143.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.59'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.59'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +265,6 @@ files:
 - lib/avm/tools/runner/files/format.rb
 - lib/avm/tools/runner/files/rotate.rb
 - lib/avm/tools/runner/git.rb
-- lib/avm/tools/runner/git/auto_commit.rb
 - lib/avm/tools/runner/git/commit.rb
 - lib/avm/tools/runner/git/deploy.rb
 - lib/avm/tools/runner/git/dirty_files.rb
@@ -293,6 +286,7 @@ files:
 - lib/avm/tools/runner/self/docker.rb
 - lib/avm/tools/runner/self/registry.rb
 - lib/avm/tools/runner/source.rb
+- lib/avm/tools/runner/source/auto_commit.rb
 - lib/avm/tools/runner/source/info.rb
 - lib/avm/tools/runner/source/issue.rb
 - lib/avm/tools/runner/source/issue/complete.rb