avm-tools 0.37.0 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e112c35554da958b5bcee6263e3ad3d6c2cd93cf70ab56eba9fb9bb689199cb8
-  data.tar.gz: 877e71a8bb6c19ab1285a88e54feba27e59bdbbc05c574c6e183c6d9d8625159
+  metadata.gz: 265ec590d53bde1eff714c1789cb317e4fe855cce54bf12535f60ab4b508b811
+  data.tar.gz: 2ac59d6b0c89adb5e091ebe88a65062ccd0ded1c2cb98e5046296701b8cb3604
 SHA512:
-  metadata.gz: 05d3e02a29bf1e45049f22dfd194e6d33d71d25967616544496d77d1b72f95753aac1e4b7365689fcf644d92fef4df0b08b7d0762f43fef97c48829f23548021
-  data.tar.gz: 4ab2a54b3b9d0c94925d47759ca7b05bd40ed8db9219aa36e2e57f3ff1b68aca330e3ebf7a82fb2a0024158d2693daa9f8f1cc2111bc9f56bf207a637ad34e84
+  metadata.gz: 38828cff9cfdc2d3aed17d93f81cc2254bb4f3bae27bd35320f1e5e4d4a7d38d6b24d0a95251aedb35fb7c2d9178ba705b7eb402306a66d2827f310e9e8a3d7e
+  data.tar.gz: 1e557150968a16d21a5002d30febe4f6812deac5b8f87f8faf84b07b6790ce71608353fa6ffe7d3727536bf4b1b4572914166eb6066f07b27c82c2d875a1f79b

data/lib/avm/executables.rb

@@ -9,6 +9,10 @@ module Avm
         ::EacRubyUtils::Envs.local
       end
 
+      def file
+        @file ||= env.executable('file', '--version')
+      end
+
       def git
         @git ||= env.executable('git', '--version')
       end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/files/info'
 require 'ostruct'
 
 module Avm
@@ -9,7 +10,7 @@ module Avm
         class Base
           def apply(files)
             old_content = Hash[files.map { |f| [f, File.read(f)] }]
-            internal_apply(files)
+            ::Avm::Files::Formatter::Utf8Assert.assert_files(files) { internal_apply(files) }
             files.map { |f| build_file_result(f, old_content[f]) }
           end
 
@@ -49,8 +50,10 @@ module Avm
           end
 
           def match_by_type?(file)
-            file_type = ::EacRubyUtils::Envs.local.command('file', '-b', file).execute!
-            valid_types.find { |t| file_type.include?(t) }
+            info = ::Avm::Files::Info.new(file)
+            return unless info.content_type.type == 'text'
+
+            valid_types.include?(info.content_type.subtype)
           end
         end
       end

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

@@ -7,10 +7,10 @@ module Avm
     class Formatter
       module Formats
         class GenericPlain < ::Avm::Files::Formatter::Formats::PerFileBase
-          VALID_EXTENSIONS = %w[.bat .css.coffee .java .js .json .php .rb .scss .sql .tex .url .yml
+          VALID_EXTENSIONS = %w[.bat .css.coffee .java .js .json .rb .scss .sql .tex .url .yml
                                 .yaml].freeze
 
-          VALID_TYPES = ['Bourne-Again shell script', 'ASCII text', 'UTF-8 Unicode text'].freeze
+          VALID_TYPES = %w[plain x-shellscript].freeze
 
           def internal_apply(files)
             files.each { |file| file_apply(file) }

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

@@ -9,7 +9,7 @@ module Avm
       module Formats
         class Php < ::Avm::Files::Formatter::Formats::PerFileBase
           VALID_EXTENSIONS = %w[.php].freeze
-          VALID_TYPES = ['PHP script'].freeze
+          VALID_TYPES = ['x-php'].freeze
 
           def file_apply(file)
             ::Avm::Executables.php_cs_fixer.command.append(['fix', file]).system!

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+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
+          ::Avm::Files::Info.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/info.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'eac_ruby_utils/core_ext'
+require 'content-type'
+
+module Avm
+  module Files
+    class Info
+      enable_simple_cache
+      common_constructor :path
+
+      private
+
+      def content_type_uncached
+        ::ContentType.parse(
+          ::Avm::Executables.file.command.append(['-ib', path]).execute!.strip
+        )
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.37.1
 platform: ruby
 authors:
 - Esquilo Azul Company
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: content-type
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: eac_launcher
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +215,8 @@ files:
 - 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/utf8_assert.rb
+- lib/avm/files/info.rb
 - lib/avm/files/rotate.rb
 - lib/avm/fs_cache.rb
 - lib/avm/git.rb