eac_tools 0.91.0 → 0.91.1

data/sub/avm/spec/lib/avm/launcher/context_spec.rb

@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/launcher/context'
-require 'avm/launcher/stereotype'
-
-RSpec.describe Avm::Launcher::Context do
-  include_context 'with launcher'
-  include_examples 'with_config', __FILE__
-
-  describe '#instances' do
-    before do
-      %w[avm-tools_stub ruby_gem_stub].each do |id|
-        application_source_path(id, DUMMY_DIR.to_pathname.join(id))
-      end
-    end
-
-    it 'returns all stub instances' do
-      is = described_class.current.instances.map(&:name)
-      expect(is).to contain_exactly('/avm-tools_stub', '/ruby_gem_stub')
-    end
-  end
-
-  describe '#instance' do
-    it 'returns with slash on begin' do
-      expect(described_class.current.instance('/avm-tools_stub'))
-        .to be_a(Avm::Launcher::Instances::Base)
-    end
-
-    context 'when the subinstance is mylib' do
-      let(:mylib_repos) do
-        r = init_remote('mylib_repos')
-        wc = init_git('mylib_wc')
-        touch_commit(wc, 'app.gemspec')
-        wc.execute!('remote', 'add', 'origin', r)
-        wc.execute!('push', 'origin', 'master')
-        r
-      end
-
-      before do
-        temp_context(File.join(__dir__, 'context_spec.yml'))
-        mylib_repos
-        application_source_path('app', File.join(projects_root, 'app'))
-      end
-
-      context 'when sub is a GitSubrepo' do
-        let(:sub) { described_class.current.instance('/app/sub1') }
-        let(:instance) { described_class.current.instance('/app/sub1/mylib') }
-
-        before do
-          app = init_git('app')
-          touch_commit(app, 'sub1/app.gemspec')
-          app.execute!('subrepo', 'clone', mylib_repos, 'sub1/mylib')
-        end
-
-        it { expect(sub).to be_a(Avm::Launcher::Instances::Base) }
-
-        it do
-          Avm::Launcher::Stereotype.git_stereotypes
-            .each { |s| expect(sub.stereotypes).not_to include(s) }
-        end
-
-        it { expect(instance).to be_a(Avm::Launcher::Instances::Base) }
-        it { expect(instance.stereotypes).to include(Avm::Git::LauncherStereotypes::GitSubrepo) }
-      end
-
-      context 'when sub is a GitSubtree' do
-        let(:sub) { described_class.current.instance('/app/sub1') }
-        let(:instance) { described_class.current.instance('/app/sub1/mylib') }
-
-        before do
-          app = init_git('app')
-          touch_commit(app, 'sub1/app.gemspec')
-          app.execute!('subtree', 'add', '-P', 'sub1/mylib', mylib_repos, 'master')
-          app.execute!('remote', 'add', 'mylib', mylib_repos)
-        end
-
-        it { expect(sub).to be_a(Avm::Launcher::Instances::Base) }
-
-        it do
-          Avm::Launcher::Stereotype.git_stereotypes
-            .each { |s| expect(sub.stereotypes).not_to include(s) }
-        end
-
-        it { expect(instance).to be_a(Avm::Launcher::Instances::Base) }
-        it { expect(instance.stereotypes).to include(Avm::Git::LauncherStereotypes::GitSubtree) }
-      end
-
-      context 'when subtree is present' do
-        before do
-          app = init_git('subtree_main_app')
-          touch_commit(app, 'file1')
-          app.execute!('subtree', 'add', '-P', 'mylib', mylib_repos, 'master')
-          app.execute!('remote', 'add', 'mylib', mylib_repos)
-          application_source_path('subtree_main_app', app.root_path)
-        end
-
-        it 'recognizes subtree instance' do # rubocop:disable RSpec/MultipleExpectations
-          i = described_class.current.instance('/subtree_main_app/mylib')
-          expect(i).to be_a(Avm::Launcher::Instances::Base)
-          expect(i.stereotypes).to include(Avm::Git::LauncherStereotypes::GitSubtree)
-        end
-      end
-
-      context 'when subinstance in HEAD and not in git_current_revision' do
-        it 'does not return subinstance' do
-          app = init_git('app') # HEAD: master
-          touch_commit(app, 'file2')
-          app.execute!('checkout', '-b', 'not_master') # HEAD: not_master
-          app.execute!('subrepo', 'clone', mylib_repos, 'mylib')
-          expect(described_class.current.instance('/app/mylib')).to be_nil
-        end
-      end
-
-      context 'when subinstances in/not in HEAD and not in/in git_current_revision' do
-        context 'when subinstance in HEAD and not in git_current_revision' do
-          it 'does not return subinstance' do
-            app = init_git('app') # HEAD: master
-            touch_commit(app, 'file2')
-            app.execute!('checkout', '-b', 'not_master') # HEAD: not_master
-            app.execute!('subrepo', 'clone', mylib_repos, 'mylib')
-            expect(described_class.current.instance('/app/mylib')).to be_nil
-          end
-        end
-
-        context 'when subinstance not in HEAD and in git_current_revision' do
-          it 'returns subinstance' do # rubocop:disable RSpec/ExampleLength
-            app = init_git('app') # HEAD: master
-            touch_commit(app, 'file3')
-            app.execute!('branch', '-f', 'not_master')
-            app.execute!('subrepo', 'clone', mylib_repos, 'mylib')
-            app.execute!('checkout', 'not_master') # HEAD: not_master
-            expect(described_class.current.instance('/app/mylib'))
-              .to be_a(Avm::Launcher::Instances::Base)
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm/spec/lib/avm/launcher/context_spec.yml

