eac_tools 0.48.0 → 0.48.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 171ff2484c7f126b41c7ce7cd1779956403eaab987125c00f667cae8b88f0f44
-  data.tar.gz: 3dbbead13aa461c61ade55f6bf2a7d226b2147ea410a419be436992bc95952f1
+  metadata.gz: 3952d236b92a07dab2d6090167fce27692d8c9a12114d77ec5cf17b55a914c91
+  data.tar.gz: ce7c0f2f4855475d499a72a0f5e956468e79e9f38b49004fecd94400e2f24662
 SHA512:
-  metadata.gz: f08562855ba9e9c9228de11b49086b2ff4fe2ffcd633dfc2fa4d21634e2cd2a318f6a67ad0d1ad09e20f6f9f8dd1bdacfddde34901eb254eb5d271e1192c78dc
-  data.tar.gz: f3abee1c74294f1029608a59986ad33fd1a484423f02079c7acf1fd433fb9c22d272fa7517bbc3e2450b3b07f94e027f4187f7d3ac62fb65cd9d262b8d42ab28
+  metadata.gz: ffc30f40ffde2c2454d4939a491dbc1671da9481be935c5a07b3fa5a65a9e2a05307238e7100620a92c8e86c99667ebb1aee589d283884a69d5a2b013a054649
+  data.tar.gz: 6c30ff53dfe58d88fb1af3162121d36c8e7c68c056d9850b897d0e6e1b233be149e72b6f2a9d9c075db6a11da45cfa1c24b1d9c62ba6620fab223e5f97b97862

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.48.0)
+    eac_tools (0.48.1)
       avm (~> 0.57)
       avm-eac_asciidoctor_base0 (~> 0.13)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
-      avm-eac_php_base0 (~> 0.4)
-      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.2)
+      avm-eac_php_base0 (~> 0.4, >= 0.4.1)
+      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.9)
       avm-eac_rails_base1 (~> 0.8)
@@ -16,8 +16,8 @@ PATH
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
       avm-eac_webapp_base0 (~> 0.13)
       avm-eac_wordpress_base0 (~> 0.3)
-      avm-tools (~> 0.142, >= 0.142.7)
-      eac_ruby_utils (~> 0.109)
+      avm-tools (~> 0.142, >= 0.142.8)
+      eac_ruby_utils (~> 0.109, >= 0.109.1)
 
 PATH
   remote: sub/aranha-parsers
@@ -68,9 +68,9 @@ PATH
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.2.2)
+    avm-eac_postgresql_base0 (0.2.3)
       avm (~> 0.57)
-      eac_ruby_utils (~> 0.108)
+      eac_ruby_utils (~> 0.109)
 
 PATH
   remote: sub/avm-eac_python_base0
@@ -123,6 +123,14 @@ PATH
       avm-eac_generic_base0 (~> 0.8)
       eac_ruby_utils (~> 0.109)
 
+PATH
+  remote: sub/avm-eac_ubuntu_base0
+  specs:
+    avm-eac_ubuntu_base0 (0.4.0)
+      avm (~> 0.57)
+      eac_ruby_utils (~> 0.109)
+      eac_templates (~> 0.3, >= 0.3.2)
+
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
@@ -165,11 +173,11 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.142.7)
+    avm-tools (0.142.8)
       aranha-parsers (~> 0.14, >= 0.14.4)
       avm (~> 0.57)
-      avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
-      avm-eac_ubuntu_base0 (~> 0.3)
+      avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
+      avm-eac_ubuntu_base0 (~> 0.4)
       avm-files (~> 0.6)
       avm-git (~> 0.10, >= 0.10.1)
       clipboard (~> 1.3, >= 1.3.6)
@@ -177,7 +185,7 @@ PATH
       eac_git (~> 0.14)
       eac_ruby_base0 (~> 0.17, >= 0.17.1)
       eac_templates (~> 0.3, >= 0.3.2)
-      git (~> 1.12)
+      git (~> 1.13)
       ruby-progressbar (~> 1.11)
 
 PATH
@@ -245,7 +253,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.109.0)
+    eac_ruby_utils (0.109.1)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -265,10 +273,6 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     asciidoctor (2.0.18)
     ast (2.4.2)
