avm-tools 0.115.0 → 0.116.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0d93631b14929c6e271ba0dd835f75a9633a961b3f870daa5c64eb467e0ef2
-  data.tar.gz: '0281c164c78506d7fe5ac8f601ce4380661f835a3c4e0ebe7c48c60334419565'
+  metadata.gz: 27716dd4266fe2074f32cc46de1d3d4b0a83612a50e4794f9948523d3ed6bad5
+  data.tar.gz: 97d712f91c0adbeacedd67674ae108d9f48fd2db800df50696625a7d81bd95f3
 SHA512:
-  metadata.gz: bcbb490835a6f843cb9179effd073b661e7d4c7d1006ae4a135744d692203425ab8c4f9dbd18d55af1b1744655ec216c3feaf23470c1df691788eb3d94030a9d
-  data.tar.gz: 2e647b2157fe2c3bdf9ea51ebaac0809e4299af1bb13c96b73bae51c68e9876ba37347a9a85f3e15b8eede0c837546edf05079b116abf67081ecbe28062092b3
+  metadata.gz: ba1854580f3fd1cbda82b94422e8feffde990f8f8ec4ec5e789f7e565536502f581a9e6da694a2eb04c76da27916b6bbd8504dc6663e8a540aae7e8517941256
+  data.tar.gz: fc5000e7db1db0c41cda3768665ce4bd08846a81ba7c7f8d5b8c8e014d79fc28bf99a6d0fa5ba75d7b2d8b3be360c2dd13d18321cdb0b1789972f84e89616d60

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.115.0'
+    VERSION = '0.116.0'
   end
 end

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.1', '>= 0.1.3'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.2'
   s.add_dependency 'eac_ruby_utils', '~> 0.80', '>= 0.80.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.2', '>= 0.2.1'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.3'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '>= 0.9.9'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/tasks_scheduler/systemd_unit.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/systemd_unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class TasksScheduler
