avm-tools 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc93a50b713fa65d2893cb05c7a38feab44295c625011c6597d5aeaaf866ccf9
-  data.tar.gz: 67ab9170e9c7e780bf839d0bdb1d5ebe4edb91e2d46b08af22a46c5bfb2c93c6
+  metadata.gz: b2dfc6aad10cade7a84fad01d04a2ca982bfeb9d20f8c5efcf1253c14876d964
+  data.tar.gz: b5a79cb9c4d62f8cefb1954fd79ee353ab928f9a2b1042e681a962390762bfe3
 SHA512:
-  metadata.gz: d6f5008949bde37c4f319aea45a7676b7acc314408154fabe3ace835206dd44f988cd6593e6b571291898bc659fcd013f3d43e49807f9046233f5c028f4894d6
-  data.tar.gz: d9db915b89d71139af123feab08e08e3a4743a866d3895c9fbedb5b61def92e64d0509c9e7bb7fffbc56f76fdf7239087ef26810d7b80cd6155513d25ea75a82
+  metadata.gz: a3c5a134d6bff614af0aa153248c3952b5f043b590b666e2d3421a1477b2a180c69c2af864773e558af825d1f6e720ee8d56fbb13dd2c8c71782be3dedc7ba71
+  data.tar.gz: 47734387f9fbb75a13c734b96bf2c45d5fcd8baf464db24a0af32fc3e2c9e4813c60ffd3d3ff53237770db341ff8a1baf6c847e24909d3813cc5dcb44b1656e9

data/lib/avm/files/formatter.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/filesystem_traverser'
+
+module Avm
+  module Files
+    class Formatter
+      require_sub __FILE__
+      enable_simple_cache
+      enable_console_speaker
+      common_constructor :source_paths, :options
+
+      FORMATS = %w[generic_plain].freeze
+
+      def run
+        clear
+        search_files
+        apply
+        show_results
+      end
+
+      private
+
+      def apply
+        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)
+
+          @result += format.apply(files)
+        end
+      end
+
+      def check_file(file)
+        format = find_format(file)
+        infov file, format ? format.class : '-' if options.fetch(:verbose)
+        return unless format
+
+        @formats_files[format] ||= []
+        @formats_files[format] << file
+      end
+
+      def clear
+        @formats_files = {}
+        @result = []
+      end
+
+      def find_format(file)
+        formats.each do |c|
+          return c if c.match?(file)
+        end
+        nil
+      end
+
+      def formats_uncached
+        FORMATS.map do |identifier|
+          "avm/files/formatter/formats/#{identifier}".camelize.constantize.new
+        end
+      end
+
+      def fs_traverser_uncached
+        r = ::EacRubyUtils::FilesystemTraverser.new
+        r.check_file = method(:check_file)
+        r.recursive = options.fetch(:recursive)
+        r
+      end
+
+      def search_files
+        infov 'Directories to search', source_paths.count
+        source_paths.each do |source_path|
+          infom "Searching files on \"#{source_path}\"..."
+          fs_traverser.check_path(source_path)
+        end
+      end
+
+      def show_results
+        changed = @result.select(&:changed)
+        changed.each do |h|
+          out h.file.t_s.cyan
+          out " (#{h.format})".yellow
+          puts ' changed'.green
+        end
+        infov('Files changed', "#{changed.count}/#{@result.count}")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Files
+    class Formatter
+      module Formats
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+
+module Avm
+  module Files
+    class Formatter
+      module Formats
+        class Base
+          def apply(files)
+            old_content = Hash[files.map { |f| [f, File.read(f)] }]
+            internal_apply(files)
+            files.map { |f| build_file_result(f, old_content[f]) }
+          end
+
+          def name
+            self.class.name.demodulize
+          end
+
+          def match?(file)
+            match_by_extension?(file) || match_by_type?(file)
+          end
+
+          def valid_extensions
+            constant_or_array('VALID_EXTENSIONS')
+          end
+
+          def valid_types
+            constant_or_array('VALID_TYPES')
+          end
+
+          private
+
+          def constant_or_array(name)
+            return [] unless self.class.const_defined?(name)
+
+            self.class.const_get(name)
+          end
+
+          def build_file_result(file, old_content)
+            ::OpenStruct.new(file: file, format: self.class,
+                             changed: (old_content != File.read(file)))
+          end
+
+          def match_by_extension?(file)
+            valid_extensions.any? do |valid_extension|
+              file.extname.ends_with?(valid_extension)
+            end
+          end
+
+          def match_by_type?(file)
+            file_type = ::EacRubyUtils::Envs.local.command('file', '-b', file).execute!
+            valid_types.find { |t| file_type.include?(t) }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/files/formatter/formats/base'
+
+module Avm
+  module Files
+    class Formatter
+      module Formats
+        class GenericPlain < ::Avm::Files::Formatter::Formats::Base
+          VALID_EXTENSIONS = %w[.bat .css.coffee .java .js .json .php .rb .scss .sql .tex .url .yml
+                                .yaml].freeze
+
+          VALID_TYPES = ['Bourne-Again shell script', 'ASCII text', 'UTF-8 Unicode text'].freeze
+
+          def internal_apply(files)
+            files.each { |file| file_apply(file) }
+          end
+
+          def file_apply(file)
+            file.write(string_apply(file.read))
+          end
+
+          def string_apply(string)
+            b = ''
+            string.each_line do |line|
+              b += "#{line.rstrip}\n"
+            end
+            "#{b.strip}\n".gsub(/\t/, '  ')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/result.rb

