eac_tools 0.60.0 → 0.60.2

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

@@ -6,7 +6,6 @@ module Avm
   module EacLatexBase0
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
-        FILES_UNITS = {}.freeze
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacLatexBase0
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/sub/avm-eac_php_base0/avm-eac_php_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

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

@@ -7,7 +7,6 @@ module Avm
   module EacPhpBase0
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
-        FILES_UNITS = {}.freeze
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPhpBase0
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

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

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   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

@@ -28,7 +28,7 @@ module Avm
             info 'Database has no tables'
           else
             info "Removing #{ts.count} table(s)..."
-            run_sql('drop table ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
+            run_sql('drop table if exists ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
           end
         end
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.2.3'
+    VERSION = '0.2.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.8', '>= 0.8.1'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -7,7 +7,17 @@ module Avm
   module EacRailsBase0
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
-        FILES_UNITS = { uploads: 'public/uploads' }.freeze
+        UPLOADS_UNIT_SUBPATH = 'public/uploads'
+
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          super.add_unit('uploads', uploads_unit)
+        end
+
+        # @return [Avm::Instances::Data::FilesUnit]
+        def uploads_unit
+          ::Avm::Instances::Data::FilesUnit.new(self, UPLOADS_UNIT_SUBPATH)
+        end
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
   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,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
+  s.add_dependency 'avm', '~> 0.67'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.1'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.14'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -17,6 +17,11 @@ module Avm
           the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', DEFAULT_RAILS_ENVIRONMENT)
         end
 
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          super.add_unit('database', database_unit)
+        end
+
         def rake(*args)
           bundle('exec', 'rake', *args)
         end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.8.2'
+    VERSION = '0.8.3'
   end
 end

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

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
+  s.add_dependency 'avm', '~> 0.67'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.2'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.3'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.16'

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'addressable/uri'
-require 'avm/eac_redmine_base0/instances/data_package'
 require 'avm/eac_redmine_base0/instances/docker_image'
 require 'avm/eac_redmine_base0/instances/runners'
 require 'avm/eac_redmine_base0/instances/rest_api'
@@ -31,9 +30,11 @@ module Avm
           ]
         end
 
-        # @return [Avm::EacRedmineBase0::Instances::DataPackage]
-        def data_package
-          @data_package ||= ::Avm::EacRedmineBase0::Instances::DataPackage.new(self)
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          r = super.add_unit('files', files_data_unit).add_unit('gitolite', gitolite_data_unit)
+          r.after_load { instance.run_installer }
+          r
         end
 
         # @return [Addressable::URI]

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -12,6 +12,8 @@ module Avm
       class DockerImage < ::Avm::Instances::DockerImage
         enable_simple_cache
 
+        APACHE_HOST_DOCKERFILE_SUBPATH = 'apache_host_dockerfile'
+        APACHE_PATH_DOCKERFILE_SUBPATH = 'apache_path_dockerfile'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
         REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
@@ -23,9 +25,12 @@ module Avm
         end
 
         def apache_setup
-          return '' if web_path_present?
+          template.child(apache_setup_dockerfile).apply(self)
+        end
 
-          template.child('Dockerfile_apache_setup').apply(self)
+        # @return [String]
+        def apache_setup_dockerfile
+          web_path_present? ? APACHE_PATH_DOCKERFILE_SUBPATH : APACHE_HOST_DOCKERFILE_SUBPATH
         end
 
         def base_image

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.19.0'
+    VERSION = '0.19.2'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile

@@ -0,0 +1,5 @@
+USER root
+RUN a2ensite 000-default
+RUN a2ensite default-ssl
+RUN a2enmod ssl
+RUN service apache2 restart

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

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.66'
+  s.add_dependency 'avm', '~> 0.67'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.3'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.4'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'avm-files', '~> 0.6'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'

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

@@ -4,7 +4,6 @@ require 'avm/instances/base'
 require 'avm/eac_postgresql_base0/instance_with'
 require 'avm/instances/data/files_unit'
 require 'avm/instances/data/package'
-require 'avm/eac_webapp_base0/instances/deploy/file_unit'
 require 'avm/eac_webapp_base0/instances/runners'
 require 'avm/eac_ubuntu_base0/instances/base'
 
@@ -16,8 +15,6 @@ module Avm
         include ::Avm::EacPostgresqlBase0::InstanceWith
         enable_simple_cache
 
-        FILES_UNITS = [].freeze
-
         def data_dump(argv = [])
           run_subcommand(data_dump_runner_class, argv)
         end
@@ -33,10 +30,14 @@ module Avm
           ).run
         end
 
