avm-eac_rails_base1 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1c90d3dfb3e81da85980dc5791ad6940084b8cf31e0a15459e87809d2679a2e
-  data.tar.gz: 7083e86a075897d6ada5d5327684c8b8ecdf864a304d08af80fb84582d862439
+  metadata.gz: 84854e10d4ae4915469b65a563b5579d086d935a989423a373e58a3d49173adb
+  data.tar.gz: a58c7ab22468e0f964594443f35136fd71c5096f93071cd3b361b9ec13a4396f
 SHA512:
-  metadata.gz: 42ad1e1cf98bfe5d1cae9ee3de7cf9413bf0bcdf68dcb8c9d304277d1c3a66d68851c30a40d88bc974fa3b19724016f722a0d55266ec48f04c437bb47ad803e6
-  data.tar.gz: 46679fdc666f604debb262b6e0c44b22dec64315166202f735ef1498ac9e79e23cadd98ed0de3d25a32778d6fffc10780c98267ac5593026810e51252aae38cc
+  metadata.gz: 6b84460b7913ee8a90af0a279b550e5e8118fbd16d0af80e1c238b31aac5f8c6431269316948ef7ebe81c834b27b5bf4457fe47d332494d1610b68259eb00322
+  data.tar.gz: 412f16d894b91b4de55744313abe50a3114af5965334fe31e4791003d8b8e49121fa0b8e20b30ff976a3a71e84ad5f2a1e5aaf17092edfd7e394021205d23394

data/lib/avm/eac_rails_base1/instances/apache_host.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/apache_host'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
+        def document_root
+          "#{instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)}/public"
+        end
+
+        def extra_content
+          'PassengerEnabled On'
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_rails_base1/instances/systemd_unit/service.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      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
+end

data/lib/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler_command.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      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
+end

data/lib/avm/eac_rails_base1/instances/systemd_unit.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class SystemdUnit
+        JOBS = %w[write_tasks_scheduler_command write_service link_service verify_service
+                  reload_systemd enable_service start_service].freeze
+
+        include ::Avm::Entries::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.install_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
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base1/systemd_unit'
+require 'avm/eac_rails_base1/instances/systemd_unit'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -31,9 +31,9 @@ module Avm
           private
 
           def systemd_unit_uncached
-            ::Avm::EacRailsBase1::SystemdUnit.new(runner_context.call(:instance),
-                                                  restart: parsed.restart,
-                                                  exec_run: parsed.exec_run?)
+            ::Avm::EacRailsBase1::Instances::SystemdUnit.new(runner_context.call(:instance),
+                                                             restart: parsed.restart,
+                                                             exec_run: parsed.exec_run?)
           end
 
           def result_uncached

data/lib/avm/eac_rails_base1/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_rails_base1
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,56 +16,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0.57'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0.57'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.27'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.27.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.27'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.27.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.107'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.107.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.107'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.107.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +105,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm/eac_rails_base1.rb
-- lib/avm/eac_rails_base1/apache_host.rb
 - lib/avm/eac_rails_base1/instances.rb
+- lib/avm/eac_rails_base1/instances/apache_host.rb
 - lib/avm/eac_rails_base1/instances/base.rb
+- lib/avm/eac_rails_base1/instances/systemd_unit.rb
+- lib/avm/eac_rails_base1/instances/systemd_unit/service.rb
+- lib/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler_command.rb
 - lib/avm/eac_rails_base1/runner.rb
 - lib/avm/eac_rails_base1/runner/bundle.rb
 - lib/avm/eac_rails_base1/runner/code_runner.rb
@@ -102,12 +123,9 @@ files:
 - lib/avm/eac_rails_base1/runner_with/bundle.rb
 - lib/avm/eac_rails_base1/runner_with/rails_environment.rb
 - lib/avm/eac_rails_base1/sources/base.rb
-- lib/avm/eac_rails_base1/systemd_unit.rb
-- lib/avm/eac_rails_base1/systemd_unit/service.rb
-- lib/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.rb
 - lib/avm/eac_rails_base1/version.rb
-- template/avm/eac_rails_base1/systemd_unit/tasks_scheduler.service
-- template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh
+- template/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler.service
+- template/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler_command.sh
 homepage: 
 licenses: []
 metadata: {}

data/lib/avm/eac_rails_base1/apache_host.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_webapp_base0/apache_host'
-
-module Avm
-  module EacRailsBase1
-    class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
-      def document_root
-        "#{instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)}/public"
-      end
-
-      def extra_content
-        'PassengerEnabled On'
-      end
-    end
-  end
-end

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

@@ -1,70 +0,0 @@
-# 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/lib/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.rb

@@ -1,29 +0,0 @@
-# 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/lib/avm/eac_rails_base1/systemd_unit.rb

@@ -1,57 +0,0 @@
-# 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.install_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