eac_tools 0.86.7 → 0.86.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d67c2a515fd0150abe443e603d3cd661157476bfbdc017f72e9e7fbcbbd0e893
-  data.tar.gz: 7804925301bc2de9ad5897721b8c4a0f19ea028a28faa75b6d025ccdae39ee3d
+  metadata.gz: 3a651785bbad5b6e82261dd8b700b59444065b413a84e1761eaeb52b5f678e8b
+  data.tar.gz: a83ff785fb5a584a6d53a241df483c72d82f73331d0988ca7a46d28da1995342
 SHA512:
-  metadata.gz: 7ca17b5749cc8815d455f8e382e8734eb55adedb239bf0607284b06227047cd71586cca3bf0fbea6e6783ef6ee57f0c91cfb804376258372a03eca1a165fdcae
-  data.tar.gz: d168cc711313a7404b33c421a6e03dec8a2a4848c42674fdcfc8ab7d91b915a9de8fb700456fff0deb1f6d5872b4ea91d28928537807394f9995c7e4afbcebc1
+  metadata.gz: 421d195b6f42b45c6dde83b4357307aa3acc9332be4925fd89aef01fd9e65d4fda2abc52424bb45ae236da15326ca69b291458895274a6ecefa72efa9595916d
+  data.tar.gz: 7ab426184c8b950306561e5762219be50cb101eeef7a09edf422d72d9da0dbcaff488883c8dd17386231ae39b82c33f080783e315cc78c4302c64afa14efb5de

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.86.7)
+    eac_tools (0.86.8)
       avm (~> 0.86, >= 0.86.2)
       avm-eac_asciidoctor_base0 (~> 0.22)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
@@ -16,7 +16,7 @@ PATH
       avm-eac_redmine_base0 (~> 0.22)
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
-      avm-eac_webapp_base0 (~> 0.18, >= 0.18.3)
+      avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.17)
       avm-tools (~> 0.161)
@@ -44,6 +44,18 @@ PATH
       eac_ruby_utils (~> 0.117, >= 0.117.1)
       eac_templates (~> 0.5)
 
+PATH
+  remote: sub/avm-eac_webapp_base0
+  specs:
+    avm-eac_webapp_base0 (0.18.4)
+      avm (~> 0.86, >= 0.86.2)
+      avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
+      avm-eac_ubuntu_base0 (~> 0.5)
+      avm-files (~> 0.7)
+      eac_ruby_utils (~> 0.121)
+      htmlbeautifier (~> 1.4, >= 1.4.3)
+
 PATH
   remote: sub/avm-eac_wordpress_base0
   specs:
@@ -136,13 +148,6 @@ GEM
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       eac_envs-http (~> 0.4, >= 0.4.1)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
-    avm-eac_webapp_base0 (0.18.3)
-      avm (~> 0.84, >= 0.84.2)
-      avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
-      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.2)
-      avm-eac_ubuntu_base0 (~> 0.5)
-      avm-files (~> 0.6, >= 0.6.2)
-      eac_ruby_utils (~> 0.120)
     avm-files (0.7.0)
       avm (~> 0.84, >= 0.84.2)
       eac_cli (~> 0.40)
