avm-files 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d5cb06e33cdfb8e9c6b35d9349dfdfebd3751af5fa4ee2c7809769c97e4941
-  data.tar.gz: fcfc92226e4436f50623e2e29d40f21ddb7fdb9c4d7a5bfb401e9b73f58f7bb1
+  metadata.gz: a15e83c7782bf6ffdef6b000388557afe3908a8674fd2fe39271d25e9ba8d95a
+  data.tar.gz: 827f3caae4307adac725722fc90eb841b83c3202ee827a8d9382ae31f5e95e8e
 SHA512:
-  metadata.gz: da6fb0ff60feff999ccabc04353c5db56aa76412508c583a4d0f48f54b1522305cc849c1d17c4cebf7bdf4013ceb8caf2b2066b29329e2f9563f5c8bbf9c244b
-  data.tar.gz: e6c8d78575769d1e4b0fa4115b74d54875bbc8b89d24086fe55b47648482b2767679a49d7e316f45c49ab3187fade40a6d2f1b8fe5d93fefacc0d6ef0b6bfd16
+  metadata.gz: 51d7889ea7e2b81d7fb8912d935cc8799a20991035ee7a5cbbbd48f56740a38c3c328ac723a48e57252da6cc6591bc3b6c3c2ead555d2c334611b768c643ccf2
+  data.tar.gz: b804db8f325774413c9d258b68bfbad0a1d6018052550252bfbadce32156478f4925fc45860eec4f52c30fb3efcc9a85193295f83d66336690acad6f74011e53

data/lib/avm/files/appendable/templatized_directory.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/files/appendable/resource_base'
-require 'eac_templates/directory'
+require 'eac_templates/variables/directory'
 
 module Avm
   module Files
@@ -18,7 +18,7 @@ module Avm
         def write_on(target_dir)
           raise 'Variables source not set' if appender.variables_source.blank?
 
-          ::EacTemplates::Directory.new(source_path).apply(
+          ::EacTemplates::Variables::Directory.new(source_path).apply(
             appender.variables_source,
             target_dir
           )

data/lib/avm/files/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.5.0'
+    VERSION = '0.6.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-files
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,82 +16,82 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.67'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.67.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.67'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.67.1
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.30'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.30.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.30'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.30.1
 - !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
+        version: '0.16'
   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
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.105'
+        version: '0.112'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.105'
+        version: '0.112'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -121,8 +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/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/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,91 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/registry'
-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
-
-      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_from_registry
-      end
-
-      def formats_from_registry
-        ::Avm::Registry.file_formats.available.reverse.map(&:new)
-      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