@@ -9,7 +9,7 @@ module Avm
 
     lists.add_string :type, :success, :error, :neutral
 
-    lists.type.values.each do |type|
+    lists.type.values.each do |type| # rubocop:disable Style/HashEachMethods
       class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
         def self.#{type}(value)
           new(value, TYPE_#{type.upcase})
@@ -51,7 +51,7 @@ module Avm
       self.class.const_get("type_#{type}_color".upcase)
     end
 
-    lists.type.values.each do |type|
+    lists.type.values.each do |type| # rubocop:disable Style/HashEachMethods
       class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
         def #{type}?
           @type == '#{type}'

data/lib/avm/ruby.rb

@@ -11,7 +11,7 @@ module Avm
 
       def on_clean_envvars(*start_with_vars)
         old_values = envvars_starting_with(start_with_vars)
-        old_values.keys.each { |k| ENV.delete(k) }
+        old_values.keys.each { |k| ENV.delete(k) } # rubocop:disable Style/HashEachMethods
         yield
       ensure
         old_values&.each { |k, v| ENV[k] = v }

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

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/console/docopt_runner'
-require 'avm/tools/runner/files/rotate'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class Files < ::EacRubyUtils::Console::DocoptRunner
+        require_sub __FILE__
+
         DOC = <<~DOCOPT
           Files utilities for AVM.
 

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'avm/files/formatter'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Files < ::EacRubyUtils::Console::DocoptRunner
+        class Format < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacRubyUtils::Console::Speaker
+
+          DOC = <<~DOCOPT
+            Format files.
+
+            Usage:
+              __PROGRAM__ [options] [<paths>...]
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help                 Show this screen.
+              -a --apply                Confirm changes.
+              -n --no-recursive         No recursive.
+              -v --verbose              Verbose
+          DOCOPT
+
+          def run
+            ::Avm::Files::Formatter.new(source_paths, formatter_options).run
+          end
+
+          def formatter_options
+            { apply: options.fetch('--apply'), recursive: !options.fetch('--no-recursive'),
+              verbose: options.fetch('--verbose') }
+          end
+
+          def source_paths
+            options.fetch('<paths>').if_present(%w[.])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.34.0'
+    VERSION = '0.35.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -76,20 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -136,16 +130,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.80.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.80.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +187,10 @@ files:
 - lib/avm/docker/runner.rb
 - lib/avm/executables.rb
 - lib/avm/files.rb
+- lib/avm/files/formatter.rb
+- lib/avm/files/formatter/formats.rb
+- lib/avm/files/formatter/formats/base.rb
+- lib/avm/files/formatter/formats/generic_plain.rb
 - lib/avm/files/rotate.rb
 - lib/avm/fs_cache.rb
 - lib/avm/git.rb
@@ -289,6 +287,7 @@ files:
 - lib/avm/tools/runner/eac_wordpress_base0/data.rb
 - lib/avm/tools/runner/eac_wordpress_base0/deploy.rb
 - lib/avm/tools/runner/files.rb
+- 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_fixup.rb