@@ -1,5 +0,0 @@
-Instances:
-  /subtree_main_app:
-    git_current_revision: master
-  /app:
-    git_current_revision: master

data/sub/avm/spec/lib/avm/launcher/context_spec_files/config.yml

@@ -1,9 +0,0 @@
----
-app:
-  avm_type: Application
-avm-tools_stub:
-  avm_type: Application
-ruby_gem_stub:
-  avm_type: Application
-subtree_main_app:
-  avm_type: Application

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

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/launcher/context'
-require 'avm/launcher/instances/base'
-
-RSpec.describe Avm::Launcher::Instances::Base do
-  include_context 'with launcher'
-  let(:fixtures_dir) { __dir__.to_pathname.join('base_spec_files') }
-
-  before do
-    allow(ProgressBar).to receive(:create).and_return(double.as_null_object)
-    context_set(fixtures_dir.join('settings.yaml').to_path, DUMMY_DIR)
-    %w[avm-tools_stub ruby_gem_stub].each do |id|
-      application_source_path(id, File.join(projects_root, id))
-    end
-  end
-
-  include_examples 'with_config', __FILE__
-
-  describe '#options' do
-    context 'when instance is "avm-tools_stub"' do
-      let(:instance) { Avm::Launcher::Context.current.instance('/avm-tools_stub') }
-
-      it { expect(instance).to be_a(described_class) }
-      it { expect(instance.options.git_current_revision).to eq('origin/master') }
-      it { expect(instance.options.git_publish_remote).to eq('publish') }
-      it { expect(instance.publishable?).to be(true) }
-    end
-
-    context 'when instance is "ruby_gem_stub"' do
-      let(:instance) { Avm::Launcher::Context.current.instance('/ruby_gem_stub') }
-
-      before do
-        instance.application.entry('publishable').write(false)
-      end
-
-      it { expect(instance.options.git_current_revision).to eq('git_current_revision_setted') }
-      it { expect(instance.options.git_publish_remote).to eq('git_publish_remote_setted') }
-      it { expect(instance.publishable?).to be(false) }
-    end
-  end
-end

