eac_tools 0.47.2 → 0.48.1

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/runners/tasks_scheduler.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      module Runners
+        class TasksScheduler
+          require_sub __FILE__
+
+          runner_with :help, :subcommands do
+            subcommands
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/{runner.rb → instances/runners.rb}

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/runner'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacRailsBase1
-    class Runner < ::Avm::EacWebappBase0::Runner
-      require_sub __FILE__
+    module Instances
+      module Runners
+        require_sub __FILE__
+      end
     end
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.7.1'
+    VERSION = '0.8.0'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.7', '>= 0.7.1'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_fs', '~> 0.15'
+  s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.109'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project_rename.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'avm/eac_rails_base1/runner/code_runner'
+require 'avm/eac_rails_base1/instances/runners/code_runner'
 
 module Avm
   module EacRedmineBase0

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.17.0'
+    VERSION = '0.18.0'
   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_redmine_base0/lib/avm/eac_redmine_base0/runners.rb → avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacRedmineBase0
-    module Runners
+  module EacUbuntuBase0
+    module Instances
       require_sub __FILE__
     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_rails_base0/lib/avm/eac_rails_base0/runners.rb → avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/rspec.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacRailsBase0
-    module Runners
+  module EacUbuntuBase0
+    module Rspec
       require_sub __FILE__
     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_wordpress_base0/lib/avm/eac_wordpress_base0/runners.rb → avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0.rb}

@@ -3,9 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacWordpressBase0
-    module Runners
-      require_sub __FILE__
-    end
+  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-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.1'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.109'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.12.3'
+    VERSION = '0.13.0'
   end
 end

data/sub/avm-eac_wordpress_base0/avm-eac_wordpress_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.45'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13'
+  s.add_dependency 'eac_ruby_utils', '~> 0.109'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWordpressBase0
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

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