avm-tools 0.115.0 → 0.116.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0d93631b14929c6e271ba0dd835f75a9633a961b3f870daa5c64eb467e0ef2
-  data.tar.gz: '0281c164c78506d7fe5ac8f601ce4380661f835a3c4e0ebe7c48c60334419565'
+  metadata.gz: 9ade74f1c59b191c0af317c03f8acb00fffc0e2bcac3120b56a604ab72a31ac1
+  data.tar.gz: 9d9967c47a11500142f7843b53ac7430f40fb191e441ce177ce583a58f46fffc
 SHA512:
-  metadata.gz: bcbb490835a6f843cb9179effd073b661e7d4c7d1006ae4a135744d692203425ab8c4f9dbd18d55af1b1744655ec216c3feaf23470c1df691788eb3d94030a9d
-  data.tar.gz: 2e647b2157fe2c3bdf9ea51ebaac0809e4299af1bb13c96b73bae51c68e9876ba37347a9a85f3e15b8eede0c837546edf05079b116abf67081ecbe28062092b3
+  metadata.gz: dae95c3e50159a7cd7a9c77745a106d462c2d5c8445a43f92f35cadeb42545509d83b53f2085a339b9dac930610a6cc68cb4551a2dd35e0a2566a1d07f932ce1
+  data.tar.gz: 7dc23f20f7430e88fd0a75582a899df38a81eb6a102f948611c96d810d766032656c730395ef66f4a3f89a11ad4b84d429252dcbf8e58082777b632f5e2ad188

data/lib/avm/launcher/instances/settings.rb

@@ -23,7 +23,7 @@ module Avm
         end
 
         def publishable?
-          !!publishable_value
+          publishable_value ? true : false
         end
 
         def stereotype_publishable?(stereotype)
@@ -39,11 +39,15 @@ module Avm
         end
 
         def parse_publishable_value(value, hash_to_true)
-          return value.with_indifferent_access if !hash_to_true && value.is_a?(::Hash)
+          return value.with_indifferent_access if parse_publishable_value_hash?(value, hash_to_true)
           return true if value.nil? || value == true
           return false if value == false
 
-          !!value
+          value ? true : false
+        end
+
+        def parse_publishable_value_hash?(value, hash_to_true)
+          !hash_to_true && value.is_a?(::Hash)
         end
       end
     end

data/lib/avm/projects/stereotypes.rb

@@ -11,8 +11,8 @@ module Avm
       class << self
         def list
           @list ||= constants.map { |c| const_get(c) }
-                             .select { |c| c.included_modules.include?(Avm::Projects::Stereotype) }
-                             .freeze
+                      .select { |c| c.included_modules.include?(Avm::Projects::Stereotype) }
+                      .freeze
         end
       end
     end

data/lib/avm/ruby/bundler/incompatible_parser/depends_on.rb

@@ -9,7 +9,7 @@ module Avm
       class IncompatibleParser
         class DependsOn < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /(.+) was resolved to (.+), which depends on/
-                        .to_parser { |m| new(m[1], m[2]) }
+                          .to_parser { |m| new(m[1], m[2]) }
 
           common_constructor :gem_name, :version do
             self.version = ::Gem::Version.new(version)

data/lib/avm/ruby/bundler/incompatible_parser/gem_conflict.rb

@@ -9,7 +9,7 @@ module Avm
       class IncompatibleParser
         class GemConflict < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /Bundler could not find compatible versions for gem "(.+)":/
-                        .to_parser { |m| new(m[1]) }
+                          .to_parser { |m| new(m[1]) }
 
           enable_simple_cache
           common_constructor :gem_name

data/lib/avm/ruby/bundler/incompatible_parser/in_gemfile.rb

@@ -9,7 +9,7 @@ module Avm
       class IncompatibleParser
         class InGemfile < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /In Gemfile:/
-                        .to_parser { |_m| new }
+                          .to_parser { |_m| new }
 
           common_constructor
         end

data/lib/avm/ruby/bundler/incompatible_parser/version_requirement.rb

