avm-eac_redmine_base0 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d851b9a2e5895bffd9830f752d05e18957b897e44398026c61916ecc3955b7
-  data.tar.gz: b744ea2ec75dc9f349475c66a94a5611a38d208b4c53b8116e3029d87aba2858
+  metadata.gz: f24264eaab80e14c42168a30561e40f309f84a9d67dc5e45c078409a1dbd3eda
+  data.tar.gz: e7b114c9bea0d113cefd1c6e9f8d231d03a39d743e04042e5417bc5b92751ecb
 SHA512:
-  metadata.gz: fdeb8c77b40dacf07dfaf1f738eed19e1f255f562030f487aecce8bc25b765b8e49a95d773a25bb5518e9b3a715e3fbf5698770e17b360e3b711d1934aa47cd3
-  data.tar.gz: 0ba34fcbe7f3ceee0b31c8025ef4168ccd7b4d985aed23089a4c547b7cba1ee32ec3199ffb6595546ee0a02a7ce162ae0fa10228d916be6048cd05fd5f2cf034
+  metadata.gz: aed7b120ecde3e0fcc81ff01530eb1fec356b62ec934c6d5f39b0acebd61df31864c6af4f3726fa7e8aa2892c2624898421980d4c600f2d9767e9f648293942a
+  data.tar.gz: 613324a28ac37018f479b597dcfd7e9ced06bba558a891842b1ad391b09b21f98ecbce39e090606889826cf7f47037d6cde6545975bb278837cba39a8391b323

data/lib/avm/eac_redmine_base0/instances/base/files.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+require 'avm/instances/data/files_unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        module Files
+          FILES_SUBPATH = 'files'
+
+          # @return [Avm::Instances::Data::FilesUnit]
+          def files_data_unit
+            ::Avm::Instances::Data::FilesUnit.new(self, FILES_SUBPATH)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/base/gitolite.rb

@@ -18,6 +18,12 @@ module Avm
             uri_components_entries_values GITOLITE_ENTRY_KEYS_PREFIX
           end
 
+          # @return [Avm::Instances::Data::FilesUnit]
+          def gitolite_data_unit
+            ::Avm::Instances::Data::FilesUnit.new(self, gitolite_repositories_path,
+                                                  sudo_user: entry('gitolite.username').value!)
+          end
+
           def gitolite_hostname_default_value
             DEFAULT_HOSTNAME
           end
@@ -28,6 +34,11 @@ module Avm
             end
           end
 
+          # @return [Pathname]
+          def gitolite_repositories_path
+            entry('gitolite.path').value!.to_pathname.join('repositories')
+          end
+
           def gitolite_scheme_default_value
             DEFAULT_SCHEME
           end

data/lib/avm/eac_redmine_base0/instances/base/install.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        module Install
+          def run_installer
+            ::EacRubyUtils::Ruby.on_clean_environment do
+              installer_command.system!
+            end
+          end
+
+          def installer_command
+            host_env.command(installer_path, install_task)
+          end
+
+          def installer_path
+            ::File.join(install_path, 'plugins', 'redmine_installer', 'installer',
+                        'run.sh')
+          end
+
+          def install_task
+            if web_path_optional.present?
+              'redmine_as_apache_path'
+            else
+              'redmine_as_apache_base'
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'addressable/uri'
-require 'avm/eac_redmine_base0/instances/data_unit'
+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'
@@ -14,8 +14,6 @@ module Avm
         require_sub __FILE__, include_modules: true
         enable_simple_cache
 
-        FILES_UNITS = { files: 'files' }.freeze
-
         def docker_image_class
           ::Avm::EacRedmineBase0::Instances::DockerImage
         end
@@ -30,13 +28,9 @@ module Avm
           ]
         end
 
+        # @return [Avm::EacRedmineBase0::Instances::DataPackage]
         def data_package
-          @data_package ||= ::Avm::Data::Instance::Package.new(
-            self,
-            units: {
-              all: ::Avm::EacRedmineBase0::Instances::DataUnit.new(self)
-            }
-          )
+          @data_package ||= ::Avm::EacRedmineBase0::Instances::DataPackage.new(self)
         end
 
         # @return [Addressable::URI]

