avm-tools 0.93.0 → 0.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6d2b367a6cca1ba76094f9847bfc4155a3c9abe9665b582c572cb35567320b
-  data.tar.gz: 3aea3baa7f0e41dc0566d2d4411e1cf4c78e852aae4787f33d002a274dd4f3b2
+  metadata.gz: d5c0c0b3a077d30739e756476f997c1d74acc2f6cbf52ba89ca55efecc87879a
+  data.tar.gz: e26b9535c059c92e9a401db8552d33ca16f8ee38bf9743100cb61cbcf2d27c39
 SHA512:
-  metadata.gz: 73222b5a84ab23aacbc5088f0c9a297babcae52fa5427ebcae52053c697250ac4aa8a3e91940a4f82dd5d5f5bf39f12fb730c1d9883ae44cccf606419a241117
-  data.tar.gz: f76583694406760f366788cc4535095604adf4eaaf784350d425d3d820764c4a531a317fde4ddab56abd496b85895cf55dc9825046c3c4fa09059d66934d4992
+  metadata.gz: ce8b71b8307d328e7a8ecb64d6c860eea72a47c22a769de30c101686b7089b9e6ee1d05a932c311139e3ba554bff03fae9d091cd9c1eb97ae2cb6d8135e8ee6b
+  data.tar.gz: eb891b911edc41e6989ab28f59f79b47e9d49ad18454cb8178a49f3e87f79f3b36206057476aa524d7a197d333228f551dfcce43553ae4aac2369382e62b94bf

data/lib/avm/git/auto_commit/commit_info.rb

@@ -8,10 +8,11 @@ module Avm
       class CommitInfo
         enable_immutable
 
-        immutable_accessor :fixup
+        immutable_accessor :fixup, :message
 
         def git_commit_args
           r = fixup.if_present([]) { |v| ['--fixup', v.sha1] }
+          r += message.if_present([]) { |v| ['--message', v] }
           return r if r.any?
 
           raise 'Argument list is empty'

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

@@ -2,13 +2,13 @@
 
 require 'eac_ruby_utils/core_ext'
 
+::EacRubyUtils.require_sub __FILE__
+
 module Avm
   module Git
     module AutoCommit
       module Rules
-        require_sub __FILE__
-
-        RULES_CLASSES = %w[last manual nth unique]
+        RULES_CLASSES = %w[last manual new nth unique]
                         .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
 
         class << self
@@ -22,7 +22,7 @@ module Avm
           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) + ')')
+                RULES_CLASSES.flat_map(&:keys).join(', ') + ')')
           end
         end
       end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+require 'avm/git/auto_commit_path'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class New < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def auto_commit_path
