avm-tools 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0fc54aa88d5a418257e41542446fd247ecacc10764babfc6b1c74c329c4560
-  data.tar.gz: 163c224656cb2db01b66c756e186ea57f532fba2d225334f77573f18dfbce52e
+  metadata.gz: e112c35554da958b5bcee6263e3ad3d6c2cd93cf70ab56eba9fb9bb689199cb8
+  data.tar.gz: 877e71a8bb6c19ab1285a88e54feba27e59bdbbc05c574c6e183c6d9d8625159
 SHA512:
-  metadata.gz: 66bfb3911d0cf5ea1c84a4ccbb6df1f9e80a4f28819b364a54835259d3561068a09f49a874221789e53a3bb46cb616bcef4bb25407f1431ee930f389dd55177b
-  data.tar.gz: 8585671f0d8aaa316124354b9390beedc7667e49a667be6db76a744590a2cb74cdda96691111bac2e7c20808b1bf61286ece822bb68ca48affd4679a5d192331
+  metadata.gz: 05d3e02a29bf1e45049f22dfd194e6d33d71d25967616544496d77d1b72f95753aac1e4b7365689fcf644d92fef4df0b08b7d0762f43fef97c48829f23548021
+  data.tar.gz: 4ab2a54b3b9d0c94925d47759ca7b05bd40ed8db9219aa36e2e57f3ff1b68aca330e3ebf7a82fb2a0024158d2693daa9f8f1cc2111bc9f56bf207a637ad34e84

data/lib/avm/executables.rb

@@ -16,6 +16,10 @@ module Avm
       def docker
         @docker ||= env.executable('docker', '--version')
       end
+
+      def php_cs_fixer
+        @php_cs_fixer ||= env.executable('php-cs-fixer', '--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[generic_plain].freeze
+      FORMATS = %w[php generic_plain].freeze
 
       def run
         clear
@@ -77,7 +77,7 @@ module Avm
       def show_results
         changed = @result.select(&:changed)
         changed.each do |h|
-          out h.file.t_s.cyan
+          out h.file.to_s.cyan
           out " (#{h.format})".yellow
           puts ' changed'.green
         end

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

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

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

@@ -0,0 +1,17 @@
+# 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

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

@@ -0,0 +1,22 @@
+# 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
+          VALID_EXTENSIONS = %w[.php].freeze
+          VALID_TYPES = ['PHP script'].freeze
+
+          def file_apply(file)
+            ::Avm::Executables.php_cs_fixer.command.append(['fix', file]).system!
+            ::Avm::Files::Formatter::Formats::GenericPlain.new.file_apply(file)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.36.0'
+    VERSION = '0.37.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +199,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/rotate.rb
 - lib/avm/fs_cache.rb
 - lib/avm/git.rb