-    avm-eac_ubuntu_base0 (0.3.0)
-      avm (~> 0.7)
-      eac_ruby_utils (~> 0.77, >= 0.77.1)
-      eac_templates (~> 0.3)
     clipboard (1.3.6)
     colorize (0.8.1)
     concurrent-ruby (1.1.10)
@@ -316,7 +320,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     filesize (0.2.0)
-    git (1.12.0)
+    git (1.13.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)
@@ -397,6 +401,7 @@ DEPENDENCIES
   avm-eac_redmine_base0!
   avm-eac_redmine_plugin_base0!
   avm-eac_ruby_base1!
+  avm-eac_ubuntu_base0!
   avm-eac_webapp_base0!
   avm-eac_wordpress_base0!
   avm-files!

data/lib/eac_tools/version.rb

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

data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'avm', '~> 0.57'
-  s.add_dependency 'eac_ruby_utils', '~> 0.108'
+  s.add_dependency 'eac_ruby_utils', '~> 0.109'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
 end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/data_unit.rb

@@ -7,6 +7,7 @@ module Avm
     class Instance
       class DataUnit < ::Avm::Instances::Data::Unit
         EXTENSION = '.pgdump.gz'
+        TABLES_SQL = 'select tablename from pg_tables where schemaname = \'public\''
 
         before_load :clear_database
 
@@ -15,24 +16,29 @@ module Avm
         end
 
         def load_command
-          instance.psql_command.prepend(['gzip', '-d', '@ESC_|'])
+          instance.load_gzip_command
         end
 
         private
 
         def clear_database
           info 'Clearing database (Dropping all tables)...'