data/sub/avm/spec/lib/avm/launcher/instances/base_spec_files/config.yml

@@ -1,5 +0,0 @@
----
-avm-tools_stub:
-  avm_type: Application
-ruby_gem_stub:
-  avm_type: Application

data/sub/avm/spec/lib/avm/launcher/instances/base_spec_files/settings.yaml

@@ -1,5 +0,0 @@
----
-Instances:
-  /ruby_gem_stub:
-    git_current_revision: git_current_revision_setted
-    git_publish_remote: git_publish_remote_setted

data/sub/avm/spec/lib/avm/patches/eac_config/entry_path_spec.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/patches/eac_config/entry_path'
-
-RSpec.describe EacConfig::EntryPath do
-  {
-    'install.path' => {
-      auto: 'auto_install_path',
-      default: 'install_path_default_value',
-      get: 'install_path',
-      get_optional: 'install_path_optional',
-      inherited_block: 'install_path_inherited_value_proc'
-    }
-  }.each do |instance_path, test_data|
-    context "when path is \"#{instance_path}\"" do
-      let(:instance) { described_class.assert(instance_path) }
-
-      test_data.each do |method_prefix, expected_value|
-        method_name = "#{method_prefix}_method_name"
-        context "when method name is \"#{method_name}\"" do
-          it do
-            expect(instance.send(method_name)).to eq(expected_value.to_sym)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/scms/auto_commit/file_resource_name'
-
-RSpec.describe Avm::Scms::AutoCommit::FileResourceName, :git do
-  let(:git) { stubbed_git_local_repo }
-
-  describe '#class_name' do
-    {
-      'app/models/mynamespace/the_class.rb' => 'Mynamespace::TheClass',
-      'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb' => 'Cliutils::EacRedmineBase0::Activity'
-    }.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) }
-
-        it { expect(instance.class_name).to eq(expected_class_name) }
-      end
-    end
-  end
-end

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

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/scms/base'
-
-RSpec.describe Avm::Scms::Base do
-  include_examples 'not_in_avm_registry'
-end

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

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/sources/base'
-
-RSpec.describe Avm::Sources::Base do
-  include_examples 'not_in_avm_registry'
-end

data/sub/avm/spec/lib/avm/sources/runner_spec.rb

@@ -1,9 +0,0 @@
-# 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/spec/rubocop_spec.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/avm/spec/spec_helper/launcher_context/settings.yml

@@ -1,6 +0,0 @@
----
-Instances:
-  /ruby_gem_stub:
-    git_current_revision: git_current_revision_setted
-    git_publish_remote: git_publish_remote_setted
-    publishable: false

