eac_tools 0.37.1 → 0.37.2

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/provider.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/file_formats/html'
+require 'avm/eac_webapp_base0/file_formats/javascript'
+require 'avm/eac_webapp_base0/file_formats/json'
+require 'avm/eac_webapp_base0/file_formats/xml'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Provider
+        ALL_NAMES = %w[html javascript json xml].freeze
+
+        def all
+          @all ||= ALL_NAMES.map do |name|
+            ::Avm::EacWebappBase0::FileFormats.const_get(name.camelize).freeze
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/xml.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Xml < ::Avm::EacGenericBase0::FileFormats::Base
+        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

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

data/sub/avm-files/avm-files.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.43'
+  s.add_dependency 'avm', '~> 0.51'
   s.add_dependency 'eac_cli', '~> 0.28'
   s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'eac_ruby_utils', '~> 0.105'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-files/lib/avm/files/formatter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 require 'eac_fs/traversable'
 
@@ -16,8 +17,6 @@ module Avm
         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
@@ -59,9 +58,11 @@ module Avm
       end
 
       def formats_uncached
-        FORMATS.map do |identifier|
-          "avm/files/formatter/formats/#{identifier}".camelize.constantize.new
-        end
+        formats_from_registry
+      end
+
+      def formats_from_registry
+        ::Avm::Registry.file_formats.available.reverse.map(&:new)
       end
 
       def search_files

data/sub/avm-files/lib/avm/files/version.rb

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

data/sub/avm-tools/avm-tools.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.3'
-  s.add_dependency 'avm', '~> 0.50'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.25'
+  s.add_dependency 'avm', '~> 0.51'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.26'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
+  s.add_dependency 'avm-files', '~> 0.5'
   s.add_dependency 'avm-git', '~> 0.8'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
@@ -28,5 +28,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'git', '~> 1.12'
   s.add_dependency 'ruby-progressbar', '~> 1.11'
 
+  s.add_development_dependency 'avm-eac_php_base0', '~> 0.2'
+  s.add_development_dependency 'avm-eac_python_base0', '~> 0.1'
+  s.add_development_dependency 'avm-eac_webapp_base0', '~> 0.11'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.142.1'
+    VERSION = '0.142.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.37.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-16 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0.51'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_latex_base0
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base0
   requirement: !ruby/object:Gem::Requirement
@@ -160,28 +160,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.26'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +211,7 @@ dependencies:
         version: '0.142'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.142.1
+        version: 0.142.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
         version: '0.142'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.142.1
+        version: 0.142.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -283,6 +283,8 @@ files:
 - sub/avm-eac_generic_base0/Gemfile
 - sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0.rb
+- sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats.rb
+- sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/instances.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/instances/base.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources.rb
@@ -332,9 +334,19 @@ files:
 - sub/avm-eac_php_base0/Gemfile
 - sub/avm-eac_php_base0/avm-eac_php_base0.gemspec
 - sub/avm-eac_php_base0/lib/avm/eac_php_base0.rb
+- sub/avm-eac_php_base0/lib/avm/eac_php_base0/file_formats.rb
+- sub/avm-eac_php_base0/lib/avm/eac_php_base0/file_formats/base.rb
 - sub/avm-eac_php_base0/lib/avm/eac_php_base0/version.rb
 - sub/avm-eac_php_base0/spec/rubocop_spec.rb
 - sub/avm-eac_php_base0/spec/spec_helper.rb
+- sub/avm-eac_python_base0/Gemfile
+- sub/avm-eac_python_base0/avm-eac_python_base0.gemspec
+- sub/avm-eac_python_base0/lib/avm/eac_python_base0.rb
+- sub/avm-eac_python_base0/lib/avm/eac_python_base0/file_formats.rb
+- sub/avm-eac_python_base0/lib/avm/eac_python_base0/file_formats/base.rb
+- sub/avm-eac_python_base0/lib/avm/eac_python_base0/version.rb
+- sub/avm-eac_python_base0/spec/rubocop_spec.rb
+- sub/avm-eac_python_base0/spec/spec_helper.rb
 - sub/avm-eac_rails_base0/Gemfile
 - sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0.rb
@@ -473,6 +485,8 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem/build.rb
@@ -581,6 +595,12 @@ files:
 - sub/avm-eac_webapp_base0/Gemfile
 - sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/html.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/javascript.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/json.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/provider.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/xml.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_host.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_path.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb
@@ -635,16 +655,6 @@ files:
 - sub/avm-files/lib/avm/files/appender.rb
 - sub/avm-files/lib/avm/files/deploy.rb
 - sub/avm-files/lib/avm/files/formatter.rb
-- sub/avm-files/lib/avm/files/formatter/formats.rb
-- sub/avm-files/lib/avm/files/formatter/formats/base.rb
-- sub/avm-files/lib/avm/files/formatter/formats/generic_plain.rb
-- sub/avm-files/lib/avm/files/formatter/formats/html.rb
-- sub/avm-files/lib/avm/files/formatter/formats/javascript.rb
-- sub/avm-files/lib/avm/files/formatter/formats/json.rb
-- sub/avm-files/lib/avm/files/formatter/formats/php.rb
-- sub/avm-files/lib/avm/files/formatter/formats/python.rb
-- sub/avm-files/lib/avm/files/formatter/formats/ruby.rb
-- sub/avm-files/lib/avm/files/formatter/formats/xml.rb
 - sub/avm-files/lib/avm/files/formatter/utf8_assert.rb
 - sub/avm-files/lib/avm/files/runner_with.rb
 - sub/avm-files/lib/avm/files/runner_with/file_replacer.rb
@@ -906,6 +916,8 @@ files:
 - sub/avm/lib/avm/entries/keys_constants_set.rb
 - sub/avm/lib/avm/entries/uri_builder.rb
 - sub/avm/lib/avm/executables.rb
+- sub/avm/lib/avm/file_formats.rb
+- sub/avm/lib/avm/file_formats/base.rb
 - sub/avm/lib/avm/instances.rb
 - sub/avm/lib/avm/instances/base.rb
 - sub/avm/lib/avm/instances/base/auto_values.rb
@@ -952,6 +964,7 @@ files:
 - sub/avm/lib/avm/registry/application_stereotypes.rb
 - sub/avm/lib/avm/registry/application_stereotypes/build_available.rb
 - sub/avm/lib/avm/registry/application_stereotypes/stereotype_builder.rb
+- sub/avm/lib/avm/registry/file_formats.rb
 - sub/avm/lib/avm/registry/from_gems.rb
 - sub/avm/lib/avm/registry/instances.rb
 - sub/avm/lib/avm/registry/launcher_stereotypes.rb

data/sub/avm-files/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/sub/avm-files/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/sub/avm-files/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/sub/avm-files/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/sub/avm-files/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/sub/avm-files/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/sub/avm-files/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/sub/avm-files/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/sub/avm-files/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