avm-tools 0.75.1 → 0.76.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4600b008c9ecc3f3aaa220ec18cac2199559787186710d80e6cd1fda6f39cf97
-  data.tar.gz: a8f6c806934616363ef26f4acc6e486a0f3fd215867e013c588256c20e077086
+  metadata.gz: 523777fd378f3ba655e65b12e452660f192e2875791439146808c472ee5cd982
+  data.tar.gz: 253dabfb78beaefa4b40dcfe6f669ae0e74761cb63a2e3418fda41ca8e107d2f
 SHA512:
-  metadata.gz: d10aa9242ee96189a7f43ab7ba1d1dc8cda2c7bb9961566ed7c2bf2a2a33d4c285eb1a42eb747342e2a6d2a1f5130e4681871dbc92cf9716978914216c922a12
-  data.tar.gz: 6eab4907c7e01156c4a7394e0ffa1503a1a8cdc3dce4e4f05aabd105b66c0576baecd6b30f0779e01565c78db3603614e8e75426b3cead19751d7bef2de582db
+  metadata.gz: 7208ff787a4d219d9a66b9e6e978dbf51cb142ea6af94b4347f9fc7f56c478962113b775896d52351fc35bea6fad3b796c9d5387af70c491a56542cd42872d25
+  data.tar.gz: 77004875dc073ea43aca01a5a3c4bbbf178fed773056bae70206745ce6d677ebfdf797871a0e5a8196eac1fd30774ab49e0e6b7503009abc22e0f278e5e6aaf0

data/lib/avm/files/formatter.rb

@@ -10,7 +10,11 @@ module Avm
       require_sub __FILE__
       enable_simple_cache
       enable_console_speaker
-      common_constructor :source_paths, :options
+      enable_listable
+      lists.add_symbol :option, :apply, :recursive, :verbose
+      common_constructor :source_paths, :options, default: [{}] do
+        options.assert_valid_keys(self.class.lists.option.values)
+      end
 
       FORMATS = %w[ruby php html python xml json generic_plain].freeze
 
@@ -27,7 +31,7 @@ module Avm
         infom "Applying #{@formats_files.count} format(s)... "
         @formats_files.each do |format, files|
           infom "Applying format #{format.name} (Files matched: #{files.count})..."
-          next unless options.fetch(:apply)
+          next unless options[OPTION_APPLY]
 
           @result += format.apply(files)
         end
@@ -35,7 +39,7 @@ module Avm
 
       def traverser_check_file(file)
         format = find_format(file)
-        infov file, format ? format.class : '-' if options.fetch(:verbose)
+        infov file, format ? format.class : '-' if options[OPTION_VERBOSE]
         return unless format
 
         @formats_files[format] ||= []
@@ -79,7 +83,7 @@ module Avm
       end
 
       def traverser_recursive
-        options.fetch(:recursive)
+        options[OPTION_RECURSIVE]
       end
     end
   end

data/lib/avm/git/auto_commit_path.rb

@@ -5,6 +5,7 @@ require 'eac_ruby_utils/core_ext'
 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
@@ -31,10 +32,7 @@ module Avm
       end
 
       def class_name
-        CLASS_NAME_PATTERNS.each do |pattern|
-          pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
-        end
-        raise "No pattern matched \"#{relative_path}\""
+        ruby_class_name || relative_path.to_path
       end
 
       def commit_message

data/lib/avm/git/auto_commit_path/ruby.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class AutoCommitPath
+      module Ruby
+        RUBY_CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
+
+        def ruby_class_name
+          RUBY_CLASS_NAME_PATTERNS.each do |pattern|
+            pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/files/format.rb

@@ -32,8 +32,9 @@ module Avm
           end
 
           def formatter_options
-            { apply: options.fetch('--apply'), recursive: !options.fetch('--no-recursive'),
-              verbose: options.fetch('--verbose') }
+            { ::Avm::Files::Formatter::OPTION_APPLY => options.fetch('--apply'),
+              ::Avm::Files::Formatter::OPTION_RECURSIVE => !options.fetch('--no-recursive'),
+              ::Avm::Files::Formatter::OPTION_VERBOSE => options.fetch('--verbose') }
           end
 
           def git

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/git/auto_commit_path'
+require 'avm/files/formatter'
 require 'eac_cli/default_runner'
 
 module Avm
@@ -13,12 +14,14 @@ module Avm
           runner_definition do
             desc 'Commit with message based in content commited.'
             bool_opt '-d', '--dirty', 'Select dirty files.'
+            bool_opt '-f', '--format', 'Format files before commit.'
             pos_arg 'paths', repeat: true, optional: true
           end
 
           def run
             clear_stage
             banner
+            format_files
             run_paths
           end
 
@@ -39,6 +42,14 @@ module Avm
             context(:git).dirty_files.map { |d| context(:git).root_path.join / d.path }
           end
 
+          def format_files
+            return unless options.fetch('--format')
+
+            infom 'Formating files...'
+            ::Avm::Files::Formatter.new(paths.map(&:path),
+                                        ::Avm::Files::Formatter::OPTION_APPLY => true).run
+          end
+
           def paths_uncached
             (options.fetch('<paths>')
               .map { |p| p.to_pathname.expand_path } + dirty_paths)

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.75.1'
+    VERSION = '0.76.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.75.1
+  version: 0.76.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -369,6 +369,7 @@ files:
 - lib/avm/fs_cache.rb
 - lib/avm/git.rb
 - lib/avm/git/auto_commit_path.rb
+- lib/avm/git/auto_commit_path/ruby.rb
 - lib/avm/git/commit.rb
 - lib/avm/git/commit/class_methods.rb
 - lib/avm/git/commit/deploy.rb