avm-tools 0.37.1 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 265ec590d53bde1eff714c1789cb317e4fe855cce54bf12535f60ab4b508b811
-  data.tar.gz: 2ac59d6b0c89adb5e091ebe88a65062ccd0ded1c2cb98e5046296701b8cb3604
+  metadata.gz: 585031f042e816f18293f7db1e5319c947db381562c87a6aad9f6c61ddfb1f1b
+  data.tar.gz: 44f66d7bdd9776e640dd4cd2e3df43acfea139366676f84d32bf07877c04c9b5
 SHA512:
-  metadata.gz: 38828cff9cfdc2d3aed17d93f81cc2254bb4f3bae27bd35320f1e5e4d4a7d38d6b24d0a95251aedb35fb7c2d9178ba705b7eb402306a66d2827f310e9e8a3d7e
-  data.tar.gz: 1e557150968a16d21a5002d30febe4f6812deac5b8f87f8faf84b07b6790ce71608353fa6ffe7d3727536bf4b1b4572914166eb6066f07b27c82c2d875a1f79b
+  metadata.gz: debbe214e6e984483870ed64d9a0a8d2eac5dc5231b6dc5d4f1408e93f81aaa98baec2d1c260aaaf9366a6565eacc49a7e090c2f188eac766d2e74ceeb48f9b5
+  data.tar.gz: d7a5a4597ee14bf3e1f05c4a021fc678c4cc297bafda9f5e3268160210d9605d5ef7be1408b41b0a9aa2439b9ebe1550082fa58f0accc4aa08b16dd29b03621a

data/lib/avm/executables.rb

@@ -1,28 +1,23 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/envs'
+require 'eac_ruby_utils/simple_cache'
 
 module Avm
   module Executables
     class << self
+      include ::EacRubyUtils::SimpleCache
+
       def env
         ::EacRubyUtils::Envs.local
       end
 
-      def file
-        @file ||= env.executable('file', '--version')
-      end
-
-      def git
-        @git ||= env.executable('git', '--version')
-      end
-
-      def docker
-        @docker ||= env.executable('docker', '--version')
-      end
+      private
 
-      def php_cs_fixer
-        @php_cs_fixer ||= env.executable('php-cs-fixer', '--version')
+      %w[docker file git php-cs-fixer yapf].each do |program|
+        define_method(program.underscore + '_uncached') do
+          env.executable(program, '--version')
+        end
       end
     end
   end

data/lib/avm/files/formatter.rb

@@ -11,7 +11,7 @@ module Avm
       enable_console_speaker
       common_constructor :source_paths, :options
 
-      FORMATS = %w[php generic_plain].freeze
+      FORMATS = %w[php python generic_plain].freeze
 
       def run
         clear

data/lib/avm/files/formatter/formats/generic_plain.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/files/formatter/formats/per_file_base'
+require 'avm/files/formatter/formats/base'
 
 module Avm
   module Files
     class Formatter
       module Formats
-        class GenericPlain < ::Avm::Files::Formatter::Formats::PerFileBase
+        class GenericPlain < ::Avm::Files::Formatter::Formats::Base
           VALID_EXTENSIONS = %w[.bat .css.coffee .java .js .json .rb .scss .sql .tex .url .yml
                                 .yaml].freeze
 

data/lib/avm/files/formatter/formats/php.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
-require 'avm/files/formatter/formats/per_file_base'
 require 'avm/files/formatter/formats/generic_plain'
 
 module Avm
   module Files
     class Formatter
       module Formats
-        class Php < ::Avm::Files::Formatter::Formats::PerFileBase
+        class Php < ::Avm::Files::Formatter::Formats::GenericPlain
           VALID_EXTENSIONS = %w[.php].freeze
           VALID_TYPES = ['x-php'].freeze
 
           def file_apply(file)
             ::Avm::Executables.php_cs_fixer.command.append(['fix', file]).system!
-            ::Avm::Files::Formatter::Formats::GenericPlain.new.file_apply(file)
+            super(file)
           end
         end
       end

data/lib/avm/files/formatter/formats/python.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/files/formatter/formats/generic_plain'
+
+module Avm
+  module Files
+    class Formatter
+      module Formats
+        class Python < ::Avm::Files::Formatter::Formats::GenericPlain
+          VALID_EXTENSIONS = %w[.py].freeze
+          VALID_TYPES = ['x-python'].freeze
+
+          def internal_apply(files)
+            ::Avm::Executables.yapf.command.append(['--in-place', *files]).system!
+            super(files)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.37.1'
+    VERSION = '0.38.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.38.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -213,8 +213,8 @@ files:
 - lib/avm/files/formatter/formats.rb
 - lib/avm/files/formatter/formats/base.rb
 - lib/avm/files/formatter/formats/generic_plain.rb
-- lib/avm/files/formatter/formats/per_file_base.rb
 - lib/avm/files/formatter/formats/php.rb
+- lib/avm/files/formatter/formats/python.rb
 - lib/avm/files/formatter/utf8_assert.rb
 - lib/avm/files/info.rb
 - lib/avm/files/rotate.rb

data/lib/avm/files/formatter/formats/per_file_base.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/files/formatter/formats/base'
-
-module Avm
-  module Files
-    class Formatter
-      module Formats
-        class PerFileBase < ::Avm::Files::Formatter::Formats::Base
-          def internal_apply(files)
-            files.each { |file| file_apply(file) }
-          end
-        end
-      end
-    end
-  end
-end