avm 0.51.0 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7d526aa03c069d29d98545ce6d90ff1336592ad1c74a432c88430feb4cc71a6
-  data.tar.gz: f1b4f72746cd60c762df317eb415a91810de688bf58bc24d1ab261f085974b52
+  metadata.gz: 9867c212c40c67bb9467d5109778d76f2bc11752b604934404e11956663e719b
+  data.tar.gz: 0ef0d4ca046e4fcbf8e03174bbece1b4e71972c02d50692bd9c3ef8ad2f3e04a
 SHA512:
-  metadata.gz: db1371c99c4d393a1b47cb09275a9fb6c9acb094706119b2db2a83131e87b75a85210b097e76dd053f35b892680713e493b2a2277767b66b0885e5c0434f713a
-  data.tar.gz: c2f242bddf30a01e4db4f4aaaffa7878863df455a04023d928ab611951cd2a73b4343cea0bcb312c44db96b98488a4337894f90cf23aba6972f28bf4ab571ee9
+  metadata.gz: d68c998e7a9decaebba0c1023f1e2c259ea9edeeac3a8bb05d78740a45422308031bdcd650d2beaf487de4adef82b9faa72c4bfc2fd88e9c788a456a5ac7fd17
+  data.tar.gz: b499addbd90d59becc16270a7f9cb5f8839db6ac4d1a3dc2e7467f75d8d6b97a45ade2bfca0b783fb24f314a4c4241b263d587a0aee755c1e0eb1918d9d188f9

data/lib/avm/executables.rb

@@ -14,7 +14,7 @@ module Avm
 
       private
 
-      %w[file git js-beautify latex php-cs-fixer tidy yapf xdg-open].each do |program|
+      %w[xdg-open].each do |program|
         define_method(program.underscore + '_uncached') do
           env.executable(program, '--version')
         end

data/lib/avm/file_formats/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/file_formats/utf8_assert'
 require 'eac_fs/file_info'
 require 'ostruct'
 
@@ -10,7 +11,7 @@ module Avm
 
       def apply(files)
         old_content = Hash[files.map { |f| [f, File.read(f)] }]
-        ::Avm::Files::Formatter::Utf8Assert.assert_files(files) { internal_apply(files) }
+        ::Avm::FileFormats::Utf8Assert.assert_files(files) { internal_apply(files) }
         files.map { |f| build_file_result(f, old_content[f]) }
       end
 

data/lib/avm/file_formats/search_formatter.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_ruby_utils/core_ext'
+require 'eac_fs/traversable'
+
+module Avm
+  module FileFormats
+    class SearchFormatter
+      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
+
+      def run
+        clear
+        search_files
+        apply
+        show_results
+      end
+
+      private
+
+      def apply
+        speak(:infom, "Applying #{@formats_files.count} format(s)... ")
+        @formats_files.each do |format, files|
+          speak(: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)
+        speak(:infov, file, format ? format.class : '-')
+        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_from_registry
+      end
+
+      def formats_from_registry
+        ::Avm::Registry.file_formats.available.reverse.map(&:new)
+      end
+
+      def search_files
+        speak(:infov, 'Directories to search', source_paths.count)
+        source_paths.each do |source_path|
+          speak(:infom, "Searching files on \"#{source_path}\"...")
+          traverser_check_path(source_path)
+        end
+      end
+
+      def show_results
+        changed = @result.select(&:changed)
+        changed.each do |h|
+          speak(:out, h.file.to_s.cyan)
+          speak(:out, " (#{h.format})".yellow)
+          speak(:puts, ' changed'.green)
+        end
+        speak(:infov, 'Files changed', "#{changed.count}/#{@result.count}")
+      end
+
+      def traverser_recursive
+        options[OPTION_RECURSIVE]
+      end
+
+      def speak(method, *method_args)
+        return unless options[OPTION_VERBOSE].to_bool
+
+        send(method, *method_args)
+      end
+    end
+  end
+end

data/lib/avm/file_formats/utf8_assert.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+
+module Avm
+  module FileFormats
+    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

data/lib/avm/rspec/setup.rb

@@ -7,7 +7,8 @@ module Avm
   module Rspec
     module Setup
       require_sub __FILE__
-      EXAMPLES = %w[entries_values in_avm_registry not_in_avm_registry].freeze
+      EXAMPLES = %w[avm_file_formats_with_fixtures entries_values in_avm_registry
+                    not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples

data/lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/source_target_fixtures'
+require 'avm/file_formats/search_formatter'
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'avm_file_formats_with_fixtures' do |the_spec_file|
+  include_examples 'source_target_fixtures', the_spec_file
+
+  def format_files_in_directory(target_dir)
+    ::Avm::FileFormats::SearchFormatter
+      .new([target_dir], recursive: true, apply: true, verbose: false)
+      .run
+  end
+
+  def source_data(source_file)
+    dir = temp_dir
+    source_basename = source_file_basename_without_source_extname(source_file)
+    source_path = dir.join(source_basename)
+    ::FileUtils.cp(source_file, source_path)
+    format_files_in_directory(dir)
+    source_path.read
+  end
+
+  def source_file_basename_without_source_extname(source_file)
+    source_file.to_pathname.basename_sub { |b| b.to_path.gsub(/\.source/, '') }.basename
+  end
+
+  def target_data(target_file)
+    ::File.read(target_file)
+  end
+end

data/lib/avm/scms/commit.rb

@@ -12,6 +12,14 @@ module Avm
         raise_abstract_method __method__
       end
 
+      def deploy_to_env_path(_target_env, _target_path)
+        raise_abstract_method __method__
+      end
+
+      def id
+        raise_abstract_method __method__
+      end
+
       # @param other [Avm::Scms::Commit]
       # @return [Avm::Scms::Commit]
       def merge_with(_other)

data/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.51.0'
+  VERSION = '0.53.0'
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.53.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aranha-parsers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.4
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +78,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: eac_fs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: eac_git
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +118,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.105'
+        version: '0.106'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.106.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.105'
+        version: '0.106'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.106.1
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +313,8 @@ files:
 - lib/avm/executables.rb
 - lib/avm/file_formats.rb
 - lib/avm/file_formats/base.rb
+- lib/avm/file_formats/search_formatter.rb
+- lib/avm/file_formats/utf8_assert.rb
 - lib/avm/instances.rb
 - lib/avm/instances/base.rb
 - lib/avm/instances/base/auto_values.rb
@@ -327,6 +375,7 @@ files:
 - lib/avm/rspec.rb
 - lib/avm/rspec/setup.rb
 - lib/avm/rspec/setup/launcher.rb
+- lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb
 - lib/avm/rspec/shared_examples/entries_values.rb
 - lib/avm/rspec/shared_examples/in_avm_registry.rb
 - lib/avm/rspec/shared_examples/not_in_avm_registry.rb