-          run_sql(drop_all_tables_sql).if_present { |v| run_sql(v) }
-        end
-
-        def drop_all_tables_sql
-          "select 'drop table \"' || tablename || '\" cascade;' from pg_tables " \
-            "where schemaname = 'public';"
+          ts = tables
+          if ts.empty?
+            info 'Database has no tables'
+          else
+            info "Removing #{ts.count} table(s)..."
+            run_sql('drop table ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
+          end
         end
 
         def run_sql(sql)
           instance.psql_command_command(sql).execute!
         end
+
+        def tables
+          run_sql(TABLES_SQL).each_line.map(&:strip).reject(&:blank?)
+        end
       end
     end
   end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance.rb

@@ -29,7 +29,22 @@ module Avm
 
       # @return [EacRubyUtils::Envs::Command]
       def dump_gzip_command
-        dump_command.pipe(env.command('gzip', '-9', '-c'))
+        dump_command.pipe(gzip_compress_command)
+      end
+
+      # @return [EacRubyUtils::Envs::Command]
+      def gzip_compress_command
+        env.command('gzip', '-9', '-c')
+      end
+
+      # @return [EacRubyUtils::Envs::Command]
+      def gzip_decompress_command
+        env.command('gzip', '-d')
+      end
+
+      # @return [EacRubyUtils::Envs::Command]
+      def load_gzip_command
+        gzip_decompress_command.pipe(psql_command)
       end
 
       # @return [String]

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/sub/avm-eac_ubuntu_base0/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/sub/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_ubuntu_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_ubuntu_base0'
+  s.version     = Avm::EacUbuntuBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,template}/**/*']
+
+  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
+
+  s.add_development_dependency 'avm-eac_ubuntu_base0'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+end

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/apache/resource.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacUbuntuBase0
+    class Apache
+      class Resource
+        common_constructor :apache, :type, :directory_prefix, :name
+
+        def available_path
+          ::File.join(apache.etc_root, "#{directory_prefix}-available", "#{name}.conf")
+        end
+
+        def available?
+          apache.host_env.file(available_path).exist?
+        end
+
+        def disable
+          apache.host_env.command('sudo', "a2dis#{type}", name).execute!
+        end
+
+        def enable
+          apache.host_env.command('sudo', "a2en#{type}", name).execute!
+        end
+
+        def enabled_path
+          ::File.join(apache.etc_root, "#{directory_prefix}-enabled", "#{name}.conf")
+        end
+
+        def enabled?
+          apache.host_env.file(enabled_path).exist?
+        end
+
+        def remove
+          remove_disabled
+          remove_available
+        end
+
+        def remove_available
+          raise 'Remove enabled before' if enabled?
+
+          apache.host_env.command('sudo', 'rm', '-f', available_path).execute! if available?
+        end
+
+        def remove_disabled
+          disable if enabled?
+          apache.host_env.command('sudo', 'rm', '-f', enabled_path).execute! if enabled?
+        end
+
+        def write(content)
+          ::EacRubyUtils::Envs.local.command('echo', content).pipe(
+            apache.host_env.command('sudo', 'tee', available_path)
+          ).execute!
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/apache.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacUbuntuBase0
+    class Apache
+      require_sub __FILE__
+      common_constructor :host_env
+
+      def etc_root
+        '/etc/apache2'
+      end
+
+      def service(command)
+        host_env.command('sudo', 'service', 'apache2', command)
+      end
+
+      { conf: :conf, site: :sites }.each do |type, directory_prefix|
+        define_method type do |name|
+          ::Avm::EacUbuntuBase0::Apache::Resource.new(self, type, directory_prefix, name)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/docker_image.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/docker/image'
+require 'eac_templates/from_all_gems'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacUbuntuBase0
+    class DockerImage < ::Avm::Docker::Image
+      USER_NAME = 'myuser'
+
+      def stereotype_tag
+        'eac_ubuntu_base0'
+      end
+
+      def user_home
+        ::File.join('/home', user_name)
+      end
+
+      def user_name
+        USER_NAME
+      end
+
+      def user_password
+        user_name
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/docker_image'
+require 'avm/instances/base'
+
+module Avm
+  module EacUbuntuBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        def docker_image_class
+          ::Avm::EacUbuntuBase0::DockerImage
+        end
+
+        def file_sudo_write(path, content)
+          ::EacRubyUtils::Envs.local.command('echo', content).pipe(
+            host_env.command('sudo', 'tee', path)
+          ).execute!
+        end
+      end
+    end
+  end
+end

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

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

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/rspec/ssh_docker_server.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'eac_docker/images/templatized'
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/core_ext'
+
+module Avm
+  module EacUbuntuBase0
+    module Rspec
+      class SshDockerServer < ::EacDocker::Images::Templatized
+        # @return [EacRubyUtils::Envs::SshEnv]
+        def env
+          raise '@env is blank' if @env.blank?
+
+          @env
+        end
+
+        def on_run
+          on_container do
+            on_env do
+              yield
+            end
+          end
+        end
+
+        private
+
+        def container
+          raise '@container is blank' if @container.blank?
+
+          @container
+        end
+
+        def env_identity_file
+          template.child('id_rsa').path
+        end
+
+        def env_identity_file_good_permissions
+          r = ::EacRubyUtils::Fs::Temp.file
+          ::FileUtils.cp env_identity_file, r
+          r.chmod(0o600)
+          r
+        end
+
+        def close_env
+          @identity_file.remove
+          @env = nil
+        end
+
+        def on_env
+          open_env
+          begin
+            yield
+          ensure
+            close_env
+          end
+        end
+
+        def on_container
+          provide.container.temporary(true).on_detached do |container|
+            @container = container
+            begin
+              yield
+            ensure
+              @container = nil
+            end
+          end
+        end
+
+        def open_env
+          raise 'Environment already open' if @env.present?
+
+          @identity_file = env_identity_file_good_permissions
+          @env = ::EacRubyUtils::Envs::SshEnv.new(
+            "ssh://root@#{container.hostname}" \
+              '?StrictHostKeyChecking=no' \
+              '&BatchMode=yes' \
+              "&IdentityFile=#{@identity_file}"
+          )
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/rspec.rb

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

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base/docker.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/docker/runner'
+require 'avm/runners/base'
+require 'eac_ruby_utils/struct'
+
+module Avm
+  module EacUbuntuBase0
+    module Runners
+      class Base < ::Avm::Runners::Base
+        class Docker < ::Avm::Docker::Runner
+          def use_default_registry?
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/runners/base'
+require 'avm/eac_ubuntu_base0/instances/base'
+require 'eac_ruby_utils/patches/module/require_sub'
+
+module Avm
+  module EacUbuntuBase0
+    module Runners
+      class Base < ::Avm::Runners::Base
+        enable_simple_cache
+        require_sub __FILE__
+
+        INSTANCE_ID = 'eac-ubuntu-base0_self'
+
+        runner_with :help, :subcommands do
+          subcommands
+        end
+
+        private
+
+        def instance_uncached
+          ::Avm::EacUbuntuBase0::Instances::Base.by_id(INSTANCE_ID)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacUbuntuBase0
+    VERSION = '0.4.0'
+  end
+end

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0.rb

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