data/sub/avm/spec/spec_helper/launcher_context.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-DUMMY_DIR = File.expand_path('../dummy', __dir__)
-
-RSpec.shared_context 'with launcher' do
-  before do
-    require 'avm/launcher/context'
-    Avm::Launcher::Context.current = Avm::Launcher::Context.new(
-      projects_root: DUMMY_DIR,
-      settings_file: File.join(__dir__, 'launcher_context', 'settings.yml'),
-      cache_root: Dir.mktmpdir
-    )
-    @remotes_dir = Dir.mktmpdir
-    allow(ProgressBar).to receive(:create).and_return(double.as_null_object)
-  end
-
-  # @param application_id [String]
-  # @param path [Pathname]
-  # @return void
-  def application_source_path(application_id, path)
-    EacConfig::Node.context.current.entry("#{application_id}_dev.install.path").value =
-      path.to_pathname.to_path
-  end
-
-  # @param settings_path [Pathname]
-  # @param projects_root [Pathname]
-  def context_set(settings_path, projects_root)
-    require 'avm/launcher/context'
-    require 'tmpdir'
-    Avm::Launcher::Context.current = Avm::Launcher::Context.new(
-      settings_file: settings_path.to_pathname.to_path,
-      cache_root: Dir.mktmpdir
-    )
-    self.projects_root = projects_root
-  end
-
-  # @param settings_path [Pathname]
-  def temp_context(settings_path)
-    context_set(settings_path, Dir.mktmpdir)
-  end
-
-  def init_remote(name)
-    require 'avm/git/launcher/base'
-    r = Avm::Git::Launcher::Base.new(File.join(@remotes_dir, name)) # rubocop:disable RSpec/InstanceVariable
-    r.init_bare
-    r
-  end
-
-  def init_git(subdir)
-    require 'avm/git/launcher/base'
-    r = Avm::Git::Launcher::Base.new(File.join(projects_root, subdir))
-    r.git
-    r.execute!('config', 'user.email', 'theuser@example.net')
-    r.execute!('config', 'user.name', 'The User')
-    r
-  end
-
-  # @param path [String]
-  def projects_root
-    @projects_root ||= Dir.mktmpdir
-  end
-
-  # @param path [Pathname]
-  def projects_root=(path)
-    @projects_root = path.to_pathname.to_path
-  end
-
-  def touch_commit(repos, subpath)
-    require 'fileutils'
-    FileUtils.mkdir_p(File.dirname(repos.subpath(subpath)))
-    FileUtils.touch(repos.subpath(subpath))
-    repos.execute!('add', repos.subpath(subpath))
-    repos.execute!('commit', '-m', subpath)
-  end
-end

data/sub/avm/spec/spec_helper.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/rspec/default_setup'
-EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__)).stub_avm_contexts
-EacRubyUtils.require_sub(__FILE__)

data/sub/avm/template/avm/self/docker_image/Dockerfile

@@ -1,17 +0,0 @@
-FROM ruby:2.5
-RUN gem install avm-tools
-
-RUN apt-get update && apt-get -y --no-install-recommends install \
-    ca-certificates \
-    curl
-
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.4/gosu-$(dpkg --print-architecture)" \
-    && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.4/gosu-$(dpkg --print-architecture).asc" \
-    && gpg --verify /usr/local/bin/gosu.asc \
-    && rm /usr/local/bin/gosu.asc \
-    && chmod +x /usr/local/bin/gosu
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD []

data/sub/avm/template/avm/self/docker_image/entrypoint.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Add local user
-# Either use the LOCAL_USER_ID if passed in at runtime or
-# fallback
-
-USER_ID=${LOCAL_USER_ID:-9001}
-
-echo "Starting with UID : $USER_ID"
-useradd --shell /bin/bash -u $USER_ID -o -c "" -m user
-export HOME=/home/user
-exec /usr/local/bin/gosu user avm "$@"

data/sub/avm-eac_redmine_base0/Gemfile

