avm-eac_redmine_base0 0.18.2 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ee700356cc1a169722b6d2fde458d15ff4db2e631511e922d10bf4799d0e56
-  data.tar.gz: '08831928259ce9ad89b579bf8d7512143b52149c91acee8a336386d2bfc94546'
+  metadata.gz: b27527dc74e72e965df3c22833d830e38db777b978c51029724bc0a6ed9f4e8d
+  data.tar.gz: 6b9d3b228d2b45ee20a62a2870f8f20a81bbce3a6d64c13c3fe5030e6a305880
 SHA512:
-  metadata.gz: 0b5cfcb2f093b265bfcdb8f2382af5301e976bb7c1cc048a8c613b11d23f214cde0432271fb430b5984ab70c40c7f0f808cfabfea2716d653ed62c09b05557ad
-  data.tar.gz: a2f56e430271194bccaa50570f86f0c6c94e2f3c75b04479dc4fc603da7fba4d30fac38a97e51c6ee293d70abefdcfdec44c9978996b8639ca07db86a1939436
+  metadata.gz: 2fb910a6048022cdc49c0abe2a5f75808a616ae15c92fd5d3b71f694bd254b55c86d02fe9dd378b5477bdc83fcc9d32fe2901b81a0694cfa26c8d93549fef715
+  data.tar.gz: 4b81fbff0ad9dc1465f564e28859a20ebabc2a93374812bebc9d719d6fa4ed635669994eeb43bb2b45520596d32aeae93111ee0ccab12be217dc5c13d9fdda01

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

@@ -0,0 +1,22 @@
+# 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 Nodejs
+          DEFAULT_NODEJS_VERSION = '19.8.1'
+          NODEJS_VERSION_KEY = 'nodejs.version'
+
+          def auto_install_nodejs_version
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, NODEJS_VERSION_KEY) ||
+              DEFAULT_NODEJS_VERSION
+          end
+        end
+      end
+    end
+  end
+end

data/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/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.18.2'
+    VERSION = '0.19.1'
   end
 end

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

@@ -1,5 +1,8 @@
 # Ruby
-export rvm_ruby='ruby-%%RUBY.VERSION%%'
+export ruby_version='%%INSTALL.RUBY.VERSION%%'
+
+# NodeJs
+export nodejs_version='%%INSTALL.NODEJS.VERSION%%'
 
 # Database
 export postgresql_internal='%%DATABASE_INTERNAL%%'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.65'
+        version: '0.67'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.65'
+        version: '0.67'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +174,8 @@ files:
 - 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/nodejs.rb
 - lib/avm/eac_redmine_base0/instances/base/web.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_package.rb

@@ -1,23 +0,0 @@
-# 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