data/sub/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/docker_image_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/docker_image'
+require 'eac_docker/images/base'
+require 'eac_docker/registry'
+
+::RSpec.describe ::Avm::EacUbuntuBase0::DockerImage do
+  let(:registry) { ::EacDocker::Registry.new('stub') }
+  let(:instance) { described_class.new(registry) }
+
+  describe '#provide' do
+    it do
+      expect(instance.provide).to be_a(::EacDocker::Images::Base)
+    end
+  end
+end

data/sub/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/runners/base/docker_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/runners/base'
+require 'avm/eac_ubuntu_base0/runners/base/docker'
+
+::RSpec.describe ::Avm::EacUbuntuBase0::Runners::Base::Docker do
+  it do
+    expect { run_command('--registry-name', 'testing', '--image-name') }.not_to raise_error
+  end
+
+  def run_command(*argv)
+    ::Avm::EacUbuntuBase0::Runners::Base.run(argv: %w[docker] + argv)
+  end
+end

data/sub/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/runners/base_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/runners/base'
+
+::RSpec.describe ::Avm::EacUbuntuBase0::Runners::Base do
+  include_examples 'in_avm_registry', 'runners'
+end

data/sub/avm-eac_ubuntu_base0/spec/rubocop_spec.rb

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

data/sub/avm-eac_ubuntu_base0/spec/spec_helper.rb

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

data/sub/avm-eac_ubuntu_base0/template/avm/eac_ubuntu_base0/docker_image/Dockerfile.template

@@ -0,0 +1,24 @@
+FROM ubuntu:20.04
+
+# Base system update
+RUN apt-get update -y
+RUN apt-get dist-upgrade -y
+
+# Timezone
+RUN apt-get install -y tzdata
+RUN ln -fs /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime
+RUN dpkg-reconfigure --frontend noninteractive tzdata
+
+# Default user
+RUN /usr/sbin/useradd --shell /bin/bash --home-dir %%user_home%% --create-home %%user_name%%
+RUN /bin/echo '%%user_name%%:%%user_password%%' | /usr/sbin/chpasswd
+RUN /bin/chown %%user_name%%:%%user_name%% %%user_home%% -R
+
+# Sudo
+RUN apt-get install -y sudo
+RUN /bin/echo "%%user_name%% ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/%%user_name%%_all_nopasswd && chmod 0440 /etc/sudoers.d/%%user_name%%_all_nopasswd
+
+# Container
+USER %%user_name%%
+WORKDIR %%user_home%%
+CMD /bin/bash

data/sub/avm-tools/avm-tools.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
   s.add_dependency 'avm', '~> 0.57'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.1'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4'
   s.add_dependency 'avm-files', '~> 0.6'
   s.add_dependency 'avm-git', '~> 0.10', '>= 0.10.1'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_git', '~> 0.14'
   s.add_dependency 'eac_ruby_base0', '~> 0.17', '>= 0.17.1'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
-  s.add_dependency 'git', '~> 1.12'
+  s.add_dependency 'git', '~> 1.13'
   s.add_dependency 'ruby-progressbar', '~> 1.11'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.142.7'
+    VERSION = '0.142.8'
   end
 end

data/sub/avm-tools/spec/lib/avm/tools/runner/git/deploy_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/eac_ubuntu_base0/rspec/ssh_docker_server'
 require 'avm/tools/runner'
 require 'tmpdir'
 
@@ -86,7 +87,8 @@ require 'tmpdir'
   end
 
   context 'with ssh target', docker: true do
-    let(:env) { ::StubbedDockerServer.env }
+    let(:ssh_server) { ::Avm::EacUbuntuBase0::Rspec::SshDockerServer.new }
+    let(:env) { ssh_server.env }
     let(:tmpdir) { env.command('mktemp', '-d').execute! }
     let(:target_dir) { ::File.join(tmpdir, 'target') }
     let(:target_url) do
