eac_tools 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 331f73c00105798972e35c3eb8049f412eceecf7ce6805f2b96be3d97999c3c9
-  data.tar.gz: ebe8e2dc8c9245bfa657a9ff036620280e4e81c808e85f98bc543758bac64738
+  metadata.gz: baba23c169953217d7ae8fb843f6e6ba92026ea05912703fbdaa96d928e26441
+  data.tar.gz: ba6447143ad6a2549e67d876df792093af9de18a54ca960068e7ab066d5e261d
 SHA512:
-  metadata.gz: 2cb086332be7545caf2bd3d288f35c11ab444b7dc826a7798f8b45c65e6e33a10e7209c19e72acb2a7c5ae5940cd55881c9c94fe9f4786c0093d2fe87cf7ada3
-  data.tar.gz: c4376b3c09a9c577c2c97e6434edbd13d268d21d09d1a6d5ec4e2808ca56d2c3cb3f094cdcda91e964eef70b6480407b693a8913af4b0b6427221580250ef8b4
+  metadata.gz: e4a52a8b9facf9631f73dce00eebdf34332096e7b69557d9421b5dbe24e349189f906ef5ac4bbaf3dd61d772a0f8aa095c579ef1e023af45c5616c504e865e92
+  data.tar.gz: 28e74a110919a42cad8431eb7893c1e740768f9d4a0ef1a2a486a6cc867d6839a5907a6d122d7183c72b53e618d321f65eb331ca2bfd9810d15de15eaf2d81b1

data/Gemfile.lock

@@ -1,18 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.17.0)
+    eac_tools (0.18.0)
+      avm (~> 0.35)
       avm-eac_asciidoctor_base0 (~> 0.4)
-      avm-eac_generic_base0 (~> 0.4)
+      avm-eac_generic_base0 (~> 0.5)
+      avm-eac_latex_base0 (~> 0.1)
       avm-eac_rails_base0 (~> 0.6, >= 0.6.1)
       avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
       avm-eac_redmine_base0 (~> 0.11)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.13)
+      avm-eac_ruby_base1 (~> 0.15)
       avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
       avm-eac_wordpress_base0 (~> 0.1)
-      avm-tools (~> 0.130)
-      eac_ruby_utils (~> 0.97)
+      avm-tools (~> 0.131)
+      eac_ruby_utils (~> 0.98)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -27,10 +29,18 @@ PATH
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.4.0)
+    avm-eac_generic_base0 (0.5.0)
       avm (~> 0.28)
       eac_ruby_utils (~> 0.96)
 
+PATH
+  remote: sub/avm-eac_latex_base0
+  specs:
+    avm-eac_latex_base0 (0.1.0)
+      avm (~> 0.34)
+      avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
+      eac_ruby_utils (~> 0.97)
+
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
@@ -70,7 +80,7 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.13.0)
+    avm-eac_ruby_base1 (0.15.0)
       avm (~> 0.34)
       avm-eac_generic_base0 (~> 0.2)
       eac_ruby_utils (~> 0.95, >= 0.95.1)
@@ -88,14 +98,15 @@ PATH
 PATH
   remote: sub/avm-eac_wordpress_base0
   specs:
-    avm-eac_wordpress_base0 (0.1.0)
+    avm-eac_wordpress_base0 (0.1.1)
+      avm (~> 0.35)
       avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
       eac_ruby_utils (~> 0.97)
 
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.130.0)
+    avm-tools (0.131.0)
       aranha-parsers (~> 0.4)
       avm (~> 0.34)
       avm-eac_ruby_base1 (~> 0.8)
@@ -113,7 +124,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.34.0)
+    avm (0.35.0)
       eac_cli (~> 0.27, >= 0.27.6)
       eac_config (~> 0.10)
       eac_docker (~> 0.3)