data/lib/avm/eac_redmine_base0/instances/data_package.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/instances/data/package'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class DataPackage < ::Avm::Instances::Data::Package
+        after_load :run_installer
+
+        def initialize(instance, options = {})
+          super(instance, options.merge(units: options[:units].if_present({}).merge(
+            database: instance.database_unit, files: instance.files_data_unit,
+            gitolite: instance.gitolite_data_unit
+          )))
+        end
+
+        delegate :run_installer, to: :instance
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instances/deploy.rb

@@ -11,25 +11,7 @@ module Avm
 
         def run_installer
           infom 'Running installer'
-          ::EacRubyUtils::Ruby.on_clean_environment do
-            installer_command.system!
-          end
-        end
-
-        def installer_command
-          instance.host_env.command(installer_path, install_task)
-        end
-
-        def installer_path
-          ::File.join(instance.install_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
-        end
-
-        def install_task
-          if instance.web_path_optional.present?
-            'redmine_as_apache_path'
-          else
-            'redmine_as_apache_base'
-          end
+          instance.run_installer
         end
       end
     end

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

data/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template

@@ -22,8 +22,8 @@ export address_path='%%WEB.PATH%%'
 
 # Git
 export git_repositories_hierarchical_organisation=false
-export gitolite_user='%%GIT.USERNAME%%'
-export gitolite_user_home="/var/lib/${gitolite_user}"
+export gitolite_user='%%GITOLITE.USERNAME%%'
+export gitolite_user_home='%%GITOLITE.PATH%%'
 export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
 
 # Mail settings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,42 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.57'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.57'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: eac_rest
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        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.104'
+        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
@@ -165,9 +171,11 @@ files:
 - lib/avm/eac_redmine_base0/instances/apache_host.rb
 - lib/avm/eac_redmine_base0/instances/base.rb
 - lib/avm/eac_redmine_base0/instances/base/database.rb
+- lib/avm/eac_redmine_base0/instances/base/files.rb
 - lib/avm/eac_redmine_base0/instances/base/gitolite.rb
+- lib/avm/eac_redmine_base0/instances/base/install.rb
 - lib/avm/eac_redmine_base0/instances/base/web.rb
-- lib/avm/eac_redmine_base0/instances/data_unit.rb
+- lib/avm/eac_redmine_base0/instances/data_package.rb
 - lib/avm/eac_redmine_base0/instances/deploy.rb
 - lib/avm/eac_redmine_base0/instances/docker_image.rb
 - lib/avm/eac_redmine_base0/instances/rest_api.rb

data/lib/avm/eac_redmine_base0/instances/data_unit.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/data/instance/unit'
-require 'eac_ruby_utils/core_ext'
-require 'curb'
-require 'open-uri'
-
-module Avm
-  module EacRedmineBase0
-    module Instances
-      class DataUnit < ::Avm::Data::Instance::Unit
-        common_constructor :instance
-
-        EXPORT_PATH = '/backup/export'
-        EXTENSION = '.tar'
-        IMPORT_PATH = '/backup/import.json'
-
-        def do_dump(data_path)
-          ::File.open(data_path, 'wb') do |file|
-            file << export_request.response.body_data_or_raise
-          end
-        end
-
-        def do_load(data_path)
-          do_load_by_web(data_path) || do_load_by_rake(data_path) || raise('Failed to load')
-        end
-
-        def do_load_by_web(data_path)
-          c = Curl::Easy.new(import_url)
-          c.multipart_form_post = true
-          c.http_post(Curl::PostField.file('redmine_with_git_tableless_load[path]', data_path))
-          c.perform
-          true
-        rescue Curl::Err::ConnectionFailedError
-          false
-        end
-
-        def do_load_by_rake(data_path)
-          instance.bundle('exec', 'rake', "redmine_with_git:load:all[#{data_path}]").system
-          true
-        end
-
-        def export_request
-          instance.rest_api.request(EXPORT_PATH)
-        end
-
-        def import_url
-          instance.rest_api.build_service_url(IMPORT_PATH).to_s
-        end
-      end
-    end
-  end
-end