@@ -96,7 +98,7 @@ require 'tmpdir'
     end
 
     around do |example|
-      ::StubbedDockerServer.on_run(&example)
+      ssh_server.on_run(&example)
     end
 
     before do

data/sub/eac_ruby_utils/eac_ruby_utils.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'bundler'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'net-ssh', '~> 4.2'
+  s.add_development_dependency 'avm-eac_ubuntu_base0', '~> 0.4'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/composite_command.rb

@@ -25,8 +25,20 @@ module EacRubyUtils
 
       # @return [String]
       def bash_command
-        ['set', '-euo', 'pipefail', OPERATOR_BEFORE, left_command.command, operator,
-         right_command.command].join(' ')
+        ['set', '-euo', 'pipefail', OPERATOR_BEFORE, left_command_line, operator,
+         right_command_line].join(' ')
+      end
+
+      def left_command_line
+        left_command.command_line_without_env
+      end
+
+      def right_command_line
+        if right_command.env == left_command.env
+          right_command.command_line_without_env
+        else
+          right_command.command
+        end
       end
     end
   end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/gems_registry/gem.rb

@@ -69,8 +69,9 @@ module EacRubyUtils
           .result
       end
 
+      # @return [Array<Gem::Dependency>]
       def gem_item_dependencies(item)
-        ::Gem::Specification.find_by_name(item.name).dependencies
+        ::Gem::Specification.find_by_name(item.name).dependencies.select(&:runtime?)
       rescue ::Gem::MissingSpecError
         []
       end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.109.0'
+  VERSION = '0.109.1'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/{command_spec.rb → command/base_example.rb}

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/envs/command'
-require 'eac_ruby_utils/envs/executable'
-require 'eac_ruby_utils/envs/local_env'
+require 'eac_ruby_utils/envs/execution_error'
 
-RSpec.describe ::EacRubyUtils::Envs::Command do
-  let(:env) { ::EacRubyUtils::Envs::LocalEnv.new }
+::RSpec.shared_examples 'with_command_env' do # rubocop:disable Metrics/BlockLength
   let(:echo) { env.executable('echo', '--version') }
   let(:cat) { env.executable('cat', '--version') }
   let(:not_existing_file) { ::Pathname.new('a_file_that_not_exists') }

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/command/local_env_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/envs/command'
+require 'eac_ruby_utils/envs/local_env'
+require_relative 'base_example'
+
+::RSpec.describe ::EacRubyUtils::Envs::Command do
+  let(:env) { ::EacRubyUtils::Envs::LocalEnv.new }
+
+  include_examples 'with_command_env'
+end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/command/ssh_env_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/rspec/ssh_docker_server'
+require 'eac_ruby_utils/envs/command'
+require 'eac_ruby_utils/envs/ssh_env'
+require_relative 'base_example'
+
+::RSpec.describe ::EacRubyUtils::Envs::Command do
+  let(:ssh_server) { ::Avm::EacUbuntuBase0::Rspec::SshDockerServer.new }
+  let(:env) { ssh_server.env }
+
+  around do |example|
+    ssh_server.on_run(&example)
+  end
+
+  include_examples 'with_command_env'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.48.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-10 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -73,6 +73,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_postgresql_base0
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +95,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +105,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: avm-eac_python_base0
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +239,7 @@ dependencies:
         version: '0.142'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.142.7
+        version: 0.142.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -243,7 +249,7 @@ dependencies:
         version: '0.142'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.142.7
+        version: 0.142.8
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +257,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.109'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.109.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -258,6 +267,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.109'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.109.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -733,6 +745,28 @@ files:
 - sub/avm-eac_ruby_base1/template/avm/eac_ruby_base1/source_generators/base/static/spec/rubocop_spec.rb
 - sub/avm-eac_ruby_base1/template/avm/eac_ruby_base1/source_generators/base/static/spec/spec_helper.rb
 - sub/avm-eac_ruby_base1/template/avm/eac_ruby_base1/source_generators/base/version.template
