avm-files 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3085133d00ac94129da5d5e78859c07481852f0069ab0f26e2eb3444fb94702b
-  data.tar.gz: d224e3473ce1a5a04600cb7956a2150551f5c9c5b6faeef78d6ece26806ab127
+  metadata.gz: e510cd75129a6011f2667901c52525f77fbbdab82704ba4d57fafb41c92c5210
+  data.tar.gz: d303097f76578bc209d1774fb155d37ce798ce18f34680ffec3baf737b72d7e8
 SHA512:
-  metadata.gz: dc02d2d6c0b3eaa3f9e2a7c2632a1a6d4d8593a5a57dd1e966fc3494306d0ae14868af2471713a5b423710bd857bd3e4bc0f5691b620065491dc5ca6e1ec2994
-  data.tar.gz: 9e48c31f7224c9bfafb7103a03cd854ef4e158a2dd5d289a13391e0ca2082296468031a575a6126015f331baf0abdeea95be3738b01053b20bd9f1abc26812fc
+  metadata.gz: f97680fe4d6bf056bf841d666b5ebb9ccc98b44b4b3df06d3fe62932a16f8e051a370869c3d1a5aeaf76abe1ce59d992839674949ae1748e4774614f54b7d3f5
+  data.tar.gz: 229d6b4ad97a47fe100126c7f4eba638cee4cf6b4b4469c45f5c8d62fc194bf168904ac0556510916de2815eb221c9b247d882a0838907c961f33f491fdd9875

data/lib/avm/files/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.4.1'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-files
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.52'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.52'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.103'
+        version: '0.106'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.103'
+        version: '0.106'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -121,18 +121,6 @@ files:
 - lib/avm/files/appendable/templatized_directory.rb
 - lib/avm/files/appender.rb
 - lib/avm/files/deploy.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/formatter/formats/html.rb