@@ -236,6 +241,7 @@ GEM
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)
+    htmlbeautifier (1.4.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
@@ -333,6 +339,7 @@ DEPENDENCIES
   avm-eac_rails_base0!
   avm-eac_redmine_plugin_base0!
   avm-eac_ubuntu_base0!
+  avm-eac_webapp_base0!
   avm-eac_wordpress_base0!
   eac_ruby_gem_support (~> 0.10)
   eac_tools!

data/lib/eac_tools/version.rb

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

data/sub/avm-eac_webapp_base0/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

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.86', '>= 0.86.2'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
+  s.add_dependency 'avm-files', '~> 0.7'
+  s.add_dependency 'eac_ruby_utils', '~> 0.121'
+  s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.3'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.10'
+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(file)
+        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(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

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(files)
+        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(files)
+        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_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/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

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'avm/eac_webapp_base0/instances/apache_base'
+require 'eac_templates/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheBase
+        APACHE_DIRECTORY_EXTRA_CONFIG_KEY = 'install.apache_directory_extra_config'
+        JOBS = %w[write_available_no_ssl_site enable_no_ssl_site remove_ssl_site reload_apache
+                  run_certbot enable_ssl_site reload_apache].freeze
+        include ::Avm::Entries::Jobs::Base
+
+        def directory_extra_config
+          instance.entry(APACHE_DIRECTORY_EXTRA_CONFIG_KEY).optional_value
+            .if_present { |v| "  #{v}\n" }
+        end
+
+        def no_ssl_site_content
+          ::Avm::EacWebappBase0::Instances::ApacheHost
+            .template.child('no_ssl.conf')
+            .apply(variables_source)
+        end
+
+        def ssl?
+          options[:certbot]
+        end
+
+        private
+
+        def enable_no_ssl_site
+          infom 'Enabling no SSL site...'
+          no_ssl_site.enable
+        end
+
+        def enable_ssl_site
+          return unless ssl?
+
+          infom 'Enabling SSL site...'
+          ssl_site.enable
+        end
+
+        def no_ssl_site_uncached
+          apache.site(instance.id)
+        end
+
+        def remove_ssl_site
+          infom 'Removing SSL site...'
+          ssl_site.remove
+        end
+
+        def run_certbot
+          return unless ssl?
+
+          infom 'Running Certbot...'
+          instance.host_env.command(
+            'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
+            '--redirect', '--non-interactive', '--agree-tos',
+            '--email', instance.install_email
+          ).system!
+        end
+
+        def ssl_site_uncached
+          apache.site("#{no_ssl_site.name}-le-ssl")
+        end
+
+        def write_available_no_ssl_site
+          infom 'Writing no SSL site conf...'
+          no_ssl_site.write(no_ssl_site_content)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'avm/eac_webapp_base0/instances/apache_base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class ApachePath < ::Avm::EacWebappBase0::Instances::ApacheBase
+        JOBS = %w[write_available_conf enable_conf reload_apache].freeze
+        include ::Avm::Entries::Jobs::Base
+
+        def content
+          ::Avm::EacWebappBase0::Instances::ApachePath.template.child('default.conf')
+            .apply(variables_source)
+        end
+
+        def extra_content
+          ''
+        end
+
+        private
+
+        def enable_conf
+          infom 'Enabling configuration...'
+          conf.enable
+        end
+
+        def conf_uncached
+          apache.conf(instance.id)
+        end
+
+        def write_available_conf
+          infom 'Writing available configuration...'
+          conf.write(content)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/apache.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        module Apache
+          common_concern
+
+          class_methods do
+            # @return [Class]
+            def apache_path_class
+              ancestors.lazy.map { |ancestor| apache_path_class_by_ancestor(ancestor) }
+                .find(&:present?) || raise("No apache patch class found for \"#{self}\"")
+            end
+
+            private
+
+            # @param ancestor [Module]
+            # @return [Class]
+            def apache_path_class_by_ancestor(ancestor)
+              "#{ancestor.name.deconstantize}::ApachePath".constantize
+            rescue ::NameError
+              nil
+            end
+          end
+
+          # @return [Class]
+          def apache_path_class
+            self.class.apache_path_class
+          end
+
+          # @return [Avm::EacUbuntuBase0::Apache::Resource, nil]
+          def apache_resource
+            %i[conf site]
+              .lazy
+              .map { |type| platform_instance.apache.send(type, install_apache_resource_name) }
+              .find(&:available?)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/install.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        module Install
+          common_concern do
+            uri_components_entries_values 'install', %w[apache_resource_name]
+          end
+
+          def install_apache_resource_name_default_value
+            id
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/eac_postgresql_base0/instance_with'
+require 'avm/instances/data/files_unit'
+require 'avm/instances/data/package'
+require 'avm/eac_webapp_base0/instances/processes/web_server'
+require 'avm/eac_webapp_base0/instances/runners'
+require 'avm/eac_ubuntu_base0/instances/base'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        require_sub __FILE__, include_modules: true
+        include ::Avm::EacPostgresqlBase0::InstanceWith
+        enable_simple_cache
+
+        def run_subcommand(subcommand_class, argv)
+          subcommand_class.create(
+            argv: argv,
+            parent: ::Avm::Instances::Base::SubcommandParent.new(self)
+          ).run
+        end
+
+        def database_unit
+          pg_data_unit
+        end
+
+        # @return [Array<Avm::Instances::Process>]
+        def processes
+          super + [::Avm::EacWebappBase0::Instances::Processes::WebServer.new(self)]
+        end
+
+        private
+
+        # @return [Avm::EacUbuntuBase0::Instances::Base]
+        def platform_instance_uncached
+          ::Avm::EacUbuntuBase0::Instances::Base.by_id(id)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/path_string'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        module AppendedDirectories
+          APPENDED_DIRECTORIES_ENTRY_KEY = 'deploy.appended_directories'
+
+          def appended_directories
+            appended_directories_from_instance_entry + appended_directories_from_options
+          end
+
+          def appended_directories_from_instance_entry
+            ::Avm::PathString.paths(instance.read_entry_optional(APPENDED_DIRECTORIES_ENTRY_KEY))
+          end
+
+          def appended_directories_from_options
+            options[OPTION_APPENDED_DIRECTORIES] || []
+          end
+        end
+      end
+    end
+  end
+end