@@ -166,7 +177,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.97.0)
+    eac_ruby_utils (0.98.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       bundler
@@ -331,6 +342,7 @@ DEPENDENCIES
   avm!
   avm-eac_asciidoctor_base0!
   avm-eac_generic_base0!
+  avm-eac_latex_base0!
   avm-eac_rails_base0!
   avm-eac_rails_base1!
   avm-eac_redmine_base0!

data/lib/eac_tools/version.rb

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

data/sub/avm/lib/avm/entries/auto_values/uri_entry.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module AutoValues
+      class UriEntry
+        common_constructor :entries_provider, :suffix
+
+        def found?
+          value.present?
+        end
+
+        def value
+          ::Avm::Entries::UriBuilder.from_all_fields do |field_name|
+            entries_provider.entry([suffix, field_name]).value
+          end.to_uri.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    class UriBuilder
+      require_sub __FILE__
+
+      FIELDS = %w[scheme user password host port path query fragment].freeze
+      FIELDS_TRANSLATIONS = {
+        username: :user, hostname: :host
+      }.freeze
+      ENTRIES_FIELDS = FIELDS.map do |field|
+        FIELDS_TRANSLATIONS.key(field.to_sym).if_present(field).to_s
+      end
+
+      class << self
+        def from_all_fields(&block)
+          r = new
+          ENTRIES_FIELDS.each do |field_name|
+            field_value = block.call(field_name)
+            r.field_set(field_name, field_value) if field_value.present?
+          end
+          r
+        end
+
+        def from_source(source)
+          if source.is_a?(::Addressable::URI)
+            from_source_uri(source)
+          elsif source.blank?
+            new
+          else
+            raise "Unexpected source: #{source}"
+          end
+        end
+
+        def from_source_uri(source_uri)
+          new(source_uri.to_hash)
+        end
+      end
+
+      common_constructor :data, default: [{}]
+
+      def field_get(name)
+        data[name.to_sym].if_present(&:to_s)
+      end
+
+      def field_set(field, value)
+        tfield = translate_field(field)
+        if FIELDS.include?(tfield)
+          main_field_set(tfield, value)
+        else
+          sub_field_set(tfield, value)
+        end
+      end
+
+      def translate_field(field)
+        if FIELDS_TRANSLATIONS.key?(field.to_sym)
+          FIELDS_TRANSLATIONS.fetch(field.to_sym).to_s
+        else
+          field.to_s
+        end
+      end
+
+      # @return [Addressable::URI, nil]
+      def to_uri
+        to_required_uri
+      rescue ::Addressable::URI::InvalidURIError
+        nil
+      end
+
+      # @return [Addressable::URI]
+      def to_required_uri
+        ::Addressable::URI.new(FIELDS.map { |f| [f.to_sym, field_get(f)] }.to_h)
+      end
+
+      private
+
+      def main_field_set(name, value)
+        data[name.to_sym] = value
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/instances/base/auto_values/install.rb

@@ -7,8 +7,10 @@ module Avm
     class Base
       module AutoValues
         module Install
-          def auto_access
-            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present? ? 'ssh' : 'local'
+          def auto_install_groupname
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME) ||
+              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
           end
 
           def auto_install_hostname
@@ -33,13 +35,8 @@ module Avm
           end
 
           def auto_install_url_by_parts
-            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_HOSTNAME).if_present do |a|
-              a = read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-                    .if_present(a) { |v| "#{v}@#{a}" }
-              a = read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_PORT)
-                    .if_present(a) { |v| "#{a}:#{v}" }
-              "ssh://#{a}"
-            end
+            require 'avm/entries/auto_values/uri_entry'
+            ::Avm::Entries::AutoValues::UriEntry.new(self, 'install').value
           end
         end
       end

data/sub/avm/lib/avm/instances/base/auto_values.rb

@@ -6,14 +6,8 @@ module Avm
   module Instances
     class Base
       module AutoValues
-        require_sub __FILE__
-
-        common_concern do
-          %w[Admin Data Database Filesystem Install Mailer Ruby Source System Web]
-            .each do |class_name|
-            include const_get(class_name)
-          end
-        end
+        require_sub __FILE__, include_modules: true
+        common_concern
       end
     end
   end

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -49,7 +49,7 @@ module Avm
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         fs: %w[url],
-        install: URI_FIELDS + %w[id],
+        install: URI_FIELDS + %w[id groupname],
         mailer: {
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]

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

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

data/sub/avm/spec/lib/avm/instances/base_spec.rb

@@ -24,10 +24,12 @@ RSpec.describe ::Avm::Instances::Base do
         ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
         ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'myhost.com',
         ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'myuser',
+        ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
         ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com'
       },
       'app_2' => {
         ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',
+        ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
         ::Avm::Instances::EntryKeys::SOURCE_INSTANCE_ID => 'app_dev'
       },
       'app_3' => {
@@ -48,6 +50,13 @@ RSpec.describe ::Avm::Instances::Base do
         ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
         ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
       },
+      'app_4' => {
+        ::Avm::Instances::EntryKeys::INSTALL_SCHEME => 'ssh',
+        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'host4.net',
+        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'user4',
+        ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'group4',
+        ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://user4@host4.net'
+      },
       'mailer_0' => {
         ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
         ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => '',
@@ -62,8 +71,16 @@ RSpec.describe ::Avm::Instances::Base do
     }.each do |instance_id, values|
       values.each do |input, expected|
         context "when a auto value is requested for \"#{instance_id}.#{input}\"" do
+          let(:instance) { described_class.by_id(instance_id) }
+
+          it do
+            expect(described_class.ancestors.map(&:name)).to(
+              include('Avm::Instances::Base::AutoValues::Install')
+            )
+          end
+
           it ".read_entry should return \"#{expected}\"" do
-            expect(described_class.by_id(instance_id).read_entry(input)).to eq(expected)
+            expect(instance.read_entry(input)).to eq(expected)
           end
         end
       end

data/sub/avm/spec/lib/avm/instances/base_spec_configs_storage.yml

