eac_tools 0.100.0 → 0.101.1

data/sub/avm/lib/avm/scms/null.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/scms/base'
-
 module Avm
   module Scms
     class Null < ::Avm::Scms::Base

data/sub/avm/lib/avm/self/docker_image.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/docker/image'
-
 module Avm
   module Self
     class DockerImage < ::Avm::Docker::Image

data/sub/avm/lib/avm/self/instance.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/instances/base'
-require 'avm/self/docker_image'
-require 'avm/self/instance/entry_keys'
-
 module Avm
   module Self
     class Instance < ::Avm::Instances::Base

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/source_generators/option_list'
-require 'avm/with/application_stereotype'
-
 module Avm
   module SourceGenerators
     class Base

data/sub/avm/lib/avm/source_generators/option_list.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/source_generators/option'
-
 module Avm
   module SourceGenerators
     class OptionList

data/sub/avm/lib/avm/source_generators/runner.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/registry'
 require 'eac_cli/core_ext'
 
 module Avm

data/sub/avm/lib/avm/sources/base/application.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/applications/base'
 require 'eac_config/entry_path'
 
 module Avm

data/sub/avm/lib/avm/sources/base/instance.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/applications/base'
-require 'avm/instances/base'
-
 module Avm
   module Sources
     class Base

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/sources/base/subs_paths'
-
 module Avm
   module Sources
     class Base

data/sub/avm/lib/avm/sources/base/subs.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/sources/base/sub'
-require 'avm/sources/base/subs_paths'
-
 module Avm
   module Sources
     class Base

data/sub/avm/lib/avm/sources/base/version_bump.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/sources/base'
-
 module Avm
   module Sources
     class Base

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/registry'
-require 'avm/scms/null'
-require 'avm/with/application_stereotype'
-require 'avm/with/extra_subcommands'
-
 module Avm
   module Sources
     class Base

data/sub/avm/lib/avm/sources/tests/builder.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/sources/tests/performer'
-require 'avm/sources/tests/single'
-
 module Avm
   module Sources
     module Tests

data/sub/avm/lib/avm/sources/tests/performer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/sources/tests/result'
-
 module Avm
   module Sources
     module Tests

data/sub/avm/lib/avm/sources/tests/single.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/sources/tests/result'
-
 require 'eac_fs/logs'
 
 module Avm

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

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

data/sub/avm/spec/lib/avm/scms/auto_commit/file_resource_name_spec.rb

@@ -2,6 +2,7 @@
 
 RSpec.describe Avm::Scms::AutoCommit::FileResourceName, :git do
   let(:git) { stubbed_git_local_repo }
+  let(:scm) { Avm::Registry.scms.detect(git.root_path) }
 
   describe '#class_name' do
     {
@@ -10,7 +11,7 @@ RSpec.describe Avm::Scms::AutoCommit::FileResourceName, :git do
     }.each do |relative_path, expected_class_name|
       context "when path is \"#{relative_path}\"" do
         let(:path) { git.root_path.join(relative_path) }
-        let(:instance) { described_class.new(git, path) }
+        let(:instance) { described_class.new(scm, path) }
 
         it { expect(instance.class_name).to eq(expected_class_name) }
       end

data/sub/avm/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
 require 'avm'
+require 'avm/eac_ruby_base1'
+require 'avm/git'
+require 'eac_ruby_gem_support'
 EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__)).stub_avm_contexts
 EacRubyUtils.require_sub(__FILE__)

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

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