-- lib/avm/files/formatter/formats/javascript.rb
-- lib/avm/files/formatter/formats/json.rb
-- lib/avm/files/formatter/formats/php.rb
-- lib/avm/files/formatter/formats/python.rb
-- lib/avm/files/formatter/formats/ruby.rb
-- lib/avm/files/formatter/formats/xml.rb
-- lib/avm/files/formatter/utf8_assert.rb
 - lib/avm/files/runner_with.rb
 - lib/avm/files/runner_with/file_replacer.rb
 - lib/avm/files/runner_with/filesystem_traverser.rb

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

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_fs/file_info'
-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)] }]
-            ::Avm::Files::Formatter::Utf8Assert.assert_files(files) { 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_filename?(file) || match_by_type?(file)
-          end
-
-          def valid_basenames
-            constant_or_array('VALID_BASENAMES')
-          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_filename?(file)
-            valid_basenames.any? do |valid_basename|
-              file.basename.fnmatch?(valid_basename)
-            end
-          end
-
-          def match_by_type?(file)
-            info = ::EacFs::FileInfo.new(file)
-            return unless info.content_type.type == 'text'
-
-            valid_types.include?(info.content_type.subtype)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-# 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_BASENAMES = %w[*.asm *.bat *.css.coffee *.java *.js *.rb *.s *.scss *.sql *.tex
-                               *.url *.yml *.yaml].freeze
-
-          VALID_TYPES = %w[plain x-shellscript].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/files/formatter/formats/html.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/files/formatter/formats/generic_plain'
-require 'htmlbeautifier'
-
-module Avm
-  module Files
-    class Formatter
-      module Formats
-        class Html < ::Avm::Files::Formatter::Formats::GenericPlain
-          VALID_BASENAMES = %w[*.html *.html.erb].freeze
-          VALID_TYPES = ['html'].freeze
-
-          def file_apply(path)
-            input = ::File.read(path)
-            temppath = tempfile_path
-            ::File.open(temppath, 'w') do |output|
-              beautify path, input, output
-            end
-            ::FileUtils.mv(temppath, path)
-            super(path)
-          end
-
-          private
-
-          def beautify(name, input, output)
-            output.puts ::HtmlBeautifier.beautify(input, htmlbeautify_options)
-          rescue StandardError => e
-            raise "Error parsing #{name}: #{e}"
-          end
-
-          def htmlbeautify_options
-            @htmlbeautify_options ||= { indent: '  ' }
-          end
-
-          def tempfile_path
-            tempfile = ::Tempfile.new
-            tempfile.close
-            tempfile.path
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/executables'
-require 'avm/files/formatter/formats/generic_plain'
-
-module Avm
-  module Files
-    class Formatter
-      module Formats
-        class Javascript < ::Avm::Files::Formatter::Formats::GenericPlain
-          VALID_BASENAMES = %w[*.js].freeze
-          VALID_TYPES = [].freeze
-
-          def internal_apply(files)
-            ::Avm::Executables.js_beautify.command.append(
-              ['--indent-size=2', '--end-with-newline', '--replace', *files]
-            ).system!
-            super(files)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/files/formatter/formats/generic_plain'
-
-module Avm
-  module Files
-    class Formatter
-      module Formats
-        class Json < ::Avm::Files::Formatter::Formats::GenericPlain
-          VALID_BASENAMES = %w[*.json].freeze
-          VALID_TYPES = [].freeze
-
-          def file_apply(file)
-            ::File.write(file, ::JSON.pretty_generate(::JSON.parse(::File.read(file))))
-          end
-
-          def json_file?(file)
-            ::JSON.parse(::File.read(file))
-            true
-          rescue JSON::ParserError
-            false
-          end
-        end
-      end
-    end
-  end
-end

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

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

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/executables'
-require 'avm/files/formatter/formats/generic_plain'
-
-module Avm
-  module Files
-    class Formatter
-      module Formats
-        class Python < ::Avm::Files::Formatter::Formats::GenericPlain
-          VALID_BASENAMES = %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/files/formatter/formats/ruby.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/files/formatter/formats/generic_plain'
-require 'avm/eac_ruby_base1/rubocop'
-
-module Avm
-  module Files
-    class Formatter
-      module Formats
-        class Ruby < ::Avm::Files::Formatter::Formats::GenericPlain
-          VALID_BASENAMES = %w[*.gemspec *.rake *.rb Gemfile Rakefile].freeze
-          VALID_TYPES = ['x-ruby'].freeze
-
-          def internal_apply(files)
-            ::Avm::EacRubyBase1::Rubocop.new('.', ['-a', '--ignore-parent-exclusion'] + files).run
-            super(files)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/executables'
-require 'avm/files/formatter/formats/generic_plain'
-
-module Avm
-  module Files
-    class Formatter
-      module Formats
-        class Xml < ::Avm::Files::Formatter::Formats::GenericPlain
-          VALID_BASENAMES = %w[*.xml].freeze
-          VALID_TYPES = ['xml'].freeze
-
-          def internal_apply(files)
-            format_command(files).system!
-            super(files)
-          end
-
-          def format_command(files)
-            ::Avm::Executables.tidy.command.append(
-              %w[-xml -modify --indent auto --indent-spaces 2 --wrap 100] + files
-            )
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-# 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/utf8_assert.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_fs/file_info'
-
-module Avm
-  module Files
-    class Formatter
-      class Utf8Assert
-        UTF8_CHARSET = 'utf-8'
-        UTF8_CHARSETS = [UTF8_CHARSET, 'us-ascii'].freeze
-
-        class << self
-          def assert_files(files)
-            asserters = files.map { |file| new(file) }
-            begin
-              asserters.each(&:assert)
-              yield
-            ensure
-              asserters.each(&:revert)
-            end
-          end
-        end
-
-        enable_simple_cache
-        common_constructor :path
-
-        def assert
-          return if original_utf8?
-
-          convert_self(original_charset, UTF8_CHARSET)
-        end
-
-        def revert
-          return if original_utf8?
-
-          convert_self(UTF8_CHARSET, original_charset)
-        end
-
-        private
-
-        def original_info_uncached
-          ::EacFs::FileInfo.new(path)
-        end
-
-        def original_charset_uncached
-          return original_info.content_type.charset if original_info.content_type.charset.present?
-
-          raise 'No charset found'
-        rescue StandardError => e
-          raise "Unable to determine the charset of #{path} (#{e.message})"
-        end
-
-        def original_utf8?
-          UTF8_CHARSETS.include?(original_charset)
-        end
-
-        def convert_file(from_path, from_charset, to_path, to_charset)
-          File.open(from_path, "r:#{from_charset}") do |input|
-            File.open(to_path, "w:#{to_charset}") do |output|
-              output.write(input.read)
-            end
-          end
-        end
-
-        def convert_self(from_charset, to_charset)
-          temp = ::Tempfile.new
-          temp.close
-          convert_file(path, from_charset, temp.path, to_charset)
-          ::FileUtils.mv(temp.path, path)
-        end
-      end
-    end
-  end
-end

data/lib/avm/files/formatter.rb

@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_fs/traversable'
-
-module Avm
-  module Files
-    class Formatter
-      include ::EacFs::Traversable
-      require_sub __FILE__
-      enable_simple_cache
-      enable_speaker
-      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 javascript json 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[OPTION_APPLY]
-
-          @result += format.apply(files)
-        end
-      end
-
-      def traverser_check_file(file)
-        format = find_format(file)
-        infov file, format ? format.class : '-' if options[OPTION_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 search_files
-        infov 'Directories to search', source_paths.count
-        source_paths.each do |source_path|
-          infom "Searching files on \"#{source_path}\"..."
-          traverser_check_path(source_path)
-        end
-      end
-
-      def show_results
-        changed = @result.select(&:changed)
-        changed.each do |h|
-          out h.file.to_s.cyan
-          out " (#{h.format})".yellow
-          puts ' changed'.green
-        end
-        infov('Files changed', "#{changed.count}/#{@result.count}")
-      end
-
-      def traverser_recursive
-        options[OPTION_RECURSIVE]
-      end
-    end
-  end
-end