+        # @return [Avm::Instances::Data::Package]
         def data_package
-          @data_package ||= ::Avm::Instances::Data::Package.new(
-            self, units: { database: database_unit }.merge(files_units)
-          )
+          @data_package ||= data_package_create
+        end
+
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          ::Avm::Instances::Data::Package.new(self)
         end
 
         def database_unit
@@ -49,12 +50,6 @@ module Avm
         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::Instances::Data::FilesUnit.new(self, fs_path_subpath)
-          end
-        end
       end
     end
   end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/{file_unit.rb → setup_files_unit.rb}

@@ -4,7 +4,8 @@ module Avm
   module EacWebappBase0
     module Instances
       class Deploy
-        class FileUnit < ::SimpleDelegator
+        class SetupFilesUnit < ::SimpleDelegator
+          enable_method_class
           attr_reader :data_key, :fs_path_subpath
 
           def initialize(deploy, data_key, fs_path_subpath)
@@ -13,7 +14,7 @@ module Avm
             @fs_path_subpath = fs_path_subpath
           end
 
-          def run
+          def result
             assert_source_directory
             link_source_target
           end
@@ -34,9 +35,17 @@ module Avm
 
           def link_source_target
             infom "Linking \"#{data_key}\" directory..."
-            instance.host_env.command('rm', '-rf', target_path).execute!
+            return unless remove_target
+
             instance.host_env.command('ln', '-s', source_path, target_path).execute!
           end
+
+          private
+
+          # @return [Boolean]
+          def remove_target
+            instance.host_env.command('rm', '-rf', target_path).execute.fetch(:exit_code).zero?
+          end
         end
       end
     end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy.rb

@@ -10,7 +10,7 @@ module Avm
   module EacWebappBase0
     module Instances
       class Deploy
-        require_sub __FILE__, include_modules: true
+        require_sub __FILE__, include_modules: true, require_dependency: true
 
         DEFAULT_REFERENCE = 'HEAD'
 
@@ -42,9 +42,8 @@ module Avm
         end
 
         def setup_files_units
-          instance.class.const_get('FILES_UNITS').each do |data_key, fs_path_subpath|
-            FileUnit.new(self, data_key, fs_path_subpath).run
-          end
+          instance.data_package.units.values.map(&:installation_files_data).select(&:present?)
+                  .each { |unit_install| setup_files_unit(unit_install.key, unit_install.subpath) }
         end
 
         def assert_instance_branch

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/load.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/numeric/time'
+require 'avm/result'
 require 'eac_cli/speaker'
 require 'eac_ruby_utils/simple_cache'
 
@@ -17,7 +18,7 @@ module Avm
             end
 
             def run
-              return ::Dev::Result.error("Dump \"#{dump_path}\" does not exist") unless
+              return fatal_error("Dump \"#{dump_path}\" does not exist") unless
               ::File.exist?(dump_path)
 
               load_dump

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.14.0'
+    VERSION = '0.15.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.57'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm', '~> 0.67'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   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/instances/base.rb

@@ -7,7 +7,15 @@ module Avm
   module EacWordpressBase0
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
-        FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
+        THEMES_UNIT_SUBPATH = 'wp-content/themes'
+        UPLOADS_UNIT_SUBPATH = 'wp-content/uploads'
+
+        # @return [Avm::Instances::Data::Package]
+        def data_package_create
+          %w[database themes uploads].inject(super) do |a, e|
+            a.add_unit(e, send("#{e}_unit"))
+          end
+        end
 
         def database_unit
           web_url = read_entry(::Avm::Instances::EntryKeys::WEB_URL)
@@ -20,6 +28,16 @@ module Avm
             SQL
           end
         end
+
+        # @return [Avm::Instances::Data::FilesUnit]
+        def themes_unit
+          ::Avm::Instances::Data::FilesUnit.new(self, THEMES_UNIT_SUBPATH)
+        end
+
+        # @return [Avm::Instances::Data::FilesUnit]
+        def uploads_unit
+          ::Avm::Instances::Data::FilesUnit.new(self, UPLOADS_UNIT_SUBPATH)
+        end
       end
     end
   end

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

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