@@ -9,7 +9,7 @@ module Avm
       class IncompatibleParser
         class VersionRequirement < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /\A([a-z][a-z_0-9]*)(?: \((.+)\))?\z/
-                        .to_parser { |m| new(m[1], m[2]) }
+                          .to_parser { |m| new(m[1], m[2]) }
 
           enable_simple_cache
           attr_accessor :stack

data/lib/avm/ruby/bundler/incompatible_parser.rb

@@ -13,7 +13,7 @@ module Avm
 
         def initialize(path)
           @gems_in_conflict = ::Avm::Ruby::Bundler::IncompatibleParser::LineBuffer
-                              .from_file(path).gems_in_conflict.freeze
+                                .from_file(path).gems_in_conflict.freeze
         end
 
         def data

data/lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock/git.rb

@@ -29,7 +29,7 @@ module Avm
                 def git_continue_run(command)
                   infom "\"#{command}\" --continue..."
                   cmd = instance.git_repo.command(command, '--continue')
-                                .envvar('GIT_EDITOR', 'true')
+                          .envvar('GIT_EDITOR', 'true')
                   return unless !cmd.system && !conflict?
 
                   fatal_error "\"#{cmd}\" failed and there is no conflict"

data/lib/avm/tools/runner/app_src/test.rb

@@ -71,8 +71,8 @@ module Avm
 
           def test_builder
             r = ::Avm::Sources::Tests::Builder.new(runner_context.call(:subject))
-                                              .include_main(include_main?)
-                                              .include_subs(include_subs?)
+                  .include_main(include_main?)
+                  .include_subs(include_subs?)
             parsed.source_id.inject(r) { |a, e| a.include_id(e) }
           end
 

data/lib/avm/tools/runner/git/deploy.rb

@@ -78,15 +78,15 @@ module Avm
 
           def deploy
             ::Avm::Git::Commit.new(git, reference_sha1)
-                              .deploy_to_url(target_url)
-                              .append_templatized_directories(appended_directories)
-                              .variables_source_set(variables_source)
-                              .run
+              .deploy_to_url(target_url)
+              .append_templatized_directories(appended_directories)
+              .variables_source_set(variables_source)
+              .run
           end
 
           def target_url
             parsed.target_url.if_present { |v| return v }
-            instance.if_present { |v| return v.read_entry('fs.url') }
+            instance.if_present { |v| return v.read_entry(::Avm::Instances::EntryKeys::FS_URL) }
             nil
           end
 

data/lib/avm/tools/runner/git/dirty_files.rb

@@ -10,7 +10,7 @@ module Avm
           DEFAULT_FORMAT = '%p'
           FIELDS = {
             i: :index, w: :worktree, p: :path, a: :absolute_path
-          }.map { |k, v| ["%#{k}", v] }.to_h
+          }.transform_keys { |k| "%#{k}" }
 
           runner_with :help do
             desc 'Lists dirty files in Git repository.'

data/lib/avm/tools/runner/git/revisions_test.rb

@@ -51,7 +51,7 @@ module Avm
 
           def revisions_uncached
             runner_context.call(:git).execute!('log', '--pretty=format:%H', 'origin/master..HEAD')
-                          .each_line.map(&:strip).reverse.map do |sha1|
+              .each_line.map(&:strip).reverse.map do |sha1|
               ::Avm::Git::RevisionTest.new(runner_context.call(:git), sha1, test_revision_options)
             end
           end

data/lib/avm/tools/runner/ruby/rubocop.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/ruby/rubocop'
+require 'avm/eac_ruby_base1/rubocop'
 
 module Avm
   module Tools
@@ -15,7 +15,7 @@ module Avm
           end
 
           def run
-            ::Avm::Ruby::Rubocop.new(path, parsed.rubocop_args).run
+            ::Avm::EacRubyBase1::Rubocop.new(path, parsed.rubocop_args).run
           end
 
           private

data/lib/avm/tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'
   s.add_dependency 'minitar', '~> 0.9'
 
-  s.add_development_dependency 'aranha-parsers', '~> 0.7', '>= 0.7.2'
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
+  s.add_development_dependency 'aranha-parsers', '~> 0.14', '~> 0.14.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm/lib/avm/instances/base/auto_values/mailer.rb