@@ -1,8 +0,0 @@
-# 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_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-
-require 'avm/eac_redmine_base0/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'avm-eac_redmine_base0'
-  s.version     = Avm::EacRedmineBase0::VERSION
-  s.authors     = ['Put here the authors']
-  s.summary     = 'Put here de description.'
-
-  s.files = Dir['{lib,locale,template}/**/*']
-
-  s.required_ruby_version = '>= 2.7.0'
-
-  s.add_dependency 'avm', '~> 0.92'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.13'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.10'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5', '>= 0.5.1'
-  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_fs', '~> 0.17'
-  s.add_dependency 'eac_rest', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.122'
-
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.9.0'
-end

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

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/instances/apache_host'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class ApacheHost < ::Avm::EacRailsBase1::Instances::ApacheHost
-      end
-    end
-  end
-end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/database.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/instances/base'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class Base < ::Avm::EacRailsBase1::Instances::Base
-        module Database
-          DATABASE_INTERNAL_HOSTNAME = ::Avm::Instances::Base::AutoValues::Database::LOCAL_ADDRESS
-          DEFAULT_POSTGRESQL_VERSION = ''
-
-          common_concern do
-            uri_components_entries_values 'postgresql', %w[version]
-          end
-
-          def database_internal
-            ::Avm::Instances::Base::AutoValues::Database::LOCAL_ADDRESSES
-              .include?(entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value)
-          end
-
-          def postgresql_version_default_value
-            DEFAULT_POSTGRESQL_VERSION
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/files.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/instances/base'
-require 'avm/instances/data/files_unit'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class Base < ::Avm::EacRailsBase1::Instances::Base
-        module Files
-          FILES_SUBPATH = 'files'
-
-          # @return [Avm::Instances::Data::FilesUnit]
-          def files_data_unit
-            ::Avm::Instances::Data::FilesUnit.new(self, FILES_SUBPATH)
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/gitolite.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/instances/base'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class Base < ::Avm::EacRailsBase1::Instances::Base
-        module Gitolite
-          GITOLITE_ENTRY_KEYS_PREFIX = 'gitolite'
-          DEFAULT_HOSTNAME = 'localhost'
-          DEFAULT_PATH_PARENT = '/var/lib'
-          DEFAULT_SCHEME = 'file'
-          DEFAULT_USERNAME = 'git'
-
-          common_concern do
-            uri_components_entries_values GITOLITE_ENTRY_KEYS_PREFIX
-            undef_method :gitolite_path_inherited_value_proc
-          end
-
-          # @return [Avm::Instances::Data::FilesUnit]
-          def gitolite_data_unit
-            ::Avm::Instances::Data::FilesUnit.new(self, gitolite_repositories_path,
-                                                  sudo_user: entry('gitolite.username').value!)
-          end
-
-          def gitolite_hostname_default_value
-            DEFAULT_HOSTNAME
-          end
-
-          # @return [String]
-          def gitolite_path_default_value
-            gitolite_username_optional.if_present do |v|
-              ::File.join(DEFAULT_PATH_PARENT, v)
-            end
-          end
-
-          # @return [Pathname]
-          def gitolite_repositories_path
-            entry('gitolite.path').value!.to_pathname.join('repositories')
-          end
-
-          def gitolite_scheme_default_value
-            DEFAULT_SCHEME
-          end
-
-          def gitolite_username_default_value
-            DEFAULT_USERNAME
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/instances/base'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class Base < ::Avm::EacRailsBase1::Instances::Base
-        module Install
-          INSTALL_EXTRA_KEY = 'install.extra'
-          DEFAULT_INSTALL_EXTRA = ''
-
-          # @return [String]
-          def auto_install_extra
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, INSTALL_EXTRA_KEY) ||
-              DEFAULT_INSTALL_EXTRA
-          end
-
-          def run_installer
-            ::EacRubyUtils::Ruby.on_clean_environment do
-              installer_command.system!
-            end
-          end
-
-          def installer_command
-            host_env.command(installer_path, install_task)
-          end
-
-          def installer_path
-            ::File.join(install_path, 'plugins', 'redmine_installer', 'installer',
-                        'run.sh')
-          end
-
-          def install_task
-            if web_path_optional.present?
-              'redmine_as_apache_path'
-            else
-              'redmine_as_apache_base'
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/nodejs.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/instances/base'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class Base < ::Avm::EacRailsBase1::Instances::Base
-        module Nodejs
-          DEFAULT_NODEJS_VERSION = '19.8.1'
-          NODEJS_VERSION_KEY = 'nodejs.version'
-
-          def auto_install_nodejs_version
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, NODEJS_VERSION_KEY) ||
-              DEFAULT_NODEJS_VERSION
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/web.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/instances/base'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class Base < ::Avm::EacRailsBase1::Instances::Base
-        module Web
-          def web_authority
-            web_hostname.if_present do |h|
-              h.to_s + web_port_optional.if_present('') { |p| ":#{p}" }
-            end
-          end
-        end
-      end
-    end
-  end
-end