+- sub/avm-eac_ubuntu_base0/Gemfile
+- sub/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/apache.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/apache/resource.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/docker_image.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances/base.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/rspec.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/rspec/ssh_docker_server.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base/docker.rb
+- sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/version.rb
+- sub/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/docker_image_spec.rb
+- sub/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/runners/base/docker_spec.rb
+- sub/avm-eac_ubuntu_base0/spec/lib/avm/eac_ubuntu_base0/runners/base_spec.rb
+- sub/avm-eac_ubuntu_base0/spec/rubocop_spec.rb
+- sub/avm-eac_ubuntu_base0/spec/spec_helper.rb
+- sub/avm-eac_ubuntu_base0/template/avm/eac_ubuntu_base0/docker_image/Dockerfile.template
+- sub/avm-eac_ubuntu_base0/template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/Dockerfile
+- sub/avm-eac_ubuntu_base0/template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/id_rsa
+- sub/avm-eac_ubuntu_base0/template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/id_rsa.pub
 - sub/avm-eac_webapp_base0/Gemfile
 - sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0.rb
@@ -992,11 +1026,6 @@ files:
 - sub/avm-tools/spec/spec_helper/avm_tools_runner.rb
 - sub/avm-tools/spec/spec_helper/eac_launcher.rb
 - sub/avm-tools/spec/spec_helper/eac_launcher/settings.yml
-- sub/avm-tools/spec/spec_helper/stub_templates/stubbed_docker_server/Dockerfile
-- sub/avm-tools/spec/spec_helper/stub_templates/stubbed_docker_server/id_rsa
-- sub/avm-tools/spec/spec_helper/stub_templates/stubbed_docker_server/id_rsa.pub
-- sub/avm-tools/spec/spec_helper/stubbed_docker_server.rb
-- sub/avm-tools/spec/spec_helper/templates.rb
 - sub/avm-tools/template/avm/self/docker_image/Dockerfile
 - sub/avm-tools/template/avm/self/docker_image/entrypoint.sh
 - sub/avm/Gemfile
@@ -1762,7 +1791,9 @@ files:
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/compare_by_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/custom_format_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/enum_spec.rb
-- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/command_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/command/base_example.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/command/local_env_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/command/ssh_env_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/executable_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/ssh_env_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/extname_spec.rb

data/sub/avm-tools/spec/spec_helper/stubbed_docker_server.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_docker/images/templatized'
-require 'eac_ruby_utils/core_ext'
-require_relative 'templates'
-
-class StubbedDockerServer < ::EacDocker::Images::Templatized
-  class << self
-    enable_simple_cache
-
-    def on_run
-      instance.on_run { yield }
-    end
-
-    delegate :env, to: :instance
-
-    private
-
-    def instance_uncached
-      new.tag('avm_stubbed_docker_server')
-    end
-  end
-
-  def env
-    raise '@env is blank' if @env.blank?
-
-    @env
-  end
-
-  def on_run
-    on_container do
-      on_env do
-        yield
-      end
-    end
-  end
-
-  private
-
-  def container
-    raise '@container is blank' if @container.blank?
-
-    @container
-  end
-
-  def env_identity_file
-    template.child('id_rsa').path
-  end
-
-  def env_identity_file_good_permissions
-    r = ::EacRubyUtils::Fs::Temp.file
-    ::FileUtils.cp env_identity_file, r
-    r.chmod(0o600)
-    r
-  end
-
-  def close_env
-    @identity_file.remove
-    @env = nil
-  end
-
-  def on_env
-    open_env
-    begin
-      yield
-    ensure
-      close_env
-    end
-  end
-
-  def on_container
-    provide.container.temporary(true).on_detached do |container|
-      @container = container
-      begin
-        yield
-      ensure
-        @container = nil
-      end
-    end
-  end
-
-  def open_env
-    raise 'Environment already open' if @env.present?
-
-    @identity_file = env_identity_file_good_permissions
-    @env = ::EacRubyUtils::Envs::SshEnv.new(
-      "ssh://root@#{container.hostname}" \
-        '?StrictHostKeyChecking=no' \
-        '&BatchMode=yes' \
-        "&IdentityFile=#{@identity_file}"
-    )
-  end
-end

data/sub/avm-tools/spec/spec_helper/templates.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_templates/patches/object/template'
-
-::EacTemplates::Searcher.default.included_paths << ::File.join(__dir__, 'stub_templates')