@@ -9,8 +9,8 @@ module Avm
       module AutoValues
         module Mailer
           ::Avm::Instances::EntryKeys.all.select { |c| c.to_s.start_with?('mailer.') }
-                                     .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
-                                     .each do |mailer_key|
+            .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
+            .each do |mailer_key|
             define_method ::Avm::Instances::Entry.auto_value_method_name(mailer_key) do
               mailer_auto_common(mailer_key)
             end

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -43,8 +43,10 @@ module Avm
 
       {
         '' => %w[data_fs_path fs_path host_id name source_instance_id],
+        admin: %w[username password api_key],
         database: %w[id hostname limit name password port system timeout username extra],
         docker: %w[registry],
+        fs: %w[url],
         mailer: {
           '' => %w[id from reply_to],
           smtp: %w[address port domain username password authentication openssl_verify_mode

data/sub/avm/lib/avm/registry/base.rb

@@ -17,7 +17,7 @@ module Avm
 
       def detect_optional(*registered_initialize_args)
         registered_modules.reverse.lazy.map { |klass| klass.new(*registered_initialize_args) }
-                          .find(&:valid?)
+          .find(&:valid?)
       end
 
       def provider_module_suffix
@@ -40,7 +40,7 @@ module Avm
 
       def registered_modules_uncached
         registered_gems.flat_map { |registry| modules_from_registry(registry) }
-                       .select { |v| valid_registered_module?(v) }.uniq
+          .select { |v| valid_registered_module?(v) }.uniq
       end
 
       def modules_from_registry(registry)

data/sub/avm/lib/avm/rspec/shared_examples/not_in_avm_registry.rb

@@ -4,7 +4,7 @@ require 'avm/registry'
 
 ::RSpec.shared_examples 'not_in_avm_registry' do |registry_method = nil|
   registry_method.if_present(::Avm::Registry.registries) { |v| [::Avm::Registry.send(v)] }
-                 .each do |registry|
+    .each do |registry|
     context "when registry is #{registry}" do
       it 'is not in the avm registry' do
         expect(registry.registered_modules).not_to include(described_class)

data/sub/avm/lib/avm/sources/tests/builder.rb

@@ -33,7 +33,7 @@ module Avm
         # @return [Array<Avm::Sources::Tests::Single>]
         def available_units
           @available_units ||= ([main_source] + main_source.subs)
-                               .map { |a_source| create_unit(a_source) }
+                                 .map { |a_source| create_unit(a_source) }
         end
 
         def available_units_from_main

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.17.0'
+  VERSION = '0.18.1'
 end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb

@@ -17,7 +17,7 @@ module Avm
           end
 
           def source_path
-            build.project.root.join(subpath)
+            build.project.path.join(subpath)
           end
 
           def target_path

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build.rb

@@ -25,7 +25,7 @@ module Avm
         end
 
         def default_target_directory
-          project.root.join('build')
+          project.path.join('build')
         end
 
         def target_directory
@@ -36,7 +36,7 @@ module Avm
 
         def source_files_uncached
           r = []
-          project.root.children.each do |child|
+          project.path.children.each do |child|
             next unless SOURCE_EXTNAMES.include?(child.extname)
 
             r << ::Avm::EacAsciidoctorBase0::Sources::Build::File.new(self, child.basename)

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runner/build.rb

@@ -29,7 +29,7 @@ module Avm
           end
 
           def default_target_directory
-            runner_context.call(:project).root.join('build')
+            runner_context.call(:project).path.join('build')
           end
 
           def open

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runner.rb

@@ -15,8 +15,8 @@ module Avm
         end
 
         def project_banner
-          infov 'Project', project.name
-          infov 'Path', project.root
+          infov 'Project', project.application.name
+          infov 'Path', project.path
         end
 
         private

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   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,9 +12,9 @@ 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'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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.1'
   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%%'; RAILS_ENV=production bundle exec tasks_scheduler "$@" )

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

@@ -12,12 +12,12 @@ 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'
   s.add_dependency 'eac_rest', '~> 0.4'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end