@@ -22,6 +22,12 @@ app_3:
     id: app_1
   mailer:
     id: mailer_0
+app_4:
+  install:
+    scheme: ssh
+    username: user4
+    hostname: host4.net
+    groupname: group4
 mailer_0:
   mailer:
     from: 'noreply@example.net'

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+
+module Avm
+  module EacGenericBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+      end
+    end
+  end
+end

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

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

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/sub/avm-eac_latex_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_latex_base0/avm-eac_latex_base0.gemspec

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_latex_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_latex_base0'
+  s.version     = Avm::EacLatexBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'avm', '~> 0.34'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/apache_host'
+
+module Avm
+  module EacLatexBase0
+    module Instances
+      class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+        def document_root
+          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        end
+
+        def extra_content
+          ''
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instance'
+
+module Avm
+  module EacLatexBase0
+    module Instances
+      class Base < ::Avm::EacWebappBase0::Instance
+        FILES_UNITS = {}.freeze
+      end
+    end
+  end
+end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/instances/deploy.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_latex_base0/sources/base'
+require 'avm/eac_latex_base0/sources/build'
+
+module Avm
+  module EacLatexBase0
+    module Instances
+      class Deploy < ::Avm::EacWebappBase0::Deploy
+        def build_content
+          ::Avm::EacLatexBase0::Sources::Build.new(project, output_file:
+              build_dir.join(pdf_path))
+        end
+
+        def title
+          instance.id.humanize
+        end
+
+        def pdf_path
+          "#{instance.id.underscore}.pdf"
+        end
+
+        def variables_source
+          self
+        end
+
+        private
+
+        def project_uncached
+          ::Avm::EacLatexBase0::Sources::Base.new(
+            instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          )
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/instances.rb

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

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacLatexBase0
+    module Sources
+      class Base < ::Avm::Sources::Base
+        def chapters
+          chapters_file.read.split("\n").map(&:strip).reject { |c| c == '' }
+        end
+
+        def chapters_file
+          root.join('chapters')
+        end
+
+        def main_file
+          path.join('main.tex')
+        end
+
+        def name
+          root.basename.to_s
+        end
+
+        def default_output_dir
+          root.join('dist')
+        end
+
+        def default_output_file
+          root.join("#{name}.pdf")
+        end
+
+        def root
+          path
+        end
+
+        def valid?
+          main_file.file?
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/sources/build/chapters_content.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacLatexBase0
+    module Sources
+      class Build
+        class << self
+          def chapter_filename(chapter_name)
+            "chapter_#{chapter_name}"
+          end
+        end
+
+        module ChaptersContent
+          private
+
+          def chapter
+            options[:chapter]
+          end
+
+          def chapter_filename(chapter_name)
+            ::Avm::EacLatexBase0::Sources::Build.chapter_filename(chapter_name)
+          end
+
+          def check_chapter
+            return unless chapter
+            return if project.chapters.include?(chapter)
+
+            fatal_error("Chapter not found: \"#{chapter}\" (List: #{project.chapters})")
+          end
+
+          def include_content
+            main_path = source_temp_dir.join('main.tex')
+            main_path.write(main_path.read.gsub(CONTENT_VAR, include_chapters_content))
+          end
+
+          def include_chapters_content
+            r = chapters_content
+            r = "\\maketitle\n\n#{r}" if chapter.blank?
+            r
+          end
+
+          def chapters_content
+            project.chapters.map { |c| "\\include{#{chapter_filename(c)}}" }.join("\n")
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/sources/build/commons.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_templates/core_ext'
+require 'singleton'
+
+module Avm
+  module EacLatexBase0
+    module Sources
+      class Build
+        class Commons
+          include ::Singleton
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/sources/build/copy_files.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/eac_latex_base0/sources/build/commons'
+require 'avm/eac_latex_base0/sources/build/file'
+
+module Avm
+  module EacLatexBase0
+    module Sources
+      class Build
+        module CopyFiles
+          def copy_project_files
+            copy_project_dir('.')
+          end
+
+          def copy_project_obj(subpath)
+            return if File.basename(subpath).start_with?('.')
+
+            if File.directory?(File.join(project.root, subpath))
+              copy_project_dir(subpath)
+            else
+              copy_project_file(subpath)
+            end
+          end
+
+          def copy_project_file(subpath)
+            ::Avm::EacLatexBase0::Sources::Build::File.new(project, subpath)
+                                                      .build_to_dir(source_temp_dir)
+          end
+
+          def copy_project_dir(subpath)
+            Dir.entries(File.join(project.root, subpath)).each do |f|
+              copy_project_obj(File.join(subpath, f))
+            end
+          end
+
+          def copy_commons_files
+            target_dir = source_temp_dir.join('commons')
+            target_dir.mkpath
+            ::Avm::EacLatexBase0::Sources::Build::Commons.instance.template.apply(self, target_dir)
+          end
+        end
+      end
+    end
+  end
+end