eac_tools 0.101.0 → 0.101.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c554375ac8e252484dc1c15155cb1325cbaaa9df0abd6ac15f203217b1406c0e
-  data.tar.gz: dcca74777e9f0b1e09a81a235beb7bfba4ccb9d6d4dee8194ac5756c8b260f46
+  metadata.gz: 624b7798ee787487ca1d381c2c18c9b662bbb240d2b34ee074436f2ba094caf2
+  data.tar.gz: e9182b15272b9901eddb501105f40af7561605ad6be9326c0a752ceb7fecfbff
 SHA512:
-  metadata.gz: 5bea0deecf54a646da7eadf3ceedd8175daf632cd2d7b7a561ca3c3523ef29fe4021bf9ada58d09b4330acd111877f39b044f3608bfa5913a5b6f1b5d9512828
-  data.tar.gz: ab5be2a05d676c2a01f224d3daccf1cb335c16f371f2d516a85dc455f6c61ed4ec4406a3e8d1c244f50dc0afac96c5f3ee4dda07700dcb9b22b085cc7bf71213
+  metadata.gz: 8bf9dd0d1223b460cfc68ccb4cc3048c8884ebb6a0d30b943bb8f1c0b1c7c43e56f518dd649fc8181d9861b36e82ee761158d2a73c36cc0e4b36e3a0a277ee23
+  data.tar.gz: 7a7ab1ec0a87a2648a2ee1917ddbcae9afac92acb80a9c2d82d44493efffb420ebac159f8695ff287ad69abbd328d8a92825be884359d5af15702ae74b820430

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.101.0)
-      avm (~> 0.96)
+    eac_tools (0.101.1)
+      avm (~> 0.96, >= 0.96.1)
       avm-eac_asciidoctor_base0 (~> 0.25)
-      avm-eac_generic_base0 (~> 0.15)
+      avm-eac_generic_base0 (~> 0.15, >= 0.15.1)
       avm-eac_github_base0 (~> 0.3)
       avm-eac_gitlab_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.2)
@@ -17,50 +17,43 @@ PATH
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
       avm-eac_ruby_base0 (~> 0.1)
       avm-eac_ruby_base1 (~> 0.36)
-      avm-eac_webapp_base0 (~> 0.21)
+      avm-eac_webapp_base0 (~> 0.21, >= 0.21.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.20)
-      avm-tools (~> 0.163, >= 0.163.2)
+      avm-tools (~> 0.163, >= 0.163.3)
       eac_ruby_utils (~> 0.128)
 
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.15.0)
-      avm (~> 0.95)
-      eac_ruby_utils (~> 0.127)
-
-PATH
-  remote: sub/avm-eac_ruby_base1
-  specs:
-    avm-eac_ruby_base1 (0.36.0)
-      avm (~> 0.95, >= 0.95.2)
-      avm-eac_generic_base0 (~> 0.15)
-      eac_envs-http (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.127)
+    avm-eac_generic_base0 (0.15.1)
+      avm (~> 0.96, >= 0.96.1)
+      eac_ruby_utils (~> 0.128)
 
 PATH
-  remote: sub/avm-git
+  remote: sub/avm-eac_webapp_base0
   specs:
-    avm-git (0.20.0)
-      avm (~> 0.96)
+    avm-eac_webapp_base0 (0.21.1)
+      avm (~> 0.96, >= 0.96.1)
+      avm-eac_generic_base0 (~> 0.15, >= 0.15.1)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
+      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
       avm-files (~> 0.9)
-      eac_git (~> 0.18)
       eac_ruby_utils (~> 0.128)
-      git (~> 1.19, >= 1.19.1)
+      htmlbeautifier (~> 1.4, >= 1.4.3)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.163.2)
-      avm (~> 0.96)
+    avm-tools (0.163.3)
+      avm (~> 0.96, >= 0.96.1)
       clipboard (~> 1.4, >= 1.4.1)
       eac_ruby_base0 (~> 0.19, >= 0.19.1)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.96.0)
+    avm (0.96.1)
       clipboard (~> 1.4, >= 1.4.1)
       eac_cli (~> 0.43)
       eac_config (~> 0.15)
@@ -71,40 +64,6 @@ PATH
       minitar (~> 0.12, >= 0.12.1)
       ruby-progressbar (~> 1.13)
 
-PATH
-  remote: sub/eac_git
-  specs:
-    eac_git (0.18.0)
-      eac_ruby_utils (~> 0.128)
-      parseconfig (~> 1.1, >= 1.1.2)
-
-PATH
-  remote: sub/eac_ruby_base0
-  specs:
-    eac_ruby_base0 (0.19.1)
-      avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
-      eac_cli (~> 0.38, >= 0.38.1)
-      eac_fs (~> 0.18, >= 0.18.1)
-      eac_ruby_utils (~> 0.126)
-
-PATH
-  remote: sub/eac_ruby_gem_support
-  specs:
-    eac_ruby_gem_support (0.12.0)
-      eac_ruby_utils (~> 0.127)
-      rspec (~> 3.13, >= 3.13.1)
-      rubocop (~> 1.76)
-      rubocop-rails (~> 2.32)
-      rubocop-rspec (~> 3.6)
-      super_diff (~> 0.9)
-
-PATH
-  remote: sub/eac_templates
-  specs:
-    eac_templates (0.8.1)
-      eac_config (~> 0.15)
-      eac_ruby_utils (~> 0.127)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -171,24 +130,27 @@ GEM
     avm-eac_ruby_base0 (0.1.0)
       avm-eac_ruby_base1 (~> 0.34)
       eac_ruby_utils (~> 0.122)