+              ::Avm::Git::AutoCommitPath.new(file.git, 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/git/auto_commit/rules/nth.rb

@@ -7,6 +7,14 @@ module Avm
     module AutoCommit
       module Rules
         class Nth < ::Avm::Git::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

data/lib/avm/git/auto_commit_path.rb

@@ -6,31 +6,10 @@ module Avm
   module Git
     class AutoCommitPath
       require_sub __FILE__, include_modules: true
-      enable_console_speaker
       common_constructor :git, :path do
         self.path = path.to_pathname
       end
 
-      CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
-
-      def run
-        banner
-        commit
-      end
-
-      def banner
-        infom "Checking \"#{relative_path}\""
-        infov '  * Class name', class_name
-        infov '  * Commit message', commit_message
-      end
-
-      def commit
-        infom '  * Commiting...'
-        git.system!('reset', 'HEAD')
-        git.system!('add', '--', relative_path.to_path)
-        git.system!('commit', '-m', commit_message, '--', relative_path.to_path)
-      end
-
       def class_name
         ruby_class_name || relative_path.to_path
       end

data/lib/avm/git/file_auto_fixup.rb

@@ -10,10 +10,16 @@ module Avm
       enable_simple_cache
       enable_listable
 
-      common_constructor :git, :path, :rules
+      common_constructor :git, :path, :rules do
+        self.path = path.to_pathname
+      end
 
       COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
 
+      def git_relative_path
+        path.to_pathname.relative_path_from(git.root_path)
+      end
+
       def run
         start_banner
         run_commit || warn("No rule returned commit information for \"#{path}\"")
@@ -22,7 +28,7 @@ module Avm
       private
 
       def commit_args
-        commit_info.if_present([], &:git_commit_args) + ['--', path]
+        commit_info.if_present([], &:git_commit_args) + ['--', git_relative_path]
       end
 
       def commit_info_uncached

data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/core_update'
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        class CoreUpdate < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+        class CoreUpdate
+          runner_with :help do
             arg_opt '-u', '--url', 'Core\'s package URL.'
             arg_opt '-v', '--version', 'Core\'s version.'
             desc 'Update instance\' core.'
@@ -32,7 +28,7 @@ module Avm
           end
 
           def update
-            ::Avm::EacRedmineBase0::CoreUpdate.new(context(:instance), version, url).run
+            ::Avm::EacRedmineBase0::CoreUpdate.new(runner_context.call(:instance), version, url).run
           end
 
           def url
@@ -40,7 +36,7 @@ module Avm
           end
 
           def url_by_version
-            options.fetch('--version').if_present do |v|
+            parsed.version.if_present do |v|
               "https://www.redmine.org/releases/redmine-#{v}.tar.gz"
             end
           end
@@ -52,11 +48,11 @@ module Avm
           end
 
           def version
-            options.fetch('--version') || version_by_url
+            parsed.version || version_by_url
           end
 
           def version_by_url
-            options.fetch('--url').if_present do |v|
+            parsed.url.if_present do |v|
               /(\d+.\d+.\d+)/.if_match(v, false) { |m| m[1] }
             end
           end

data/lib/avm/tools/runner/git/auto_commit.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/git/auto_commit_path'
-require 'avm/files/formatter'
 require 'eac_cli/core_ext'
+require 'avm/files/formatter'
+require 'avm/git/file_auto_fixup'
+require 'avm/git/auto_commit/rules'
 
 module Avm
   module Tools
@@ -10,54 +11,53 @@ module Avm
       class Git
         class AutoCommit
           runner_with :help do
-            desc 'Commit with message based in content commited.'
+            desc 'Auto fixup files.'
             bool_opt '-d', '--dirty', 'Select dirty files.'
             bool_opt '-f', '--format', 'Format files before commit.'
-            pos_arg 'paths', repeat: true, optional: true
+            arg_opt '-r', '--rule', 'Apply a rule in the specified order.', repeat: true
+            pos_arg :files, repeat: true, optional: true
           end
 
           def run
-            clear_stage
-            banner
             format_files
-            run_paths
+            files.each do |file|
+              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run
+            end
           end
 
           private
 
-          def banner
-            infov 'Paths', paths.count
+          def files_uncached
+            (files_from_option + dirty_files).sort.uniq
           end
 
-          def clear_stage
-            infom 'Clearing stage...'
-            runner_context.call(:git).system!('reset', 'HEAD')
-          end
-
-          def dirty_paths
-            return [] unless parsed.dirty?
-
-            runner_context.call(:git).dirty_files.map do |d|
-              runner_context.call(:git).root_path.join / d.path
-            end
+          def files_from_option
+            parsed.files.map { |p| p.to_pathname.expand_path }
           end
 
           def format_files
             return unless parsed.format?
 
             infom 'Formating files...'
-            ::Avm::Files::Formatter.new(paths.map(&:path),
-                                        ::Avm::Files::Formatter::OPTION_APPLY => true).run
+            ::Avm::Files::Formatter.new(files, ::Avm::Files::Formatter::OPTION_APPLY => true).run
           end
 
-          def paths_uncached
-            (parsed.paths.map { |p| p.to_pathname.expand_path } + dirty_paths)
-              .reject(&:directory?).sort.uniq
-              .map { |path| ::Avm::Git::AutoCommitPath.new(runner_context.call(:git), path) }
+          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
+          end
+
+          def rules
+            parsed.rule.map do |rule_string|
+              ::Avm::Git::AutoCommit::Rules.parse(rule_string)
+            end
           end
 
-          def run_paths
-            paths.each(&:run)
+          def select
+            parsed.last? ? 1 : parsed.select
           end
         end
       end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.93.0'
+    VERSION = '0.94.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.93.0
+  version: 0.94.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-14 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -408,6 +408,7 @@ files:
 - lib/avm/git/auto_commit/rules/base.rb
 - lib/avm/git/auto_commit/rules/last.rb
 - lib/avm/git/auto_commit/rules/manual.rb
+- lib/avm/git/auto_commit/rules/new.rb
 - lib/avm/git/auto_commit/rules/nth.rb
 - lib/avm/git/auto_commit/rules/unique.rb
 - lib/avm/git/auto_commit_path.rb
@@ -542,7 +543,6 @@ files:
 - 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/auto_fixup.rb
 - lib/avm/tools/runner/git/commit.rb
 - lib/avm/tools/runner/git/deploy.rb
 - lib/avm/tools/runner/git/dirty_files.rb

data/lib/avm/tools/runner/git/auto_fixup.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'avm/git/file_auto_fixup'
-require 'avm/git/auto_commit/rules'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class AutoFixup
-          runner_with :help do
-            desc 'Auto fixup files.'
-            arg_opt '-r', '--rule', 'Apply a rule in the specified order.', repeat: true
-            pos_arg :files, repeat: true, optional: true
-          end
-
-          def run
-            files.each do |file|
-              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run
-            end
-          end
-
-          private
-
-          def files
-            files_from_option || dirty_files
-          end
-
-          def files_from_option
-            r = parsed.files
-            r.any? ? r.map { |p| p.to_pathname.expand_path } : nil
-          end
-
-          def dirty_files
-            runner_context.call(:git).dirty_files.map(&:path)
-          end
-
-          def rules
-            parsed.rule.map do |rule_string|
-              ::Avm::Git::AutoCommit::Rules.parse(rule_string)
-            end
-          end
-
-          def select
-            parsed.last? ? 1 : parsed.select
-          end
-        end
-      end
-    end
-  end
-end