eac_tools 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 483fe35d1d7edbef046db2d18503575164208989b276d44207ef8931b4b43a39
-  data.tar.gz: 1955810083df4620b3b03228c68ebc7b9dfbd47403d0d318e5a3ebdef6f89ccc
+  metadata.gz: baba23c169953217d7ae8fb843f6e6ba92026ea05912703fbdaa96d928e26441
+  data.tar.gz: ba6447143ad6a2549e67d876df792093af9de18a54ca960068e7ab066d5e261d
 SHA512:
-  metadata.gz: ff15828b3b75b1e625b80681bf3ef1bc5069e7e07d0a770c50e20b7e4b40132ebf322d63d75bfcf64041a336130e733fed0690c0445473ed1d80fbef6d6e964b
-  data.tar.gz: 193fd20c6f955468dec78935d3046dc312b6b454e1c6ec2760e516c637427b94d1c4413ef2255c41595b26eba3cc6824e490531619c040d6193a208dc73f42e7
+  metadata.gz: e4a52a8b9facf9631f73dce00eebdf34332096e7b69557d9421b5dbe24e349189f906ef5ac4bbaf3dd61d772a0f8aa095c579ef1e023af45c5616c504e865e92
+  data.tar.gz: 28e74a110919a42cad8431eb7893c1e740768f9d4a0ef1a2a486a6cc867d6839a5907a6d122d7183c72b53e618d321f65eb331ca2bfd9810d15de15eaf2d81b1

data/Gemfile.lock

@@ -1,18 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.16.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.12)
+      avm-eac_ruby_base1 (~> 0.15)
       avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
       avm-eac_wordpress_base0 (~> 0.1)
-      avm-tools (~> 0.129)
-      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,8 +80,8 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.12.0)
-      avm (~> 0.26)
+    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,30 +98,33 @@ 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.129.0)
+    avm-tools (0.131.0)
       aranha-parsers (~> 0.4)
-      avm (~> 0.30)
+      avm (~> 0.34)
       avm-eac_ruby_base1 (~> 0.8)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.1)
       avm-git (~> 0.3, >= 0.3.1)
       clipboard (~> 1.3, >= 1.3.3)
       curb (~> 0.9.10)
+      eac_git (~> 0.12, >= 0.12.1)
       eac_ruby_base0 (~> 0.16, >= 0.16.4)
+      eac_templates (~> 0.3, >= 0.3.1)
       git (~> 1.7)
       ruby-progressbar (~> 1.10, >= 1.10.1)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.33.0)
+    avm (0.35.0)
       eac_cli (~> 0.27, >= 0.27.6)
       eac_config (~> 0.10)
       eac_docker (~> 0.3)
@@ -164,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
@@ -329,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.16.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/registry/source_generators.rb

@@ -8,8 +8,9 @@ module Avm
     class SourceGenerators < ::Avm::Registry::FromGems
       # @return [Avm::Instances::Base, nil]
       def class_detect(klass, detect_args)
-        stereotype_name, target_path = detect_args
-        klass.application_stereotype.name == stereotype_name ? klass.new(target_path) : nil
+        detect_args = detect_args.dup
+        stereotype_name = detect_args.shift
+        klass.application_stereotype.name == stereotype_name ? klass.new(*detect_args) : nil
       end
     end
   end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/source_generators/option_list'
 require 'avm/with/application_stereotype'
 require 'eac_ruby_utils/core_ext'
 
@@ -7,8 +8,22 @@ module Avm
   module SourceGenerators
     class Base
       include ::Avm::With::ApplicationStereotype
-      common_constructor :target_path do
+
+      class << self
+        # @return [Avm::SourceGenerators::OptionList]
+        def option_list
+          Avm::SourceGenerators::OptionList.new
+        end
+      end
+
+      common_constructor :target_path, :options, default: [{}] do
         self.target_path = target_path.to_pathname
+        self.options = option_list.validate(options)
+      end
+
+      # @return [Avm::SourceGenerators::OptionList]
+      def option_list
+        self.class.option_list
       end
 
       def perform

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Avm
+  module SourceGenerators
+    class Option
+      common_constructor :name, :description, default: [nil] do
+        self.name = name.to_sym
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/option'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module SourceGenerators
+    class OptionList
+      enable_immutable
+      immutable_accessor :option, type: :array
+
+      alias immutable_option option
+
+      def option(*args)
+        immutable_option(::Avm::SourceGenerators::Option.new(*args))
+      end
+
+      # @return [Hash<Symbol, String>]
+      def validate(options_hash)
+        options_hash.transform_keys { |k| validate_option(k) }
+      end
+
+      def validate_option(option_name)
+        option_name = option_name.to_sym
+
+        return option_name if options.any? { |option| option.name == option_name }
+
+        raise "No option found with name \"#{option_name}\""
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_cli/core_ext'
+
+module Avm
+  module SourceGenerators
+    class Runner
+      OPTION_NAME_VALUE_SEPARATOR = ':'
+
+      runner_with :help do
+        arg_opt '-o', '--option', 'Option for generator.', repeat: true, optional: true
+        pos_arg :stereotype_name
+        pos_arg :target_path
+      end
+
+      def run
+        start_banner
+        generate
+      end
+
+      def generate
+        infom 'Generating...'
+        generator.perform
+        success "Source generated in \"#{generator.target_path}\""
+      end
+
+      def start_banner
+        infov 'Stereotype', stereotype_name
+        infov 'Target path', target_path
+        infov 'Generator', generator.class
+      end
+
+      def generator_uncached
+        ::Avm::Registry.source_generators
+          .detect_optional(stereotype_name, target_path, options) ||
+          fatal_error("No generator found for stereotype \"#{stereotype_name}\"")
+      end
+
+      delegate :stereotype_name, to: :parsed
+
+      # @return [Hash<String, String>]
+      def options
+        parsed.option.map { |v| v.split(OPTION_NAME_VALUE_SEPARATOR) }.to_h
+      end
+
+      def target_path
+        parsed.target_path.to_pathname
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Sources
+    class Runner
+      runner_with :help, :subcommands do
+        desc 'Root command for sources.'
+        arg_opt '-C', '--path', 'Path to the source.', default: '.'
+        subcommands
+      end
+
+      def extra_available_subcommands
+        optional_source.if_present({}, &:extra_available_subcommands)
+      end
+
+      def source_banner
+        infov 'Source', source
+      end
+
+      # @return [Pathname]
+      def source_path
+        parsed.path.to_pathname
+      end
+
+      private
+
+      def source_uncached
+        ::Avm::Registry.sources.detect(source_path)
+      end
+
+      def optional_source_uncached
+        ::Avm::Registry.sources.detect_optional(source_path)
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.33.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/spec/lib/avm/sources/runner_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'avm/sources/runner'
+
+::RSpec.describe ::Avm::Sources::Runner do
+  it do
+    expect { described_class.run(argv: %w[--help]) }.not_to raise_error
+  end
+end

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-tools/lib/avm/ruby/bundler.rb → avm-eac_generic_base0/lib/avm/eac_generic_base0/instances.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Ruby
-    module Bundler
+  module EacGenericBase0
+    module Instances
       require_sub __FILE__
     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