+    avm-eac_ruby_base1 (0.36.0)
+      avm (~> 0.95, >= 0.95.2)
+      avm-eac_generic_base0 (~> 0.15)
+      eac_envs-http (~> 0.6, >= 0.6.1)
+      eac_ruby_utils (~> 0.127)
     avm-eac_ubuntu_base0 (0.5.1)
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
       eac_templates (~> 0.5, >= 0.5.1)
-    avm-eac_webapp_base0 (0.21.0)
-      avm (~> 0.94, >= 0.94.1)
-      avm-eac_generic_base0 (~> 0.14)
-      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
-      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
-      avm-files (~> 0.8, >= 0.8.1)
-      eac_ruby_utils (~> 0.126)
-      htmlbeautifier (~> 1.4, >= 1.4.3)
     avm-eac_wordpress_base0 (0.3.2)
       avm (~> 0.86, >= 0.86.2)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
       eac_ruby_utils (~> 0.121)
     avm-files (0.9.0)
       avm (~> 0.95)
+    avm-git (0.20.0)
+      avm (~> 0.96)
+      avm-files (~> 0.9)
+      eac_git (~> 0.18)
+      eac_ruby_utils (~> 0.128)
+      git (~> 1.19, >= 1.19.1)
     base64 (0.3.0)
     clipboard (1.4.1)
     colorize (0.8.1)
@@ -221,10 +183,25 @@ GEM
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.123)
       ruby-filemagic (~> 0.7, >= 0.7.3)
+    eac_git (0.18.0)
+      eac_ruby_utils (~> 0.128)
+      parseconfig (~> 1.1, >= 1.1.2)
     eac_rest (0.12.0)
       eac_envs-http (~> 0.5)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.120)
+    eac_ruby_base0 (0.19.1)
+      avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
+      eac_cli (~> 0.38, >= 0.38.1)
+      eac_fs (~> 0.18, >= 0.18.1)
+      eac_ruby_utils (~> 0.126)
+    eac_ruby_gem_support (0.12.0)
+      eac_ruby_utils (~> 0.127)
+      rspec (~> 3.13, >= 3.13.1)
+      rubocop (~> 1.76)
+      rubocop-rails (~> 2.32)
+      rubocop-rspec (~> 3.6)
+      super_diff (~> 0.9)
     eac_ruby_utils (0.128.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.7)
@@ -232,6 +209,9 @@ GEM
       filesize (~> 0.2)
       net-ssh (~> 4.2)
       zeitwerk (~> 2.6, >= 2.6.18)
+    eac_templates (0.8.1)
+      eac_config (~> 0.15)
+      eac_ruby_utils (~> 0.127)
     faraday (2.8.1)
       base64
       faraday-net_http (>= 2.0, < 3.1)
@@ -241,10 +221,10 @@ GEM
     faraday-gzip (0.1.0)
       faraday (>= 1.0)
       zlib (~> 2.1)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
     faraday-net_http (3.0.2)
-    faraday-retry (2.3.1)
+    faraday-retry (2.3.2)
       faraday (~> 2.0)
     filesize (0.2.0)
     git (1.19.1)
@@ -294,7 +274,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.4)
-    rubocop (1.76.1)
+    rubocop (1.76.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -302,7 +282,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.0, < 2.0)
+      rubocop-ast (>= 1.45.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.45.1)
@@ -348,13 +328,9 @@ PLATFORMS
 DEPENDENCIES
   avm!
   avm-eac_generic_base0!
-  avm-eac_ruby_base1!
-  avm-git!
+  avm-eac_webapp_base0!
   avm-tools!
-  eac_git!
-  eac_ruby_base0!
-  eac_ruby_gem_support!
-  eac_templates!
+  eac_ruby_gem_support (~> 0.12)
   eac_tools!
 
 BUNDLED WITH

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.101.0'
+  VERSION = '0.101.1'
 end

data/sub/avm/lib/avm/entries/base.rb

@@ -5,7 +5,7 @@ require 'eac_config/entry_path'
 module Avm
   module Entries
     module Base
-      require_sub __FILE__, require_dependency: true
+      require_sub __FILE__, require_mode: :kernel
       common_concern
 
       module ClassMethods

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

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

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_dependency 'avm', '~> 0.95'
-  s.add_dependency 'eac_ruby_utils', '~> 0.127'
+  s.add_dependency 'avm', '~> 0.96', '>= 0.96.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.128'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.11', '>= 0.11.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.12'
 end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb

@@ -6,7 +6,7 @@ module Avm
   module EacGenericBase0
     module FileFormats
       class Base < ::Avm::FileFormats::Base
-        require_sub __FILE__, include_modules: true, require_dependency: true
+        require_sub __FILE__, include_modules: true, require_mode: :kernel
 
         VALID_BASENAMES = %w[*.asm *.bat *.coffee *.java *.js *.rb *.s *.sql *.tex *.url *.yml
                              *.yaml].freeze

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.15.0'
+    VERSION = '0.15.1'
   end
 end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0.rb

@@ -7,3 +7,5 @@ module Avm
   module EacGenericBase0
   end
 end
+
+require 'avm'

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_webapp_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_webapp_base0'
+  s.version     = Avm::EacWebappBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,template}/**/{*,.*}']
+  s.required_ruby_version = '>= 2.7'
+
+  s.add_dependency 'avm', '~> 0.96', '>= 0.96.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.15', '>= 0.15.1'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5', '>= 0.5.1'
+  s.add_dependency 'avm-files', '~> 0.9'
+  s.add_dependency 'eac_ruby_utils', '~> 0.128'
+  s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.3'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.12'
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+
+module Avm
+  module EacWebappBase0
+    module Executables
+      class << self
+        enable_simple_cache
+
+        def env
+          ::EacRubyUtils::Envs.local
+        end
+
+        private
+
+        %w[cssbeautify-cli js-beautify tidy].each do |program|
+          define_method("#{program.underscore}_uncached") do
+            env.executable(program, '--version')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_webapp_base0/executables'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Css < ::Avm::EacGenericBase0::FileFormats::Base
+        class FileApply
+          EXECUTABLE_NAME = 'cssbeautify-cli'
+          EXECUTABLE_CHECK_ARGS = ['--version'].freeze
+          EXECUTABLE_STATIC_ARGS = ['--autosemicolon', '--indent', '  ', '--openbrace',
+                                    'end-of-line', '--stdin'].freeze
+
+          common_constructor :file
+
+          def perform
+            on_temp_output_file do |_temp_file|
+              run_command
+            end
+          end
+
+          private
+
+          attr_accessor :output_file
+
+          def command
+            ::Avm::EacWebappBase0::Executables.cssbeautify_cli.command(*EXECUTABLE_STATIC_ARGS)
+          end
+
+          def on_temp_output_file
+            ::EacRubyUtils::Fs::Temp.on_file do |temp_output_file|
+              self.output_file = temp_output_file
+              yield
+              ::FileUtils.mv(temp_output_file.to_path, file)
+            end
+          end
+
+          def run_command
+            command.system!(input_file: file, output_file: output_file.to_path)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'eac_ruby_utils/envs'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Css < ::Avm::EacGenericBase0::FileFormats::Base
+        require_sub __FILE__
+
+        VALID_BASENAMES = %w[*.css *.scss].freeze
+        VALID_TYPES = [].freeze
+
+        def file_apply(file)
+          ::Avm::EacWebappBase0::FileFormats::Css::FileApply.new(file).perform
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'htmlbeautifier'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Html < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.html *.html.erb].freeze
+        VALID_TYPES = [].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
+        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

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_webapp_base0/executables'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Javascript < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.js].freeze
+        VALID_TYPES = [].freeze
+
+        def internal_apply(files)
+          ::Avm::EacWebappBase0::Executables.js_beautify.command.append(
+            ['--indent-size=2', '--end-with-newline', '--replace', *files]
+          ).system!
+          super
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/file_formats/css'
+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[css html javascript json xml].freeze
+
+        def all
+          @all ||= ALL_NAMES.map do |name|
+            ::Avm::EacWebappBase0::FileFormats.const_get(name.camelize)
+          end.freeze
+        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/eac_generic_base0/file_formats/base'
+require 'avm/eac_webapp_base0/executables'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Xml < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.svg *.xml].freeze
+        VALID_TYPES = ['image/svg+xml', 'xml'].freeze
+
+        def internal_apply(files)
+          format_command(files).system!
+          super
+        end
+
+        def format_command(files)
+          ::Avm::EacWebappBase0::Executables.tidy.command.append(
+            %w[-xml -modify --indent auto --indent-spaces 2 --wrap 100] + files
+          )
+        end
+      end
+    end
+  end
+end

data/sub/{avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems.rb → avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats.rb}

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module Avm
-  module EacRubyBase1
-    module Rubygems
+  module EacWebappBase0
+    module FileFormats
       require_sub __FILE__
     end
   end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_base.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_templates/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class ApacheBase
+        # @return [String]
+        def document_root
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
+        end
+
+        protected
+
+        def reload_apache
+          infom 'Reloading Apache...'
+          apache.service('reload')
+        end
+
+        private
+
+        # @return [Avm::EacUbuntuBase0::Apache]
+        def apache_uncached
+          instance.platform_instance.apache
+        end
+      end
+    end
+  end
+end