+        class SystemdUnit
+          DEFAULT_RESTART = 'on-failure'
+
+          runner_with :help do
+            desc 'Configure Systemd unit for instace\'s tasks scheduler daemon (Reference: ' \
+              'https://www.freedesktop.org/software/systemd/man/systemd.service.html).'
+            bool_opt '-e', '--exec-run', 'Run daemon with "run" instead of "start"/"stop".'
+            arg_opt '-r', '--restart', 'Value for systemd.service, Restart=.',
+                    default: DEFAULT_RESTART
+          end
+
+          delegate :restart, to: :parsed
+
+          def run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          private
+
+          def systemd_unit_uncached
+            ::Avm::EacRailsBase1::SystemdUnit.new(runner_context.call(:instance),
+                                                  restart: parsed.restart,
+                                                  exec_run: parsed.exec_run?)
+          end
+
+          def result_uncached
+            systemd_unit.run
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/tasks_scheduler.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class TasksScheduler
+        require_sub __FILE__
+
+        runner_with :help, :subcommands do
+          subcommands
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/service.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class SystemdUnit
+      module Service
+        def service_content
+          template.child('tasks_scheduler.service').apply(variables_source)
+        end
+
+        def service_exec_lines
+          service_exec_operations
+            .map { |k, v| "#{k}=#{tasks_scheduler_command_path} #{v}" }
+            .join("\n")
+        end
+
+        def service_path
+          ::Pathname.new('/etc/systemd/system').join(unit_name)
+        end
+
+        def service_link_path
+          ::Pathname.new('/etc/systemd/system/multi-user.target.wants').join(unit_name)
+        end
+
+        def verify_service
+          sudo_system!('systemd-analyze', 'verify', service_path)
+        end
+
+        private
+
+        def enable_service
+          systemctl('enable', unit_name)
+        end
+
+        def link_service
+          sudo_execute!('rm', '-f', service_link_path)
+          sudo_execute!('ln', '-s', service_path, service_link_path)
+        end
+
+        def reload_systemd
+          systemctl('daemon-reload')
+        end
+
+        # @return [Hash<String, String>]
+        def service_exec_operations
+          if exec_run?
+            { 'ExecStart' => 'run' }
+          else
+            { 'ExecStart' => 'start', 'ExecStop' => 'stop' }
+          end
+        end
+
+        def start_service
+          systemctl('start', unit_name)
+        end
+
+        def systemctl(*args)
+          sudo_system!('systemctl', *args)
+        end
+
+        def write_service
+          infom 'Writing service\'s unit file...'
+          platform_instance.file_sudo_write(service_path, service_content)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class SystemdUnit
+      module TasksSchedulerCommand
+        def tasks_scheduler_command_content
+          template.child('tasks_scheduler_command.sh').apply(variables_source)
+        end
+
+        def tasks_scheduler_command_path
+          "/opt/aux/#{instance.id}/tasks_scheduler.sh"
+        end
+
+        private
+
+        def write_tasks_scheduler_command
+          infom 'Writing tasks scheduler\'s command...'
+          sudo_execute!('mkdir', '-p', ::File.dirname(tasks_scheduler_command_path))
+          platform_instance.file_sudo_write(tasks_scheduler_command_path,
+                                            tasks_scheduler_command_content)
+          sudo_execute!('chmod', '+x', tasks_scheduler_command_path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'avm/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class SystemdUnit
+      JOBS = %w[write_tasks_scheduler_command write_service link_service verify_service
+                reload_systemd enable_service start_service].freeze
+
+      include ::Avm::Jobs::Base
+      require_sub __FILE__, include_modules: true
+      delegate :platform_instance, to: :instance
+
+      enable_listable
+      lists.add_symbol :option, :exec_run, :restart
+
+      def description
+        "#{instance.id} Tasks Scheduler"
+      end
+
+      def exec_run?
+        options[OPTION_EXEC_RUN]
+      end
+
+      def option_list
+        self.class.lists.option
+      end
+
+      def restart
+        options[OPTION_RESTART]
+      end
+
+      def unit_name
+        "#{instance.id}_tasks_scheduler.service"
+      end
+
+      def user
+        instance.ssh_username
+      end
+
+      private
+
+      def sudo_execute!(*args)
+        platform_instance.host_env.command(['sudo'] + args).execute!
+      end
+
+      def sudo_system!(*args)
+        command_args = ['sudo'] + args
+        infom "Running \"#{::Shellwords.join(command_args)}\"..."
+        platform_instance.host_env.command(command_args).system!
+      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.1.4'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler.service

@@ -0,0 +1,12 @@
+[Unit]
+Description='%%description%%'
+After=postgresql.service
+
+[Service]
+Type=forking
+%%service_exec_lines%%
+Restart=%%restart%%
+User=%%user%%
+
+[Install]
+WantedBy=multi-user.target

data/sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+source "$HOME/.rvm/scripts/rvm"
+( cd '%%fs_path%%'; bundle exec tasks_scheduler "$@" )

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

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.1'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_fs', '~> 0.4'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
   end
 end

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

@@ -10,6 +10,12 @@ module Avm
         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

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

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

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm', '~> 0.1'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.1'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.1'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2.1'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'

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

@@ -5,12 +5,14 @@ require 'avm/eac_postgresql_base0/instance_with'
 require 'avm/data/instance/files_unit'
 require 'avm/data/instance/package'
 require 'avm/eac_webapp_base0/deploy/file_unit'
+require 'avm/eac_ubuntu_base0/instances/base'
 
 module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
       require_sub __FILE__
       include ::Avm::EacPostgresqlBase0::InstanceWith
+      enable_simple_cache
 
       FILES_UNITS = [].freeze
 
@@ -45,6 +47,11 @@ module Avm
 
       private
 
+      # @return [Avm::EacUbuntuBase0::Instances::Base]
+      def platform_instance_uncached
+        ::Avm::EacUbuntuBase0::Instances::Base.by_id(id)
+      end
+
       def files_units
         self.class.const_get('FILES_UNITS').transform_values do |fs_path_subpath|
           ::Avm::Data::Instance::FilesUnit.new(self, fs_path_subpath)

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

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

data/sub/eac_cli/lib/eac_cli/runner_with/subcommands.rb

@@ -95,7 +95,7 @@ module EacCli
         raise(::EacCli::Parser::Error.new(
                 self.class.runner_definition, runner_context.argv,
                 "Subcommand \"#{subcommand_name}\" not found " \
-                  "(Available: #{available_subcommands.keys}"
+                  "(Available: #{available_subcommands.keys})"
               ))
       end
 

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.27.1'
+  VERSION = '0.27.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.115.0
+  version: 0.116.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -497,11 +497,18 @@ files:
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/logs.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/logs/clear.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/rails_server.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/tasks_scheduler.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/tasks_scheduler/systemd_unit.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner_with/bundle.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner_with/rails_environment.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/service.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb
 - sub/avm-eac_rails_base1/spec/rubocop_spec.rb
 - sub/avm-eac_rails_base1/spec/spec_helper.rb
+- sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler.service
+- sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh
 - sub/avm-eac_redmine_base0/Gemfile
 - sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0.rb